mirror of
https://github.com/Kaelio/ktx.git
synced 2026-07-25 12:01:03 +02:00
ktx ingest resolved the SQL-analysis port via resolveKtxCliSqlAnalysis, which honors the external-daemon env overrides, but `ktx sql` and the MCP server built their port by calling createManagedDaemonSqlAnalysisPort directly. On a uv-less host with an external daemon and the override set, ingest worked while `ktx sql` and MCP sql_execution ignored the override and tried to install the managed Python runtime — contradicting the documented contract and runtime-requirements, which already skip the managed runtime when those vars are set. Collapse the three call sites onto one env-override-aware resolver: add externalDaemonSqlAnalysisBaseUrl + resolveSqlAnalysisPort in managed-python-http.ts and route sql.ts, mcp-server-factory.ts, and resolveKtxCliSqlAnalysis through it. createManagedDaemonSqlAnalysisPort becomes @internal (test-only export).
298 lines
11 KiB
TypeScript
298 lines
11 KiB
TypeScript
import { createServer } from 'node:http';
|
|
import type { AddressInfo } from 'node:net';
|
|
import { describe, expect, it, vi } from 'vitest';
|
|
import {
|
|
createManagedDaemonHttpJsonRunner,
|
|
createManagedDaemonLookerTableIdentifierParser,
|
|
createManagedDaemonSqlAnalysisPort,
|
|
createManagedPythonDaemonBaseUrlResolver,
|
|
externalDaemonSqlAnalysisBaseUrl,
|
|
managedDaemonDatabaseIntrospectionOptions,
|
|
resolveSqlAnalysisPort,
|
|
} from '../src/managed-python-http.js';
|
|
|
|
function io() {
|
|
let stderr = '';
|
|
return {
|
|
io: {
|
|
stdout: { write: vi.fn() },
|
|
stderr: { write: (chunk: string) => (stderr += chunk) },
|
|
},
|
|
stderr: () => stderr,
|
|
};
|
|
}
|
|
|
|
async function startLoopbackDaemon() {
|
|
const paths: string[] = [];
|
|
const server = createServer((req, res) => {
|
|
paths.push(req.url ?? '');
|
|
req.on('data', () => {});
|
|
req.on('end', () => {
|
|
res.writeHead(200, { 'content-type': 'application/json' });
|
|
res.end(JSON.stringify({ ok: true }));
|
|
});
|
|
});
|
|
await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve));
|
|
const { port } = server.address() as AddressInfo;
|
|
return {
|
|
baseUrl: `http://127.0.0.1:${port}`,
|
|
paths,
|
|
close: () => new Promise<void>((resolve, reject) => server.close((error) => (error ? reject(error) : resolve()))),
|
|
};
|
|
}
|
|
|
|
describe('createManagedPythonDaemonBaseUrlResolver', () => {
|
|
it('ensures the core runtime, starts the daemon, reports the URL, and caches the result', async () => {
|
|
const testIo = io();
|
|
const ensureRuntime = vi.fn(async () => ({
|
|
layout: {} as never,
|
|
manifest: {} as never,
|
|
}));
|
|
const startDaemon = vi.fn(async () => ({
|
|
status: 'started' as const,
|
|
layout: {} as never,
|
|
state: { pid: 1234 } as never,
|
|
baseUrl: 'http://127.0.0.1:61234',
|
|
}));
|
|
const resolveBaseUrl = createManagedPythonDaemonBaseUrlResolver({
|
|
cliVersion: '0.2.0',
|
|
projectDir: '/work/proj',
|
|
installPolicy: 'auto',
|
|
io: testIo.io,
|
|
ensureRuntime,
|
|
startDaemon,
|
|
});
|
|
|
|
await expect(resolveBaseUrl()).resolves.toBe('http://127.0.0.1:61234');
|
|
await expect(resolveBaseUrl()).resolves.toBe('http://127.0.0.1:61234');
|
|
|
|
expect(ensureRuntime).toHaveBeenCalledTimes(1);
|
|
expect(ensureRuntime).toHaveBeenCalledWith({
|
|
cliVersion: '0.2.0',
|
|
installPolicy: 'auto',
|
|
io: testIo.io,
|
|
feature: 'core',
|
|
});
|
|
expect(startDaemon).toHaveBeenCalledTimes(1);
|
|
expect(startDaemon).toHaveBeenCalledWith({
|
|
cliVersion: '0.2.0',
|
|
projectDir: '/work/proj',
|
|
features: ['core'],
|
|
force: false,
|
|
});
|
|
expect(testIo.stderr()).toContain('Started ktx daemon: http://127.0.0.1:61234');
|
|
});
|
|
|
|
it('reports daemon reuse without reinstalling after the first resolved URL', async () => {
|
|
const testIo = io();
|
|
const ensureRuntime = vi.fn(async () => ({
|
|
layout: {} as never,
|
|
manifest: {} as never,
|
|
}));
|
|
const startDaemon = vi.fn(async () => ({
|
|
status: 'reused' as const,
|
|
layout: {} as never,
|
|
state: { pid: 1234 } as never,
|
|
baseUrl: 'http://127.0.0.1:61234',
|
|
}));
|
|
const resolveBaseUrl = createManagedPythonDaemonBaseUrlResolver({
|
|
cliVersion: '0.2.0',
|
|
projectDir: '/work/proj',
|
|
installPolicy: 'never',
|
|
io: testIo.io,
|
|
ensureRuntime,
|
|
startDaemon,
|
|
});
|
|
|
|
await expect(resolveBaseUrl()).resolves.toBe('http://127.0.0.1:61234');
|
|
await expect(resolveBaseUrl()).resolves.toBe('http://127.0.0.1:61234');
|
|
|
|
expect(ensureRuntime).toHaveBeenCalledTimes(1);
|
|
expect(startDaemon).toHaveBeenCalledTimes(1);
|
|
expect(testIo.stderr()).toContain('Using existing ktx daemon: http://127.0.0.1:61234');
|
|
});
|
|
});
|
|
|
|
describe('createManagedDaemonHttpJsonRunner', () => {
|
|
it('resolves the managed base URL lazily for each HTTP JSON request', async () => {
|
|
const postJson = vi.fn(async () => ({ ok: true }));
|
|
const runner = createManagedDaemonHttpJsonRunner({
|
|
resolveBaseUrl: async () => 'http://127.0.0.1:61234',
|
|
postJson,
|
|
});
|
|
|
|
await expect(runner('/sql/parse-table-identifier', { items: [] })).resolves.toEqual({ ok: true });
|
|
|
|
expect(postJson).toHaveBeenCalledWith('http://127.0.0.1:61234', '/sql/parse-table-identifier', { items: [] });
|
|
});
|
|
});
|
|
|
|
describe('ktx daemon ingest ports', () => {
|
|
it('creates a Looker table parser backed by the ktx daemon runner', async () => {
|
|
const requestJson = vi.fn(async () => ({
|
|
results: {
|
|
'model.explore': {
|
|
ok: true,
|
|
catalog: 'warehouse',
|
|
schema: 'public',
|
|
name: 'orders',
|
|
canonical_table: 'public.orders',
|
|
},
|
|
},
|
|
}));
|
|
const parser = createManagedDaemonLookerTableIdentifierParser({ requestJson });
|
|
|
|
await expect(
|
|
parser.parse([{ key: 'model.explore', sql_table_name: 'public.orders', dialect: 'postgres' }]),
|
|
).resolves.toEqual({
|
|
'model.explore': {
|
|
ok: true,
|
|
catalog: 'warehouse',
|
|
schema: 'public',
|
|
name: 'orders',
|
|
canonical_table: 'public.orders',
|
|
},
|
|
});
|
|
expect(requestJson).toHaveBeenCalledWith('/sql/parse-table-identifier', {
|
|
items: [{ key: 'model.explore', sql_table_name: 'public.orders', dialect: 'postgres' }],
|
|
});
|
|
});
|
|
|
|
it('creates a SQL analysis port backed by the ktx daemon runner', async () => {
|
|
const requestJson = vi.fn(async () => ({
|
|
fingerprint: 'select-orders',
|
|
normalized_sql: 'SELECT * FROM public.orders WHERE id = ?',
|
|
tables_touched: ['public.orders'],
|
|
literal_slots: [{ position: 1, type: 'number', example_value: '42' }],
|
|
}));
|
|
const sqlAnalysis = createManagedDaemonSqlAnalysisPort({ requestJson });
|
|
|
|
await expect(sqlAnalysis.analyzeForFingerprint('SELECT * FROM public.orders WHERE id = 42', 'postgres')).resolves
|
|
.toEqual({
|
|
fingerprint: 'select-orders',
|
|
normalizedSql: 'SELECT * FROM public.orders WHERE id = ?',
|
|
tablesTouched: ['public.orders'],
|
|
literalSlots: [{ position: 1, type: 'number', exampleValue: '42' }],
|
|
});
|
|
expect(requestJson).toHaveBeenCalledWith('/api/sql/analyze-for-fingerprint', {
|
|
sql: 'SELECT * FROM public.orders WHERE id = 42',
|
|
dialect: 'postgres',
|
|
});
|
|
});
|
|
|
|
it('routes SQL batch analysis through the ktx daemon runner', async () => {
|
|
const requestJson = vi.fn(async () => ({
|
|
results: {
|
|
orders: {
|
|
tables_touched: [{ catalog: null, db: 'public', name: 'orders' }],
|
|
columns_by_clause: { select: ['status'] },
|
|
error: null,
|
|
},
|
|
},
|
|
}));
|
|
const sqlAnalysis = createManagedDaemonSqlAnalysisPort({ requestJson });
|
|
|
|
await expect(sqlAnalysis.analyzeBatch([{ id: 'orders', sql: 'select status from public.orders' }], 'postgres'))
|
|
.resolves.toEqual(
|
|
new Map([
|
|
[
|
|
'orders',
|
|
{
|
|
tablesTouched: [{ catalog: null, db: 'public', name: 'orders' }],
|
|
columnsByClause: { select: ['status'] },
|
|
error: null,
|
|
},
|
|
],
|
|
]),
|
|
);
|
|
expect(requestJson).toHaveBeenCalledWith('/sql/analyze-batch', {
|
|
dialect: 'postgres',
|
|
items: [{ id: 'orders', sql: 'select status from public.orders' }],
|
|
});
|
|
});
|
|
|
|
it('returns live-database daemon request options backed by the managed runner', async () => {
|
|
const requestJson = vi.fn(async () => ({
|
|
connection_id: 'warehouse',
|
|
tables: [],
|
|
}));
|
|
const options = managedDaemonDatabaseIntrospectionOptions({ requestJson });
|
|
expect(options.requestJson).toBeDefined();
|
|
|
|
await expect(options.requestJson?.('/database/introspect', { connection_id: 'warehouse' })).resolves.toEqual({
|
|
connection_id: 'warehouse',
|
|
tables: [],
|
|
});
|
|
expect(requestJson).toHaveBeenCalledWith('/database/introspect', { connection_id: 'warehouse' });
|
|
});
|
|
});
|
|
|
|
describe('externalDaemonSqlAnalysisBaseUrl', () => {
|
|
it('prefers KTX_SQL_ANALYSIS_URL over KTX_DAEMON_URL', () => {
|
|
expect(
|
|
externalDaemonSqlAnalysisBaseUrl({
|
|
KTX_SQL_ANALYSIS_URL: 'http://analysis.example',
|
|
KTX_DAEMON_URL: 'http://daemon.example',
|
|
}),
|
|
).toBe('http://analysis.example');
|
|
});
|
|
|
|
it('falls back to KTX_DAEMON_URL when only it is set', () => {
|
|
expect(externalDaemonSqlAnalysisBaseUrl({ KTX_DAEMON_URL: 'http://daemon.example' })).toBe('http://daemon.example');
|
|
});
|
|
|
|
it('trims surrounding whitespace and ignores whitespace-only overrides', () => {
|
|
expect(externalDaemonSqlAnalysisBaseUrl({ KTX_SQL_ANALYSIS_URL: ' http://analysis.example ' })).toBe(
|
|
'http://analysis.example',
|
|
);
|
|
expect(externalDaemonSqlAnalysisBaseUrl({ KTX_SQL_ANALYSIS_URL: ' ', KTX_DAEMON_URL: '' })).toBeUndefined();
|
|
expect(externalDaemonSqlAnalysisBaseUrl({})).toBeUndefined();
|
|
});
|
|
});
|
|
|
|
describe('resolveSqlAnalysisPort', () => {
|
|
it('uses the managed daemon when no external override is set', async () => {
|
|
const daemon = await startLoopbackDaemon();
|
|
const testIo = io();
|
|
const ensureRuntime = vi.fn(async () => ({ layout: {} as never, manifest: {} as never }));
|
|
const startDaemon = vi.fn(async () => ({
|
|
status: 'started' as const,
|
|
layout: {} as never,
|
|
state: { pid: 1234 } as never,
|
|
baseUrl: daemon.baseUrl,
|
|
}));
|
|
try {
|
|
const port = resolveSqlAnalysisPort(
|
|
{ cliVersion: '0.2.0', projectDir: '/work/proj', installPolicy: 'auto', io: testIo.io, ensureRuntime, startDaemon },
|
|
{},
|
|
);
|
|
await expect(port.validateReadOnly('select 1', 'postgres')).resolves.toEqual({ ok: true });
|
|
expect(ensureRuntime).toHaveBeenCalledTimes(1);
|
|
expect(startDaemon).toHaveBeenCalledTimes(1);
|
|
expect(daemon.paths).toContain('/sql/validate-read-only');
|
|
} finally {
|
|
await daemon.close();
|
|
}
|
|
});
|
|
|
|
it('routes to the external daemon and skips the managed runtime when KTX_SQL_ANALYSIS_URL is set', async () => {
|
|
const daemon = await startLoopbackDaemon();
|
|
const testIo = io();
|
|
const ensureRuntime = vi.fn(async () => ({ layout: {} as never, manifest: {} as never }));
|
|
const startDaemon = vi.fn(async () => {
|
|
throw new Error('managed runtime must not start when an external daemon URL is set');
|
|
});
|
|
try {
|
|
const port = resolveSqlAnalysisPort(
|
|
{ cliVersion: '0.2.0', projectDir: '/work/proj', installPolicy: 'auto', io: testIo.io, ensureRuntime, startDaemon },
|
|
{ KTX_SQL_ANALYSIS_URL: daemon.baseUrl },
|
|
);
|
|
await expect(port.validateReadOnly('select 1', 'postgres')).resolves.toEqual({ ok: true });
|
|
expect(ensureRuntime).not.toHaveBeenCalled();
|
|
expect(startDaemon).not.toHaveBeenCalled();
|
|
expect(daemon.paths).toContain('/sql/validate-read-only');
|
|
} finally {
|
|
await daemon.close();
|
|
}
|
|
});
|
|
});
|