apunkt/ktx
1
0
Fork 0
mirror of https://github.com/Kaelio/ktx.git synced 2026-07-10 11:12:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: pass embeddingProvider into ingest/scan instead of resolving inside @ktx/context

Browse source
This commit is contained in:
Andrey Avtomonov 2026-05-21 01:56:34 +02:00
parent 95c0846ff7
commit 4d6808e09f
7 changed files with 41 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/context/src/ingest/local-bundle-runtime.ts
View file

@ -8,7 +8,6 @@ import { noopLogger, SessionWorktreeService } from '../core/index.js';
import type { KtxSemanticLayerComputePort } from '../daemon/index.js';
import {
createRuntimeToolDescriptorFromAiTool,
createLocalKtxEmbeddingProviderFromConfig,
createLocalKtxLlmRuntimeFromConfig,
KtxIngestEmbeddingPortAdapter,
RuntimeAgentRunner,
@ -16,6 +15,7 @@ import {
type KtxLlmRuntimePort,
type KtxRuntimeToolSet,
} from '../llm/index.js';
import type { KtxEmbeddingProvider } from '@ktx/llm';
import type { KtxLocalProject } from '../project/index.js';
import { ktxLocalStateDbPath } from '../project/index.js';
import { PromptService } from '../prompts/index.js';
@ -114,6 +114,7 @@ export interface CreateLocalBundleIngestRuntimeOptions {
queryExecutor?: KtxSqlQueryExecutorPort;
jobIdFactory?: () => string;
logger?: KtxLogger;
embeddingProvider?: KtxEmbeddingProvider | null;
}
export interface LocalBundleIngestRuntime {
@ -669,7 +670,7 @@ export function createLocalBundleIngestRuntime(
mkdirSync(join(options.project.projectDir, '.ktx/cache/local-ingest'), { recursive: true });
const store = new SqliteBundleIngestStore({ dbPath });
const contextStore = new SqliteContextEvidenceStore({ dbPath });
const embeddingProvider = createLocalKtxEmbeddingProviderFromConfig(options.project.config.ingest.embeddings);
const embeddingProvider = options.embeddingProvider ?? null;
const embedding = embeddingProvider ? new KtxIngestEmbeddingPortAdapter(embeddingProvider) : new NoopEmbeddingPort();
const connections = new LocalConnectionCatalog(options.project, options.queryExecutor);
const rootFileStore = options.project.fileStore;

4
packages/context/src/ingest/local-ingest.ts
View file

@ -34,6 +34,7 @@ export interface RunLocalIngestOptions {
semanticLayerCompute?: KtxSemanticLayerComputePort;
queryExecutor?: KtxSqlQueryExecutorPort;
logger?: KtxLogger;
embeddingProvider?: import('@ktx/llm').KtxEmbeddingProvider | null;
}
export interface LocalIngestMcpOptions
@ -172,6 +173,7 @@ async function runScheduledPullJob(options: {
semanticLayerCompute?: KtxSemanticLayerComputePort;
queryExecutor?: KtxSqlQueryExecutorPort;
logger?: KtxLogger;
embeddingProvider?: import('@ktx/llm').KtxEmbeddingProvider | null;
}): Promise<LocalIngestResult> {
const runtime = createLocalBundleIngestRuntime(options);
const jobId = options.jobId ?? runtime.nextJobId();
@ -225,6 +227,7 @@ export async function runLocalIngest(options: RunLocalIngestOptions): Promise<Lo
semanticLayerCompute: options.semanticLayerCompute,
queryExecutor: options.queryExecutor,
logger: options.logger,
embeddingProvider: options.embeddingProvider,
});
}
@ -403,6 +406,7 @@ export async function runLocalMetabaseIngest(
semanticLayerCompute: options.semanticLayerCompute,
queryExecutor: options.queryExecutor,
logger: options.logger,
embeddingProvider: options.embeddingProvider,
});
} catch (error) {
child = await recordLocalMetabaseChildFailure({

11
packages/context/src/scan/local-enrichment.test.ts
View file

@ -813,16 +813,16 @@ describe('local scan enrichment', () => {
}
});
it('resolves gateway LLM providers and OpenAI embeddings from local scan config', () => {
it('resolves gateway LLM providers and passes injected embedding provider through to scan enrichment', () => {
const createKtxLlmProvider = vi.fn(() => ({
getModel: vi.fn().mockReturnValue({ modelId: 'provider/language-model', provider: 'gateway' }),
}));
const createKtxEmbeddingProvider = vi.fn(() => ({
const embeddingProvider = {
dimensions: 1536,
maxBatchSize: 8,
embed: vi.fn(),
[['embed', 'Many'].join('')]: vi.fn(),
}));
};
const providers = createLocalScanEnrichmentProvidersFromConfig(
{
@ -844,8 +844,8 @@ describe('local scan enrichment', () => {
},
{
createKtxLlmProvider: createKtxLlmProvider as any,
createKtxEmbeddingProvider: createKtxEmbeddingProvider as any,
env: { OPENAI_API_KEY: 'openai-key' }, // pragma: allowlist secret
embeddingProvider: embeddingProvider as any,
},
);
@ -854,8 +854,5 @@ describe('local scan enrichment', () => {
expect(createKtxLlmProvider).toHaveBeenCalledWith(
expect.objectContaining({ backend: 'gateway', modelSlots: { default: 'provider/language-model' } }),
);
expect(createKtxEmbeddingProvider).toHaveBeenCalledWith(
expect.objectContaining({ backend: 'openai', model: 'provider/embedding-model' }),
);
});
});

13
packages/context/src/scan/local-scan.ts
View file

@ -1,4 +1,4 @@
import type { createKtxEmbeddingProvider, createKtxLlmProvider } from '@ktx/llm';
import type { createKtxEmbeddingProvider, createKtxLlmProvider, KtxEmbeddingProvider } from '@ktx/llm';
import {
createDefaultLocalIngestAdapters,
getLocalStageOnlyIngestStatus,
@ -6,11 +6,7 @@ import {
runLocalStageOnlyIngest,
type SourceAdapter,
} from '../ingest/index.js';
import {
createLocalKtxEmbeddingProviderFromConfig,
createLocalKtxLlmRuntimeFromConfig,
KtxScanEmbeddingPortAdapter,
} from '../llm/index.js';
import { createLocalKtxLlmRuntimeFromConfig, KtxScanEmbeddingPortAdapter } from '../llm/index.js';
import type { KtxProjectLlmConfig, KtxScanEnrichmentConfig, KtxScanRelationshipConfig } from '../project/config.js';
import type { KtxLocalProject } from '../project/index.js';
import { ktxLocalStateDbPath } from '../project/local-state-db.js';
@ -55,6 +51,7 @@ export interface RunLocalScanOptions {
enrichmentProviders?: KtxLocalScanEnrichmentProviders | null;
enrichmentStateStore?: SqliteLocalScanEnrichmentStateStore | null;
progress?: KtxProgressPort;
embeddingProvider?: KtxEmbeddingProvider | null;
}
export interface LocalScanRunResult {
@ -152,6 +149,7 @@ interface LocalScanEnrichmentProviderDeps {
createKtxEmbeddingProvider?: typeof createKtxEmbeddingProvider;
env?: NodeJS.ProcessEnv;
projectDir?: string;
embeddingProvider?: KtxEmbeddingProvider | null;
}
export function createLocalScanEnrichmentProvidersFromConfig(
@ -171,7 +169,7 @@ export function createLocalScanEnrichmentProvidersFromConfig(
...deps,
projectDir: deps.projectDir,
});
const embeddingProvider = createLocalKtxEmbeddingProviderFromConfig(config.embeddings, deps);
const embeddingProvider = deps.embeddingProvider ?? null;
if (!llmRuntime || !embeddingProvider) {
return null;
}
@ -371,6 +369,7 @@ export async function runLocalScan(options: RunLocalScanOptions): Promise<LocalS
? options.enrichmentProviders
: createLocalScanEnrichmentProvidersFromConfig(options.project.config.scan.enrichment, options.project.config.llm, {
projectDir: options.project.projectDir,
embeddingProvider: options.embeddingProvider ?? null,
})
: null;