Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/Commands/KnowledgeSearchStatusCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Commands;

use App\Contracts\EmbeddingServiceInterface;
use LaravelZero\Framework\Commands\Command;
use TheShit\Vector\Contracts\EmbeddingClient;

use function Termwind\render;

Expand All @@ -21,7 +21,7 @@ class KnowledgeSearchStatusCommand extends Command
*/
protected $description = 'Show search capabilities and configuration status';

public function handle(EmbeddingServiceInterface $embeddingService): int
public function handle(EmbeddingClient $embeddingService): int
{
// Gather data
/** @var bool $semanticEnabled */
Expand All @@ -31,7 +31,7 @@ public function handle(EmbeddingServiceInterface $embeddingService): int
/** @var string|null $embeddingProvider */
$embeddingProvider = config('search.embedding_provider') ?: 'none';

$testEmbedding = $embeddingService->generate('test');
$testEmbedding = $embeddingService->embed('test');
$hasEmbeddingSupport = $testEmbedding !== [];

$qdrant = app(\App\Services\QdrantService::class);
Expand Down
25 changes: 0 additions & 25 deletions app/Contracts/EmbeddingServiceInterface.php

This file was deleted.

35 changes: 19 additions & 16 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace App\Providers;

use App\Contracts\EmbeddingServiceInterface;
use App\Contracts\HealthCheckInterface;
use App\Services\DailyLogService;
use App\Services\DeletionTracker;
Expand All @@ -17,10 +16,10 @@
use App\Services\QdrantService;
use App\Services\RemoteSyncService;
use App\Services\RuntimeEnvironment;
use App\Services\StubEmbeddingService;
use App\Services\TieredSearchService;
use App\Services\WriteGateService;
use Illuminate\Support\ServiceProvider;
use TheShit\Vector\Contracts\EmbeddingClient;
use TheShit\Vector\Qdrant;

class AppServiceProvider extends ServiceProvider
Expand Down Expand Up @@ -95,9 +94,24 @@ private function loadUserConfig(): void
config(['search.qdrant.collection' => $userConfig['qdrant']['collection']]);
}

// embeddings.url -> search.qdrant.embedding_server
// embeddings.provider -> vector.embeddings.provider
if (isset($userConfig['embeddings']['provider']) && is_string($userConfig['embeddings']['provider'])) {
config(['vector.embeddings.provider' => $userConfig['embeddings']['provider']]);
}

// embeddings.model -> vector.embeddings.model
if (isset($userConfig['embeddings']['model']) && is_string($userConfig['embeddings']['model'])) {
config(['vector.embeddings.model' => $userConfig['embeddings']['model']]);
}

// embeddings.url -> vector.embeddings.url
if (isset($userConfig['embeddings']['url']) && is_string($userConfig['embeddings']['url'])) {
config(['search.qdrant.embedding_server' => $userConfig['embeddings']['url']]);
config(['vector.embeddings.url' => $userConfig['embeddings']['url']]);
}

// embeddings.api_key -> vector.embeddings.api_key
if (isset($userConfig['embeddings']['api_key']) && is_string($userConfig['embeddings']['api_key'])) {
config(['vector.embeddings.api_key' => $userConfig['embeddings']['api_key']]);
}

// write_gate.criteria -> write-gate.criteria (per-project overrides)
Expand Down Expand Up @@ -128,17 +142,6 @@ public function register(): void
$app->make(RuntimeEnvironment::class)
));

// Embedding service
$this->app->singleton(EmbeddingServiceInterface::class, function (): \App\Services\StubEmbeddingService|\App\Services\EmbeddingService {
if (config('search.embedding_provider') === 'none') {
return new StubEmbeddingService;
}

return new \App\Services\EmbeddingService(
config('search.qdrant.embedding_server', 'http://localhost:8001')
);
});

// Knowledge cache service
$this->app->singleton(KnowledgeCacheService::class, fn (): \App\Services\KnowledgeCacheService => new KnowledgeCacheService);

Expand All @@ -157,7 +160,7 @@ public function register(): void

