Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 16e023e

Browse files
committedAug 2, 2024·
omg this will simplify a lot of things but it sure is making a lot of changes
1 parent 076d53b commit 16e023e

11 files changed

+16
-27
lines changed
 

‎Modules/LlmDriver/app/Functions/CreateDocument.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22

33
namespace LlmLaraHub\LlmDriver\Functions;
44

5-
use App\Domains\Documents\StatusEnum;
6-
use App\Domains\Documents\TypesEnum;
7-
use App\Domains\Sources\WebSearch\Response\SearchResponseDto;
8-
use App\Domains\Sources\WebSearch\WebSearchFacade;
9-
use App\Models\Document;
10-
use Facades\App\Domains\Tokenizer\Templatizer;
115
use App\Helpers\ChatHelperTrait;
6+
use App\Models\Document;
127
use App\Models\Message;
13-
use Facades\App\Domains\Sources\WebSearch\GetPage;
148
use Illuminate\Support\Facades\Log;
15-
use LlmLaraHub\LlmDriver\LlmDriverFacade;
169
use LlmLaraHub\LlmDriver\Responses\FunctionResponse;
1710
use LlmLaraHub\LlmDriver\ToolsHelper;
1811

‎Modules/LlmDriver/app/OllamaClient.php

-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ public function completion(string $prompt): CompletionResponse
186186
'stream' => false,
187187
]);
188188

189-
190189
return OllamaCompletionResponse::from($response->json());
191190
}
192191

‎Modules/LlmDriver/app/Responses/ClaudeCompletionResponse.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function __construct(
1212
#[WithCastable(ClaudeContentCaster::class)]
1313
public mixed $content,
1414
public string|Optional $stop_reason,
15-
public string|null $tool_used = "",
15+
public ?string $tool_used = '',
1616
/** @var array<ToolDto> */
1717
#[WithCastable(ClaudeToolCaster::class)]
1818
#[MapInputName('content')]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class CompletionResponse extends \Spatie\LaravelData\Data
99
public function __construct(
1010
public mixed $content,
1111
public string|Optional $stop_reason,
12-
public string|null $tool_used = "",
12+
public ?string $tool_used = '',
1313
/** @var array<ToolDto> */
1414
public array $tool_calls = [],
1515
public ?int $input_tokens = null,

‎Modules/LlmDriver/app/Responses/OllamaCompletionResponse.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function __construct(
1212
public mixed $content,
1313
#[MapInputName('done_reason')]
1414
public string|Optional $stop_reason,
15-
public string|null $tool_used = "",
15+
public ?string $tool_used = '',
1616
/** @var array<OllamaToolDto> */
1717
#[MapInputName('message.tool_calls')]
1818
public array $tool_calls = [],

‎app/Jobs/ProcessTextFilesJob.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ public function handle(): void
9292
Bus::batch([
9393
[
9494
new TagDocumentJob($document),
95-
new DocumentProcessingCompleteJob($document)
96-
]
95+
new DocumentProcessingCompleteJob($document),
96+
],
9797
])
98-
->name("Finalizing Documents")
98+
->name('Finalizing Documents')
9999
->allowFailures()
100100
->dispatch();
101101
})

‎app/Models/Document.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
use Illuminate\Support\Facades\Bus;
2020
use Illuminate\Support\Facades\Log;
2121
use LlmLaraHub\LlmDriver\HasDrivers;
22-
use LlmLaraHub\LlmDriver\LlmDriverFacade;
2322
use LlmLaraHub\TagFunction\Contracts\TaggableContract;
2423
use LlmLaraHub\TagFunction\Helpers\Taggable;
2524
use LlmLaraHub\TagFunction\Jobs\TagDocumentJob;
@@ -164,7 +163,7 @@ public static function make(
164163
string $content,
165164
Collection $collection,
166165
?string $filePath = null
167-
) : Document {
166+
): Document {
168167
return Document::create([
169168
'file_path' => $filePath,
170169
'collection_id' => $collection->id,
@@ -213,10 +212,10 @@ public function vectorizeDocument(): void
213212
[
214213
new SummarizeDocumentJob($document),
215214
new TagDocumentJob($document),
216-
new DocumentProcessingCompleteJob($document)
217-
]
215+
new DocumentProcessingCompleteJob($document),
216+
],
218217
])
219-
->name("Finalizing Documents")
218+
->name('Finalizing Documents')
220219
->allowFailures()
221220
->dispatch();
222221
})

‎app/Models/Message.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use App\Events\MessageCreatedEvent;
1010
use App\Jobs\OrchestrateJob;
1111
use App\Jobs\SimpleRetrieveRelatedOrchestrateJob;
12-
use App\Jobs\SimpleSearchAndSummarizeOrchestrateJob;
1312
use Facades\App\Domains\Tokenizer\Templatizer;
1413
use Illuminate\Bus\Batch;
1514
use Illuminate\Database\Eloquent\Factories\HasFactory;

‎tests/Feature/Http/Controllers/ChatControllerTest.php

-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use App\Models\User;
1212
use Facades\App\Domains\Agents\VerifyResponseAgent;
1313
use Facades\LlmLaraHub\LlmDriver\Orchestrate;
14-
use Illuminate\Support\Facades\Bus;
1514
use LlmLaraHub\LlmDriver\LlmDriverFacade;
1615
use LlmLaraHub\LlmDriver\Responses\CompletionResponse;
1716
use Tests\TestCase;
@@ -178,8 +177,6 @@ public function test_kick_off_chat_makes_system()
178177

179178
}
180179

181-
182-
183180
public function test_standard_checker()
184181
{
185182
Orchestrate::shouldReceive('handle')->once()->andReturn('Yo');

‎tests/Feature/Models/DocumentTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public function test_parent()
3737
$model->parent->id);
3838
}
3939

40-
public function test_document_make() {
40+
public function test_document_make()
41+
{
4142
$collection = \App\Models\Collection::factory()->create();
4243
$document = Document::make('Foo bar',
4344
$collection);
@@ -48,7 +49,8 @@ public function test_document_make() {
4849
$this->assertNotNull($document->collection->documents()->first()->id);
4950
}
5051

51-
public function test_document_vectorize() {
52+
public function test_document_vectorize()
53+
{
5254
Bus::fake();
5355
$collection = \App\Models\Collection::factory()->create();
5456
$document = Document::make('Foo bar',

‎tests/Feature/SearchAndSummarizeChatRepoTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use App\Domains\Agents\VerifyPromptOutputDto;
66
use App\Domains\Chat\MetaDataDto;
7-
use App\Domains\Messages\RoleEnum;
87
use App\Domains\Messages\RetrieveRelatedChatRepo;
8+
use App\Domains\Messages\RoleEnum;
99
use App\Models\Chat;
1010
use App\Models\Collection;
1111
use App\Models\Document;

0 commit comments

Comments
 (0)
Please sign in to comment.