@duckcodeailabs/dql-cli 1.4.4 → 1.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +123 -0
- package/README.md +72 -0
- package/{apps-api.d.ts → dist/apps-api.d.ts} +27 -3
- package/dist/apps-api.d.ts.map +1 -0
- package/{apps-api.js → dist/apps-api.js} +512 -8
- package/dist/apps-api.js.map +1 -0
- package/{apps-api.test.js → dist/apps-api.test.js} +6 -0
- package/{apps-api.test.js.map → dist/apps-api.test.js.map} +1 -1
- package/{args.test.js → dist/args.test.js} +8 -0
- package/{args.test.js.map → dist/args.test.js.map} +1 -1
- package/dist/assets/dql-notebook/assets/index-DZ2X3-OY.js +862 -0
- package/dist/assets/dql-notebook/assets/index-R3UrqjLQ.css +1 -0
- package/{assets → dist/assets}/dql-notebook/index.html +2 -2
- package/dist/block-studio-import.d.ts +59 -0
- package/dist/block-studio-import.d.ts.map +1 -0
- package/dist/block-studio-import.js +398 -0
- package/dist/block-studio-import.js.map +1 -0
- package/dist/block-studio-import.test.d.ts +2 -0
- package/dist/block-studio-import.test.d.ts.map +1 -0
- package/dist/block-studio-import.test.js +110 -0
- package/dist/block-studio-import.test.js.map +1 -0
- package/dist/commands/agent.d.ts.map +1 -0
- package/{commands → dist/commands}/agent.js +98 -5
- package/dist/commands/agent.js.map +1 -0
- package/{commands → dist/commands}/app.d.ts.map +1 -1
- package/{commands → dist/commands}/app.js +6 -0
- package/dist/commands/app.js.map +1 -0
- package/dist/commands/import.d.ts +3 -0
- package/dist/commands/import.d.ts.map +1 -0
- package/dist/commands/import.js +50 -0
- package/dist/commands/import.js.map +1 -0
- package/{commands → dist/commands}/init.d.ts.map +1 -1
- package/{commands → dist/commands}/init.js +8 -5
- package/dist/commands/init.js.map +1 -0
- package/{commands → dist/commands}/init.test.js +84 -24
- package/dist/commands/init.test.js.map +1 -0
- package/{commands → dist/commands}/migrate.d.ts.map +1 -1
- package/{commands → dist/commands}/migrate.js +5 -0
- package/dist/commands/migrate.js.map +1 -0
- package/dist/commands/validate.d.ts.map +1 -0
- package/dist/commands/validate.js +163 -0
- package/dist/commands/validate.js.map +1 -0
- package/dist/commands/validate.test.d.ts +2 -0
- package/dist/commands/validate.test.d.ts.map +1 -0
- package/dist/commands/validate.test.js +55 -0
- package/dist/commands/validate.test.js.map +1 -0
- package/{index.js → dist/index.js} +6 -1
- package/dist/index.js.map +1 -0
- package/{llm → dist/llm}/index.d.ts.map +1 -1
- package/{llm → dist/llm}/index.js +4 -3
- package/{llm → dist/llm}/index.js.map +1 -1
- package/{llm → dist/llm}/providers/dql-agent-provider.d.ts +1 -1
- package/dist/llm/providers/dql-agent-provider.d.ts.map +1 -0
- package/dist/llm/providers/dql-agent-provider.js +287 -0
- package/dist/llm/providers/dql-agent-provider.js.map +1 -0
- package/{llm → dist/llm}/types.d.ts +3 -1
- package/dist/llm/types.d.ts.map +1 -0
- package/{local-runtime.d.ts.map → dist/local-runtime.d.ts.map} +1 -1
- package/{local-runtime.js → dist/local-runtime.js} +567 -50
- package/dist/local-runtime.js.map +1 -0
- package/{schedule → dist/schedule}/runner.d.ts.map +1 -1
- package/{schedule → dist/schedule}/runner.js +4 -0
- package/{schedule → dist/schedule}/runner.js.map +1 -1
- package/dist/settings/provider-settings.d.ts +33 -0
- package/dist/settings/provider-settings.d.ts.map +1 -0
- package/dist/settings/provider-settings.js +91 -0
- package/dist/settings/provider-settings.js.map +1 -0
- package/package.json +31 -20
- package/apps-api.d.ts.map +0 -1
- package/apps-api.js.map +0 -1
- package/assets/dql-notebook/assets/index-DUTeFz5j.js +0 -858
- package/assets/dql-notebook/assets/index-DrhoZmtv.css +0 -1
- package/commands/agent.d.ts.map +0 -1
- package/commands/agent.js.map +0 -1
- package/commands/app.js.map +0 -1
- package/commands/init.js.map +0 -1
- package/commands/init.test.js.map +0 -1
- package/commands/migrate.js.map +0 -1
- package/commands/validate.d.ts.map +0 -1
- package/commands/validate.js +0 -116
- package/commands/validate.js.map +0 -1
- package/index.js.map +0 -1
- package/llm/providers/dql-agent-provider.d.ts.map +0 -1
- package/llm/providers/dql-agent-provider.js +0 -99
- package/llm/providers/dql-agent-provider.js.map +0 -1
- package/llm/types.d.ts.map +0 -1
- package/local-runtime.js.map +0 -1
- /package/{apps-api.test.d.ts → dist/apps-api.test.d.ts} +0 -0
- /package/{apps-api.test.d.ts.map → dist/apps-api.test.d.ts.map} +0 -0
- /package/{args.d.ts → dist/args.d.ts} +0 -0
- /package/{args.d.ts.map → dist/args.d.ts.map} +0 -0
- /package/{args.js → dist/args.js} +0 -0
- /package/{args.js.map → dist/args.js.map} +0 -0
- /package/{args.test.d.ts → dist/args.test.d.ts} +0 -0
- /package/{args.test.d.ts.map → dist/args.test.d.ts.map} +0 -0
- /package/{assets → dist/assets}/dql-notebook/assets/codemirror-DJYUkPr1.js +0 -0
- /package/{assets → dist/assets}/dql-notebook/assets/react-CRB3T2We.js +0 -0
- /package/{assets → dist/assets}/notebook-browser/app.js +0 -0
- /package/{assets → dist/assets}/notebook-browser/index.html +0 -0
- /package/{assets → dist/assets}/notebook-browser/styles.css +0 -0
- /package/{block-templates.d.ts → dist/block-templates.d.ts} +0 -0
- /package/{block-templates.d.ts.map → dist/block-templates.d.ts.map} +0 -0
- /package/{block-templates.js → dist/block-templates.js} +0 -0
- /package/{block-templates.js.map → dist/block-templates.js.map} +0 -0
- /package/{commands → dist/commands}/agent.d.ts +0 -0
- /package/{commands → dist/commands}/app.d.ts +0 -0
- /package/{commands → dist/commands}/build.d.ts +0 -0
- /package/{commands → dist/commands}/build.d.ts.map +0 -0
- /package/{commands → dist/commands}/build.js +0 -0
- /package/{commands → dist/commands}/build.js.map +0 -0
- /package/{commands → dist/commands}/build.test.d.ts +0 -0
- /package/{commands → dist/commands}/build.test.d.ts.map +0 -0
- /package/{commands → dist/commands}/build.test.js +0 -0
- /package/{commands → dist/commands}/build.test.js.map +0 -0
- /package/{commands → dist/commands}/certify.d.ts +0 -0
- /package/{commands → dist/commands}/certify.d.ts.map +0 -0
- /package/{commands → dist/commands}/certify.js +0 -0
- /package/{commands → dist/commands}/certify.js.map +0 -0
- /package/{commands → dist/commands}/compile.d.ts +0 -0
- /package/{commands → dist/commands}/compile.d.ts.map +0 -0
- /package/{commands → dist/commands}/compile.js +0 -0
- /package/{commands → dist/commands}/compile.js.map +0 -0
- /package/{commands → dist/commands}/compile.test.d.ts +0 -0
- /package/{commands → dist/commands}/compile.test.d.ts.map +0 -0
- /package/{commands → dist/commands}/compile.test.js +0 -0
- /package/{commands → dist/commands}/compile.test.js.map +0 -0
- /package/{commands → dist/commands}/diff.d.ts +0 -0
- /package/{commands → dist/commands}/diff.d.ts.map +0 -0
- /package/{commands → dist/commands}/diff.js +0 -0
- /package/{commands → dist/commands}/diff.js.map +0 -0
- /package/{commands → dist/commands}/doctor.d.ts +0 -0
- /package/{commands → dist/commands}/doctor.d.ts.map +0 -0
- /package/{commands → dist/commands}/doctor.js +0 -0
- /package/{commands → dist/commands}/doctor.js.map +0 -0
- /package/{commands → dist/commands}/doctor.test.d.ts +0 -0
- /package/{commands → dist/commands}/doctor.test.d.ts.map +0 -0
- /package/{commands → dist/commands}/doctor.test.js +0 -0
- /package/{commands → dist/commands}/doctor.test.js.map +0 -0
- /package/{commands → dist/commands}/fmt.d.ts +0 -0
- /package/{commands → dist/commands}/fmt.d.ts.map +0 -0
- /package/{commands → dist/commands}/fmt.js +0 -0
- /package/{commands → dist/commands}/fmt.js.map +0 -0
- /package/{commands → dist/commands}/info.d.ts +0 -0
- /package/{commands → dist/commands}/info.d.ts.map +0 -0
- /package/{commands → dist/commands}/info.js +0 -0
- /package/{commands → dist/commands}/info.js.map +0 -0
- /package/{commands → dist/commands}/init.d.ts +0 -0
- /package/{commands → dist/commands}/init.test.d.ts +0 -0
- /package/{commands → dist/commands}/init.test.d.ts.map +0 -0
- /package/{commands → dist/commands}/lineage.d.ts +0 -0
- /package/{commands → dist/commands}/lineage.d.ts.map +0 -0
- /package/{commands → dist/commands}/lineage.js +0 -0
- /package/{commands → dist/commands}/lineage.js.map +0 -0
- /package/{commands → dist/commands}/mcp.d.ts +0 -0
- /package/{commands → dist/commands}/mcp.d.ts.map +0 -0
- /package/{commands → dist/commands}/mcp.js +0 -0
- /package/{commands → dist/commands}/mcp.js.map +0 -0
- /package/{commands → dist/commands}/migrate.d.ts +0 -0
- /package/{commands → dist/commands}/new.d.ts +0 -0
- /package/{commands → dist/commands}/new.d.ts.map +0 -0
- /package/{commands → dist/commands}/new.js +0 -0
- /package/{commands → dist/commands}/new.js.map +0 -0
- /package/{commands → dist/commands}/new.test.d.ts +0 -0
- /package/{commands → dist/commands}/new.test.d.ts.map +0 -0
- /package/{commands → dist/commands}/new.test.js +0 -0
- /package/{commands → dist/commands}/new.test.js.map +0 -0
- /package/{commands → dist/commands}/notebook.d.ts +0 -0
- /package/{commands → dist/commands}/notebook.d.ts.map +0 -0
- /package/{commands → dist/commands}/notebook.js +0 -0
- /package/{commands → dist/commands}/notebook.js.map +0 -0
- /package/{commands → dist/commands}/parse.d.ts +0 -0
- /package/{commands → dist/commands}/parse.d.ts.map +0 -0
- /package/{commands → dist/commands}/parse.js +0 -0
- /package/{commands → dist/commands}/parse.js.map +0 -0
- /package/{commands → dist/commands}/preview.d.ts +0 -0
- /package/{commands → dist/commands}/preview.d.ts.map +0 -0
- /package/{commands → dist/commands}/preview.js +0 -0
- /package/{commands → dist/commands}/preview.js.map +0 -0
- /package/{commands → dist/commands}/schedule.d.ts +0 -0
- /package/{commands → dist/commands}/schedule.d.ts.map +0 -0
- /package/{commands → dist/commands}/schedule.js +0 -0
- /package/{commands → dist/commands}/schedule.js.map +0 -0
- /package/{commands → dist/commands}/semantic.d.ts +0 -0
- /package/{commands → dist/commands}/semantic.d.ts.map +0 -0
- /package/{commands → dist/commands}/semantic.js +0 -0
- /package/{commands → dist/commands}/semantic.js.map +0 -0
- /package/{commands → dist/commands}/serve.d.ts +0 -0
- /package/{commands → dist/commands}/serve.d.ts.map +0 -0
- /package/{commands → dist/commands}/serve.js +0 -0
- /package/{commands → dist/commands}/serve.js.map +0 -0
- /package/{commands → dist/commands}/slack.d.ts +0 -0
- /package/{commands → dist/commands}/slack.d.ts.map +0 -0
- /package/{commands → dist/commands}/slack.js +0 -0
- /package/{commands → dist/commands}/slack.js.map +0 -0
- /package/{commands → dist/commands}/sync.d.ts +0 -0
- /package/{commands → dist/commands}/sync.d.ts.map +0 -0
- /package/{commands → dist/commands}/sync.js +0 -0
- /package/{commands → dist/commands}/sync.js.map +0 -0
- /package/{commands → dist/commands}/sync.test.d.ts +0 -0
- /package/{commands → dist/commands}/sync.test.d.ts.map +0 -0
- /package/{commands → dist/commands}/sync.test.js +0 -0
- /package/{commands → dist/commands}/sync.test.js.map +0 -0
- /package/{commands → dist/commands}/test.d.ts +0 -0
- /package/{commands → dist/commands}/test.d.ts.map +0 -0
- /package/{commands → dist/commands}/test.js +0 -0
- /package/{commands → dist/commands}/test.js.map +0 -0
- /package/{commands → dist/commands}/validate.d.ts +0 -0
- /package/{commands → dist/commands}/verify.d.ts +0 -0
- /package/{commands → dist/commands}/verify.d.ts.map +0 -0
- /package/{commands → dist/commands}/verify.js +0 -0
- /package/{commands → dist/commands}/verify.js.map +0 -0
- /package/{digest.d.ts → dist/digest.d.ts} +0 -0
- /package/{digest.d.ts.map → dist/digest.d.ts.map} +0 -0
- /package/{digest.js → dist/digest.js} +0 -0
- /package/{digest.js.map → dist/digest.js.map} +0 -0
- /package/{git-service.d.ts → dist/git-service.d.ts} +0 -0
- /package/{git-service.d.ts.map → dist/git-service.d.ts.map} +0 -0
- /package/{git-service.js → dist/git-service.js} +0 -0
- /package/{git-service.js.map → dist/git-service.js.map} +0 -0
- /package/{governance-runtime.d.ts → dist/governance-runtime.d.ts} +0 -0
- /package/{governance-runtime.d.ts.map → dist/governance-runtime.d.ts.map} +0 -0
- /package/{governance-runtime.js → dist/governance-runtime.js} +0 -0
- /package/{governance-runtime.js.map → dist/governance-runtime.js.map} +0 -0
- /package/{index.d.ts → dist/index.d.ts} +0 -0
- /package/{index.d.ts.map → dist/index.d.ts.map} +0 -0
- /package/{llm → dist/llm}/index.d.ts +0 -0
- /package/{llm → dist/llm}/providers/claude-agent-sdk.d.ts +0 -0
- /package/{llm → dist/llm}/providers/claude-agent-sdk.d.ts.map +0 -0
- /package/{llm → dist/llm}/providers/claude-agent-sdk.js +0 -0
- /package/{llm → dist/llm}/providers/claude-agent-sdk.js.map +0 -0
- /package/{llm → dist/llm}/providers/claude-code.d.ts +0 -0
- /package/{llm → dist/llm}/providers/claude-code.d.ts.map +0 -0
- /package/{llm → dist/llm}/providers/claude-code.js +0 -0
- /package/{llm → dist/llm}/providers/claude-code.js.map +0 -0
- /package/{llm → dist/llm}/tools.d.ts +0 -0
- /package/{llm → dist/llm}/tools.d.ts.map +0 -0
- /package/{llm → dist/llm}/tools.js +0 -0
- /package/{llm → dist/llm}/tools.js.map +0 -0
- /package/{llm → dist/llm}/types.js +0 -0
- /package/{llm → dist/llm}/types.js.map +0 -0
- /package/{local-runtime.d.ts → dist/local-runtime.d.ts} +0 -0
- /package/{local-runtime.test.d.ts → dist/local-runtime.test.d.ts} +0 -0
- /package/{local-runtime.test.d.ts.map → dist/local-runtime.test.d.ts.map} +0 -0
- /package/{local-runtime.test.js → dist/local-runtime.test.js} +0 -0
- /package/{local-runtime.test.js.map → dist/local-runtime.test.js.map} +0 -0
- /package/{metricflow.d.ts → dist/metricflow.d.ts} +0 -0
- /package/{metricflow.d.ts.map → dist/metricflow.d.ts.map} +0 -0
- /package/{metricflow.js → dist/metricflow.js} +0 -0
- /package/{metricflow.js.map → dist/metricflow.js.map} +0 -0
- /package/{metricflow.test.d.ts → dist/metricflow.test.d.ts} +0 -0
- /package/{metricflow.test.d.ts.map → dist/metricflow.test.d.ts.map} +0 -0
- /package/{metricflow.test.js → dist/metricflow.test.js} +0 -0
- /package/{metricflow.test.js.map → dist/metricflow.test.js.map} +0 -0
- /package/{open-browser.d.ts → dist/open-browser.d.ts} +0 -0
- /package/{open-browser.d.ts.map → dist/open-browser.d.ts.map} +0 -0
- /package/{open-browser.js → dist/open-browser.js} +0 -0
- /package/{open-browser.js.map → dist/open-browser.js.map} +0 -0
- /package/{schedule → dist/schedule}/alerts.d.ts +0 -0
- /package/{schedule → dist/schedule}/alerts.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/alerts.js +0 -0
- /package/{schedule → dist/schedule}/alerts.js.map +0 -0
- /package/{schedule → dist/schedule}/discovery.d.ts +0 -0
- /package/{schedule → dist/schedule}/discovery.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/discovery.js +0 -0
- /package/{schedule → dist/schedule}/discovery.js.map +0 -0
- /package/{schedule → dist/schedule}/notifiers/email.d.ts +0 -0
- /package/{schedule → dist/schedule}/notifiers/email.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/notifiers/email.js +0 -0
- /package/{schedule → dist/schedule}/notifiers/email.js.map +0 -0
- /package/{schedule → dist/schedule}/notifiers/file.d.ts +0 -0
- /package/{schedule → dist/schedule}/notifiers/file.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/notifiers/file.js +0 -0
- /package/{schedule → dist/schedule}/notifiers/file.js.map +0 -0
- /package/{schedule → dist/schedule}/notifiers/index.d.ts +0 -0
- /package/{schedule → dist/schedule}/notifiers/index.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/notifiers/index.js +0 -0
- /package/{schedule → dist/schedule}/notifiers/index.js.map +0 -0
- /package/{schedule → dist/schedule}/notifiers/slack.d.ts +0 -0
- /package/{schedule → dist/schedule}/notifiers/slack.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/notifiers/slack.js +0 -0
- /package/{schedule → dist/schedule}/notifiers/slack.js.map +0 -0
- /package/{schedule → dist/schedule}/runner.d.ts +0 -0
- /package/{schedule → dist/schedule}/runs.d.ts +0 -0
- /package/{schedule → dist/schedule}/runs.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/runs.js +0 -0
- /package/{schedule → dist/schedule}/runs.js.map +0 -0
- /package/{schedule → dist/schedule}/service.d.ts +0 -0
- /package/{schedule → dist/schedule}/service.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/service.js +0 -0
- /package/{schedule → dist/schedule}/service.js.map +0 -0
- /package/{schedule → dist/schedule}/types.d.ts +0 -0
- /package/{schedule → dist/schedule}/types.d.ts.map +0 -0
- /package/{schedule → dist/schedule}/types.js +0 -0
- /package/{schedule → dist/schedule}/types.js.map +0 -0
- /package/{semantic-import.d.ts → dist/semantic-import.d.ts} +0 -0
- /package/{semantic-import.d.ts.map → dist/semantic-import.d.ts.map} +0 -0
- /package/{semantic-import.js → dist/semantic-import.js} +0 -0
- /package/{semantic-import.js.map → dist/semantic-import.js.map} +0 -0
- /package/{semantic-import.test.d.ts → dist/semantic-import.test.d.ts} +0 -0
- /package/{semantic-import.test.d.ts.map → dist/semantic-import.test.d.ts.map} +0 -0
- /package/{semantic-import.test.js → dist/semantic-import.test.js} +0 -0
- /package/{semantic-import.test.js.map → dist/semantic-import.test.js.map} +0 -0
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import { readdirSync, readFileSync, existsSync, statSync } from 'node:fs';
|
|
2
|
+
import { dirname, extname, join, relative, resolve } from 'node:path';
|
|
3
|
+
import { Parser, analyze, loadSemanticLayerFromDir } from '@duckcodeailabs/dql-core';
|
|
4
|
+
function normalizePath(path) {
|
|
5
|
+
return path.replaceAll('\\', '/');
|
|
6
|
+
}
|
|
7
|
+
function findProjectRoot(startPath) {
|
|
8
|
+
let current = existsSync(startPath) && statSync(startPath).isFile() ? dirname(startPath) : startPath;
|
|
9
|
+
while (true) {
|
|
10
|
+
if (existsSync(join(current, 'dql.config.json')) || existsSync(join(current, 'blocks')) || existsSync(join(current, 'semantic-layer'))) {
|
|
11
|
+
return current;
|
|
12
|
+
}
|
|
13
|
+
const parent = dirname(current);
|
|
14
|
+
if (parent === current)
|
|
15
|
+
return startPath;
|
|
16
|
+
current = parent;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
function collectDqlFilesFromDir(dirPath, projectRoot) {
|
|
20
|
+
if (!existsSync(dirPath))
|
|
21
|
+
return [];
|
|
22
|
+
const files = [];
|
|
23
|
+
for (const entry of readdirSync(dirPath, { withFileTypes: true })) {
|
|
24
|
+
const entryPath = join(dirPath, entry.name);
|
|
25
|
+
if (entry.isDirectory()) {
|
|
26
|
+
files.push(...collectDqlFilesFromDir(entryPath, projectRoot));
|
|
27
|
+
}
|
|
28
|
+
else if (entry.isFile() && extname(entry.name) === '.dql') {
|
|
29
|
+
files.push({
|
|
30
|
+
filePath: entryPath,
|
|
31
|
+
relativePath: normalizePath(relative(projectRoot, entryPath)),
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return files;
|
|
36
|
+
}
|
|
37
|
+
function collectValidationFiles(targetPath) {
|
|
38
|
+
const target = resolve(targetPath ?? '.');
|
|
39
|
+
const projectRoot = findProjectRoot(target);
|
|
40
|
+
if (existsSync(target)) {
|
|
41
|
+
const targetStat = statSync(target);
|
|
42
|
+
if (targetStat.isFile()) {
|
|
43
|
+
return {
|
|
44
|
+
projectRoot,
|
|
45
|
+
files: extname(target) === '.dql'
|
|
46
|
+
? [{ filePath: target, relativePath: normalizePath(relative(projectRoot, target)) }]
|
|
47
|
+
: [],
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
if (targetStat.isDirectory() && target !== projectRoot) {
|
|
51
|
+
return {
|
|
52
|
+
projectRoot,
|
|
53
|
+
files: collectDqlFilesFromDir(target, projectRoot),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
const dirs = ['blocks', 'dashboards', 'workbooks'];
|
|
58
|
+
return {
|
|
59
|
+
projectRoot,
|
|
60
|
+
files: dirs.flatMap((dir) => collectDqlFilesFromDir(join(projectRoot, dir), projectRoot)),
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
export async function runValidate(path, flags) {
|
|
64
|
+
const { projectRoot, files } = collectValidationFiles(path);
|
|
65
|
+
const diagnostics = [];
|
|
66
|
+
// Load semantic layer if present
|
|
67
|
+
let semanticLayer;
|
|
68
|
+
const semanticDir = join(projectRoot, 'semantic-layer');
|
|
69
|
+
if (existsSync(semanticDir)) {
|
|
70
|
+
try {
|
|
71
|
+
semanticLayer = loadSemanticLayerFromDir(semanticDir);
|
|
72
|
+
}
|
|
73
|
+
catch (err) {
|
|
74
|
+
diagnostics.push({
|
|
75
|
+
file: 'semantic-layer/',
|
|
76
|
+
severity: 'error',
|
|
77
|
+
message: `Failed to load semantic layer: ${err instanceof Error ? err.message : String(err)}`,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
for (const { filePath, relativePath } of files) {
|
|
82
|
+
try {
|
|
83
|
+
const source = readFileSync(filePath, 'utf-8');
|
|
84
|
+
const parser = new Parser(source, relativePath);
|
|
85
|
+
const ast = parser.parse();
|
|
86
|
+
// Run semantic analysis
|
|
87
|
+
try {
|
|
88
|
+
const diags = analyze(ast);
|
|
89
|
+
for (const diag of diags) {
|
|
90
|
+
diagnostics.push({
|
|
91
|
+
file: relativePath,
|
|
92
|
+
severity: diag.severity === 'error' ? 'error' : 'warning',
|
|
93
|
+
message: diag.message,
|
|
94
|
+
line: diag.span?.start?.line,
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
// analyze may throw on some inputs
|
|
100
|
+
}
|
|
101
|
+
// Check semantic block metric references
|
|
102
|
+
for (const stmt of ast.statements) {
|
|
103
|
+
if (stmt.kind !== 'BlockDecl')
|
|
104
|
+
continue;
|
|
105
|
+
const block = stmt;
|
|
106
|
+
if (block.blockType === 'semantic' && block.metricRef) {
|
|
107
|
+
if (semanticLayer) {
|
|
108
|
+
const composed = semanticLayer.composeQuery({
|
|
109
|
+
metrics: [block.metricRef],
|
|
110
|
+
dimensions: [],
|
|
111
|
+
});
|
|
112
|
+
if (!composed) {
|
|
113
|
+
diagnostics.push({
|
|
114
|
+
file: relativePath,
|
|
115
|
+
severity: 'error',
|
|
116
|
+
message: `Metric "${block.metricRef}" referenced in block "${block.name}" not found in semantic layer`,
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
diagnostics.push({
|
|
122
|
+
file: relativePath,
|
|
123
|
+
severity: 'warning',
|
|
124
|
+
message: `Semantic block "${block.name}" references metric "${block.metricRef}" but no semantic-layer/ directory exists`,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
catch (err) {
|
|
131
|
+
diagnostics.push({
|
|
132
|
+
file: relativePath,
|
|
133
|
+
severity: 'error',
|
|
134
|
+
message: `Parse error: ${err instanceof Error ? err.message : String(err)}`,
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
const fileCount = files.length;
|
|
139
|
+
// Output
|
|
140
|
+
const errors = diagnostics.filter((d) => d.severity === 'error');
|
|
141
|
+
const warnings = diagnostics.filter((d) => d.severity === 'warning');
|
|
142
|
+
if (flags.format === 'json') {
|
|
143
|
+
console.log(JSON.stringify({ files: fileCount, diagnostics }, null, 2));
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
console.log(`\n Validated ${fileCount} DQL file(s)\n`);
|
|
147
|
+
if (diagnostics.length === 0) {
|
|
148
|
+
console.log(' All files are valid.\n');
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
for (const d of diagnostics) {
|
|
152
|
+
const loc = d.line ? `:${d.line}` : '';
|
|
153
|
+
const icon = d.severity === 'error' ? 'ERROR' : 'WARN';
|
|
154
|
+
console.log(` ${icon} ${d.file}${loc}: ${d.message}`);
|
|
155
|
+
}
|
|
156
|
+
console.log(`\n ${errors.length} error(s), ${warnings.length} warning(s)\n`);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
if (errors.length > 0) {
|
|
160
|
+
process.exitCode = 1;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=validate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/commands/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.test.d.ts","sourceRoot":"","sources":["../../src/commands/validate.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from 'node:fs';
|
|
3
|
+
import { join } from 'node:path';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { runValidate } from './validate.js';
|
|
6
|
+
const tempDirs = [];
|
|
7
|
+
afterEach(() => {
|
|
8
|
+
vi.restoreAllMocks();
|
|
9
|
+
process.exitCode = undefined;
|
|
10
|
+
while (tempDirs.length > 0) {
|
|
11
|
+
const dir = tempDirs.pop();
|
|
12
|
+
if (dir)
|
|
13
|
+
rmSync(dir, { recursive: true, force: true });
|
|
14
|
+
}
|
|
15
|
+
});
|
|
16
|
+
function tempProject() {
|
|
17
|
+
const dir = mkdtempSync(join(tmpdir(), 'dql-validate-'));
|
|
18
|
+
tempDirs.push(dir);
|
|
19
|
+
writeFileSync(join(dir, 'dql.config.json'), JSON.stringify({ version: 1, name: 'validate-test' }));
|
|
20
|
+
return dir;
|
|
21
|
+
}
|
|
22
|
+
function writeValidBlock(path) {
|
|
23
|
+
writeFileSync(path, `block "Monthly Revenue" {
|
|
24
|
+
domain = "finance"
|
|
25
|
+
type = "custom"
|
|
26
|
+
status = "certified"
|
|
27
|
+
query = """
|
|
28
|
+
SELECT 1 AS revenue
|
|
29
|
+
"""
|
|
30
|
+
}
|
|
31
|
+
`);
|
|
32
|
+
}
|
|
33
|
+
describe('runValidate', () => {
|
|
34
|
+
it('recursively validates domain-scoped DQL files in a project folder', async () => {
|
|
35
|
+
const root = tempProject();
|
|
36
|
+
mkdirSync(join(root, 'blocks', 'finance'), { recursive: true });
|
|
37
|
+
writeValidBlock(join(root, 'blocks', 'finance', 'monthly_revenue.dql'));
|
|
38
|
+
const log = vi.spyOn(console, 'log').mockImplementation(() => { });
|
|
39
|
+
await runValidate(root, { format: 'text' });
|
|
40
|
+
expect(log.mock.calls.map((call) => call.join(' ')).join('\n')).toContain('Validated 1 DQL file(s)');
|
|
41
|
+
expect(process.exitCode).toBeUndefined();
|
|
42
|
+
});
|
|
43
|
+
it('validates a nested single file while loading project-level context', async () => {
|
|
44
|
+
const root = tempProject();
|
|
45
|
+
mkdirSync(join(root, 'blocks', 'finance'), { recursive: true });
|
|
46
|
+
const blockPath = join(root, 'blocks', 'finance', 'monthly_revenue.dql');
|
|
47
|
+
writeValidBlock(blockPath);
|
|
48
|
+
const log = vi.spyOn(console, 'log').mockImplementation(() => { });
|
|
49
|
+
await runValidate(blockPath, { format: 'json' });
|
|
50
|
+
const payload = JSON.parse(String(log.mock.calls.at(-1)?.[0]));
|
|
51
|
+
expect(payload.files).toBe(1);
|
|
52
|
+
expect(payload.diagnostics).toEqual([]);
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
//# sourceMappingURL=validate.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.test.js","sourceRoot":"","sources":["../../src/commands/validate.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,7 @@ import { runSchedule } from './commands/schedule.js';
|
|
|
28
28
|
import { runAgent } from './commands/agent.js';
|
|
29
29
|
import { runSlack } from './commands/slack.js';
|
|
30
30
|
import { runVerify } from './commands/verify.js';
|
|
31
|
+
import { runImport } from './commands/import.js';
|
|
31
32
|
const HELP = `
|
|
32
33
|
dql — DQL CLI
|
|
33
34
|
|
|
@@ -45,6 +46,7 @@ const HELP = `
|
|
|
45
46
|
dql info <file.dql> Show block metadata
|
|
46
47
|
dql migrate <source> Scaffold migration from looker/tableau/dbt/metabase/raw-sql
|
|
47
48
|
dql migrate format [--check] Upgrade all .dql/.dqlnb files to canonical format
|
|
49
|
+
dql import sql <path> Preview SQL files/folders as draft Block Studio import candidates
|
|
48
50
|
dql fmt <file.dql|.dqlnb> Format DQL/notebook file in place
|
|
49
51
|
dql diff <path> Diff a .dql/.dqlnb file vs HEAD
|
|
50
52
|
dql diff <before> <after> Semantic diff between two files
|
|
@@ -55,7 +57,7 @@ const HELP = `
|
|
|
55
57
|
dql lineage [block] [path] Answer-layer lineage analysis
|
|
56
58
|
dql mcp [--http] Run the DQL MCP server (stdio by default; --http = loopback)
|
|
57
59
|
dql app new|ls|show|build|reindex <name>
|
|
58
|
-
Manage App artifacts (
|
|
60
|
+
Manage App artifacts (metadata, policies, dashboards, schedules)
|
|
59
61
|
dql schedule list|run|start|status Local scheduler for @schedule'd blocks (alerts + notifications)
|
|
60
62
|
dql agent ask "<question>" Block-first agent loop (certified blocks → fallback LLM SQL)
|
|
61
63
|
dql agent reindex Rebuild .dql/cache/agent-kg.sqlite
|
|
@@ -139,6 +141,9 @@ async function main() {
|
|
|
139
141
|
case 'migrate':
|
|
140
142
|
await runMigrate(file, flags);
|
|
141
143
|
break;
|
|
144
|
+
case 'import':
|
|
145
|
+
await runImport(file, rest, flags);
|
|
146
|
+
break;
|
|
142
147
|
case 'fmt':
|
|
143
148
|
await runFmt(file, flags);
|
|
144
149
|
break;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/llm/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,UAAU,GAChB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/llm/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,UAAU,GAChB,MAAM,YAAY,CAAC;AAgBpB,wBAAgB,SAAS,CAAC,QAAQ,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,CAElE"}
|
|
@@ -2,9 +2,9 @@ import { claudeAgentSdkRunner } from './providers/claude-agent-sdk.js';
|
|
|
2
2
|
import { claudeCodeRunner } from './providers/claude-code.js';
|
|
3
3
|
import { createDqlAgentProviderRunner } from './providers/dql-agent-provider.js';
|
|
4
4
|
/**
|
|
5
|
-
* Registry of available LLM providers.
|
|
6
|
-
*
|
|
7
|
-
*
|
|
5
|
+
* Registry of available LLM providers. Notebook and App chat default to the
|
|
6
|
+
* Settings-resolved DQL agent providers. Claude Agent SDK / Claude Code remain
|
|
7
|
+
* explicit experimental runners for MCP-oriented workflows.
|
|
8
8
|
*/
|
|
9
9
|
const RUNNERS = {
|
|
10
10
|
'claude-agent-sdk': claudeAgentSdkRunner,
|
|
@@ -12,6 +12,7 @@ const RUNNERS = {
|
|
|
12
12
|
openai: createDqlAgentProviderRunner('openai'),
|
|
13
13
|
gemini: createDqlAgentProviderRunner('gemini'),
|
|
14
14
|
ollama: createDqlAgentProviderRunner('ollama'),
|
|
15
|
+
'custom-openai': createDqlAgentProviderRunner('custom-openai'),
|
|
15
16
|
};
|
|
16
17
|
export function getRunner(provider) {
|
|
17
18
|
return RUNNERS[provider] ?? null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/llm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAajF;;;;GAIG;AACH,MAAM,OAAO,GAAoC;IAC/C,kBAAkB,EAAE,oBAAoB;IACxC,aAAa,EAAE,gBAAgB;IAC/B,MAAM,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IAC9C,MAAM,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IAC9C,MAAM,EAAE,4BAA4B,CAAC,QAAQ,CAAC;CAC/
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/llm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAajF;;;;GAIG;AACH,MAAM,OAAO,GAAoC;IAC/C,kBAAkB,EAAE,oBAAoB;IACxC,aAAa,EAAE,gBAAgB;IAC/B,MAAM,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IAC9C,MAAM,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IAC9C,MAAM,EAAE,4BAA4B,CAAC,QAAQ,CAAC;IAC9C,eAAe,EAAE,4BAA4B,CAAC,eAAe,CAAC;CAC/D,CAAC;AAEF,MAAM,UAAU,SAAS,CAAC,QAAoB;IAC5C,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;AACnC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AgentRunner, ProviderId } from '../types.js';
|
|
2
|
-
type SimpleProviderId = Extract<ProviderId, 'openai' | 'gemini' | 'ollama'>;
|
|
2
|
+
type SimpleProviderId = Extract<ProviderId, 'openai' | 'gemini' | 'ollama' | 'custom-openai'>;
|
|
3
3
|
export declare function createDqlAgentProviderRunner(id: SimpleProviderId): AgentRunner;
|
|
4
4
|
export {};
|
|
5
5
|
//# sourceMappingURL=dql-agent-provider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dql-agent-provider.d.ts","sourceRoot":"","sources":["../../../src/llm/providers/dql-agent-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAmB,WAAW,EAA4B,UAAU,EAAE,MAAM,aAAa,CAAC;AAGtG,KAAK,gBAAgB,GAAG,OAAO,CAAC,UAAU,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,eAAe,CAAC,CAAC;AAmE9F,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,gBAAgB,GAAG,WAAW,CAmE9E"}
|
|
@@ -0,0 +1,287 @@
|
|
|
1
|
+
import { KGStore, MemoryStore, defaultKgPath, defaultMemoryPath, GeminiProvider, OllamaProvider, OpenAIProvider, answer, loadSkills, reindexProject, } from '@duckcodeailabs/dql-agent';
|
|
2
|
+
import { existsSync } from 'node:fs';
|
|
3
|
+
import { getEffectiveProviderConfig } from '../../settings/provider-settings.js';
|
|
4
|
+
const SPECS = {
|
|
5
|
+
openai: {
|
|
6
|
+
label: 'OpenAI',
|
|
7
|
+
setup: 'Configure OpenAI in Settings or set OPENAI_API_KEY. Optional: OPENAI_MODEL and OPENAI_BASE_URL.',
|
|
8
|
+
create: (projectRoot) => {
|
|
9
|
+
const config = getEffectiveProviderConfig(projectRoot, 'openai');
|
|
10
|
+
return new OpenAIProvider({ apiKey: config.apiKey, model: config.model, baseUrl: config.baseUrl });
|
|
11
|
+
},
|
|
12
|
+
},
|
|
13
|
+
gemini: {
|
|
14
|
+
label: 'Gemini',
|
|
15
|
+
setup: 'Configure Gemini in Settings or set GEMINI_API_KEY. Optional: GEMINI_MODEL.',
|
|
16
|
+
create: (projectRoot) => {
|
|
17
|
+
const config = getEffectiveProviderConfig(projectRoot, 'gemini');
|
|
18
|
+
return new GeminiProvider({ apiKey: config.apiKey, model: config.model });
|
|
19
|
+
},
|
|
20
|
+
},
|
|
21
|
+
ollama: {
|
|
22
|
+
label: 'Ollama',
|
|
23
|
+
setup: 'Start Ollama and configure OLLAMA_BASE_URL / OLLAMA_MODEL in Settings or env.',
|
|
24
|
+
create: (projectRoot) => {
|
|
25
|
+
const config = getEffectiveProviderConfig(projectRoot, 'ollama');
|
|
26
|
+
return new OllamaProvider({ model: config.model, baseUrl: config.baseUrl });
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
'custom-openai': {
|
|
30
|
+
label: 'Custom OpenAI-compatible',
|
|
31
|
+
setup: 'Configure a custom OpenAI-compatible endpoint in Settings with base URL, model, and optional API key.',
|
|
32
|
+
create: (projectRoot) => {
|
|
33
|
+
const config = getEffectiveProviderConfig(projectRoot, 'custom-openai');
|
|
34
|
+
return new OpenAIProvider({ apiKey: config.apiKey, model: config.model, baseUrl: config.baseUrl, allowNoApiKey: true });
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
function emitProposalFromText(text, emit) {
|
|
39
|
+
const match = text.match(/DQL_BLOCK_PROPOSAL\s*[:=]?\s*(\{[\s\S]*\})\s*$/);
|
|
40
|
+
if (!match)
|
|
41
|
+
return;
|
|
42
|
+
try {
|
|
43
|
+
const raw = JSON.parse(match[1]);
|
|
44
|
+
if (!raw.name || !raw.sql)
|
|
45
|
+
return;
|
|
46
|
+
emit({
|
|
47
|
+
kind: 'proposal',
|
|
48
|
+
proposal: {
|
|
49
|
+
name: String(raw.name),
|
|
50
|
+
domain: String(raw.domain ?? ''),
|
|
51
|
+
owner: String(raw.owner ?? ''),
|
|
52
|
+
description: String(raw.description ?? ''),
|
|
53
|
+
sql: String(raw.sql),
|
|
54
|
+
tags: Array.isArray(raw.tags) ? raw.tags.map(String) : undefined,
|
|
55
|
+
chartType: typeof raw.chartType === 'string' ? raw.chartType : undefined,
|
|
56
|
+
},
|
|
57
|
+
governance: { certified: false, errors: [], warnings: ['Generated by a non-tool provider; review before saving.'] },
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
catch {
|
|
61
|
+
// Ignore malformed proposal text. The visible assistant response still streams as text.
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
export function createDqlAgentProviderRunner(id) {
|
|
65
|
+
return {
|
|
66
|
+
async run(req, emit, signal) {
|
|
67
|
+
const spec = SPECS[id];
|
|
68
|
+
const provider = spec.create(req.projectRoot);
|
|
69
|
+
const available = await provider.available().catch(() => false);
|
|
70
|
+
if (!available) {
|
|
71
|
+
emit({ kind: 'error', message: `${spec.label} is not configured or reachable. ${spec.setup}` });
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
try {
|
|
75
|
+
emit({ kind: 'thinking', text: `Using ${spec.label} through the governed DQL agent.` });
|
|
76
|
+
const kgPath = defaultKgPath(req.projectRoot);
|
|
77
|
+
if (!existsSync(kgPath)) {
|
|
78
|
+
emit({ kind: 'thinking', text: 'Building the local agent knowledge graph from blocks, apps, dashboards, dbt, and semantic metadata.' });
|
|
79
|
+
await reindexProject(req.projectRoot, { kgPath });
|
|
80
|
+
}
|
|
81
|
+
const question = lastUserMessage(req);
|
|
82
|
+
if (!question) {
|
|
83
|
+
emit({ kind: 'error', message: 'No user question found.' });
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
const memory = new MemoryStore(defaultMemoryPath(req.projectRoot));
|
|
87
|
+
const kg = new KGStore(kgPath);
|
|
88
|
+
try {
|
|
89
|
+
const memoryContext = memory.search({
|
|
90
|
+
query: question,
|
|
91
|
+
scopes: ['thread', 'notebook', 'project', 'user', 'artifact'],
|
|
92
|
+
scopeId: req.upstream?.cellId,
|
|
93
|
+
limit: 6,
|
|
94
|
+
});
|
|
95
|
+
const skills = loadSkills(req.projectRoot).skills;
|
|
96
|
+
const blockHints = inferFollowUpBlockHints(req, question);
|
|
97
|
+
const result = await answer({
|
|
98
|
+
question,
|
|
99
|
+
extraContext: renderExtraContext(req, blockHints),
|
|
100
|
+
provider,
|
|
101
|
+
kg,
|
|
102
|
+
skills,
|
|
103
|
+
blockHints,
|
|
104
|
+
memoryContext,
|
|
105
|
+
signal,
|
|
106
|
+
executeCertifiedBlock: req.executeCertifiedBlock,
|
|
107
|
+
});
|
|
108
|
+
emit({ kind: 'tool_result', id: 'governed_answer', output: result });
|
|
109
|
+
emit({ kind: 'text', text: formatAgentAnswer(result) });
|
|
110
|
+
if (result.proposedSql) {
|
|
111
|
+
emitDraftProposal(result, question, emit);
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
emitProposalFromText(result.text, emit);
|
|
115
|
+
}
|
|
116
|
+
persistThreadMemory(memory, req, question, result);
|
|
117
|
+
}
|
|
118
|
+
finally {
|
|
119
|
+
kg.close();
|
|
120
|
+
memory.close();
|
|
121
|
+
}
|
|
122
|
+
emit({ kind: 'done', stopReason: 'stop' });
|
|
123
|
+
}
|
|
124
|
+
catch (err) {
|
|
125
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
126
|
+
const setupHint = shouldShowProviderSetupHint(message) ? ` ${spec.setup}` : '';
|
|
127
|
+
emit({ kind: 'error', message: `${spec.label} failed: ${message}.${setupHint}` });
|
|
128
|
+
}
|
|
129
|
+
},
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
function shouldShowProviderSetupHint(message) {
|
|
133
|
+
return /api key|not configured|not reachable|connection refused|ECONNREFUSED|fetch failed|network error|model .*not found/i
|
|
134
|
+
.test(message);
|
|
135
|
+
}
|
|
136
|
+
function lastUserMessage(req) {
|
|
137
|
+
for (let i = req.messages.length - 1; i >= 0; i--) {
|
|
138
|
+
const msg = req.messages[i];
|
|
139
|
+
if (msg.role === 'user' && msg.content.trim())
|
|
140
|
+
return msg.content.trim();
|
|
141
|
+
}
|
|
142
|
+
return '';
|
|
143
|
+
}
|
|
144
|
+
function renderExtraContext(req, blockHints) {
|
|
145
|
+
const parts = [];
|
|
146
|
+
if (req.upstream?.sql)
|
|
147
|
+
parts.push(`Current upstream SQL:\n${req.upstream.sql}`);
|
|
148
|
+
if (blockHints.length > 0) {
|
|
149
|
+
parts.push(`Follow-up context: the user is referring to certified block "${blockHints[0]}".`);
|
|
150
|
+
}
|
|
151
|
+
return parts.length > 0 ? parts.join('\n\n') : undefined;
|
|
152
|
+
}
|
|
153
|
+
function inferFollowUpBlockHints(req, question) {
|
|
154
|
+
if (!isGenericFollowUp(question))
|
|
155
|
+
return [];
|
|
156
|
+
for (let i = req.messages.length - 1; i >= 0; i--) {
|
|
157
|
+
const msg = req.messages[i];
|
|
158
|
+
if (msg.role !== 'assistant')
|
|
159
|
+
continue;
|
|
160
|
+
const fromAnswer = msg.content.match(/Answered by certified block \*\*([^*]+)\*\*/i)?.[1];
|
|
161
|
+
const fromCitation = msg.content.match(/^- block:\s*([A-Za-z0-9_.-]+)/im)?.[1];
|
|
162
|
+
const block = fromAnswer ?? fromCitation;
|
|
163
|
+
if (block)
|
|
164
|
+
return [block.trim()];
|
|
165
|
+
}
|
|
166
|
+
return [];
|
|
167
|
+
}
|
|
168
|
+
const GENERIC_FOLLOW_UP_WORDS = new Set([
|
|
169
|
+
'a', 'about', 'again', 'all', 'also', 'and', 'as', 'be', 'block', 'can', 'could', 'data', 'do',
|
|
170
|
+
'execute', 'for', 'from', 'get', 'give', 'import', 'it', 'its', 'let', 'lets', 'me', 'metrics',
|
|
171
|
+
'more', 'now', 'of', 'output', 'please', 'result', 'results', 'run', 'show', 'solution', 'summary',
|
|
172
|
+
'that', 'the', 'them', 'this', 'to', 'use', 'with', 'you',
|
|
173
|
+
]);
|
|
174
|
+
function isGenericFollowUp(question) {
|
|
175
|
+
const lower = question.toLowerCase();
|
|
176
|
+
if (!/\b(block|data|execute|import|it|result|results|run|solution|that|this)\b/.test(lower))
|
|
177
|
+
return false;
|
|
178
|
+
const tokens = lower.match(/[a-z0-9_]+/g) ?? [];
|
|
179
|
+
const meaningful = tokens.filter((token) => token.length > 1 && !GENERIC_FOLLOW_UP_WORDS.has(token));
|
|
180
|
+
return meaningful.length === 0;
|
|
181
|
+
}
|
|
182
|
+
function formatAgentAnswer(result) {
|
|
183
|
+
const badge = result.certification === 'certified'
|
|
184
|
+
? 'Certified'
|
|
185
|
+
: result.sourceTier === 'semantic_layer'
|
|
186
|
+
? 'AI generated from semantic layer - analyst review required'
|
|
187
|
+
: result.kind === 'no_answer'
|
|
188
|
+
? 'No answer'
|
|
189
|
+
: 'AI generated from dbt manifest - analyst review required';
|
|
190
|
+
const citations = result.citations.length > 0
|
|
191
|
+
? '\n\nCitations:\n' + result.citations.map((c) => `- ${c.kind}: ${c.name}${c.provenance ? ` (${c.provenance})` : ''}`).join('\n')
|
|
192
|
+
: '';
|
|
193
|
+
const resultPreview = formatResultPreview(result.result);
|
|
194
|
+
const sql = result.proposedSql ? `\n\nProposed SQL:\n\`\`\`sql\n${result.proposedSql}\n\`\`\`` : '';
|
|
195
|
+
return `[${badge}]\n\n${result.text}${resultPreview}${citations}${sql}`;
|
|
196
|
+
}
|
|
197
|
+
function formatResultPreview(result) {
|
|
198
|
+
if (!result)
|
|
199
|
+
return '';
|
|
200
|
+
const columns = normalizeColumns(result.columns).slice(0, 8);
|
|
201
|
+
const rows = Array.isArray(result.rows) ? result.rows.slice(0, 8) : [];
|
|
202
|
+
const shown = rows.length;
|
|
203
|
+
const timing = typeof result.executionTime === 'number' && result.executionTime > 0
|
|
204
|
+
? ` in ${Math.round(result.executionTime)} ms`
|
|
205
|
+
: '';
|
|
206
|
+
if (columns.length === 0 || rows.length === 0) {
|
|
207
|
+
return `\n\nResults: ${result.rowCount} row${result.rowCount === 1 ? '' : 's'}${timing}.`;
|
|
208
|
+
}
|
|
209
|
+
const tableRows = rows.map((row) => {
|
|
210
|
+
const record = row && typeof row === 'object' ? row : {};
|
|
211
|
+
return `| ${columns.map((col) => formatCell(record[col])).join(' | ')} |`;
|
|
212
|
+
});
|
|
213
|
+
const omittedRows = result.rowCount > shown ? ` Showing first ${shown} rows.` : '';
|
|
214
|
+
return [
|
|
215
|
+
`\n\nResults: ${result.rowCount} row${result.rowCount === 1 ? '' : 's'}${timing}.${omittedRows}`,
|
|
216
|
+
`| ${columns.map(escapeMarkdownTable).join(' | ')} |`,
|
|
217
|
+
`| ${columns.map(() => '---').join(' | ')} |`,
|
|
218
|
+
...tableRows,
|
|
219
|
+
].join('\n');
|
|
220
|
+
}
|
|
221
|
+
function normalizeColumns(columns) {
|
|
222
|
+
return columns.map((column) => {
|
|
223
|
+
if (typeof column === 'string')
|
|
224
|
+
return column;
|
|
225
|
+
if (column && typeof column === 'object' && typeof column.name === 'string') {
|
|
226
|
+
return column.name;
|
|
227
|
+
}
|
|
228
|
+
return String(column);
|
|
229
|
+
});
|
|
230
|
+
}
|
|
231
|
+
function formatCell(value) {
|
|
232
|
+
if (value === null || typeof value === 'undefined')
|
|
233
|
+
return '';
|
|
234
|
+
const raw = typeof value === 'object' ? JSON.stringify(value) : String(value);
|
|
235
|
+
return escapeMarkdownTable(raw.length > 80 ? `${raw.slice(0, 77)}...` : raw);
|
|
236
|
+
}
|
|
237
|
+
function escapeMarkdownTable(value) {
|
|
238
|
+
return value.replace(/\|/g, '\\|').replace(/\r?\n/g, ' ');
|
|
239
|
+
}
|
|
240
|
+
function emitDraftProposal(result, question, emit) {
|
|
241
|
+
const proposal = {
|
|
242
|
+
name: slugify(question).slice(0, 56) || 'ai_generated_analysis',
|
|
243
|
+
domain: '',
|
|
244
|
+
owner: `${process.env.USER ?? 'analyst'}@local`,
|
|
245
|
+
description: result.text.slice(0, 240),
|
|
246
|
+
sql: result.proposedSql,
|
|
247
|
+
tags: ['ai-generated', 'needs-review', result.sourceTier ?? 'dbt_manifest'],
|
|
248
|
+
chartType: result.suggestedViz,
|
|
249
|
+
};
|
|
250
|
+
emit({
|
|
251
|
+
kind: 'proposal',
|
|
252
|
+
proposal,
|
|
253
|
+
governance: {
|
|
254
|
+
certified: false,
|
|
255
|
+
errors: [],
|
|
256
|
+
warnings: ['AI generated. Analyst review and certification are required before reuse as governed content.'],
|
|
257
|
+
},
|
|
258
|
+
});
|
|
259
|
+
}
|
|
260
|
+
function persistThreadMemory(memory, req, question, result) {
|
|
261
|
+
const cellId = req.upstream?.cellId;
|
|
262
|
+
if (!cellId)
|
|
263
|
+
return;
|
|
264
|
+
memory.upsert({
|
|
265
|
+
id: `thread:${cellId}`,
|
|
266
|
+
scope: 'thread',
|
|
267
|
+
scopeId: cellId,
|
|
268
|
+
title: 'Notebook chat summary',
|
|
269
|
+
content: [
|
|
270
|
+
`Latest question: ${question}`,
|
|
271
|
+
`Latest route: ${result.sourceTier ?? 'unknown'} / ${result.certification ?? 'unknown'}`,
|
|
272
|
+
`Latest answer: ${result.text.slice(0, 500)}`,
|
|
273
|
+
].join('\n'),
|
|
274
|
+
tags: ['chat', result.sourceTier ?? 'unknown', result.certification ?? 'unknown'],
|
|
275
|
+
source: 'notebook-chat',
|
|
276
|
+
confidence: result.confidence ?? 0.5,
|
|
277
|
+
importance: 0.45,
|
|
278
|
+
});
|
|
279
|
+
}
|
|
280
|
+
function slugify(input) {
|
|
281
|
+
return input
|
|
282
|
+
.toLowerCase()
|
|
283
|
+
.replace(/[^a-z0-9]+/g, '_')
|
|
284
|
+
.replace(/^_+|_+$/g, '')
|
|
285
|
+
.replace(/_{2,}/g, '_');
|
|
286
|
+
}
|
|
287
|
+
//# sourceMappingURL=dql-agent-provider.js.map
|