// Qdrant vector database service
$this->app->singleton(QdrantService::class, fn ($app): \App\Services\QdrantService => new QdrantService(
embeddingService: $app->make(EmbeddingServiceInterface::class),
embeddingService: $app->make(EmbeddingClient::class),
qdrant: $app->make(Qdrant::class),
vectorSize: (int) config('search.embedding_dimension', 1024),
scoreThreshold: (float) config('search.minimum_similarity', 0.7),
Expand Down
10 changes: 5 additions & 5 deletions app/Services/CodeIndexerService.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace App\Services;

use App\Contracts\EmbeddingServiceInterface;
use Saloon\Exceptions\Request\RequestException;
use Symfony\Component\Finder\Finder;
use TheShit\Vector\Contracts\EmbeddingClient;
use TheShit\Vector\Data\ScoredPoint;
use TheShit\Vector\Qdrant;

Expand Down Expand Up @@ -34,7 +34,7 @@ class CodeIndexerService
private const FILE_EXTENSIONS = ['php', 'py', 'js', 'ts', 'tsx', 'jsx', 'vue'];

public function __construct(
private readonly EmbeddingServiceInterface $embeddingService,
private readonly EmbeddingClient $embeddingService,
private readonly Qdrant $qdrant,
private readonly int $vectorSize = 1024,
) {}
Expand Down Expand Up @@ -119,7 +119,7 @@ public function indexFile(string $filepath, string $repo): array
$id = md5($filepath.'_'.$index);
$text = $this->buildSearchableText($chunk['content'], $filepath, $functions);

$vector = $this->embeddingService->generate($text);
$vector = $this->embeddingService->embed($text);

if ($vector === []) {
continue;
Expand Down Expand Up @@ -164,7 +164,7 @@ public function indexFile(string $filepath, string $repo): array
*/
public function search(string $query, int $limit = 10, array $filters = []): array
{
$vector = $this->embeddingService->generate($query);
$vector = $this->embeddingService->embed($query);

if ($vector === []) {
return [];
Expand Down Expand Up @@ -212,7 +212,7 @@ public function indexSymbol(
int $line,
string $signature,
): array {
$vector = $this->embeddingService->generate($text);
$vector = $this->embeddingService->embed($text);

if ($vector === []) {
return ['success' => false, 'error' => 'Empty embedding'];
Expand Down
86 changes: 0 additions & 86 deletions app/Services/EmbeddingService.php

This file was deleted.

10 changes: 5 additions & 5 deletions app/Services/QdrantService.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace App\Services;

use App\Contracts\EmbeddingServiceInterface;
use App\Contracts\SparseEmbeddingServiceInterface;
use App\Exceptions\Qdrant\CollectionCreationException;
use App\Exceptions\Qdrant\ConnectionException;
Expand All @@ -14,6 +13,7 @@
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Cache;
use Saloon\Exceptions\Request\RequestException;
use TheShit\Vector\Contracts\EmbeddingClient;
use TheShit\Vector\Data\ScoredPoint;
use TheShit\Vector\Qdrant;

Expand All @@ -22,7 +22,7 @@ class QdrantService
private ?SparseEmbeddingServiceInterface $sparseEmbeddingService = null;

public function __construct(
private readonly EmbeddingServiceInterface $embeddingService,
private readonly EmbeddingClient $embeddingService,
private readonly Qdrant $qdrant,
private readonly int $vectorSize = 384,
private readonly float $scoreThreshold = 0.7,
Expand Down Expand Up @@ -572,11 +572,11 @@ public function getCollectionName(string $project): string
private function getCachedEmbedding(string $text): array
{
if (! config('search.qdrant.cache_embeddings', true)) {
return $this->embeddingService->generate($text);
return $this->embeddingService->embed($text);
}

if ($this->cacheService instanceof KnowledgeCacheService) {
return $this->cacheService->rememberEmbedding($text, fn (): array => $this->embeddingService->generate($text));
return $this->cacheService->rememberEmbedding($text, fn (): array => $this->embeddingService->embed($text));
}

$cacheKey = 'embedding:'.hash('xxh128', $text);
Expand All @@ -585,7 +585,7 @@ private function getCachedEmbedding(string $text): array
return Cache::remember(
$cacheKey,
$this->cacheTtl,
fn (): array => $this->embeddingService->generate($text)
fn (): array => $this->embeddingService->embed($text)
);
}

Expand Down
35 changes: 0 additions & 35 deletions app/Services/StubEmbeddingService.php

This file was deleted.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"laravel/mcp": "^0.6.0",
"saloonphp/saloon": "^4.0",
"symfony/uid": "^8.0",
"the-shit/vector": "^0.1.1"
"the-shit/vector": "^0.2"
},
"require-dev": {
"fakerphp/faker": "^1.23",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading