n8n 2.29.2 → 2.29.3
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/build.tsbuildinfo +1 -1
- package/dist/modules/instance-ai/instance-ai-credit.service.js +10 -6
- package/dist/modules/instance-ai/instance-ai-credit.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai-model.service.js +2 -2
- package/dist/modules/instance-ai/instance-ai-model.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.service.js +3 -1
- package/dist/modules/instance-ai/instance-ai.service.js.map +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.d.ts +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.js +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.js.map +1 -1
- package/dist/modules/instance-ai/tracing/instance-ai-tracing.service.js +1 -1
- package/dist/modules/instance-ai/tracing/instance-ai-tracing.service.js.map +1 -1
- package/package.json +26 -26
|
@@ -56,7 +56,7 @@ let InstanceAiCreditService = InstanceAiCreditService_1 = class InstanceAiCredit
|
|
|
56
56
|
this.logger.debug('Claiming Instance AI credits', { threadId, dedupeId, status, usage });
|
|
57
57
|
let result;
|
|
58
58
|
try {
|
|
59
|
-
result = await this.claimTokensWithRetry(user, dedupeId, usage);
|
|
59
|
+
result = await this.claimTokensWithRetry(user, threadId, dedupeId, usage);
|
|
60
60
|
}
|
|
61
61
|
catch (error) {
|
|
62
62
|
this.claimedRunIds.delete(dedupeId);
|
|
@@ -136,21 +136,25 @@ let InstanceAiCreditService = InstanceAiCreditService_1 = class InstanceAiCredit
|
|
|
136
136
|
}
|
|
137
137
|
async getProxyAuth(user) {
|
|
138
138
|
const client = await this.aiService.getClient();
|
|
139
|
-
const token = await client.
|
|
139
|
+
const token = await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
|
|
140
140
|
return {
|
|
141
141
|
client,
|
|
142
142
|
headers: { Authorization: `${token.tokenType} ${token.accessToken}` },
|
|
143
143
|
};
|
|
144
144
|
}
|
|
145
|
-
async claimTokens(user, dedupeId, usage) {
|
|
145
|
+
async claimTokens(user, threadId, dedupeId, usage) {
|
|
146
146
|
const { client, headers } = await this.getProxyAuth(user);
|
|
147
|
-
return await client.
|
|
147
|
+
return await client.markInstanceAiTokenUsage({ id: user.id }, headers, {
|
|
148
|
+
dedupeId,
|
|
149
|
+
usage,
|
|
150
|
+
threadId,
|
|
151
|
+
});
|
|
148
152
|
}
|
|
149
|
-
async claimTokensWithRetry(user, dedupeId, usage) {
|
|
153
|
+
async claimTokensWithRetry(user, threadId, dedupeId, usage) {
|
|
150
154
|
let lastError;
|
|
151
155
|
for (let attempt = 1; attempt <= InstanceAiCreditService_1.CLAIM_MAX_ATTEMPTS; attempt++) {
|
|
152
156
|
try {
|
|
153
|
-
return await this.claimTokens(user, dedupeId, usage);
|
|
157
|
+
return await this.claimTokens(user, threadId, dedupeId, usage);
|
|
154
158
|
}
|
|
155
159
|
catch (error) {
|
|
156
160
|
lastError = error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-ai-credit.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-credit.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAA6C;AAE7C,gCAAkC;AAElC,uCAA4C;AAC5C,+CAAsD;AACtD,mCAAgC;AAEhC,iCAA8B;AAC9B,sDAAkD;AAClD,2CAAwC;AAExC,gGAA0F;AAE1F,SAAS,eAAe,CAAC,KAAc;IACtC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AAcM,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAiBnC,YACC,MAAc,EACG,SAAoB,EACpB,SAAoB,EACpB,gBAAkC,EAClC,IAAU,EACV,UAAsC;QAJtC,cAAS,GAAT,SAAS,CAAW;QACpB,cAAS,GAAT,SAAS,CAAW;QACpB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,SAAI,GAAJ,IAAI,CAAM;QACV,eAAU,GAAV,UAAU,CAA4B;QAdvC,kBAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QAgBlD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;IAcD,KAAK,CAAC,aAAa,CAClB,IAAU,EACV,QAAgB,EAChB,QAAgB,EAChB,KAAyB,EACzB,MAAmB;QAEnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACtE,QAAQ;gBACR,QAAQ;aACR,CAAC,CAAC;YACH,OAAO;QACR,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;YACzF,OAAO;QACR,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE;gBACvE,QAAQ;gBACR,QAAQ;aACR,CAAC,CAAC;YACH,OAAO;QACR,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAKzF,IAAI,MAAoD,CAAC;QACzD,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-ai-credit.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-credit.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,7 @@ let InstanceAiModelService = class InstanceAiModelService {
|
|
|
66
66
|
const client = await this.aiService.getClient();
|
|
67
67
|
const proxyBaseUrl = client.getApiProxyBaseUrl();
|
|
68
68
|
const tokenManager = new proxy_token_manager_1.ProxyTokenManager(async () => {
|
|
69
|
-
return await client.
|
|
69
|
+
return await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
|
|
70
70
|
});
|
|
71
71
|
return await this.resolveProxyModel(user, proxyBaseUrl, tokenManager);
|
|
72
72
|
}
|
|
@@ -122,7 +122,7 @@ let InstanceAiModelService = class InstanceAiModelService {
|
|
|
122
122
|
return { creditsQuota: api_types_1.UNLIMITED_CREDITS, creditsClaimed: 0 };
|
|
123
123
|
}
|
|
124
124
|
const client = await this.aiService.getClient();
|
|
125
|
-
return await client.
|
|
125
|
+
return await client.getInstanceAiCredits({ id: user.id });
|
|
126
126
|
}
|
|
127
127
|
};
|
|
128
128
|
exports.InstanceAiModelService = InstanceAiModelService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-ai-model.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-model.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsE;AACtE,0DAAoD;AAEpD,gCAAkC;AAElC,mCAAgC;AAEhC,2CAA0C;AAC1C,sDAAkD;AAClD,wEAAmE;AACnE,2DAA4D;AAE5D,iFAA2E;AAmBpE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,eAA0C,EAC1C,SAAoB,EACpB,YAA0B;QAF1B,oBAAe,GAAf,eAAe,CAA2B;QAC1C,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAGJ,cAAc;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;IACxC,CAAC;IAaD,KAAK,CAAC,uBAAuB,CAAC,IAAU;QACvC,IAAI,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAChD,MAAM,YAAY,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACjD,MAAM,YAAY,GAAG,IAAI,uCAAiB,CAAC,KAAK,IAAI,EAAE;gBACrD,OAAO,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"instance-ai-model.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-model.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -402,7 +402,7 @@ let InstanceAiService = class InstanceAiService {
|
|
|
402
402
|
const client = await this.aiService.getClient();
|
|
403
403
|
const proxyBaseUrl = client.getApiProxyBaseUrl();
|
|
404
404
|
const tokenManager = new proxy_token_manager_1.ProxyTokenManager(async () => {
|
|
405
|
-
return await client.
|
|
405
|
+
return await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
|
|
406
406
|
});
|
|
407
407
|
const featureHeaders = (0, api_types_1.buildProxyHeaders)({
|
|
408
408
|
feature: 'instance-ai',
|
|
@@ -2165,6 +2165,7 @@ let InstanceAiService = class InstanceAiService {
|
|
|
2165
2165
|
checkpointKey: result.agentRunId,
|
|
2166
2166
|
checkpointTaskId: checkpoint?.checkpointTaskId,
|
|
2167
2167
|
});
|
|
2168
|
+
void this.creditService.claimRunUsage(user, threadId, `${result.agentRunId || runId}:${result.suspension.requestId}`, result.usage?.usage ?? [], 'suspended');
|
|
2168
2169
|
}
|
|
2169
2170
|
const intermediateText = await (result.text ?? Promise.resolve(''));
|
|
2170
2171
|
if (intermediateText) {
|
|
@@ -2818,6 +2819,7 @@ let InstanceAiService = class InstanceAiService {
|
|
|
2818
2819
|
checkpointKey: result.agentRunId,
|
|
2819
2820
|
checkpointTaskId: opts.checkpoint?.checkpointTaskId,
|
|
2820
2821
|
});
|
|
2822
|
+
void this.creditService.claimRunUsage(opts.user, opts.threadId, `${result.agentRunId || opts.runId}:${result.suspension.requestId}`, result.usage?.usage ?? [], 'suspended');
|
|
2821
2823
|
}
|
|
2822
2824
|
const intermediateText = await (result.text ?? Promise.resolve(''));
|
|
2823
2825
|
if (intermediateText) {
|