mirror of
https://github.com/Kaelio/ktx.git
synced 2026-07-04 10:52:13 +02:00
fix(cli): resolve embedding provider explicitly and surface lane status in sl search (#192)
* feat(cli): add tryUseManagedLocalEmbeddingsDaemon for read-only callers * feat(cli): add resolveProjectEmbeddingProvider helper * fix(cli): wire sl search through resolveProjectEmbeddingProvider so semantic lane works * fix(cli): wire wiki/knowledge search through resolveProjectEmbeddingProvider * feat(cli): surface embeddings-unavailable status when sl search returns empty * refactor(cli): route admin reindex through resolveProjectEmbeddingProvider * refactor: pass embeddingProvider into ingest/scan instead of resolving inside @ktx/context * refactor(mcp): resolve embedding provider in CLI factory, pass into context ports * refactor(context): delete MANAGED_SENTENCE_TRANSFORMERS_BASE_URL sentinel * refactor(cli): delete sentinel-based managed-embeddings indirection * chore: scrub stale managed-embeddings sentinel references from tests and smoke script * chore: unexport unused EmbeddingResolutionMode alias * fix(cli): force pathPrefix="" when targeting the managed embeddings daemon The managed daemon serves /embeddings/compute directly. The default pathPrefix in @ktx/llm is /api, so omitting sentenceTransformers from ktx.yaml produced /api/embeddings/compute -> 404. The resolver now sets pathPrefix='' explicitly when wiring the managed daemon URL, matching what the daemon actually exposes.
This commit is contained in:
parent
56a967278a
commit
9d92c79988
36 changed files with 750 additions and 442 deletions
|
|
@ -174,7 +174,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
driver: 'postgres',
|
||||
url: 'env:DATABASE_URL',
|
||||
};
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
|
||||
expect(Object.keys(ports).sort()).toEqual([
|
||||
'connections',
|
||||
|
|
@ -216,6 +216,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
localScan: {
|
||||
createConnector,
|
||||
},
|
||||
embeddingService: null,
|
||||
});
|
||||
|
||||
expect(Object.keys(ports).sort()).toContain('sqlExecution');
|
||||
|
|
@ -269,6 +270,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
localScan: {
|
||||
createConnector,
|
||||
},
|
||||
embeddingService: null,
|
||||
});
|
||||
|
||||
const result = await ports.sqlExecution?.execute(
|
||||
|
|
@ -313,6 +315,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
localScan: {
|
||||
createConnector: vi.fn(async () => connector),
|
||||
},
|
||||
embeddingService: null,
|
||||
});
|
||||
|
||||
await expect(
|
||||
|
|
@ -332,7 +335,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
url: 'env:DATABASE_URL',
|
||||
};
|
||||
await seedScanReport(project.projectDir);
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
|
||||
await expect(
|
||||
ports.entityDetails?.read({
|
||||
|
|
@ -358,7 +361,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
driver: 'postgres',
|
||||
url: 'env:DATABASE_URL',
|
||||
};
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
|
||||
await expect(
|
||||
ports.entityDetails?.read({
|
||||
|
|
@ -411,7 +414,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
'Seed dictionary profile',
|
||||
);
|
||||
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
|
||||
await expect(ports.dictionarySearch?.search({ values: ['paid'] })).resolves.toMatchObject({
|
||||
searched: [{ connectionId: 'warehouse', status: 'ready' }],
|
||||
|
|
@ -432,7 +435,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
url: 'env:DATABASE_URL',
|
||||
};
|
||||
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
|
||||
await expect(ports.dictionarySearch?.search({ values: ['paid'] })).resolves.toEqual({
|
||||
searched: [
|
||||
|
|
@ -601,7 +604,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
'seed scan report',
|
||||
);
|
||||
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
const results = await ports.discover?.search({ query: 'paid orders', connectionId: 'warehouse', limit: 10 });
|
||||
|
||||
expect(results).toEqual(
|
||||
|
|
@ -635,7 +638,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
'ktx@example.com',
|
||||
'Seed wiki',
|
||||
);
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
|
||||
await expect(ports.knowledge?.read({ userId: 'local-user', key: 'revenue' })).resolves.toMatchObject({
|
||||
key: 'revenue',
|
||||
|
|
@ -680,7 +683,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
'',
|
||||
].join('\n'),
|
||||
});
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
|
||||
await expect(
|
||||
ports.semanticLayer?.readSource({ connectionId: 'warehouse', sourceName: 'orders' }),
|
||||
|
|
@ -692,7 +695,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
|
||||
it('rejects path traversal keys before touching the project directory', async () => {
|
||||
const project = await initKtxProject({ projectDir: tempDir });
|
||||
const ports = createLocalProjectMcpContextPorts(project);
|
||||
const ports = createLocalProjectMcpContextPorts(project, { embeddingService: null });
|
||||
|
||||
await expect(
|
||||
ports.knowledge?.read({
|
||||
|
|
@ -746,7 +749,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
})),
|
||||
generateSources: vi.fn(),
|
||||
};
|
||||
const ports = createLocalProjectMcpContextPorts(project, { semanticLayerCompute });
|
||||
const ports = createLocalProjectMcpContextPorts(project, { semanticLayerCompute, embeddingService: null });
|
||||
|
||||
await expect(
|
||||
ports.semanticLayer?.query({
|
||||
|
|
@ -817,6 +820,7 @@ describe('createLocalProjectMcpContextPorts', () => {
|
|||
const ports = createLocalProjectMcpContextPorts(project, {
|
||||
semanticLayerCompute: compute,
|
||||
queryExecutor,
|
||||
embeddingService: null,
|
||||
});
|
||||
|
||||
const result = await ports.semanticLayer?.query({
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import { type KtxSqlQueryExecutorPort, localConnectionInfoFromConfig } from '../connections/index.js';
|
||||
import type { KtxEmbeddingPort } from '../core/index.js';
|
||||
import type { KtxSemanticLayerComputePort } from '../daemon/index.js';
|
||||
import { createLocalKtxEmbeddingProviderFromConfig, KtxIngestEmbeddingPortAdapter } from '../llm/index.js';
|
||||
import type { KtxLocalProject } from '../project/index.js';
|
||||
import { createKtxEntityDetailsService, type KtxScanConnector, type LocalScanMcpOptions } from '../scan/index.js';
|
||||
import { createKtxDiscoverDataService } from '../search/index.js';
|
||||
|
|
@ -15,7 +14,7 @@ interface CreateLocalProjectMcpContextPortsOptions {
|
|||
queryExecutor?: KtxSqlQueryExecutorPort;
|
||||
sqlAnalysis?: SqlAnalysisPort;
|
||||
localScan?: LocalScanMcpOptions;
|
||||
embeddingService?: KtxEmbeddingPort | null;
|
||||
embeddingService: KtxEmbeddingPort | null;
|
||||
}
|
||||
|
||||
function dialectForDriver(driver: string | undefined): string {
|
||||
|
|
@ -133,12 +132,9 @@ async function executeValidatedReadOnlySql(
|
|||
|
||||
export function createLocalProjectMcpContextPorts(
|
||||
project: KtxLocalProject,
|
||||
options: CreateLocalProjectMcpContextPortsOptions = {},
|
||||
options: CreateLocalProjectMcpContextPortsOptions,
|
||||
): KtxMcpContextPorts {
|
||||
const configuredEmbeddingProvider = createLocalKtxEmbeddingProviderFromConfig(project.config.ingest.embeddings);
|
||||
const embeddingService =
|
||||
options.embeddingService ??
|
||||
(configuredEmbeddingProvider ? new KtxIngestEmbeddingPortAdapter(configuredEmbeddingProvider) : null);
|
||||
const embeddingService = options.embeddingService;
|
||||
const ports: KtxMcpContextPorts = {
|
||||
connections: {
|
||||
async list() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue