@ax-llm/ax 9.0.57 → 9.0.61
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/ai/google-gemini/api.js +8 -5
- package/ai/google-gemini/api.js.map +1 -1
- package/ai/google-gemini/types.d.ts +7 -3
- package/ai/google-gemini/types.js +1 -1
- package/ai/google-gemini/types.js.map +1 -1
- package/cjs/ai/google-gemini/api.js +8 -5
- package/cjs/ai/google-gemini/api.js.map +1 -1
- package/cjs/ai/google-gemini/types.d.ts +7 -3
- package/cjs/ai/google-gemini/types.js +1 -1
- package/cjs/ai/google-gemini/types.js.map +1 -1
- package/cjs/dsp/datetime.d.ts +1 -0
- package/cjs/dsp/datetime.js +7 -0
- package/cjs/dsp/datetime.js.map +1 -1
- package/cjs/dsp/extract.js +7 -3
- package/cjs/dsp/extract.js.map +1 -1
- package/cjs/dsp/index.d.ts +1 -1
- package/cjs/dsp/parser.d.ts +33 -80
- package/cjs/dsp/parser.js +148 -1566
- package/cjs/dsp/parser.js.map +1 -1
- package/cjs/dsp/prompt.js +13 -2
- package/cjs/dsp/prompt.js.map +1 -1
- package/cjs/dsp/sig.d.ts +2 -1
- package/cjs/dsp/sig.js +7 -7
- package/cjs/dsp/sig.js.map +1 -1
- package/cjs/dsp/util.js +4 -0
- package/cjs/dsp/util.js.map +1 -1
- package/dsp/datetime.d.ts +1 -0
- package/dsp/datetime.js +5 -0
- package/dsp/datetime.js.map +1 -1
- package/dsp/extract.js +7 -3
- package/dsp/extract.js.map +1 -1
- package/dsp/index.d.ts +1 -1
- package/dsp/parser.d.ts +33 -80
- package/dsp/parser.js +147 -1565
- package/dsp/parser.js.map +1 -1
- package/dsp/prompt.js +13 -2
- package/dsp/prompt.js.map +1 -1
- package/dsp/sig.d.ts +2 -1
- package/dsp/sig.js +8 -8
- package/dsp/sig.js.map +1 -1
- package/dsp/util.js +4 -0
- package/dsp/util.js.map +1 -1
- package/package.json +1 -1
package/ai/google-gemini/api.js
CHANGED
|
@@ -25,13 +25,13 @@ const safetySettings = [
|
|
|
25
25
|
*/
|
|
26
26
|
export const axAIGoogleGeminiDefaultConfig = () => structuredClone({
|
|
27
27
|
model: AxAIGoogleGeminiModel.Gemini15Pro,
|
|
28
|
-
embedModel: AxAIGoogleGeminiEmbedModel.
|
|
28
|
+
embedModel: AxAIGoogleGeminiEmbedModel.TextEmbedding004,
|
|
29
29
|
safetySettings,
|
|
30
30
|
...axBaseAIDefaultConfig()
|
|
31
31
|
});
|
|
32
32
|
export const axAIGoogleGeminiDefaultCreativeConfig = () => structuredClone({
|
|
33
33
|
model: AxAIGoogleGeminiModel.Gemini15Flash,
|
|
34
|
-
embedModel: AxAIGoogleGeminiEmbedModel.
|
|
34
|
+
embedModel: AxAIGoogleGeminiEmbedModel.TextEmbedding004,
|
|
35
35
|
safetySettings,
|
|
36
36
|
...axBaseAIDefaultCreativeConfig()
|
|
37
37
|
});
|
|
@@ -235,10 +235,13 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
235
235
|
throw new Error('Embed texts is empty');
|
|
236
236
|
}
|
|
237
237
|
const apiConfig = {
|
|
238
|
-
name: `/models/${model}:
|
|
238
|
+
name: `/models/${model}:batchEmbedContents?key=${this.apiKey}`
|
|
239
239
|
};
|
|
240
240
|
const reqValue = {
|
|
241
|
-
requests: req.texts.map((text) => ({
|
|
241
|
+
requests: req.texts.map((text) => ({
|
|
242
|
+
model: 'models/' + model,
|
|
243
|
+
content: { parts: [{ text }] }
|
|
244
|
+
}))
|
|
242
245
|
};
|
|
243
246
|
return [apiConfig, reqValue];
|
|
244
247
|
};
|
|
@@ -294,7 +297,7 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
294
297
|
return this.generateChatResp(resp);
|
|
295
298
|
};
|
|
296
299
|
generateEmbedResp = (resp) => {
|
|
297
|
-
const embeddings = resp.embeddings.map((embedding) => embedding.
|
|
300
|
+
const embeddings = resp.embeddings.map((embedding) => embedding.values);
|
|
298
301
|
return {
|
|
299
302
|
embeddings
|
|
300
303
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../ai/google-gemini/api.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,qBAAqB,EACrB,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAOL,0BAA0B,EAC1B,qBAAqB,EACrB,8BAA8B,EAE9B,+BAA+B,EAChC,MAAM,YAAY,CAAC;AAEpB,MAAM,cAAc,GAAmC;IACrD;QACE,QAAQ,EAAE,8BAA8B,CAAC,sBAAsB;QAC/D,SAAS,EAAE,+BAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,8BAA8B,CAAC,sBAAsB;QAC/D,SAAS,EAAE,+BAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,8BAA8B,CAAC,4BAA4B;QACrE,SAAS,EAAE,+BAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,8BAA8B,CAAC,4BAA4B;QACrE,SAAS,EAAE,+BAA+B,CAAC,SAAS;KACrD;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAA2B,EAAE,CACxE,eAAe,CAAC;IACd,KAAK,EAAE,qBAAqB,CAAC,WAAW;IACxC,UAAU,EAAE,0BAA0B,CAAC,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../ai/google-gemini/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare enum AxAIGoogleGeminiModel {
|
|
|
8
8
|
AQA = "aqa"
|
|
9
9
|
}
|
|
10
10
|
export declare enum AxAIGoogleGeminiEmbedModel {
|
|
11
|
-
|
|
11
|
+
TextEmbedding004 = "text-embedding-004"
|
|
12
12
|
}
|
|
13
13
|
export declare enum AxAIGoogleGeminiSafetyCategory {
|
|
14
14
|
HarmCategoryHarassment = "HARM_CATEGORY_HARASSMENT",
|
|
@@ -134,7 +134,11 @@ export type AxAIGoogleGeminiConfig = AxModelConfig & {
|
|
|
134
134
|
export type AxAIGoogleGeminiBatchEmbedRequest = {
|
|
135
135
|
requests: {
|
|
136
136
|
model: string;
|
|
137
|
-
|
|
137
|
+
content: {
|
|
138
|
+
parts: {
|
|
139
|
+
text: string;
|
|
140
|
+
}[];
|
|
141
|
+
};
|
|
138
142
|
}[];
|
|
139
143
|
};
|
|
140
144
|
/**
|
|
@@ -143,6 +147,6 @@ export type AxAIGoogleGeminiBatchEmbedRequest = {
|
|
|
143
147
|
*/
|
|
144
148
|
export type AxAIGoogleGeminiBatchEmbedResponse = {
|
|
145
149
|
embeddings: {
|
|
146
|
-
|
|
150
|
+
values: number[];
|
|
147
151
|
}[];
|
|
148
152
|
};
|
|
@@ -9,7 +9,7 @@ export var AxAIGoogleGeminiModel;
|
|
|
9
9
|
})(AxAIGoogleGeminiModel || (AxAIGoogleGeminiModel = {}));
|
|
10
10
|
export var AxAIGoogleGeminiEmbedModel;
|
|
11
11
|
(function (AxAIGoogleGeminiEmbedModel) {
|
|
12
|
-
AxAIGoogleGeminiEmbedModel["
|
|
12
|
+
AxAIGoogleGeminiEmbedModel["TextEmbedding004"] = "text-embedding-004";
|
|
13
13
|
})(AxAIGoogleGeminiEmbedModel || (AxAIGoogleGeminiEmbedModel = {}));
|
|
14
14
|
export var AxAIGoogleGeminiSafetyCategory;
|
|
15
15
|
(function (AxAIGoogleGeminiSafetyCategory) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../ai/google-gemini/types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,qBAOX;AAPD,WAAY,qBAAqB;IAC/B,sDAA6B,CAAA;IAC7B,2DAAkC,CAAA;IAClC,gEAAuC,CAAA;IACvC,uDAA8B,CAAA;IAC9B,kDAAyB,CAAA;IACzB,oCAAW,CAAA;AACb,CAAC,EAPW,qBAAqB,KAArB,qBAAqB,QAOhC;AAED,MAAM,CAAN,IAAY,0BAEX;AAFD,WAAY,0BAA0B;IACpC,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../ai/google-gemini/types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,qBAOX;AAPD,WAAY,qBAAqB;IAC/B,sDAA6B,CAAA;IAC7B,2DAAkC,CAAA;IAClC,gEAAuC,CAAA;IACvC,uDAA8B,CAAA;IAC9B,kDAAyB,CAAA;IACzB,oCAAW,CAAA;AACb,CAAC,EAPW,qBAAqB,KAArB,qBAAqB,QAOhC;AAED,MAAM,CAAN,IAAY,0BAEX;AAFD,WAAY,0BAA0B;IACpC,qEAAuC,CAAA;AACzC,CAAC,EAFW,0BAA0B,KAA1B,0BAA0B,QAErC;AAED,MAAM,CAAN,IAAY,8BAKX;AALD,WAAY,8BAA8B;IACxC,qFAAmD,CAAA;IACnD,sFAAoD,CAAA;IACpD,kGAAgE,CAAA;IAChE,kGAAgE,CAAA;AAClE,CAAC,EALW,8BAA8B,KAA9B,8BAA8B,QAKzC;AAED,MAAM,CAAN,IAAY,+BAMX;AAND,WAAY,+BAA+B;IACzC,2DAAwB,CAAA;IACxB,oEAAiC,CAAA;IACjC,iFAA8C,CAAA;IAC9C,2EAAwC,CAAA;IACxC,oFAAiD,CAAA;AACnD,CAAC,EANW,+BAA+B,KAA/B,+BAA+B,QAM1C"}
|
|
@@ -28,14 +28,14 @@ const safetySettings = [
|
|
|
28
28
|
*/
|
|
29
29
|
const axAIGoogleGeminiDefaultConfig = () => structuredClone({
|
|
30
30
|
model: types_js_1.AxAIGoogleGeminiModel.Gemini15Pro,
|
|
31
|
-
embedModel: types_js_1.AxAIGoogleGeminiEmbedModel.
|
|
31
|
+
embedModel: types_js_1.AxAIGoogleGeminiEmbedModel.TextEmbedding004,
|
|
32
32
|
safetySettings,
|
|
33
33
|
...(0, base_js_1.axBaseAIDefaultConfig)()
|
|
34
34
|
});
|
|
35
35
|
exports.axAIGoogleGeminiDefaultConfig = axAIGoogleGeminiDefaultConfig;
|
|
36
36
|
const axAIGoogleGeminiDefaultCreativeConfig = () => structuredClone({
|
|
37
37
|
model: types_js_1.AxAIGoogleGeminiModel.Gemini15Flash,
|
|
38
|
-
embedModel: types_js_1.AxAIGoogleGeminiEmbedModel.
|
|
38
|
+
embedModel: types_js_1.AxAIGoogleGeminiEmbedModel.TextEmbedding004,
|
|
39
39
|
safetySettings,
|
|
40
40
|
...(0, base_js_1.axBaseAIDefaultCreativeConfig)()
|
|
41
41
|
});
|
|
@@ -240,10 +240,13 @@ class AxAIGoogleGemini extends base_js_1.AxBaseAI {
|
|
|
240
240
|
throw new Error('Embed texts is empty');
|
|
241
241
|
}
|
|
242
242
|
const apiConfig = {
|
|
243
|
-
name: `/models/${model}:
|
|
243
|
+
name: `/models/${model}:batchEmbedContents?key=${this.apiKey}`
|
|
244
244
|
};
|
|
245
245
|
const reqValue = {
|
|
246
|
-
requests: req.texts.map((text) => ({
|
|
246
|
+
requests: req.texts.map((text) => ({
|
|
247
|
+
model: 'models/' + model,
|
|
248
|
+
content: { parts: [{ text }] }
|
|
249
|
+
}))
|
|
247
250
|
};
|
|
248
251
|
return [apiConfig, reqValue];
|
|
249
252
|
};
|
|
@@ -299,7 +302,7 @@ class AxAIGoogleGemini extends base_js_1.AxBaseAI {
|
|
|
299
302
|
return this.generateChatResp(resp);
|
|
300
303
|
};
|
|
301
304
|
generateEmbedResp = (resp) => {
|
|
302
|
-
const embeddings = resp.embeddings.map((embedding) => embedding.
|
|
305
|
+
const embeddings = resp.embeddings.map((embedding) => embedding.values);
|
|
303
306
|
return {
|
|
304
307
|
embeddings
|
|
305
308
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../ai/google-gemini/api.ts"],"names":[],"mappings":";;;AACA,wCAIoB;AAYpB,uCAAoD;AACpD,yCAYoB;AAEpB,MAAM,cAAc,GAAmC;IACrD;QACE,QAAQ,EAAE,yCAA8B,CAAC,sBAAsB;QAC/D,SAAS,EAAE,0CAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,yCAA8B,CAAC,sBAAsB;QAC/D,SAAS,EAAE,0CAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,yCAA8B,CAAC,4BAA4B;QACrE,SAAS,EAAE,0CAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,yCAA8B,CAAC,4BAA4B;QACrE,SAAS,EAAE,0CAA+B,CAAC,SAAS;KACrD;CACF,CAAC;AAEF;;;GAGG;AACI,MAAM,6BAA6B,GAAG,GAA2B,EAAE,CACxE,eAAe,CAAC;IACd,KAAK,EAAE,gCAAqB,CAAC,WAAW;IACxC,UAAU,EAAE,qCAA0B,CAAC,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../ai/google-gemini/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare enum AxAIGoogleGeminiModel {
|
|
|
8
8
|
AQA = "aqa"
|
|
9
9
|
}
|
|
10
10
|
export declare enum AxAIGoogleGeminiEmbedModel {
|
|
11
|
-
|
|
11
|
+
TextEmbedding004 = "text-embedding-004"
|
|
12
12
|
}
|
|
13
13
|
export declare enum AxAIGoogleGeminiSafetyCategory {
|
|
14
14
|
HarmCategoryHarassment = "HARM_CATEGORY_HARASSMENT",
|
|
@@ -134,7 +134,11 @@ export type AxAIGoogleGeminiConfig = AxModelConfig & {
|
|
|
134
134
|
export type AxAIGoogleGeminiBatchEmbedRequest = {
|
|
135
135
|
requests: {
|
|
136
136
|
model: string;
|
|
137
|
-
|
|
137
|
+
content: {
|
|
138
|
+
parts: {
|
|
139
|
+
text: string;
|
|
140
|
+
}[];
|
|
141
|
+
};
|
|
138
142
|
}[];
|
|
139
143
|
};
|
|
140
144
|
/**
|
|
@@ -143,6 +147,6 @@ export type AxAIGoogleGeminiBatchEmbedRequest = {
|
|
|
143
147
|
*/
|
|
144
148
|
export type AxAIGoogleGeminiBatchEmbedResponse = {
|
|
145
149
|
embeddings: {
|
|
146
|
-
|
|
150
|
+
values: number[];
|
|
147
151
|
}[];
|
|
148
152
|
};
|
|
@@ -12,7 +12,7 @@ var AxAIGoogleGeminiModel;
|
|
|
12
12
|
})(AxAIGoogleGeminiModel || (exports.AxAIGoogleGeminiModel = AxAIGoogleGeminiModel = {}));
|
|
13
13
|
var AxAIGoogleGeminiEmbedModel;
|
|
14
14
|
(function (AxAIGoogleGeminiEmbedModel) {
|
|
15
|
-
AxAIGoogleGeminiEmbedModel["
|
|
15
|
+
AxAIGoogleGeminiEmbedModel["TextEmbedding004"] = "text-embedding-004";
|
|
16
16
|
})(AxAIGoogleGeminiEmbedModel || (exports.AxAIGoogleGeminiEmbedModel = AxAIGoogleGeminiEmbedModel = {}));
|
|
17
17
|
var AxAIGoogleGeminiSafetyCategory;
|
|
18
18
|
(function (AxAIGoogleGeminiSafetyCategory) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../ai/google-gemini/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,qBAOX;AAPD,WAAY,qBAAqB;IAC/B,sDAA6B,CAAA;IAC7B,2DAAkC,CAAA;IAClC,gEAAuC,CAAA;IACvC,uDAA8B,CAAA;IAC9B,kDAAyB,CAAA;IACzB,oCAAW,CAAA;AACb,CAAC,EAPW,qBAAqB,qCAArB,qBAAqB,QAOhC;AAED,IAAY,0BAEX;AAFD,WAAY,0BAA0B;IACpC,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../ai/google-gemini/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,qBAOX;AAPD,WAAY,qBAAqB;IAC/B,sDAA6B,CAAA;IAC7B,2DAAkC,CAAA;IAClC,gEAAuC,CAAA;IACvC,uDAA8B,CAAA;IAC9B,kDAAyB,CAAA;IACzB,oCAAW,CAAA;AACb,CAAC,EAPW,qBAAqB,qCAArB,qBAAqB,QAOhC;AAED,IAAY,0BAEX;AAFD,WAAY,0BAA0B;IACpC,qEAAuC,CAAA;AACzC,CAAC,EAFW,0BAA0B,0CAA1B,0BAA0B,QAErC;AAED,IAAY,8BAKX;AALD,WAAY,8BAA8B;IACxC,qFAAmD,CAAA;IACnD,sFAAoD,CAAA;IACpD,kGAAgE,CAAA;IAChE,kGAAgE,CAAA;AAClE,CAAC,EALW,8BAA8B,8CAA9B,8BAA8B,QAKzC;AAED,IAAY,+BAMX;AAND,WAAY,+BAA+B;IACzC,2DAAwB,CAAA;IACxB,oEAAiC,CAAA;IACjC,iFAA8C,CAAA;IAC9C,2EAAwC,CAAA;IACxC,oFAAiD,CAAA;AACnD,CAAC,EANW,+BAA+B,+CAA/B,+BAA+B,QAM1C"}
|
package/cjs/dsp/datetime.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { AxField } from './sig.js';
|
|
2
2
|
export declare function parseLLMFriendlyDate(field: Readonly<AxField>, dateStr: string): Date;
|
|
3
3
|
export declare function parseLLMFriendlyDateTime(field: Readonly<AxField>, dateStr: string): Date;
|
|
4
|
+
export declare const formatDateWithTimezone: (date: Readonly<Date>) => string;
|
package/cjs/dsp/datetime.js
CHANGED
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.formatDateWithTimezone = void 0;
|
|
6
7
|
exports.parseLLMFriendlyDate = parseLLMFriendlyDate;
|
|
7
8
|
exports.parseLLMFriendlyDateTime = parseLLMFriendlyDateTime;
|
|
8
9
|
const moment_timezone_1 = __importDefault(require("moment-timezone"));
|
|
@@ -62,4 +63,10 @@ function _parseLLMFriendlyDateTime(dateTimeStr) {
|
|
|
62
63
|
// Convert to UTC
|
|
63
64
|
return date.utc().toDate();
|
|
64
65
|
}
|
|
66
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
67
|
+
const formatDateWithTimezone = (date) => {
|
|
68
|
+
const momentDate = (0, moment_timezone_1.default)(date).utc();
|
|
69
|
+
return momentDate.format(`YYYY-MM-DD HH:mm:ss UTC`);
|
|
70
|
+
};
|
|
71
|
+
exports.formatDateWithTimezone = formatDateWithTimezone;
|
|
65
72
|
//# sourceMappingURL=datetime.js.map
|
package/cjs/dsp/datetime.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datetime.js","sourceRoot":"","sources":["../../../dsp/datetime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"datetime.js","sourceRoot":"","sources":["../../../dsp/datetime.ts"],"names":[],"mappings":"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"}
|
package/cjs/dsp/extract.js
CHANGED
|
@@ -76,6 +76,11 @@ const convertValueToType = (field, val) => {
|
|
|
76
76
|
return (0, datetime_js_1.parseLLMFriendlyDate)(field, val);
|
|
77
77
|
case 'datetime':
|
|
78
78
|
return (0, datetime_js_1.parseLLMFriendlyDateTime)(field, val);
|
|
79
|
+
case 'class':
|
|
80
|
+
if (field.type.classes && !field.type.classes.includes(val)) {
|
|
81
|
+
throw new Error(`Invalid class '${val}', expected one of the following: ${field.type.classes.join(', ')}`);
|
|
82
|
+
}
|
|
83
|
+
return val;
|
|
79
84
|
default:
|
|
80
85
|
return val; // Unknown type
|
|
81
86
|
}
|
|
@@ -88,9 +93,8 @@ const expectedTypeError = (field, err, value = '') => {
|
|
|
88
93
|
return new ValidationError({ message, field, value });
|
|
89
94
|
};
|
|
90
95
|
function validateAndParseFieldValue(field, fieldValue) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
fieldValue.toLocaleLowerCase() === 'null') {
|
|
96
|
+
const fv = fieldValue?.toLocaleLowerCase();
|
|
97
|
+
if (!fieldValue || !fv || fv === '' || fv === 'null' || fv === 'undefined') {
|
|
94
98
|
if (field.isOptional) {
|
|
95
99
|
return;
|
|
96
100
|
}
|
package/cjs/dsp/extract.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../dsp/extract.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../dsp/extract.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;;;;AAEzD,kDAA0B;AAE1B,+CAA+E;AAGxE,MAAM,aAAa,GAAG,CAC3B,GAA0B,EAC1B,MAA+B,EAC/B,OAAe,EACf,EAAE;IACF,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IACzB,IAAA,8BAAsB,EAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACrD,IAAA,kCAA0B,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB;AAOK,MAAM,sBAAsB,GAAG,CACpC,GAA0B,EAC1B,MAA+B;AAC/B,6DAA6D;AAC7D,KAAsB,EACtB,OAAe,EACf,EAAE;IACF,MAAM,MAAM,GAAG,GAAG,CAAC,eAAe,EAAE,CAAC;IAErC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;QAED,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,GAAG,GAAG,CAAC;QACjC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE/C,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACb,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,GAAG,GAAG,OAAO;iBAChB,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;iBACrB,IAAI,EAAE;iBACN,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;iBACpB,IAAI,EAAE,CAAC;YAEV,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,0BAA0B,CACvD,KAAK,CAAC,SAAS,EACf,GAAG,CACJ,CAAC;QACJ,CAAC;QAED,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAChC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;IAC1B,CAAC;AACH,CAAC,CAAC;AArCW,QAAA,sBAAsB,0BAqCjC;AAEK,MAAM,0BAA0B,GAAG,CACxC,MAA+B;AAC/B,6DAA6D;AAC7D,KAAsB,EACtB,OAAe,EACf,EAAE;IACF,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QACrB,OAAO;IACT,CAAC;IACD,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAE1E,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,0BAA0B,CACvD,KAAK,CAAC,SAAS,EACf,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,0BAA0B,8BAerC;AAEF,MAAM,kBAAkB,GAAG,CAAC,KAAwB,EAAE,GAAW,EAAE,EAAE;IACnE,QAAQ,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QACzB,KAAK,QAAQ;YACX,OAAO,GAAa,CAAC;QACvB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACtB,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC;QACD,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,MAAM,CAAC,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC;gBACzB,OAAO,KAAK,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;QACD,KAAK,MAAM;YACT,OAAO,IAAA,kCAAoB,EAAC,KAAK,EAAE,GAAa,CAAC,CAAC;QACpD,KAAK,UAAU;YACb,OAAO,IAAA,sCAAwB,EAAC,KAAK,EAAE,GAAa,CAAC,CAAC;QACxD,KAAK,OAAO;YACV,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5D,MAAM,IAAI,KAAK,CACb,kBAAkB,GAAG,qCAAqC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1F,CAAC;YACJ,CAAC;YACD,OAAO,GAAa,CAAC;QACvB;YACE,OAAO,GAAa,CAAC,CAAC,eAAe;IACzC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACxB,KAAwB,EACxB,GAAoB,EACpB,QAA4B,EAAE,EAC9B,EAAE;IACF,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,OAAO;QAC7B,CAAC,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;QAC/B,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC;IACrB,MAAM,OAAO,GAAG,UAAU,GAAG,CAAC,OAAO,gBAAgB,GAAG,UAAU,KAAK,GAAG,CAAC;IAC3E,OAAO,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,SAAS,0BAA0B,CACjC,KAAwB,EACxB,UAA8B;IAE9B,MAAM,EAAE,GAAG,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAC3C,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,MAAM,IAAI,EAAE,KAAK,WAAW,EAAE,CAAC;QAC3E,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,MAAM,iBAAiB,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,KAAK,GAAY,UAAU,CAAC;IAEhC,IAAI,KAAK,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAA,oBAAY,EAAC,UAAU,CAAC,CAAC;YACtC,KAAK,GAAG,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC1B,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAU,EAAE,UAAU,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC;YACH,KAAK,GAAG,eAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAU,EAAE,UAAU,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACH,KAAK,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACjD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAU,EAAE,IAAI,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,KAAK,GAAG,kBAAkB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAU,EAAE,UAAU,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAa,eAAgB,SAAQ,KAAK;IAChC,KAAK,CAAU;IACf,KAAK,CAAS;IAEtB,YAAY,EACV,OAAO,EACP,KAAK,EACL,KAAK,EAKL;QACA,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAEM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;IAC5B,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;IAE5B,qBAAqB,GAAG,GAAG,EAAE;QAClC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAErB,MAAM,WAAW,GAAG;YAClB;gBACE,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE;gBACtB,KAAK,EAAE,QAAQ,CAAC,CAAC,KAAK,EAAE;gBACxB,WAAW,EAAE,IAAI,CAAC,KAAK;aACxB;YACD;gBACE,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,IAAI,CAAC,OAAO;aAC1B;SACF,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;CACH;AAzCD,0CAyCC;AAEM,MAAM,YAAY,GAAG,CAAC,KAAa,EAAU,EAAE;IACpD,MAAM,gBAAgB,GAAG,qCAAqC,CAAC;IAC/D,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,CAAC,CAAW,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,CAAC,CAAW,CAAC;IAC5B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAbW,QAAA,YAAY,gBAavB"}
|
package/cjs/dsp/index.d.ts
CHANGED
|
@@ -13,4 +13,4 @@ export type { AxAssertion, AxStreamingAssertion } from './asserts.js';
|
|
|
13
13
|
export type { AxPromptTemplate, AxFieldTemplateFn } from './prompt.js';
|
|
14
14
|
export type { AxInstanceRegistry } from './registry.js';
|
|
15
15
|
export type { AxResponseHandlerArgs } from './generate.js';
|
|
16
|
-
export type {
|
|
16
|
+
export type { ParsedSignature, InputParsedFieldList, OutputParsedFieldList, ParsedIdentifier } from './parser.js';
|
package/cjs/dsp/parser.d.ts
CHANGED
|
@@ -1,87 +1,40 @@
|
|
|
1
|
-
export interface FilePosition {
|
|
2
|
-
offset: number;
|
|
3
|
-
line: number;
|
|
4
|
-
column: number;
|
|
5
|
-
}
|
|
6
|
-
export interface FileRange {
|
|
7
|
-
start: FilePosition;
|
|
8
|
-
end: FilePosition;
|
|
9
|
-
source: string;
|
|
10
|
-
}
|
|
11
|
-
export interface LiteralExpectation {
|
|
12
|
-
type: "literal";
|
|
13
|
-
text: string;
|
|
14
|
-
ignoreCase: boolean;
|
|
15
|
-
}
|
|
16
|
-
export interface ClassParts extends Array<string | ClassParts> {
|
|
17
|
-
}
|
|
18
|
-
export interface ClassExpectation {
|
|
19
|
-
type: "class";
|
|
20
|
-
parts: ClassParts;
|
|
21
|
-
inverted: boolean;
|
|
22
|
-
ignoreCase: boolean;
|
|
23
|
-
}
|
|
24
|
-
export interface AnyExpectation {
|
|
25
|
-
type: "any";
|
|
26
|
-
}
|
|
27
|
-
export interface EndExpectation {
|
|
28
|
-
type: "end";
|
|
29
|
-
}
|
|
30
|
-
export interface OtherExpectation {
|
|
31
|
-
type: "other";
|
|
32
|
-
description: string;
|
|
33
|
-
}
|
|
34
|
-
export type Expectation = LiteralExpectation | ClassExpectation | AnyExpectation | EndExpectation | OtherExpectation;
|
|
35
|
-
declare class _PeggySyntaxError extends Error {
|
|
36
|
-
static buildMessage(expected: Expectation[], found: string | null): string;
|
|
37
|
-
message: string;
|
|
38
|
-
expected: Expectation[];
|
|
39
|
-
found: string | null;
|
|
40
|
-
location: FileRange;
|
|
41
|
-
name: string;
|
|
42
|
-
constructor(message: string, expected: Expectation[], found: string | null, location: FileRange);
|
|
43
|
-
format(sources: {
|
|
44
|
-
source?: any;
|
|
45
|
-
text: string;
|
|
46
|
-
}[]): string;
|
|
47
|
-
}
|
|
48
|
-
export interface TraceEvent {
|
|
49
|
-
type: string;
|
|
50
|
-
rule: string;
|
|
51
|
-
result?: any;
|
|
52
|
-
location: FileRange;
|
|
53
|
-
}
|
|
54
|
-
export interface ParseOptions {
|
|
55
|
-
filename?: string;
|
|
56
|
-
startRule?: "ParsedSignature";
|
|
57
|
-
tracer?: any;
|
|
58
|
-
[key: string]: any;
|
|
59
|
-
}
|
|
60
|
-
export type ParseFunction = <Options extends ParseOptions>(input: string, options?: Options) => Options extends {
|
|
61
|
-
startRule: infer StartRule;
|
|
62
|
-
} ? StartRule extends "ParsedSignature" ? ParsedSignature : ParsedSignature : ParsedSignature;
|
|
63
|
-
export declare const parse: ParseFunction;
|
|
64
|
-
export declare const PeggySyntaxError: typeof _PeggySyntaxError;
|
|
65
|
-
export type PeggySyntaxError = _PeggySyntaxError;
|
|
66
1
|
export type ParsedSignature = {
|
|
67
|
-
desc:
|
|
68
|
-
inputs:
|
|
69
|
-
outputs:
|
|
2
|
+
desc: any;
|
|
3
|
+
inputs: InputParsedFieldList;
|
|
4
|
+
outputs: OutputParsedFieldList;
|
|
70
5
|
};
|
|
71
|
-
export type
|
|
72
|
-
export type
|
|
6
|
+
export type InputParsedFieldList = InputParsedField[];
|
|
7
|
+
export type OutputParsedFieldList = OutputParsedField[];
|
|
8
|
+
export type InputParsedField = {
|
|
73
9
|
name: ParsedIdentifier;
|
|
74
|
-
desc:
|
|
75
|
-
type:
|
|
76
|
-
|
|
10
|
+
desc: any;
|
|
11
|
+
type: NonNullable<{
|
|
12
|
+
name: TypeNotClass;
|
|
13
|
+
isArray: boolean;
|
|
14
|
+
} | null> | undefined;
|
|
15
|
+
isOptional: boolean;
|
|
77
16
|
};
|
|
78
|
-
export type
|
|
79
|
-
|
|
80
|
-
|
|
17
|
+
export type OutputParsedField = ClassField | NonClassField;
|
|
18
|
+
export type ClassField = {
|
|
19
|
+
name: ParsedIdentifier;
|
|
20
|
+
type: {
|
|
21
|
+
name: "class";
|
|
22
|
+
isArray: boolean;
|
|
23
|
+
classes: string[];
|
|
24
|
+
};
|
|
25
|
+
isOptional: boolean;
|
|
26
|
+
};
|
|
27
|
+
export type NonClassField = {
|
|
28
|
+
name: ParsedIdentifier;
|
|
29
|
+
desc: any;
|
|
30
|
+
type: NonNullable<{
|
|
31
|
+
name: any;
|
|
32
|
+
isArray: boolean;
|
|
33
|
+
} | null> | undefined;
|
|
34
|
+
isOptional: boolean;
|
|
81
35
|
};
|
|
82
|
-
export type
|
|
36
|
+
export type TypeNotClass = "string" | "number" | "boolean" | "json" | "image" | "datetime" | "date";
|
|
37
|
+
export type Type = TypeNotClass | "class";
|
|
83
38
|
export type ParsedIdentifier = string;
|
|
84
39
|
export type ParsedString = string;
|
|
85
|
-
export
|
|
86
|
-
export type __ = "";
|
|
87
|
-
export {};
|
|
40
|
+
export declare function parseSignature(input: string): ParsedSignature;
|