@carlonicora/nestjs-neo4jsonapi 1.93.0 → 1.94.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/agents/graph.creator/services/graph.creator.service.d.ts +2 -0
- package/dist/agents/graph.creator/services/graph.creator.service.d.ts.map +1 -1
- package/dist/agents/graph.creator/services/graph.creator.service.js +8 -0
- package/dist/agents/graph.creator/services/graph.creator.service.js.map +1 -1
- package/dist/config/interfaces/config.ai.interface.d.ts +40 -0
- package/dist/config/interfaces/config.ai.interface.d.ts.map +1 -1
- package/dist/config/interfaces/config.ai.interface.js +18 -0
- package/dist/config/interfaces/config.ai.interface.js.map +1 -1
- package/dist/core/llm/common/llm-raw-response.d.ts +17 -0
- package/dist/core/llm/common/llm-raw-response.d.ts.map +1 -0
- package/dist/core/llm/common/llm-raw-response.js +7 -0
- package/dist/core/llm/common/llm-raw-response.js.map +1 -0
- package/dist/core/llm/llm.module.d.ts.map +1 -1
- package/dist/core/llm/llm.module.js +12 -1
- package/dist/core/llm/llm.module.js.map +1 -1
- package/dist/core/llm/services/audio.llm.service.js +1 -1
- package/dist/core/llm/services/audio.llm.service.js.map +1 -1
- package/dist/core/llm/services/llm-cache.service.d.ts +59 -0
- package/dist/core/llm/services/llm-cache.service.d.ts.map +1 -0
- package/dist/core/llm/services/llm-cache.service.js +118 -0
- package/dist/core/llm/services/llm-cache.service.js.map +1 -0
- package/dist/core/llm/services/llm-call-dumper.service.d.ts +14 -0
- package/dist/core/llm/services/llm-call-dumper.service.d.ts.map +1 -1
- package/dist/core/llm/services/llm-call-dumper.service.js +95 -3
- package/dist/core/llm/services/llm-call-dumper.service.js.map +1 -1
- package/dist/core/llm/services/llm.service.d.ts +27 -23
- package/dist/core/llm/services/llm.service.d.ts.map +1 -1
- package/dist/core/llm/services/llm.service.js +184 -65
- package/dist/core/llm/services/llm.service.js.map +1 -1
- package/dist/core/llm/services/model.service.d.ts +30 -0
- package/dist/core/llm/services/model.service.d.ts.map +1 -1
- package/dist/core/llm/services/model.service.js +136 -23
- package/dist/core/llm/services/model.service.js.map +1 -1
- package/dist/core/llm/services/vision.llm.service.d.ts.map +1 -1
- package/dist/core/llm/services/vision.llm.service.js +3 -8
- package/dist/core/llm/services/vision.llm.service.js.map +1 -1
- package/dist/foundations/chunk/services/chunk.service.d.ts +1 -3
- package/dist/foundations/chunk/services/chunk.service.d.ts.map +1 -1
- package/dist/foundations/chunk/services/chunk.service.js +3 -11
- package/dist/foundations/chunk/services/chunk.service.js.map +1 -1
- package/dist/foundations/tokenusage/enums/tokenusage.type.d.ts +11 -10
- package/dist/foundations/tokenusage/enums/tokenusage.type.d.ts.map +1 -1
- package/dist/foundations/tokenusage/enums/tokenusage.type.js +10 -11
- package/dist/foundations/tokenusage/enums/tokenusage.type.js.map +1 -1
- package/dist/foundations/tokenusage/repositories/tokenusage.repository.d.ts +1 -2
- package/dist/foundations/tokenusage/repositories/tokenusage.repository.d.ts.map +1 -1
- package/dist/foundations/tokenusage/repositories/tokenusage.repository.js.map +1 -1
- package/dist/foundations/tokenusage/services/tokenusage.service.d.ts +11 -2
- package/dist/foundations/tokenusage/services/tokenusage.service.d.ts.map +1 -1
- package/dist/foundations/tokenusage/services/tokenusage.service.js +16 -7
- package/dist/foundations/tokenusage/services/tokenusage.service.js.map +1 -1
- package/package.json +2 -1
|
@@ -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;
|
|
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;AAK/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAUpD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,kBAAkB,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAiBnF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAsBjE;AAcD,qBACa,YAAY;IAErB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;gBADb,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;IAGpE,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,KAAK,WAAW,GAEtB;IAED;;;OAGG;IACH,iBAAiB,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC;IAWhE;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,MAAM,CAAC,MAAM,CAAC,EAAE;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,GAAG,aAAa;IAajB;;;;;;;;;;;;;;OAcG;IACH,YAAY,CAAC,MAAM,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,aAAa;IAK9D;;;;;;;;;OASG;IACH,WAAW,CAAC,MAAM,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,aAAa;IAK7D;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAsItB,WAAW,IAAI,mBAAmB;IAsElC,qBAAqB,IAAI,MAAM;CAGhC"}
|
|
@@ -43,16 +43,98 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
43
43
|
};
|
|
44
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
45
|
exports.ModelService = void 0;
|
|
46
|
+
exports.writeGcpCredentials = writeGcpCredentials;
|
|
47
|
+
exports.validateAiUrl = validateAiUrl;
|
|
46
48
|
const google_vertexai_1 = require("@langchain/google-vertexai");
|
|
47
49
|
const openai_1 = require("@langchain/openai");
|
|
48
50
|
const common_1 = require("@nestjs/common");
|
|
49
51
|
const config_1 = require("@nestjs/config");
|
|
52
|
+
const crypto = __importStar(require("crypto"));
|
|
50
53
|
const fs = __importStar(require("fs"));
|
|
51
54
|
const os = __importStar(require("os"));
|
|
52
55
|
const path = __importStar(require("path"));
|
|
53
56
|
const nestjs_cls_1 = require("nestjs-cls");
|
|
54
57
|
const model_weight_1 = require("../enums/model.weight");
|
|
55
58
|
const openrouter_fetch_1 = require("./openrouter-fetch");
|
|
59
|
+
/**
|
|
60
|
+
* Tracks GCP credential temp files written this process so they can be removed
|
|
61
|
+
* on exit. Each path is UUID-unique (see {@link writeGcpCredentials}).
|
|
62
|
+
*/
|
|
63
|
+
const writtenCredsPaths = new Set();
|
|
64
|
+
let gcpCleanupRegistered = false;
|
|
65
|
+
/**
|
|
66
|
+
* Securely materialises Google Vertex credentials to a temp file.
|
|
67
|
+
*
|
|
68
|
+
* Security properties (Wave 4 hardening):
|
|
69
|
+
* - UUID-unique filename — no predictable path another process can pre-create
|
|
70
|
+
* or read by guessing.
|
|
71
|
+
* - mode 0o600 — owner read/write only.
|
|
72
|
+
* - registers a single best-effort `exit` cleanup that unlinks every file we
|
|
73
|
+
* wrote, so secrets do not linger in the OS temp dir.
|
|
74
|
+
*
|
|
75
|
+
* @param decodedCredentials - The DECODED credentials JSON text to write. The
|
|
76
|
+
* caller already has the decoded JSON in scope (`credentialsJson`), so the
|
|
77
|
+
* helper writes it verbatim — it does NOT base64-decode (avoids double-decode).
|
|
78
|
+
* @param tag - A modality tag used only to make the filename human-readable.
|
|
79
|
+
* @returns The absolute path of the written credentials file.
|
|
80
|
+
*/
|
|
81
|
+
function writeGcpCredentials(decodedCredentials, tag) {
|
|
82
|
+
const credsPath = path.join(os.tmpdir(), `gcp-creds-${tag}-${crypto.randomUUID()}.json`);
|
|
83
|
+
fs.writeFileSync(credsPath, decodedCredentials, { mode: 0o600 });
|
|
84
|
+
writtenCredsPaths.add(credsPath);
|
|
85
|
+
if (!gcpCleanupRegistered) {
|
|
86
|
+
process.on("exit", () => {
|
|
87
|
+
for (const p of writtenCredsPaths) {
|
|
88
|
+
try {
|
|
89
|
+
fs.unlinkSync(p);
|
|
90
|
+
}
|
|
91
|
+
catch {
|
|
92
|
+
/* best-effort */
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
gcpCleanupRegistered = true;
|
|
97
|
+
}
|
|
98
|
+
return credsPath;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Validates an LLM endpoint URL before an API key is sent to it.
|
|
102
|
+
*
|
|
103
|
+
* Security properties (Wave 4 hardening):
|
|
104
|
+
* - Refuses an empty / missing URL for providers that require one.
|
|
105
|
+
* - Refuses a malformed URL.
|
|
106
|
+
* - Refuses plaintext HTTP to a non-local host (would leak the API key on the
|
|
107
|
+
* wire). localhost / 127.0.0.1 / ::1 / *.local are exempt (dev loopback).
|
|
108
|
+
* - Optionally enforces an `AI_URL_ALLOWLIST` (comma-separated host suffixes).
|
|
109
|
+
*
|
|
110
|
+
* @throws {Error} if the URL fails any check.
|
|
111
|
+
*/
|
|
112
|
+
function validateAiUrl(url, provider) {
|
|
113
|
+
if (!url)
|
|
114
|
+
throw new Error(`LLM provider "${provider}" requires AI_URL to be set`);
|
|
115
|
+
let parsed;
|
|
116
|
+
try {
|
|
117
|
+
parsed = new URL(url);
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
throw new Error(`AI_URL is not a valid URL: ${url}`);
|
|
121
|
+
}
|
|
122
|
+
const isLocalhost = parsed.hostname === "localhost" || parsed.hostname === "127.0.0.1" || parsed.hostname === "::1";
|
|
123
|
+
const isDotLocal = parsed.hostname.endsWith(".local");
|
|
124
|
+
if (parsed.protocol !== "https:" && !isLocalhost && !isDotLocal) {
|
|
125
|
+
throw new Error(`AI_URL must be HTTPS (or localhost) — refusing to send API key over ${parsed.protocol}`);
|
|
126
|
+
}
|
|
127
|
+
const allowlistRaw = process.env.AI_URL_ALLOWLIST;
|
|
128
|
+
if (allowlistRaw) {
|
|
129
|
+
const allowlist = allowlistRaw
|
|
130
|
+
.split(",")
|
|
131
|
+
.map((s) => s.trim())
|
|
132
|
+
.filter(Boolean);
|
|
133
|
+
const ok = allowlist.some((host) => parsed.hostname === host || parsed.hostname.endsWith(`.${host}`));
|
|
134
|
+
if (!ok)
|
|
135
|
+
throw new Error(`AI_URL hostname "${parsed.hostname}" not in allowlist`);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
56
138
|
let ModelService = class ModelService {
|
|
57
139
|
constructor(clsService, configService) {
|
|
58
140
|
this.clsService = clsService;
|
|
@@ -165,13 +247,18 @@ let ModelService = class ModelService {
|
|
|
165
247
|
},
|
|
166
248
|
};
|
|
167
249
|
switch (cfg.provider) {
|
|
168
|
-
case "llamacpp":
|
|
250
|
+
case "llamacpp": {
|
|
169
251
|
llmConfig.apiKey = "not-needed";
|
|
170
252
|
llmConfig.model = "local-model";
|
|
171
|
-
|
|
253
|
+
const llamacppUrl = cfg.url || "http://localhost:8033/v1";
|
|
254
|
+
validateAiUrl(llamacppUrl, cfg.provider);
|
|
255
|
+
llmConfig.configuration.baseURL = llamacppUrl;
|
|
172
256
|
break;
|
|
173
|
-
|
|
174
|
-
|
|
257
|
+
}
|
|
258
|
+
case "openrouter": {
|
|
259
|
+
const openrouterUrl = cfg.url || "https://openrouter.ai/api/v1";
|
|
260
|
+
validateAiUrl(openrouterUrl, cfg.provider);
|
|
261
|
+
llmConfig.configuration.baseURL = openrouterUrl;
|
|
175
262
|
if (cfg.region) {
|
|
176
263
|
// Escalating pin: attempt 1 honours the configured pin, retries allow fallbacks.
|
|
177
264
|
// The fetch injects the full provider block (order + allow_fallbacks + require_parameters),
|
|
@@ -179,29 +266,44 @@ let ModelService = class ModelService {
|
|
|
179
266
|
llmConfig.configuration.fetch = (0, openrouter_fetch_1.openRouterEscalatingFetch)(cfg.region, cfg.allowFallbacks ?? true);
|
|
180
267
|
}
|
|
181
268
|
break;
|
|
269
|
+
}
|
|
182
270
|
case "requesty":
|
|
271
|
+
validateAiUrl(cfg.url, cfg.provider);
|
|
183
272
|
llmConfig.configuration.baseURL = cfg.url;
|
|
184
273
|
break;
|
|
185
|
-
case "ollama":
|
|
274
|
+
case "ollama": {
|
|
186
275
|
// Ollama exposes an OpenAI-compatible API. Unlike `llamacpp`, the model
|
|
187
276
|
// name matters (e.g. "gemma3:12b"), so keep cfg.model. The API key is
|
|
188
277
|
// ignored by Ollama; "not-needed" satisfies the OpenAI client.
|
|
189
278
|
llmConfig.apiKey = "not-needed";
|
|
190
|
-
|
|
279
|
+
const ollamaUrl = cfg.url || "http://localhost:11434/v1";
|
|
280
|
+
validateAiUrl(ollamaUrl, cfg.provider);
|
|
281
|
+
llmConfig.configuration.baseURL = ollamaUrl;
|
|
191
282
|
break;
|
|
283
|
+
}
|
|
192
284
|
case "vertex": {
|
|
285
|
+
const previousCredsEnv = process.env.GOOGLE_APPLICATION_CREDENTIALS;
|
|
193
286
|
if (cfg.googleCredentialsBase64) {
|
|
194
287
|
const credentialsJson = Buffer.from(cfg.googleCredentialsBase64, "base64").toString("utf-8");
|
|
195
|
-
const
|
|
196
|
-
|
|
197
|
-
|
|
288
|
+
const credsPath = writeGcpCredentials(credentialsJson, opts.credentialFileTag);
|
|
289
|
+
process.env.GOOGLE_APPLICATION_CREDENTIALS = credsPath;
|
|
290
|
+
}
|
|
291
|
+
try {
|
|
292
|
+
// ChatVertexAI reads GOOGLE_APPLICATION_CREDENTIALS at construction,
|
|
293
|
+
// so restoring the env in `finally` is safe.
|
|
294
|
+
return new google_vertexai_1.ChatVertexAI({
|
|
295
|
+
model: cfg.model,
|
|
296
|
+
temperature,
|
|
297
|
+
location: cfg.region,
|
|
298
|
+
...(maxOutputTokens ? { maxOutputTokens } : {}),
|
|
299
|
+
});
|
|
300
|
+
}
|
|
301
|
+
finally {
|
|
302
|
+
if (previousCredsEnv === undefined)
|
|
303
|
+
delete process.env.GOOGLE_APPLICATION_CREDENTIALS;
|
|
304
|
+
else
|
|
305
|
+
process.env.GOOGLE_APPLICATION_CREDENTIALS = previousCredsEnv;
|
|
198
306
|
}
|
|
199
|
-
return new google_vertexai_1.ChatVertexAI({
|
|
200
|
-
model: cfg.model,
|
|
201
|
-
temperature,
|
|
202
|
-
location: cfg.region,
|
|
203
|
-
...(maxOutputTokens ? { maxOutputTokens } : {}),
|
|
204
|
-
});
|
|
205
307
|
}
|
|
206
308
|
case "azure": {
|
|
207
309
|
const azureParameters = {
|
|
@@ -222,6 +324,7 @@ let ModelService = class ModelService {
|
|
|
222
324
|
if (!cfg.url) {
|
|
223
325
|
throw new Error(`Unsupported LLM provider "${cfg.provider}": set its AI_URL (with the matching tier suffix) to use it as an OpenAI-compatible endpoint`);
|
|
224
326
|
}
|
|
327
|
+
validateAiUrl(cfg.url, cfg.provider);
|
|
225
328
|
llmConfig.configuration.baseURL = cfg.url;
|
|
226
329
|
break;
|
|
227
330
|
}
|
|
@@ -281,17 +384,27 @@ let ModelService = class ModelService {
|
|
|
281
384
|
case "vertex": {
|
|
282
385
|
// Google Vertex AI Embeddings (uses embedder-specific credentials)
|
|
283
386
|
const embedderConfig = this.aiConfig.embedder;
|
|
387
|
+
const previousCredsEnv = process.env.GOOGLE_APPLICATION_CREDENTIALS;
|
|
284
388
|
if (embedderConfig.googleCredentialsBase64) {
|
|
285
389
|
const credentialsJson = Buffer.from(embedderConfig.googleCredentialsBase64, "base64").toString("utf-8");
|
|
286
|
-
const
|
|
287
|
-
|
|
288
|
-
|
|
390
|
+
const credsPath = writeGcpCredentials(credentialsJson, "embedder");
|
|
391
|
+
process.env.GOOGLE_APPLICATION_CREDENTIALS = credsPath;
|
|
392
|
+
}
|
|
393
|
+
try {
|
|
394
|
+
// VertexAIEmbeddings reads GOOGLE_APPLICATION_CREDENTIALS at
|
|
395
|
+
// construction, so restoring the env in `finally` is safe.
|
|
396
|
+
response = new google_vertexai_1.VertexAIEmbeddings({
|
|
397
|
+
model: embedderConfig.model,
|
|
398
|
+
location: embedderConfig.region,
|
|
399
|
+
dimensions: embedderConfig.dimensions,
|
|
400
|
+
});
|
|
401
|
+
}
|
|
402
|
+
finally {
|
|
403
|
+
if (previousCredsEnv === undefined)
|
|
404
|
+
delete process.env.GOOGLE_APPLICATION_CREDENTIALS;
|
|
405
|
+
else
|
|
406
|
+
process.env.GOOGLE_APPLICATION_CREDENTIALS = previousCredsEnv;
|
|
289
407
|
}
|
|
290
|
-
response = new google_vertexai_1.VertexAIEmbeddings({
|
|
291
|
-
model: embedderConfig.model,
|
|
292
|
-
location: embedderConfig.region,
|
|
293
|
-
dimensions: embedderConfig.dimensions,
|
|
294
|
-
});
|
|
295
408
|
break;
|
|
296
409
|
}
|
|
297
410
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/model.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"model.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/model.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vision.llm.service.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/services/vision.llm.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAqB,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"vision.llm.service.d.ts","sourceRoot":"","sources":["../../../../src/core/llm/services/vision.llm.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAqB,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAIhE;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI5B;AAED;;GAEG;AACH,UAAU,gBAAgB,CAAC,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBACa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAK;IACjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAQ;gBAGtB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC;IAG7D;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAaxB;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;OAEG;YACW,SAAS;IAyBvB;;;OAGG;YACW,kBAAkB;IAahC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAM3B;;;;;;;;OAQG;YACW,2BAA2B;IA0CzC;;;;;;;;;;;;;;;;;;;OAmBG;IACG,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,gBAAgB,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;CA2G3G"}
|
|
@@ -15,6 +15,7 @@ const common_1 = require("@nestjs/common");
|
|
|
15
15
|
const config_1 = require("@nestjs/config");
|
|
16
16
|
const model_service_1 = require("../../llm/services/model.service");
|
|
17
17
|
const schema_utils_1 = require("../utils/schema.utils");
|
|
18
|
+
const llm_raw_response_1 = require("../common/llm-raw-response");
|
|
18
19
|
/**
|
|
19
20
|
* Error thrown when vision model's content moderation blocks an image analysis request.
|
|
20
21
|
* This typically happens when the image content triggers safety filters.
|
|
@@ -26,12 +27,6 @@ class ContentModerationError extends Error {
|
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
exports.ContentModerationError = ContentModerationError;
|
|
29
|
-
/**
|
|
30
|
-
* Type guard to validate raw response structure
|
|
31
|
-
*/
|
|
32
|
-
function isValidRaw(raw) {
|
|
33
|
-
return typeof raw === "object" && raw !== null;
|
|
34
|
-
}
|
|
35
30
|
let VisionLLMService = class VisionLLMService {
|
|
36
31
|
constructor(modelService, config) {
|
|
37
32
|
this.modelService = modelService;
|
|
@@ -204,7 +199,7 @@ let VisionLLMService = class VisionLLMService {
|
|
|
204
199
|
});
|
|
205
200
|
// Handle null parsed response with fallback JSON parsing
|
|
206
201
|
if (!response.parsed) {
|
|
207
|
-
const raw = isValidRaw(response.raw) ? response.raw : undefined;
|
|
202
|
+
const raw = (0, llm_raw_response_1.isValidRaw)(response.raw) ? response.raw : undefined;
|
|
208
203
|
const rawContent = raw?.content || "";
|
|
209
204
|
if (rawContent) {
|
|
210
205
|
// Attempt manual JSON parsing
|
|
@@ -223,7 +218,7 @@ let VisionLLMService = class VisionLLMService {
|
|
|
223
218
|
throw new Error("Structured output parsing failed and no raw content available");
|
|
224
219
|
}
|
|
225
220
|
// Success path - extract token usage with type guard
|
|
226
|
-
const raw = isValidRaw(response.raw) ? response.raw : undefined;
|
|
221
|
+
const raw = (0, llm_raw_response_1.isValidRaw)(response.raw) ? response.raw : undefined;
|
|
227
222
|
const input = raw?.usage_metadata?.input_tokens ?? 0;
|
|
228
223
|
const output = raw?.usage_metadata?.output_tokens ?? 0;
|
|
229
224
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vision.llm.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/vision.llm.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAwD;AACxD,2CAA4C;AAC5C,2CAA+C;AAG/C,oEAAgE;AAChE,wDAAwF;
|
|
1
|
+
{"version":3,"file":"vision.llm.service.js","sourceRoot":"","sources":["../../../../src/core/llm/services/vision.llm.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ import { Chunk } from "../../chunk/entities/chunk.entity";
|
|
|
13
13
|
import { ChunkRepository } from "../../chunk/repositories/chunk.repository";
|
|
14
14
|
import { KeyConceptRepository } from "../../keyconcept/repositories/keyconcept.repository";
|
|
15
15
|
import { KeyConceptService } from "../../keyconcept/services/keyconcept.service";
|
|
16
|
-
import { TokenUsageService } from "../../tokenusage/services/tokenusage.service";
|
|
17
16
|
export declare class ChunkService {
|
|
18
17
|
private readonly logger;
|
|
19
18
|
private readonly tracer;
|
|
@@ -24,10 +23,9 @@ export declare class ChunkService {
|
|
|
24
23
|
private readonly keyConceptService;
|
|
25
24
|
private readonly graphGeneratorService;
|
|
26
25
|
private readonly keyConceptRepository;
|
|
27
|
-
private readonly tokenUsageService;
|
|
28
26
|
private readonly moduleRef;
|
|
29
27
|
private readonly jobNames;
|
|
30
|
-
constructor(logger: AppLoggingService, tracer: TracingService, clsService: ClsService, builder: JsonApiService, chunkRepository: ChunkRepository, atomicFactService: AtomicFactService, keyConceptService: KeyConceptService, graphGeneratorService: GraphCreatorService, keyConceptRepository: KeyConceptRepository,
|
|
28
|
+
constructor(logger: AppLoggingService, tracer: TracingService, clsService: ClsService, builder: JsonApiService, chunkRepository: ChunkRepository, atomicFactService: AtomicFactService, keyConceptService: KeyConceptService, graphGeneratorService: GraphCreatorService, keyConceptRepository: KeyConceptRepository, moduleRef: ModuleRef, configService: ConfigService<BaseConfigInterface>);
|
|
31
29
|
private isDeadlockError;
|
|
32
30
|
private createEmptyChunkAnalysis;
|
|
33
31
|
private retryWithExponentialBackoff;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/chunk/services/chunk.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8DAA8D,CAAC;AAGnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAEvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,KAAK,EAAmB,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AAEjF,
|
|
1
|
+
{"version":3,"file":"chunk.service.d.ts","sourceRoot":"","sources":["../../../../src/foundations/chunk/services/chunk.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8DAA8D,CAAC;AAGnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAEvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,KAAK,EAAmB,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AAEjF,qBACa,YAAY;IAIrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAZ5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;gBAGhC,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,qBAAqB,EAAE,mBAAmB,EAC1C,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS,EACrC,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAAC;IAKnD,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YASlB,2BAA2B;YAqC3B,gCAAgC;IAkCxC,QAAQ,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAQpE,YAAY,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,QAAQ,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAyB1F,YAAY,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBrE,aAAa,CAAC,MAAM,EAAE;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,OAAO,CAAC,IAAI,CAAC;IAqIjB;;;;OAIG;IACH,OAAO,CAAC,WAAW;CAepB"}
|
|
@@ -26,10 +26,8 @@ const chunk_entity_1 = require("../../chunk/entities/chunk.entity");
|
|
|
26
26
|
const chunk_repository_1 = require("../../chunk/repositories/chunk.repository");
|
|
27
27
|
const keyconcept_repository_1 = require("../../keyconcept/repositories/keyconcept.repository");
|
|
28
28
|
const keyconcept_service_1 = require("../../keyconcept/services/keyconcept.service");
|
|
29
|
-
const tokenusage_type_1 = require("../../tokenusage/enums/tokenusage.type");
|
|
30
|
-
const tokenusage_service_1 = require("../../tokenusage/services/tokenusage.service");
|
|
31
29
|
let ChunkService = class ChunkService {
|
|
32
|
-
constructor(logger, tracer, clsService, builder, chunkRepository, atomicFactService, keyConceptService, graphGeneratorService, keyConceptRepository,
|
|
30
|
+
constructor(logger, tracer, clsService, builder, chunkRepository, atomicFactService, keyConceptService, graphGeneratorService, keyConceptRepository, moduleRef, configService) {
|
|
33
31
|
this.logger = logger;
|
|
34
32
|
this.tracer = tracer;
|
|
35
33
|
this.clsService = clsService;
|
|
@@ -39,7 +37,6 @@ let ChunkService = class ChunkService {
|
|
|
39
37
|
this.keyConceptService = keyConceptService;
|
|
40
38
|
this.graphGeneratorService = graphGeneratorService;
|
|
41
39
|
this.keyConceptRepository = keyConceptRepository;
|
|
42
|
-
this.tokenUsageService = tokenUsageService;
|
|
43
40
|
this.moduleRef = moduleRef;
|
|
44
41
|
this.jobNames = configService.get("jobNames", { infer: true }) ?? { process: {}, notifications: {} };
|
|
45
42
|
}
|
|
@@ -170,6 +167,8 @@ let ChunkService = class ChunkService {
|
|
|
170
167
|
this.tracer.addSpanEvent("Update Chunk Status");
|
|
171
168
|
const chunkAnalysis = await this.retryGraphGenerationWithFallback(() => this.graphGeneratorService.generateGraph({
|
|
172
169
|
content: chunk.content,
|
|
170
|
+
relationshipId: params.id,
|
|
171
|
+
relationshipType: params.type,
|
|
173
172
|
}), 3, 1000, params.chunkId);
|
|
174
173
|
this.tracer.addSpanEvent("Generate Graph");
|
|
175
174
|
if (chunkAnalysis) {
|
|
@@ -178,12 +177,6 @@ let ChunkService = class ChunkService {
|
|
|
178
177
|
atomicFactsCount: chunkAnalysis.atomicFacts.length,
|
|
179
178
|
relationshipsCount: chunkAnalysis.keyConceptsRelationships.length,
|
|
180
179
|
});
|
|
181
|
-
await this.tokenUsageService.recordTokenUsage({
|
|
182
|
-
tokens: chunkAnalysis.tokens,
|
|
183
|
-
type: tokenusage_type_1.TokenUsageType.GraphCreator,
|
|
184
|
-
relationshipId: params.id,
|
|
185
|
-
relationshipType: params.type,
|
|
186
|
-
});
|
|
187
180
|
await this.retryWithExponentialBackoff(async () => {
|
|
188
181
|
const keyConcepts = new Set();
|
|
189
182
|
chunkAnalysis.atomicFacts.forEach((atomicFact) => {
|
|
@@ -286,7 +279,6 @@ exports.ChunkService = ChunkService = __decorate([
|
|
|
286
279
|
keyconcept_service_1.KeyConceptService,
|
|
287
280
|
graph_creator_service_1.GraphCreatorService,
|
|
288
281
|
keyconcept_repository_1.KeyConceptRepository,
|
|
289
|
-
tokenusage_service_1.TokenUsageService,
|
|
290
282
|
core_1.ModuleRef,
|
|
291
283
|
config_1.ConfigService])
|
|
292
284
|
], ChunkService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk.service.js","sourceRoot":"","sources":["../../../../src/foundations/chunk/services/chunk.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAA+C;AAC/C,2CAA4C;AAC5C,2CAA+C;AAC/C,uCAAyC;AAEzC,mCAAoC;AACpC,2CAAwC;AACxC,wGAAmG;AACnG,+DAA2D;AAK3D,oFAAgF;AAChF,oFAAmF;AACnF,oFAAgF;AAChF,qFAAiF;AACjF,oEAA2E;AAC3E,gFAA4E;AAC5E,+FAA2F;AAC3F,qFAAiF;
|
|
1
|
+
{"version":3,"file":"chunk.service.js","sourceRoot":"","sources":["../../../../src/foundations/chunk/services/chunk.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
export
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
1
|
+
export type TokenUsageType = "graph_creator" | "counterpart_identificator" | "summariser" | "responder" | "ethicist" | "analyser" | "strategy" | "text_generation";
|
|
2
|
+
export declare const TokenUsageType: {
|
|
3
|
+
readonly GraphCreator: "graph_creator";
|
|
4
|
+
readonly CounterpartIdentificator: "counterpart_identificator";
|
|
5
|
+
readonly Summariser: "summariser";
|
|
6
|
+
readonly Responder: "responder";
|
|
7
|
+
readonly Ethicist: "ethicist";
|
|
8
|
+
readonly Analyser: "analyser";
|
|
9
|
+
readonly Strategy: "strategy";
|
|
10
|
+
readonly TextGeneration: "text_generation";
|
|
11
|
+
};
|
|
11
12
|
//# sourceMappingURL=tokenusage.type.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.type.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/enums/tokenusage.type.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"tokenusage.type.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/enums/tokenusage.type.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GACtB,eAAe,GACf,2BAA2B,GAC3B,YAAY,GACZ,WAAW,GACX,UAAU,GACV,UAAU,GACV,UAAU,GACV,iBAAiB,CAAC;AAEtB,eAAO,MAAM,cAAc;;;;;;;;;CASjB,CAAC"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TokenUsageType = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
})(TokenUsageType || (exports.TokenUsageType = TokenUsageType = {}));
|
|
4
|
+
exports.TokenUsageType = {
|
|
5
|
+
GraphCreator: "graph_creator",
|
|
6
|
+
CounterpartIdentificator: "counterpart_identificator",
|
|
7
|
+
Summariser: "summariser",
|
|
8
|
+
Responder: "responder",
|
|
9
|
+
Ethicist: "ethicist",
|
|
10
|
+
Analyser: "analyser",
|
|
11
|
+
Strategy: "strategy",
|
|
12
|
+
TextGeneration: "text_generation",
|
|
13
|
+
};
|
|
15
14
|
//# sourceMappingURL=tokenusage.type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.type.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/enums/tokenusage.type.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tokenusage.type.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/enums/tokenusage.type.ts"],"names":[],"mappings":";;;AAUa,QAAA,cAAc,GAAG;IAC5B,YAAY,EAAE,eAAe;IAC7B,wBAAwB,EAAE,2BAA2B;IACrD,UAAU,EAAE,YAAY;IACxB,SAAS,EAAE,WAAW;IACtB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,UAAU;IACpB,cAAc,EAAE,iBAAiB;CACzB,CAAC"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { OnModuleInit } from "@nestjs/common";
|
|
2
2
|
import { Neo4jService } from "../../../core/neo4j/services/neo4j.service";
|
|
3
|
-
import { TokenUsageType } from "../../tokenusage/enums/tokenusage.type";
|
|
4
3
|
export declare class TokenUsageRepository implements OnModuleInit {
|
|
5
4
|
private readonly neo4j;
|
|
6
5
|
constructor(neo4j: Neo4jService);
|
|
7
6
|
onModuleInit(): Promise<void>;
|
|
8
7
|
create(params: {
|
|
9
8
|
id: string;
|
|
10
|
-
tokenUsageType:
|
|
9
|
+
tokenUsageType: string;
|
|
11
10
|
inputTokens: number;
|
|
12
11
|
outputTokens: number;
|
|
13
12
|
cost?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.repository.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/repositories/tokenusage.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"tokenusage.repository.d.ts","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/repositories/tokenusage.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAG1E,qBACa,oBAAqB,YAAW,YAAY;IAC3C,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAE1C,YAAY;IAMZ,MAAM,CAAC,MAAM,EAAE;QACnB,EAAE,EAAE,MAAM,CAAC;QACX,cAAc,EAAE,MAAM,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,cAAc,EAAE,MAAM,CAAC;QACvB,gBAAgB,EAAE,MAAM,CAAC;KAC1B,GAAG,OAAO,CAAC,IAAI,CAAC;CAgClB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenusage.repository.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/repositories/tokenusage.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0D;AAC1D,8EAA0E;AAC1E,+EAA2E;
|
|
1
|
+
{"version":3,"file":"tokenusage.repository.js","sourceRoot":"","sources":["../../../../src/foundations/tokenusage/repositories/tokenusage.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0D;AAC1D,8EAA0E;AAC1E,+EAA2E;AAGpE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YAA6B,KAAmB;QAAnB,UAAK,GAAL,KAAK,CAAc;IAAG,CAAC;IAEpD,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;YACxB,KAAK,EAAE,qBAAqB,gCAAc,CAAC,QAAQ,0BAA0B,gCAAc,CAAC,QAAQ,IAAI,gCAAc,CAAC,SAAS,aAAa,gCAAc,CAAC,QAAQ,eAAe;SACpL,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAQZ;QACC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;QAErC,KAAK,CAAC,WAAW,GAAG;YAClB,GAAG,KAAK,CAAC,WAAW;YACpB,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC;SACvB,CAAC;QAEF,KAAK,CAAC,KAAK,IAAI;;;;;;;;;;;;;yBAaM,MAAM,CAAC,gBAAgB;;KAE3C,CAAC;QAEF,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AAjDY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAEyB,4BAAY;GADrC,oBAAoB,CAiDhC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ConfigService } from "@nestjs/config";
|
|
2
2
|
import { BaseConfigInterface } from "../../../config/interfaces";
|
|
3
3
|
import { TokenUsageInterface } from "../../../common/interfaces/token.usage.interface";
|
|
4
|
-
import { TokenUsageType } from "../../tokenusage/enums/tokenusage.type";
|
|
5
4
|
import { TokenUsageRepository } from "../../tokenusage/repositories/tokenusage.repository";
|
|
6
5
|
import { ModelWeight } from "../../../core/llm/enums/model.weight";
|
|
7
6
|
export declare class TokenUsageService {
|
|
@@ -10,9 +9,19 @@ export declare class TokenUsageService {
|
|
|
10
9
|
constructor(tokenUsageRepository: TokenUsageRepository, configService: ConfigService<BaseConfigInterface>);
|
|
11
10
|
private get aiConfig();
|
|
12
11
|
private configForWeight;
|
|
12
|
+
/**
|
|
13
|
+
* Computes the monetary cost of a call from the per-tier rates in config
|
|
14
|
+
* (`inputCostPer1MTokens` / `outputCostPer1MTokens`). Single source of truth —
|
|
15
|
+
* used both for persistence and for surfacing cost in ephemeral telemetry.
|
|
16
|
+
*/
|
|
17
|
+
computeCost(params: {
|
|
18
|
+
tokens: TokenUsageInterface;
|
|
19
|
+
useVisionCosts?: boolean;
|
|
20
|
+
modelWeight?: ModelWeight;
|
|
21
|
+
}): number;
|
|
13
22
|
recordTokenUsage(params: {
|
|
14
23
|
tokens: TokenUsageInterface;
|
|
15
|
-
type:
|
|
24
|
+
type: string;
|
|
16
25
|
relationshipId: string;
|
|
17
26
|
relationshipType: string;
|
|
18
27
|
useVisionCosts?: boolean;
|