@resolveio/server-lib 22.2.22 → 22.2.23
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/managers/openai-usage-ledger.manager.d.ts +1 -1
- package/managers/openai-usage-ledger.manager.js +4 -3
- package/managers/openai-usage-ledger.manager.js.map +1 -1
- package/methods/ai-terminal.js +10 -17
- package/methods/ai-terminal.js.map +1 -1
- package/methods/mongo-explorer.js +2 -2
- package/methods/mongo-explorer.js.map +1 -1
- package/methods/report-builder.js +11 -13
- package/methods/report-builder.js.map +1 -1
- package/package.json +1 -1
|
@@ -96,13 +96,14 @@ var estimateCost = function (model, inputTokens, outputTokens) {
|
|
|
96
96
|
};
|
|
97
97
|
function recordOpenAIUsage(input) {
|
|
98
98
|
return __awaiter(this, void 0, void 0, function () {
|
|
99
|
-
var inputTokens, outputTokens, totalTokens, model, costEstimate;
|
|
99
|
+
var idClient, inputTokens, outputTokens, totalTokens, model, costEstimate;
|
|
100
100
|
return __generator(this, function (_a) {
|
|
101
101
|
switch (_a.label) {
|
|
102
102
|
case 0:
|
|
103
|
-
if (!input
|
|
103
|
+
if (!input) {
|
|
104
104
|
return [2 /*return*/];
|
|
105
105
|
}
|
|
106
|
+
idClient = String(input.id_client || '').trim();
|
|
106
107
|
inputTokens = toNumber(input.input_tokens);
|
|
107
108
|
outputTokens = toNumber(input.output_tokens);
|
|
108
109
|
totalTokens = toNumber(input.total_tokens);
|
|
@@ -114,7 +115,7 @@ function recordOpenAIUsage(input) {
|
|
|
114
115
|
? input.cost_estimate
|
|
115
116
|
: estimateCost(model, inputTokens, outputTokens);
|
|
116
117
|
return [4 /*yield*/, openai_usage_ledger_collection_1.OpenAIUsageLedger.insertOne({
|
|
117
|
-
id_client:
|
|
118
|
+
id_client: idClient,
|
|
118
119
|
timestamp: input.timestamp || new Date(),
|
|
119
120
|
model: model,
|
|
120
121
|
input_tokens: inputTokens,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/managers/openai-usage-ledger.manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgFA,
|
|
1
|
+
{"version":3,"sources":["../../src/managers/openai-usage-ledger.manager.ts"],"names":[],"mappings":"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","file":"openai-usage-ledger.manager.js","sourcesContent":["import { round } from '../util/common';\nimport { ResolveIOServer } from '../resolveio-server-app';\nimport { OpenAIUsageLedger } from '../collections/openai-usage-ledger.collection';\n\nexport interface OpenAIUsageRecordInput {\n\tid_client?: string;\n\tmodel: string;\n\tinput_tokens: number;\n\toutput_tokens: number;\n\ttotal_tokens: number;\n\tbillable?: boolean;\n\tcategory?: string;\n\tid_request?: string;\n\tid_conversation?: string;\n\ttimestamp?: Date;\n\tcost_estimate?: number;\n}\n\ntype PricingConfig = {\n\tinputPer1k: number;\n\toutputPer1k: number;\n};\n\nconst toNumber = (value: any): number => {\n\tconst parsed = Number(value);\n\treturn Number.isFinite(parsed) ? parsed : 0;\n};\n\nconst normalizeModelKey = (value: string): string => {\n\treturn String(value || '').trim().toLowerCase();\n};\n\nconst parsePricingJson = (raw: string): Record<string, PricingConfig> => {\n\tif (!raw) {\n\t\treturn {};\n\t}\n\ttry {\n\t\tconst parsed = JSON.parse(raw);\n\t\tif (!parsed || typeof parsed !== 'object') {\n\t\t\treturn {};\n\t\t}\n\t\tconst out: Record<string, PricingConfig> = {};\n\t\tObject.keys(parsed).forEach((key) => {\n\t\t\tconst entry = parsed[key] || {};\n\t\t\tconst inputPer1k = toNumber(entry.inputPer1k ?? entry.input ?? entry.prompt ?? 0);\n\t\t\tconst outputPer1k = toNumber(entry.outputPer1k ?? entry.output ?? entry.completion ?? 0);\n\t\t\tif (inputPer1k || outputPer1k) {\n\t\t\t\tout[normalizeModelKey(key)] = { inputPer1k, outputPer1k };\n\t\t\t}\n\t\t});\n\t\treturn out;\n\t}\n\tcatch {\n\t\treturn {};\n\t}\n};\n\nconst resolvePricingConfig = (): { perModel: Record<string, PricingConfig>; defaultPricing: PricingConfig } => {\n\tconst config = ResolveIOServer.getServerConfig() || {};\n\tconst rawJson = String(config['OPENAI_MODEL_PRICING'] ?? process.env.OPENAI_MODEL_PRICING ?? '').trim();\n\tconst defaultInput = toNumber(config['OPENAI_COST_PER_1K_INPUT_TOKENS'] ?? process.env.OPENAI_COST_PER_1K_INPUT_TOKENS ?? 0);\n\tconst defaultOutput = toNumber(config['OPENAI_COST_PER_1K_OUTPUT_TOKENS'] ?? process.env.OPENAI_COST_PER_1K_OUTPUT_TOKENS ?? 0);\n\treturn {\n\t\tperModel: parsePricingJson(rawJson),\n\t\tdefaultPricing: { inputPer1k: defaultInput, outputPer1k: defaultOutput }\n\t};\n};\n\nconst estimateCost = (model: string, inputTokens: number, outputTokens: number): number => {\n\tconst { perModel, defaultPricing } = resolvePricingConfig();\n\tconst normalizedModel = normalizeModelKey(model);\n\tconst pricing = perModel[normalizedModel] || defaultPricing;\n\tif (!pricing.inputPer1k && !pricing.outputPer1k) {\n\t\treturn 0;\n\t}\n\tconst inputCost = (toNumber(inputTokens) / 1000) * pricing.inputPer1k;\n\tconst outputCost = (toNumber(outputTokens) / 1000) * pricing.outputPer1k;\n\treturn round(inputCost + outputCost, 6);\n};\n\nexport async function recordOpenAIUsage(input: OpenAIUsageRecordInput): Promise<void> {\n\tif (!input) {\n\t\treturn;\n\t}\n\tconst idClient = String(input.id_client || '').trim();\n\tconst inputTokens = toNumber(input.input_tokens);\n\tconst outputTokens = toNumber(input.output_tokens);\n\tconst totalTokens = toNumber(input.total_tokens);\n\tif (!totalTokens && (!inputTokens && !outputTokens)) {\n\t\treturn;\n\t}\n\tconst model = String(input.model || '').trim() || 'unknown';\n\tconst costEstimate = Number.isFinite(input.cost_estimate)\n\t\t? input.cost_estimate\n\t\t: estimateCost(model, inputTokens, outputTokens);\n\n\tawait OpenAIUsageLedger.insertOne({\n\t\tid_client: idClient,\n\t\ttimestamp: input.timestamp || new Date(),\n\t\tmodel,\n\t\tinput_tokens: inputTokens,\n\t\toutput_tokens: outputTokens,\n\t\ttotal_tokens: totalTokens || (inputTokens + outputTokens),\n\t\tcost_estimate: costEstimate,\n\t\tbillable: input.billable !== false,\n\t\tcategory: input.category || '',\n\t\tid_request: input.id_request || '',\n\t\tid_conversation: input.id_conversation || ''\n\t});\n}\n"]}
|
package/methods/ai-terminal.js
CHANGED
|
@@ -1479,9 +1479,8 @@ function executeAiTerminalRun(payload, context) {
|
|
|
1479
1479
|
return [4 /*yield*/, resolveClientId(conversation, input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
|
|
1480
1480
|
case 18:
|
|
1481
1481
|
idClient = _b.sent();
|
|
1482
|
-
if (!idClient) return [3 /*break*/, 20];
|
|
1483
1482
|
return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)({
|
|
1484
|
-
id_client: idClient,
|
|
1483
|
+
id_client: idClient || '',
|
|
1485
1484
|
model: codexModel || 'unknown',
|
|
1486
1485
|
input_tokens: usage.inputTokens,
|
|
1487
1486
|
output_tokens: usage.outputTokens,
|
|
@@ -1491,8 +1490,6 @@ function executeAiTerminalRun(payload, context) {
|
|
|
1491
1490
|
})];
|
|
1492
1491
|
case 19:
|
|
1493
1492
|
_b.sent();
|
|
1494
|
-
_b.label = 20;
|
|
1495
|
-
case 20:
|
|
1496
1493
|
userDoc = {
|
|
1497
1494
|
id_conversation: conversation._id,
|
|
1498
1495
|
role: 'user',
|
|
@@ -1517,20 +1514,20 @@ function executeAiTerminalRun(payload, context) {
|
|
|
1517
1514
|
updatedAt: now
|
|
1518
1515
|
};
|
|
1519
1516
|
return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(userDoc)];
|
|
1520
|
-
case
|
|
1517
|
+
case 20:
|
|
1521
1518
|
_b.sent();
|
|
1522
1519
|
return [4 /*yield*/, ai_terminal_message_collection_1.AiTerminalMessages.insertOne(assistantDoc)];
|
|
1523
|
-
case
|
|
1520
|
+
case 21:
|
|
1524
1521
|
insertResult = _b.sent();
|
|
1525
1522
|
return [4 /*yield*/, touchConversation(conversation._id, now, insertResult._id)];
|
|
1526
|
-
case
|
|
1523
|
+
case 22:
|
|
1527
1524
|
_b.sent();
|
|
1528
|
-
if (!(input.delete_files_after_run !== false)) return [3 /*break*/,
|
|
1525
|
+
if (!(input.delete_files_after_run !== false)) return [3 /*break*/, 24];
|
|
1529
1526
|
return [4 /*yield*/, cleanupAttachments(attachmentData.attachments)];
|
|
1530
|
-
case
|
|
1527
|
+
case 23:
|
|
1531
1528
|
_b.sent();
|
|
1532
|
-
_b.label =
|
|
1533
|
-
case
|
|
1529
|
+
_b.label = 24;
|
|
1530
|
+
case 24: return [2 /*return*/, {
|
|
1534
1531
|
conversation: conversation,
|
|
1535
1532
|
message: assistantDoc,
|
|
1536
1533
|
usage: assistantDoc.usage
|
|
@@ -1591,9 +1588,8 @@ function executeAiFormPatch(payload, context) {
|
|
|
1591
1588
|
return [4 /*yield*/, resolveClientIdFromConfig(input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
|
|
1592
1589
|
case 2:
|
|
1593
1590
|
idClient = _b.sent();
|
|
1594
|
-
if (!idClient) return [3 /*break*/, 4];
|
|
1595
1591
|
return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)({
|
|
1596
|
-
id_client: idClient,
|
|
1592
|
+
id_client: idClient || '',
|
|
1597
1593
|
model: codexModel || 'unknown',
|
|
1598
1594
|
input_tokens: usage.inputTokens,
|
|
1599
1595
|
output_tokens: usage.outputTokens,
|
|
@@ -1602,8 +1598,6 @@ function executeAiFormPatch(payload, context) {
|
|
|
1602
1598
|
})];
|
|
1603
1599
|
case 3:
|
|
1604
1600
|
_b.sent();
|
|
1605
|
-
_b.label = 4;
|
|
1606
|
-
case 4:
|
|
1607
1601
|
parsed = parseJsonObject(responseText);
|
|
1608
1602
|
if (!parsed || typeof parsed !== 'object') {
|
|
1609
1603
|
throw new Error('AI form patch response was not valid JSON.');
|
|
@@ -2968,12 +2962,11 @@ function executeAiAssistantCodexRun(payload, context) {
|
|
|
2968
2962
|
return [4 /*yield*/, resolveClientId(conversation, input.id_client, context === null || context === void 0 ? void 0 : context.id_user)];
|
|
2969
2963
|
case 72:
|
|
2970
2964
|
usageClientId = _22.sent();
|
|
2971
|
-
if (!usageClientId) return [3 /*break*/, 76];
|
|
2972
2965
|
_22.label = 73;
|
|
2973
2966
|
case 73:
|
|
2974
2967
|
_22.trys.push([73, 75, , 76]);
|
|
2975
2968
|
return [4 /*yield*/, (0, openai_usage_ledger_manager_1.recordOpenAIUsage)({
|
|
2976
|
-
id_client: usageClientId,
|
|
2969
|
+
id_client: usageClientId || '',
|
|
2977
2970
|
model: finalUsage.model,
|
|
2978
2971
|
input_tokens: finalUsage.input_tokens,
|
|
2979
2972
|
output_tokens: finalUsage.output_tokens,
|