Merge pull request #5 from LlmLaraHub/modules

Start moving all the core stuff into Modules

Modules/Foundation/module.json

@@ -0,0 +1,11 @@
+{
+    "name": "Foundation",
+    "alias": "foundation",
+    "description": "",
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+
+    ],
+    "files": []
+}

app/LlmDriver/readme.md → Modules/LlmDriver/README.md

@@ -18,7 +18,6 @@ return [
     App\Providers\FortifyServiceProvider::class,
     App\Providers\HorizonServiceProvider::class,
     App\Providers\JetstreamServiceProvider::class,
-    App\LlmDriver\LlmServiceProvider::class,
+    \LlmLaraHub\LlmDriver\LlmServiceProvider::class,
 ];
-
 ```

app/LlmDriver/BaseClient.php → Modules/LlmDriver/app/BaseClient.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
-use App\LlmDriver\Requests\MessageInDto;
-use App\LlmDriver\Responses\CompletionResponse;
-use App\LlmDriver\Responses\EmbeddingsResponseDto;
 use Illuminate\Support\Facades\Log;
+use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use LlmLaraHub\LlmDriver\Responses\CompletionResponse;
+use LlmLaraHub\LlmDriver\Responses\EmbeddingsResponseDto;
 
 abstract class BaseClient
 {

app/LlmDriver/ClaudeClient.php → Modules/LlmDriver/app/ClaudeClient.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
-use App\LlmDriver\Requests\MessageInDto;
-use App\LlmDriver\Responses\CompletionResponse;
-use App\LlmDriver\Responses\EmbeddingsResponseDto;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
+use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use LlmLaraHub\LlmDriver\Responses\CompletionResponse;
+use LlmLaraHub\LlmDriver\Responses\EmbeddingsResponseDto;
 
 class ClaudeClient extends BaseClient
 {

app/LlmDriver/DriversEnum.php → Modules/LlmDriver/app/DriversEnum.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
 enum DriversEnum: string
 {

app/LlmDriver/Functions/ArgumentCaster.php → Modules/LlmDriver/app/Functions/ArgumentCaster.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Functions;
+namespace LlmLaraHub\LlmDriver\Functions;
 
 use Spatie\LaravelData\Casts\Cast;
 use Spatie\LaravelData\Support\Creation\CreationContext;

app/LlmDriver/Functions/FunctionCallDto.php → Modules/LlmDriver/app/Functions/FunctionCallDto.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Functions;
+namespace LlmLaraHub\LlmDriver\Functions;
 
 use Spatie\LaravelData\Attributes\WithCast;
 

app/LlmDriver/Functions/FunctionContract.php → Modules/LlmDriver/app/Functions/FunctionContract.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\LlmDriver\Functions;
+namespace LlmLaraHub\LlmDriver\Functions;
 
-use App\LlmDriver\Requests\MessageInDto;
-use App\LlmDriver\Responses\FunctionResponse;
 use App\Models\Chat;
+use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use LlmLaraHub\LlmDriver\Responses\FunctionResponse;
 
 abstract class FunctionContract
 {

app/LlmDriver/Functions/FunctionDto.php → Modules/LlmDriver/app/Functions/FunctionDto.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Functions;
+namespace LlmLaraHub\LlmDriver\Functions;
 
 class FunctionDto extends \Spatie\LaravelData\Data
 {

app/LlmDriver/Functions/ParametersDto.php → Modules/LlmDriver/app/Functions/ParametersDto.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Functions;
+namespace LlmLaraHub\LlmDriver\Functions;
 
 class ParametersDto extends \Spatie\LaravelData\Data
 {

app/LlmDriver/Functions/PropertyDto.php → Modules/LlmDriver/app/Functions/PropertyDto.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Functions;
+namespace LlmLaraHub\LlmDriver\Functions;
 
 class PropertyDto extends \Spatie\LaravelData\Data
 {

app/LlmDriver/Functions/SearchAndSummarize.php → Modules/LlmDriver/app/Functions/SearchAndSummarize.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\LlmDriver\Functions;
+namespace LlmLaraHub\LlmDriver\Functions;
 
-use App\LlmDriver\Responses\FunctionResponse;
 use App\Models\Chat;
+use LlmLaraHub\LlmDriver\Responses\FunctionResponse;
 
 class SearchAndSummarize extends FunctionContract
 {

app/LlmDriver/Functions/SummarizeCollection.php → Modules/LlmDriver/app/Functions/SummarizeCollection.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\LlmDriver\Functions;
+namespace LlmLaraHub\LlmDriver\Functions;
 
 use App\Domains\Messages\RoleEnum;
-use App\LlmDriver\LlmDriverFacade;
-use App\LlmDriver\Requests\MessageInDto;
-use App\LlmDriver\Responses\FunctionResponse;
 use App\Models\Chat;
 use Illuminate\Support\Facades\Log;
+use LlmLaraHub\LlmDriver\LlmDriverFacade;
+use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use LlmLaraHub\LlmDriver\Responses\FunctionResponse;
 
 class SummarizeCollection extends FunctionContract
 {

app/LlmDriver/HasDrivers.php → Modules/LlmDriver/app/HasDrivers.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
 interface HasDrivers
 {

Modules/LlmDriver/app/Helpers/JobMiddlewareTrait.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace LlmLaraHub\LlmDriver\Helpers;
+
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use LlmLaraHub\LlmDriver\HasDrivers;
+use LlmLaraHub\LlmDriver\LlmDriverFacade;
+
+trait JobMiddlewareTrait
+{
+    public function driverMiddleware(HasDrivers $hasDrivers): array
+    {
+        $defaults = [];
+
+        /**
+         * @NOTE
+         * basically Ollama can only handle one job
+         * at a time from what I can tell right now.
+         * So this prevents to many jobs hitting
+         * it at once
+         */
+        if (LlmDriverFacade::driver($hasDrivers->getDriver())->isAsync()) {
+            return $defaults;
+        }
+
+        return [
+            (new WithoutOverlapping($hasDrivers->getDriver()))
+                ->releaseAfter(30)
+                ->expireAfter(600),
+        ];
+    }
+}

app/LlmDriver/Helpers/TrimText.php → Modules/LlmDriver/app/Helpers/TrimText.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Helpers;
+namespace LlmLaraHub\LlmDriver\Helpers;
 
 use voku\helper\StopWords;
 use Wamania\Snowball\StemmerFactory;

app/LlmDriver/LlmDriverClient.php → Modules/LlmDriver/app/LlmDriverClient.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
-use App\LlmDriver\Functions\SummarizeCollection;
+use LlmLaraHub\LlmDriver\Functions\SummarizeCollection;
 
 class LlmDriverClient
 {

app/LlmDriver/LlmDriverFacade.php → Modules/LlmDriver/app/LlmDriverFacade.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
 use Illuminate\Support\Facades\Facade;
 

app/LlmDriver/LlmServiceProvider.php → Modules/LlmDriver/app/LlmServiceProvider.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
-use App\LlmDriver\Functions\SearchAndSummarize;
-use App\LlmDriver\Functions\SummarizeCollection;
 use Illuminate\Support\ServiceProvider;
+use LlmLaraHub\LlmDriver\Functions\SearchAndSummarize;
+use LlmLaraHub\LlmDriver\Functions\SummarizeCollection;
 
 class LlmServiceProvider extends ServiceProvider
 {

app/LlmDriver/MockClient.php → Modules/LlmDriver/app/MockClient.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
 class MockClient extends BaseClient
 {

app/LlmDriver/OllamaClient.php → Modules/LlmDriver/app/OllamaClient.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
-use App\LlmDriver\Requests\MessageInDto;
-use App\LlmDriver\Responses\CompletionResponse;
-use App\LlmDriver\Responses\EmbeddingsResponseDto;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Laravel\Pennant\Feature;
+use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use LlmLaraHub\LlmDriver\Responses\CompletionResponse;
+use LlmLaraHub\LlmDriver\Responses\EmbeddingsResponseDto;
 
 class OllamaClient extends BaseClient
 {

app/LlmDriver/OpenAiClient.php → Modules/LlmDriver/app/OpenAiClient.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
-use App\LlmDriver\Requests\MessageInDto;
-use App\LlmDriver\Responses\CompletionResponse;
-use App\LlmDriver\Responses\EmbeddingsResponseDto;
 use Illuminate\Support\Facades\Log;
+use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use LlmLaraHub\LlmDriver\Responses\CompletionResponse;
+use LlmLaraHub\LlmDriver\Responses\EmbeddingsResponseDto;
 use OpenAI\Laravel\Facades\OpenAI;
 
 class OpenAiClient extends BaseClient

app/LlmDriver/Orchestrate.php → Modules/LlmDriver/app/Orchestrate.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace App\LlmDriver;
+namespace LlmLaraHub\LlmDriver;
 
 use App\Domains\Messages\RoleEnum;
 use App\Events\ChatUiUpdateEvent;
-use App\LlmDriver\Functions\FunctionCallDto;
-use App\LlmDriver\Requests\MessageInDto;
-use App\LlmDriver\Responses\FunctionResponse;
 use App\Models\Chat;
 use Facades\App\Domains\Messages\SearchOrSummarizeChatRepo;
 use Illuminate\Support\Arr;
+use LlmLaraHub\LlmDriver\Functions\FunctionCallDto;
+use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use LlmLaraHub\LlmDriver\Responses\FunctionResponse;
 
 class Orchestrate
 {

app/LlmDriver/Requests/MessageInDto.php → Modules/LlmDriver/app/Requests/MessageInDto.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Requests;
+namespace LlmLaraHub\LlmDriver\Requests;
 
 use Spatie\LaravelData\Data;
 

app/LlmDriver/Responses/CompletionResponse.php → Modules/LlmDriver/app/Responses/CompletionResponse.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Responses;
+namespace LlmLaraHub\LlmDriver\Responses;
 
 class CompletionResponse extends \Spatie\LaravelData\Data
 {

app/LlmDriver/Responses/EmbeddingsResponseDto.php → Modules/LlmDriver/app/Responses/EmbeddingsResponseDto.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Responses;
+namespace LlmLaraHub\LlmDriver\Responses;
 
 use Pgvector\Laravel\Vector;
 use Spatie\LaravelData\Attributes\WithCastable;

app/LlmDriver/Responses/FunctionResponse.php → Modules/LlmDriver/app/Responses/FunctionResponse.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Responses;
+namespace LlmLaraHub\LlmDriver\Responses;
 
 /**
  * @NOTE

app/LlmDriver/Responses/VectorCaster.php → Modules/LlmDriver/app/Responses/VectorCaster.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\LlmDriver\Responses;
+namespace LlmLaraHub\LlmDriver\Responses;
 
 use Pgvector\Laravel\Vector;
 use Spatie\LaravelData\Casts\Cast;

Modules/LlmDriver/composer.json

@@ -0,0 +1,28 @@
+{
+    "name": "llmlarahub/llmdriver",
+    "description": "Driver for any LLM",
+    "authors": [
+        {
+            "name": "Alfred Nutile",
+            "email": "[email protected]"
+        }
+    ],
+    "extra": {
+        "laravel": {
+            "providers": [],
+            "aliases": {
+
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "LlmLaraHub\\LlmDriver\\": "app/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "LlmLaraHub\\LlmDriver\\Tests\\": "tests/"
+        }
+    }
+}

Modules/LlmDriver/module.json

@@ -0,0 +1,11 @@
+{
+    "name": "LlmDriver",
+    "alias": "llmdriver",
+    "description": "",
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+
+    ],
+    "files": []
+}