@duckcodeailabs/dql-cli 1.4.4 → 1.5.0
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} +2 -0
- package/dist/apps-api.d.ts.map +1 -0
- package/{apps-api.js → dist/apps-api.js} +326 -4
- package/dist/apps-api.js.map +1 -0
- 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-R3UrqjLQ.css +1 -0
- package/dist/assets/dql-notebook/assets/index-mlfOQ2me.js +857 -0
- package/{assets → dist/assets}/dql-notebook/index.html +2 -2
- package/dist/block-studio-import.d.ts +58 -0
- package/dist/block-studio-import.d.ts.map +1 -0
- package/dist/block-studio-import.js +390 -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 +106 -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/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}/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} +5 -0
- 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} +551 -49
- 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/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/{apps-api.test.js → dist/apps-api.test.js} +0 -0
- /package/{apps-api.test.js.map → dist/apps-api.test.js.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}/app.d.ts.map +0 -0
- /package/{commands → dist/commands}/app.js +0 -0
- /package/{commands → dist/commands}/app.js.map +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.d.ts.map +0 -0
- /package/{commands → dist/commands}/init.js +0 -0
- /package/{commands → dist/commands}/init.js.map +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}/init.test.js +0 -0
- /package/{commands → dist/commands}/init.test.js.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
|
@@ -16,8 +16,9 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import { existsSync, readFileSync } from 'node:fs';
|
|
18
18
|
import { join } from 'node:path';
|
|
19
|
-
import {
|
|
20
|
-
import {
|
|
19
|
+
import { load as loadYaml } from 'js-yaml';
|
|
20
|
+
import { KGStore, MemoryStore, defaultKgPath, defaultMemoryPath, reindexProject, loadSkills, pickProvider, answer, } from '@duckcodeailabs/dql-agent';
|
|
21
|
+
import { buildManifest, resolveDbtManifestPath } from '@duckcodeailabs/dql-core';
|
|
21
22
|
import { findProjectRoot } from '../local-runtime.js';
|
|
22
23
|
export async function runAgent(sub, rest, flags) {
|
|
23
24
|
switch (sub) {
|
|
@@ -27,11 +28,14 @@ export async function runAgent(sub, rest, flags) {
|
|
|
27
28
|
return runReindex(flags);
|
|
28
29
|
case 'feedback':
|
|
29
30
|
return runFeedback(rest, flags);
|
|
31
|
+
case 'eval':
|
|
32
|
+
return runEval(rest, flags);
|
|
30
33
|
default:
|
|
31
|
-
throw new Error('Usage: dql agent <ask|reindex|feedback> [args]\n' +
|
|
34
|
+
throw new Error('Usage: dql agent <ask|reindex|feedback|eval> [args]\n' +
|
|
32
35
|
' dql agent ask "<question>" [--provider claude|openai|gemini|ollama] [--user <id>] [--domain <d>]\n' +
|
|
33
36
|
' dql agent reindex\n' +
|
|
34
|
-
' dql agent feedback up|down --block <id> --question "..."'
|
|
37
|
+
' dql agent feedback up|down --block <id> --question "..."\n' +
|
|
38
|
+
' dql agent eval agent-evals.yml [--provider claude|openai|gemini|ollama]');
|
|
35
39
|
}
|
|
36
40
|
}
|
|
37
41
|
async function runAsk(rest, flags) {
|
|
@@ -49,9 +53,15 @@ async function runAsk(rest, flags) {
|
|
|
49
53
|
const format = flags.format;
|
|
50
54
|
const provider = await pickProvider(providerName);
|
|
51
55
|
const kg = new KGStore(kgPath);
|
|
56
|
+
const memory = new MemoryStore(defaultMemoryPath(projectRoot));
|
|
52
57
|
const { skills } = loadSkills(projectRoot);
|
|
53
58
|
try {
|
|
54
|
-
const
|
|
59
|
+
const memoryContext = memory.search({
|
|
60
|
+
query: question,
|
|
61
|
+
scopes: ['project', 'user', 'artifact'],
|
|
62
|
+
limit: 6,
|
|
63
|
+
});
|
|
64
|
+
const manifest = buildManifest({ projectRoot, dbtManifestPath: resolveDbtManifestPath(projectRoot) ?? undefined });
|
|
55
65
|
const result = await answer({
|
|
56
66
|
question,
|
|
57
67
|
provider,
|
|
@@ -59,6 +69,7 @@ async function runAsk(rest, flags) {
|
|
|
59
69
|
skills,
|
|
60
70
|
userId,
|
|
61
71
|
domain,
|
|
72
|
+
memoryContext,
|
|
62
73
|
executeCertifiedBlock: async (node) => {
|
|
63
74
|
const block = manifest.blocks[node.name] ?? manifest.blocks[node.nodeId.replace(/^block:/, '')];
|
|
64
75
|
if (!block)
|
|
@@ -91,6 +102,7 @@ async function runAsk(rest, flags) {
|
|
|
91
102
|
rows,
|
|
92
103
|
rowCount: typeof payload.result?.rowCount === 'number' ? payload.result.rowCount : rows.length,
|
|
93
104
|
executionTime: payload.result?.executionTime,
|
|
105
|
+
blockName: node.name,
|
|
94
106
|
};
|
|
95
107
|
},
|
|
96
108
|
});
|
|
@@ -119,6 +131,7 @@ async function runAsk(rest, flags) {
|
|
|
119
131
|
}
|
|
120
132
|
finally {
|
|
121
133
|
kg.close();
|
|
134
|
+
memory.close();
|
|
122
135
|
}
|
|
123
136
|
}
|
|
124
137
|
async function runReindex(flags) {
|
|
@@ -162,4 +175,84 @@ async function runFeedback(rest, flags) {
|
|
|
162
175
|
kg.close();
|
|
163
176
|
}
|
|
164
177
|
}
|
|
178
|
+
async function runEval(rest, flags) {
|
|
179
|
+
const projectRoot = findProjectRoot(process.cwd());
|
|
180
|
+
const evalPath = rest[0] ? join(projectRoot, rest[0]) : join(projectRoot, 'agent-evals.yml');
|
|
181
|
+
if (!existsSync(evalPath))
|
|
182
|
+
throw new Error(`Eval file not found: ${evalPath}`);
|
|
183
|
+
const raw = loadYaml(readFileSync(evalPath, 'utf-8'));
|
|
184
|
+
const cases = Array.isArray(raw) ? raw : raw?.cases ?? [];
|
|
185
|
+
if (cases.length === 0)
|
|
186
|
+
throw new Error('No eval cases found.');
|
|
187
|
+
const kgPath = defaultKgPath(projectRoot);
|
|
188
|
+
if (!existsSync(kgPath))
|
|
189
|
+
await reindexProject(projectRoot, { kgPath });
|
|
190
|
+
const providerName = flags.provider;
|
|
191
|
+
const provider = await pickProvider(providerName);
|
|
192
|
+
const kg = new KGStore(kgPath);
|
|
193
|
+
const memory = new MemoryStore(defaultMemoryPath(projectRoot));
|
|
194
|
+
const { skills } = loadSkills(projectRoot);
|
|
195
|
+
const results = [];
|
|
196
|
+
try {
|
|
197
|
+
for (const testCase of cases) {
|
|
198
|
+
const memoryContext = memory.search({
|
|
199
|
+
query: testCase.question,
|
|
200
|
+
scopes: ['project', 'user', 'artifact'],
|
|
201
|
+
limit: 6,
|
|
202
|
+
});
|
|
203
|
+
const result = await answer({
|
|
204
|
+
question: testCase.question,
|
|
205
|
+
domain: testCase.domain,
|
|
206
|
+
provider,
|
|
207
|
+
kg,
|
|
208
|
+
skills,
|
|
209
|
+
memoryContext,
|
|
210
|
+
});
|
|
211
|
+
const failures = evaluateCase(testCase, result);
|
|
212
|
+
results.push({
|
|
213
|
+
name: testCase.name ?? testCase.question,
|
|
214
|
+
passed: failures.length === 0,
|
|
215
|
+
failures,
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
finally {
|
|
220
|
+
kg.close();
|
|
221
|
+
memory.close();
|
|
222
|
+
}
|
|
223
|
+
const passed = results.filter((r) => r.passed).length;
|
|
224
|
+
if (flags.format === 'json') {
|
|
225
|
+
console.log(JSON.stringify({ ok: passed === results.length, passed, total: results.length, results }, null, 2));
|
|
226
|
+
return;
|
|
227
|
+
}
|
|
228
|
+
for (const result of results) {
|
|
229
|
+
console.log(`${result.passed ? '✓' : '✕'} ${result.name}`);
|
|
230
|
+
for (const failure of result.failures)
|
|
231
|
+
console.log(` - ${failure}`);
|
|
232
|
+
}
|
|
233
|
+
console.log(`\n${passed}/${results.length} eval case(s) passed.`);
|
|
234
|
+
if (passed !== results.length)
|
|
235
|
+
process.exitCode = 1;
|
|
236
|
+
}
|
|
237
|
+
function evaluateCase(testCase, result) {
|
|
238
|
+
const expected = testCase.expected;
|
|
239
|
+
if (!expected)
|
|
240
|
+
return [];
|
|
241
|
+
const failures = [];
|
|
242
|
+
if (expected.kind && result.kind !== expected.kind)
|
|
243
|
+
failures.push(`kind expected ${expected.kind}, got ${result.kind}`);
|
|
244
|
+
if (expected.sourceTier && result.sourceTier !== expected.sourceTier)
|
|
245
|
+
failures.push(`sourceTier expected ${expected.sourceTier}, got ${result.sourceTier}`);
|
|
246
|
+
if (expected.certification && result.certification !== expected.certification)
|
|
247
|
+
failures.push(`certification expected ${expected.certification}, got ${result.certification}`);
|
|
248
|
+
if (expected.sqlContains && !result.proposedSql?.toLowerCase().includes(expected.sqlContains.toLowerCase()))
|
|
249
|
+
failures.push(`SQL did not contain "${expected.sqlContains}"`);
|
|
250
|
+
if (expected.citationKind && !result.citations.some((c) => c.kind === expected.citationKind))
|
|
251
|
+
failures.push(`missing citation kind ${expected.citationKind}`);
|
|
252
|
+
for (const column of expected.noHallucinatedColumns ?? []) {
|
|
253
|
+
if (result.proposedSql?.toLowerCase().includes(column.toLowerCase()))
|
|
254
|
+
failures.push(`hallucinated forbidden column "${column}"`);
|
|
255
|
+
}
|
|
256
|
+
return failures;
|
|
257
|
+
}
|
|
165
258
|
//# sourceMappingURL=agent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG3C,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAkD9F"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { createBlockStudioImportSession } from '../block-studio-import.js';
|
|
2
|
+
export async function runImport(source, rest, flags) {
|
|
3
|
+
if (source !== 'sql') {
|
|
4
|
+
console.error(`\n ✗ Unknown import source: "${source}"`);
|
|
5
|
+
console.error(' Supported sources in this build: sql');
|
|
6
|
+
console.error('');
|
|
7
|
+
process.exit(1);
|
|
8
|
+
}
|
|
9
|
+
const inputPath = rest[0] || flags.input;
|
|
10
|
+
if (!inputPath) {
|
|
11
|
+
console.error('\n ✗ Missing SQL import path.');
|
|
12
|
+
console.error(' Usage: dql import sql <file-or-folder> [--domain <name>] [--owner <name>]');
|
|
13
|
+
console.error('');
|
|
14
|
+
process.exit(1);
|
|
15
|
+
}
|
|
16
|
+
const session = createBlockStudioImportSession(process.cwd(), {
|
|
17
|
+
sourceKind: 'raw-sql',
|
|
18
|
+
inputPath,
|
|
19
|
+
domain: flags.domain || 'imported',
|
|
20
|
+
owner: flags.owner || '',
|
|
21
|
+
});
|
|
22
|
+
if (flags.format === 'json') {
|
|
23
|
+
console.log(JSON.stringify(session, null, 2));
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
console.log('\n DQL Import: SQL');
|
|
27
|
+
console.log(' ─────────────────────────────');
|
|
28
|
+
console.log(` Session: ${session.id}`);
|
|
29
|
+
console.log(` Source: ${session.inputPath}`);
|
|
30
|
+
console.log(` Candidates: ${session.candidates.length}`);
|
|
31
|
+
console.log(` Domain: ${session.defaults.domain}`);
|
|
32
|
+
if (session.defaults.owner)
|
|
33
|
+
console.log(` Owner: ${session.defaults.owner}`);
|
|
34
|
+
console.log('');
|
|
35
|
+
for (const candidate of session.candidates) {
|
|
36
|
+
const tables = candidate.lineage.sourceTables.length > 0
|
|
37
|
+
? candidate.lineage.sourceTables.join(', ')
|
|
38
|
+
: 'not detected';
|
|
39
|
+
const warnings = candidate.lineage.warnings.length > 0
|
|
40
|
+
? ` · ${candidate.lineage.warnings.join('; ')}`
|
|
41
|
+
: '';
|
|
42
|
+
console.log(` • ${candidate.name}`);
|
|
43
|
+
console.log(` ${candidate.id} · confidence ${Math.round(candidate.confidence * 100)}% · tables: ${tables}${warnings}`);
|
|
44
|
+
}
|
|
45
|
+
console.log('');
|
|
46
|
+
console.log(' Review in Block Studio Import, then run and save selected candidates as draft blocks.');
|
|
47
|
+
console.log(` Import cache: .dql/imports/${session.id}/`);
|
|
48
|
+
console.log('');
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=import.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG3C,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,CAAC;AAEpF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB;AAuCD,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA4F7E;AAUD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CnF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { join, relative } from 'node:path';
|
|
3
3
|
import { canonicalize, canonicalizeNotebook } from '@duckcodeailabs/dql-core';
|
|
4
|
+
import { runImport } from './import.js';
|
|
4
5
|
/**
|
|
5
6
|
* Generate a DQL block skeleton from a source tool definition.
|
|
6
7
|
*/
|
|
@@ -44,6 +45,10 @@ export async function runMigrate(file, flags) {
|
|
|
44
45
|
console.error('');
|
|
45
46
|
process.exit(1);
|
|
46
47
|
}
|
|
48
|
+
if (source === 'raw-sql' && flags.input) {
|
|
49
|
+
await runImport('sql', [flags.input], flags);
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
47
52
|
if (flags.format === 'json') {
|
|
48
53
|
console.log(JSON.stringify({
|
|
49
54
|
source,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../src/commands/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/commands/validate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AA+E3C,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAmGrF"}
|
|
@@ -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
|
|
@@ -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"}
|