@deepagents/text2sql 0.18.0 → 0.19.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/dist/index.js +316 -6
- package/dist/index.js.map +2 -2
- package/dist/lib/agents/result-tools.d.ts +15 -10
- package/dist/lib/agents/result-tools.d.ts.map +1 -1
- package/dist/lib/agents/sql.agent.d.ts +2 -4
- package/dist/lib/agents/sql.agent.d.ts.map +1 -1
- package/dist/lib/sql.d.ts.map +1 -1
- package/dist/lib/synthesis/index.js +3 -8
- package/dist/lib/synthesis/index.js.map +2 -2
- package/dist/lib/synthesis/synthesizers/depth-evolver.d.ts.map +1 -1
- package/dist/lib/synthesis/synthesizers/schema-synthesizer.d.ts.map +1 -1
- package/package.json +8 -8
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { type IFileSystem } from 'just-bash';
|
|
2
2
|
import type { SkillPathMapping } from '@deepagents/context';
|
|
3
3
|
import type { Adapter } from '../adapters/adapter.ts';
|
|
4
|
+
interface CommandResult {
|
|
5
|
+
stdout: string;
|
|
6
|
+
stderr: string;
|
|
7
|
+
exitCode: number;
|
|
8
|
+
}
|
|
4
9
|
/**
|
|
5
10
|
* Options for creating result tools.
|
|
6
11
|
*/
|
|
@@ -19,17 +24,16 @@ export interface ResultToolsOptions {
|
|
|
19
24
|
* SQL is executed via: sql run "SELECT ..."
|
|
20
25
|
*/
|
|
21
26
|
export declare function createResultTools(options: ResultToolsOptions): Promise<{
|
|
22
|
-
sandbox:
|
|
27
|
+
sandbox: {
|
|
28
|
+
executeCommand: (command: string) => Promise<CommandResult>;
|
|
29
|
+
readFile(path: string): Promise<string>;
|
|
30
|
+
writeFiles(files: Array<{
|
|
31
|
+
path: string;
|
|
32
|
+
content: string | Buffer;
|
|
33
|
+
}>): Promise<void>;
|
|
34
|
+
};
|
|
23
35
|
tools: {
|
|
24
|
-
bash: import("ai").Tool<unknown,
|
|
25
|
-
meta: Record<string, unknown>;
|
|
26
|
-
stdout: string;
|
|
27
|
-
stderr: string;
|
|
28
|
-
exitCode: number;
|
|
29
|
-
} | {
|
|
30
|
-
meta: Record<string, unknown>;
|
|
31
|
-
[Symbol.asyncIterator](): AsyncIterator<import("bash-tool").CommandResult, any, any>;
|
|
32
|
-
}>;
|
|
36
|
+
bash: import("ai").Tool<unknown, CommandResult | AsyncIterable<import("bash-tool").CommandResult>>;
|
|
33
37
|
readFile: import("ai").Tool<{
|
|
34
38
|
path: string;
|
|
35
39
|
}, {
|
|
@@ -43,4 +47,5 @@ export declare function createResultTools(options: ResultToolsOptions): Promise<
|
|
|
43
47
|
}>;
|
|
44
48
|
};
|
|
45
49
|
}>;
|
|
50
|
+
export {};
|
|
46
51
|
//# sourceMappingURL=result-tools.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"result-tools.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/result-tools.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"result-tools.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/result-tools.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,WAAW,EAOjB,MAAM,WAAW,CAAC;AAMnB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AA+kBD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,OAAO,EAAE,OAAO,CAAC;IACjB,uDAAuD;IACvD,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,6BAA6B;IAC7B,UAAU,EAAE,WAAW,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB;;kCA4C/B,MAAM;;;;;;;;;;;;;;;;;;;;;GAoDzC"}
|
|
@@ -6,10 +6,8 @@ export interface ToSqlOptions {
|
|
|
6
6
|
input: string;
|
|
7
7
|
/** Database adapter for validation */
|
|
8
8
|
adapter: Adapter;
|
|
9
|
-
/**
|
|
10
|
-
|
|
11
|
-
/** Instructions/teachings to include */
|
|
12
|
-
instructions: ContextFragment[];
|
|
9
|
+
/** Context fragments (schema + instructions/teachings) */
|
|
10
|
+
fragments: ContextFragment[];
|
|
13
11
|
/** Optional model override */
|
|
14
12
|
model: AgentModel;
|
|
15
13
|
/** Maximum retry attempts on validation failure (default: 3) */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.agent.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/sql.agent.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,KAAK,eAAe,EAKrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,
|
|
1
|
+
{"version":3,"file":"sql.agent.d.ts","sourceRoot":"","sources":["../../../src/lib/agents/sql.agent.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,KAAK,eAAe,EAKrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,8BAA8B;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAWD,QAAA,MAAM,MAAM,eAA+B,CAAC;AAC5C;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC;gBACH,OAAO,EAAE,MAAM;IAK3B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,kBAAkB;CAG/D;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,OAAO,EAAE,MAAM;IAI3B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,oBAAoB;CAGjE;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAwFvE"}
|
package/dist/lib/sql.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/lib/sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,IAAI,EAET,KAAK,OAAO,EACZ,KAAK,SAAS,EAGf,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,KAAK,eAAe,EAKrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKrD,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AAElE,qBAAa,QAAQ;;gBAYP,MAAM,EAAE;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,CAAC,GAAG,SAAS,EAAE,eAAe,EAAE,KAAK,aAAa,CAAC;QAC5D,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,cAAc,CAAC;QACvB,KAAK,EAAE,UAAU,CAAC;QAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1E,4BAA4B;QAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,UAAU,EAAE,WAAW,CAAC;KACzB;IAeY,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../src/lib/sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,IAAI,EAET,KAAK,OAAO,EACZ,KAAK,SAAS,EAGf,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,aAAa,EACb,KAAK,eAAe,EAKrB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAKrD,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AAElE,qBAAa,QAAQ;;gBAYP,MAAM,EAAE;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,CAAC,GAAG,SAAS,EAAE,eAAe,EAAE,KAAK,aAAa,CAAC;QAC5D,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,cAAc,CAAC;QACvB,KAAK,EAAE,UAAU,CAAC;QAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,GAAG,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1E,4BAA4B;QAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,UAAU,EAAE,WAAW,CAAC;KACzB;IAeY,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWlD;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAUhD;;;;;;;;;;;;;;;;;;OAkBG;IACU,OAAO,CAAC,CAAC,SAAS,YAAY,EACzC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,GAC/B,OAAO,CAAC,aAAa,EAAE,CAAC;IAKd,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE;CAoHxC"}
|
|
@@ -889,8 +889,7 @@ async function toSql(options) {
|
|
|
889
889
|
role: "You are an expert SQL query generator. You translate natural language questions into precise, efficient SQL queries based on the provided database schema.",
|
|
890
890
|
objective: "Translate natural language questions into precise, efficient SQL queries"
|
|
891
891
|
}),
|
|
892
|
-
...options.
|
|
893
|
-
...options.schemaFragments
|
|
892
|
+
...options.fragments
|
|
894
893
|
);
|
|
895
894
|
if (errors.length) {
|
|
896
895
|
context.set(
|
|
@@ -1076,9 +1075,7 @@ Generate ${this.options.count} questions at ${complexity} complexity.` : void 0;
|
|
|
1076
1075
|
return await toSql({
|
|
1077
1076
|
input: question,
|
|
1078
1077
|
adapter: this.adapter,
|
|
1079
|
-
|
|
1080
|
-
// Placeholder - needs to pass actual fragments
|
|
1081
|
-
instructions: this.options.teachings ?? [],
|
|
1078
|
+
fragments: this.options.teachings ?? [],
|
|
1082
1079
|
model: this.options.model
|
|
1083
1080
|
});
|
|
1084
1081
|
} catch (error) {
|
|
@@ -1455,9 +1452,7 @@ var DepthEvolver = class extends PairProducer {
|
|
|
1455
1452
|
const sqlResult = await toSql({
|
|
1456
1453
|
input: evolvedQuestion,
|
|
1457
1454
|
adapter: this.adapter,
|
|
1458
|
-
|
|
1459
|
-
// Placeholder - needs to pass actual fragments
|
|
1460
|
-
instructions: [],
|
|
1455
|
+
fragments: [],
|
|
1461
1456
|
model: this.options?.model
|
|
1462
1457
|
});
|
|
1463
1458
|
return {
|