@nx-ddd/any-func 17.13.0 → 17.14.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.
|
@@ -5,12 +5,13 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const core_1 = require("@angular/core");
|
|
6
6
|
const openai_1 = require("@nx-ddd/common/infrastructure/externals/openai");
|
|
7
7
|
const rxjs_1 = require("rxjs");
|
|
8
|
-
const json_schema_library_1 = require("json-schema-library");
|
|
8
|
+
const json_schema_library_1 = tslib_1.__importDefault(require("json-schema-library"));
|
|
9
9
|
const agent_1 = require("../agent");
|
|
10
10
|
const json_schema_1 = require("../impl/json-schema");
|
|
11
11
|
const any_func_service_1 = require("./any-func.service");
|
|
12
12
|
const cache_1 = require("../impl/adapters/cache");
|
|
13
13
|
const p_limit_1 = tslib_1.__importDefault(require("p-limit"));
|
|
14
|
+
const { Draft07 } = json_schema_library_1.default;
|
|
14
15
|
const ANY_FUNC_CONFIG = new core_1.InjectionToken('[@nx-ddd/any-func] AnyFuncConfig');
|
|
15
16
|
function provideAnyFuncConfig(config) {
|
|
16
17
|
return [
|
|
@@ -33,7 +34,7 @@ let AnyFuncService = class AnyFuncService {
|
|
|
33
34
|
}
|
|
34
35
|
jsonSchema(_input, jsonSchema, { instructions = '', model = 'gpt-4o', specs = [], embeddings = false, sample = 3, temperature = 0, maxRetry = 3, } = {}) {
|
|
35
36
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
|
-
const validator = new
|
|
37
|
+
const validator = new Draft07(jsonSchema);
|
|
37
38
|
for (const spec of specs) {
|
|
38
39
|
const errors = validator.validate(spec.output);
|
|
39
40
|
if (errors.length > 0) {
|
|
@@ -52,7 +53,7 @@ let AnyFuncService = class AnyFuncService {
|
|
|
52
53
|
temperature,
|
|
53
54
|
})), (0, rxjs_1.tap)(message => messages.push(message)), (0, rxjs_1.map)((message) => {
|
|
54
55
|
const output = JSON.parse(message.tool_calls[0].function.arguments);
|
|
55
|
-
const errors = new
|
|
56
|
+
const errors = new Draft07(jsonSchema).validate(output);
|
|
56
57
|
if (errors.length > 0) {
|
|
57
58
|
messages.push({
|
|
58
59
|
role: 'tool',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"any-func.service.impl.js","sourceRoot":"","sources":["../../../../../../packages/@nx-ddd/any-func/src/lib/any-func/any-func.service.impl.ts"],"names":[],"mappings":";;;;AAAA,wCAAmE;AACnE,2EAAqF;AACrF,+BAAiF;AAEjF,
|
|
1
|
+
{"version":3,"file":"any-func.service.impl.js","sourceRoot":"","sources":["../../../../../../packages/@nx-ddd/any-func/src/lib/any-func/any-func.service.impl.ts"],"names":[],"mappings":"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"}
|