@carlonicora/nestjs-neo4jsonapi 1.31.0 → 1.31.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/dist/core/llm/services/llm.service.d.ts +4 -1
- package/dist/core/llm/services/llm.service.d.ts.map +1 -1
- package/dist/core/llm/services/llm.service.js +26 -5
- package/dist/core/llm/services/llm.service.js.map +1 -1
- package/dist/core/llm/services/model.service.d.ts.map +1 -1
- package/dist/core/llm/services/model.service.js +14 -0
- package/dist/core/llm/services/model.service.js.map +1 -1
- package/dist/core/llm/utils/schema.utils.d.ts +23 -1
- package/dist/core/llm/utils/schema.utils.d.ts.map +1 -1
- package/dist/core/llm/utils/schema.utils.js +127 -5
- package/dist/core/llm/utils/schema.utils.js.map +1 -1
- package/package.json +2 -3
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { DynamicStructuredTool } from "@langchain/core/tools";
|
|
2
|
+
import { ConfigService } from "@nestjs/config";
|
|
2
3
|
import { ZodType } from "zod";
|
|
3
4
|
import { AgentMessageType } from "../../../common/enums/agentmessage.type";
|
|
5
|
+
import { BaseConfigInterface } from "../../../config/interfaces";
|
|
4
6
|
import { ModelService } from "../../llm/services/model.service";
|
|
5
7
|
/**
|
|
6
8
|
* Parameters for LLM service calls
|
|
@@ -36,8 +38,9 @@ interface SessionUsage {
|
|
|
36
38
|
}
|
|
37
39
|
export declare class LLMService {
|
|
38
40
|
private readonly modelService;
|
|
41
|
+
private readonly config;
|
|
39
42
|
private _sessionTokens;
|
|
40
|
-
constructor(modelService: ModelService);
|
|
43
|
+
constructor(modelService: ModelService, config: ConfigService<BaseConfigInterface>);
|
|
41
44
|
/**
|
|
42
45
|
* Converts AgentMessageType to LangChain BaseMessage
|
|
43
46
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm.service.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/services/llm.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"llm.service.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/services/llm.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAqB,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AA8BhE;;GAEG;AACH,UAAU,aAAa,CAAC,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,gBAAgB,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAChC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,UAAU,YAAY;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAUD,qBACa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAJzB,OAAO,CAAC,cAAc,CAAe;gBAGlB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC;IAU7D;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;OAEG;IACH,OAAO,CAAC,YAAY;IAcpB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,yBAAyB;IA6CjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACH,OAAO,CAAC,iCAAiC;IA0BzC;;OAEG;IACH,OAAO,CAAC,eAAe;IA6CvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqEG;IACG,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG;QAAE,UAAU,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IAuNvG;;;;OAIG;IACH,eAAe,IAAI,YAAY;IAI/B;;;;OAIG;IACH,YAAY,IAAI,IAAI;CAQrB"}
|
|
@@ -13,6 +13,7 @@ exports.LLMService = void 0;
|
|
|
13
13
|
const messages_1 = require("@langchain/core/messages");
|
|
14
14
|
const prompts_1 = require("@langchain/core/prompts");
|
|
15
15
|
const common_1 = require("@nestjs/common");
|
|
16
|
+
const config_1 = require("@nestjs/config");
|
|
16
17
|
const agentmessage_type_1 = require("../../../common/enums/agentmessage.type");
|
|
17
18
|
const model_service_1 = require("../../llm/services/model.service");
|
|
18
19
|
const schema_utils_1 = require("../../llm/utils/schema.utils");
|
|
@@ -23,8 +24,9 @@ function isValidRaw(raw) {
|
|
|
23
24
|
return typeof raw === "object" && raw !== null;
|
|
24
25
|
}
|
|
25
26
|
let LLMService = class LLMService {
|
|
26
|
-
constructor(modelService) {
|
|
27
|
+
constructor(modelService, config) {
|
|
27
28
|
this.modelService = modelService;
|
|
29
|
+
this.config = config;
|
|
28
30
|
this._sessionTokens = {
|
|
29
31
|
input: 0,
|
|
30
32
|
output: 0,
|
|
@@ -369,9 +371,27 @@ let LLMService = class LLMService {
|
|
|
369
371
|
}
|
|
370
372
|
}
|
|
371
373
|
// Get final structured response (unified path for both tool and non-tool flows)
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
374
|
+
// For Requesty + Gemini: sanitize schema to remove $schema, $defs, etc. that Gemini rejects
|
|
375
|
+
const aiConfig = this.config.get("ai").ai;
|
|
376
|
+
// Check if model is Gemini (handles both "gemini-..." and "google/gemini-..." formats)
|
|
377
|
+
const modelLower = aiConfig.model.toLowerCase();
|
|
378
|
+
const isGeminiModel = modelLower.startsWith("gemini") || modelLower.includes("/gemini");
|
|
379
|
+
const needsGeminiSanitization = aiConfig.provider === "requesty" && isGeminiModel;
|
|
380
|
+
let structuredLlm;
|
|
381
|
+
if (needsGeminiSanitization) {
|
|
382
|
+
// Convert Zod to JSON Schema and remove Gemini-incompatible properties
|
|
383
|
+
const jsonSchema = (0, schema_utils_1.convertZodToJsonSchema)(params.outputSchema);
|
|
384
|
+
const sanitizedSchema = (0, schema_utils_1.sanitizeSchemaForGemini)(jsonSchema);
|
|
385
|
+
structuredLlm = baseModel.withStructuredOutput(sanitizedSchema, {
|
|
386
|
+
includeRaw: true,
|
|
387
|
+
});
|
|
388
|
+
}
|
|
389
|
+
else {
|
|
390
|
+
// All other providers: use Zod schema directly
|
|
391
|
+
structuredLlm = baseModel.withStructuredOutput(params.outputSchema, {
|
|
392
|
+
includeRaw: true,
|
|
393
|
+
});
|
|
394
|
+
}
|
|
375
395
|
const response = (await structuredLlm.invoke(conversationMessages, Object.keys(configOptions).length > 0 ? configOptions : undefined));
|
|
376
396
|
// Extract token usage with type guard (includes tool iteration tokens)
|
|
377
397
|
const raw = isValidRaw(response.raw) ? response.raw : undefined;
|
|
@@ -452,6 +472,7 @@ let LLMService = class LLMService {
|
|
|
452
472
|
exports.LLMService = LLMService;
|
|
453
473
|
exports.LLMService = LLMService = __decorate([
|
|
454
474
|
(0, common_1.Injectable)(),
|
|
455
|
-
__metadata("design:paramtypes", [model_service_1.ModelService
|
|
475
|
+
__metadata("design:paramtypes", [model_service_1.ModelService,
|
|
476
|
+
config_1.ConfigService])
|
|
456
477
|
], LLMService);
|
|
457
478
|
//# sourceMappingURL=llm.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/llm.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"llm.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/llm.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.service.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/services/model.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAI5E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,mBAAmB,EAAqB,MAAM,4BAA4B,CAAC;AAapF,qBACa,YAAY;IAIrB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAJhC,OAAO,CAAC,WAAW,CAA6B;gBAG7B,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;IAKpE,OAAO,KAAK,QAAQ,GAEnB;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,MAAM,CAAC,MAAM,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,aAAa;
|
|
1
|
+
{"version":3,"file":"model.service.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/services/model.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAI5E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,OAAO,EAAE,mBAAmB,EAAqB,MAAM,4BAA4B,CAAC;AAapF,qBACa,YAAY;IAIrB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAJhC,OAAO,CAAC,WAAW,CAA6B;gBAG7B,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;IAKpE,OAAO,KAAK,QAAQ,GAEnB;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,MAAM,CAAC,MAAM,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,aAAa;IAmFxD;;;;OAIG;IACH,UAAU,IAAI,IAAI;IAIlB;;;;OAIG;IACH,YAAY,IAAI,MAAM;IAItB,WAAW,IAAI,mBAAmB;IA8DlC,cAAc,IAAI,GAAG;IAoBrB,qBAAqB,IAAI,MAAM;IAIzB,eAAe,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;CAQrG"}
|
|
@@ -123,6 +123,10 @@ let ModelService = class ModelService {
|
|
|
123
123
|
};
|
|
124
124
|
}
|
|
125
125
|
break;
|
|
126
|
+
case "requesty":
|
|
127
|
+
// Requesty uses configured values (JSON mode is used for structured output instead of function calling)
|
|
128
|
+
llmConfig.configuration.baseURL = this.aiConfig.ai.url;
|
|
129
|
+
break;
|
|
126
130
|
case "vertex": {
|
|
127
131
|
// Google Vertex AI (Gemini models)
|
|
128
132
|
// Project ID is automatically extracted from the service account credentials JSON
|
|
@@ -180,6 +184,16 @@ let ModelService = class ModelService {
|
|
|
180
184
|
},
|
|
181
185
|
});
|
|
182
186
|
break;
|
|
187
|
+
case "requesty":
|
|
188
|
+
response = new openai_1.OpenAIEmbeddings({
|
|
189
|
+
openAIApiKey: this.aiConfig.embedder.apiKey,
|
|
190
|
+
model: this.aiConfig.embedder.model,
|
|
191
|
+
dimensions: this.aiConfig.embedder.dimensions,
|
|
192
|
+
configuration: {
|
|
193
|
+
baseURL: this.aiConfig.embedder.url,
|
|
194
|
+
},
|
|
195
|
+
});
|
|
196
|
+
break;
|
|
183
197
|
case "openai":
|
|
184
198
|
response = new openai_1.OpenAIEmbeddings({
|
|
185
199
|
openAIApiKey: this.aiConfig.embedder.apiKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/model.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/model.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export interface SchemaMetadata {
|
|
|
18
18
|
/**
|
|
19
19
|
* Converts a Zod schema to JSON Schema format
|
|
20
20
|
*
|
|
21
|
-
* Uses
|
|
21
|
+
* Uses Zod 4's built-in z.toJSONSchema() for native conversion.
|
|
22
22
|
*
|
|
23
23
|
* @param zodSchema - The Zod schema to convert
|
|
24
24
|
* @returns JSON Schema object
|
|
@@ -85,5 +85,27 @@ export declare function extractSchemaMetadata(zodSchema: any): SchemaMetadata;
|
|
|
85
85
|
* ```
|
|
86
86
|
*/
|
|
87
87
|
export declare function formatFieldWithDescription(fieldName: string, fieldValue: any, description?: string): string;
|
|
88
|
+
/**
|
|
89
|
+
* Removes JSON Schema properties not supported by Gemini API.
|
|
90
|
+
*
|
|
91
|
+
* Gemini uses a subset of OpenAPI 3.0 schema that doesn't support:
|
|
92
|
+
* - $schema, $id, $defs, $ref, $comment
|
|
93
|
+
* - allOf, anyOf, oneOf (need flattening)
|
|
94
|
+
*
|
|
95
|
+
* This function recursively sanitizes a JSON Schema to make it Gemini-compatible.
|
|
96
|
+
* Use this when calling Gemini models through proxies like Requesty that don't
|
|
97
|
+
* automatically sanitize schemas.
|
|
98
|
+
*
|
|
99
|
+
* @param schema - JSON Schema object (typically from zodToJsonSchema or convertZodToJsonSchema)
|
|
100
|
+
* @returns Sanitized schema compatible with Gemini API
|
|
101
|
+
*
|
|
102
|
+
* @example
|
|
103
|
+
* ```typescript
|
|
104
|
+
* const jsonSchema = convertZodToJsonSchema(myZodSchema);
|
|
105
|
+
* const geminiSchema = sanitizeSchemaForGemini(jsonSchema);
|
|
106
|
+
* // geminiSchema has no $schema, $defs, etc.
|
|
107
|
+
* ```
|
|
108
|
+
*/
|
|
109
|
+
export declare function sanitizeSchemaForGemini(schema: any): any;
|
|
88
110
|
export {};
|
|
89
111
|
//# sourceMappingURL=schema.utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.utils.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/utils/schema.utils.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,GAAG,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"schema.utils.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/utils/schema.utils.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,GAAG,GAAG,GAAG,CAO1D;AAqDD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,GAAG,GAAG,cAAc,CAOpE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAsB3G;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CA0ExD"}
|
|
@@ -1,21 +1,57 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
exports.convertZodToJsonSchema = convertZodToJsonSchema;
|
|
4
37
|
exports.extractSchemaMetadata = extractSchemaMetadata;
|
|
5
38
|
exports.formatFieldWithDescription = formatFieldWithDescription;
|
|
6
|
-
|
|
39
|
+
exports.sanitizeSchemaForGemini = sanitizeSchemaForGemini;
|
|
40
|
+
const z = __importStar(require("zod"));
|
|
7
41
|
/**
|
|
8
42
|
* Converts a Zod schema to JSON Schema format
|
|
9
43
|
*
|
|
10
|
-
* Uses
|
|
44
|
+
* Uses Zod 4's built-in z.toJSONSchema() for native conversion.
|
|
11
45
|
*
|
|
12
46
|
* @param zodSchema - The Zod schema to convert
|
|
13
47
|
* @returns JSON Schema object
|
|
14
48
|
*/
|
|
15
49
|
function convertZodToJsonSchema(zodSchema) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
target: "
|
|
50
|
+
// Use Zod 4's native JSON Schema conversion
|
|
51
|
+
return z.toJSONSchema(zodSchema, {
|
|
52
|
+
target: "openapi-3.0", // Use OpenAPI 3.0 format (compatible with OpenAI/Gemini)
|
|
53
|
+
cycles: "ref", // Handle cycles with $defs
|
|
54
|
+
unrepresentable: "any", // Unrepresentable types become {} instead of throwing
|
|
19
55
|
});
|
|
20
56
|
}
|
|
21
57
|
/**
|
|
@@ -152,4 +188,90 @@ function formatFieldWithDescription(fieldName, fieldValue, description) {
|
|
|
152
188
|
return `${fieldName}: ${formattedValue}`;
|
|
153
189
|
}
|
|
154
190
|
}
|
|
191
|
+
/**
|
|
192
|
+
* Removes JSON Schema properties not supported by Gemini API.
|
|
193
|
+
*
|
|
194
|
+
* Gemini uses a subset of OpenAPI 3.0 schema that doesn't support:
|
|
195
|
+
* - $schema, $id, $defs, $ref, $comment
|
|
196
|
+
* - allOf, anyOf, oneOf (need flattening)
|
|
197
|
+
*
|
|
198
|
+
* This function recursively sanitizes a JSON Schema to make it Gemini-compatible.
|
|
199
|
+
* Use this when calling Gemini models through proxies like Requesty that don't
|
|
200
|
+
* automatically sanitize schemas.
|
|
201
|
+
*
|
|
202
|
+
* @param schema - JSON Schema object (typically from zodToJsonSchema or convertZodToJsonSchema)
|
|
203
|
+
* @returns Sanitized schema compatible with Gemini API
|
|
204
|
+
*
|
|
205
|
+
* @example
|
|
206
|
+
* ```typescript
|
|
207
|
+
* const jsonSchema = convertZodToJsonSchema(myZodSchema);
|
|
208
|
+
* const geminiSchema = sanitizeSchemaForGemini(jsonSchema);
|
|
209
|
+
* // geminiSchema has no $schema, $defs, etc.
|
|
210
|
+
* ```
|
|
211
|
+
*/
|
|
212
|
+
function sanitizeSchemaForGemini(schema) {
|
|
213
|
+
if (!schema || typeof schema !== "object")
|
|
214
|
+
return schema;
|
|
215
|
+
// Handle arrays
|
|
216
|
+
if (Array.isArray(schema)) {
|
|
217
|
+
return schema.map((item) => sanitizeSchemaForGemini(item));
|
|
218
|
+
}
|
|
219
|
+
const sanitized = { ...schema };
|
|
220
|
+
// Remove unsupported top-level properties
|
|
221
|
+
const unsupportedProps = ["$schema", "$id", "$defs", "$ref", "$comment"];
|
|
222
|
+
for (const prop of unsupportedProps) {
|
|
223
|
+
delete sanitized[prop];
|
|
224
|
+
}
|
|
225
|
+
// Recursively sanitize nested objects in properties
|
|
226
|
+
if (sanitized.properties) {
|
|
227
|
+
sanitized.properties = Object.fromEntries(Object.entries(sanitized.properties).map(([key, value]) => [key, sanitizeSchemaForGemini(value)]));
|
|
228
|
+
}
|
|
229
|
+
// Handle array items
|
|
230
|
+
if (sanitized.items) {
|
|
231
|
+
sanitized.items = sanitizeSchemaForGemini(sanitized.items);
|
|
232
|
+
}
|
|
233
|
+
// Handle allOf - merge all schemas into one
|
|
234
|
+
if (Array.isArray(sanitized.allOf)) {
|
|
235
|
+
for (const subSchema of sanitized.allOf) {
|
|
236
|
+
const cleaned = sanitizeSchemaForGemini(subSchema);
|
|
237
|
+
// Merge properties
|
|
238
|
+
if (cleaned.properties) {
|
|
239
|
+
sanitized.properties = { ...sanitized.properties, ...cleaned.properties };
|
|
240
|
+
}
|
|
241
|
+
// Merge required arrays (deduplicate)
|
|
242
|
+
if (cleaned.required) {
|
|
243
|
+
const merged = [...(sanitized.required || []), ...cleaned.required];
|
|
244
|
+
sanitized.required = Array.from(new Set(merged));
|
|
245
|
+
}
|
|
246
|
+
// Copy type if not set
|
|
247
|
+
if (cleaned.type && !sanitized.type) {
|
|
248
|
+
sanitized.type = cleaned.type;
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
delete sanitized.allOf;
|
|
252
|
+
}
|
|
253
|
+
// Handle anyOf/oneOf - use first option (simplified approach)
|
|
254
|
+
for (const keyword of ["anyOf", "oneOf"]) {
|
|
255
|
+
if (Array.isArray(sanitized[keyword]) && sanitized[keyword].length > 0) {
|
|
256
|
+
const firstOption = sanitizeSchemaForGemini(sanitized[keyword][0]);
|
|
257
|
+
// Merge the first option into sanitized
|
|
258
|
+
if (firstOption.properties) {
|
|
259
|
+
sanitized.properties = { ...sanitized.properties, ...firstOption.properties };
|
|
260
|
+
}
|
|
261
|
+
if (firstOption.required) {
|
|
262
|
+
const merged = [...(sanitized.required || []), ...firstOption.required];
|
|
263
|
+
sanitized.required = Array.from(new Set(merged));
|
|
264
|
+
}
|
|
265
|
+
if (firstOption.type && !sanitized.type) {
|
|
266
|
+
sanitized.type = firstOption.type;
|
|
267
|
+
}
|
|
268
|
+
delete sanitized[keyword];
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
// Recursively sanitize additionalProperties if it's an object schema
|
|
272
|
+
if (sanitized.additionalProperties && typeof sanitized.additionalProperties === "object") {
|
|
273
|
+
sanitized.additionalProperties = sanitizeSchemaForGemini(sanitized.additionalProperties);
|
|
274
|
+
}
|
|
275
|
+
return sanitized;
|
|
276
|
+
}
|
|
155
277
|
//# sourceMappingURL=schema.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.utils.js","sourceRoot":"","sources":["../../../../src/core/llm/utils/schema.utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.utils.js","sourceRoot":"","sources":["../../../../src/core/llm/utils/schema.utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@carlonicora/nestjs-neo4jsonapi",
|
|
3
|
-
"version": "1.31.
|
|
3
|
+
"version": "1.31.1",
|
|
4
4
|
"description": "NestJS foundation package with JSON:API, Neo4j, Redis, LangChain agents, and common utilities",
|
|
5
5
|
"author": "Carlo Nicora",
|
|
6
6
|
"license": "GPL-3.0-or-later",
|
|
@@ -121,8 +121,7 @@
|
|
|
121
121
|
"turndown": "^7.2.2",
|
|
122
122
|
"web-push": "^3.6.7",
|
|
123
123
|
"xlsx-republish": "^0.20.3",
|
|
124
|
-
"zod": "^4.3.5"
|
|
125
|
-
"zod-to-json-schema": "^3.25.1"
|
|
124
|
+
"zod": "^4.3.5"
|
|
126
125
|
},
|
|
127
126
|
"devDependencies": {
|
|
128
127
|
"@eslint/eslintrc": "^3.3.3",
|