@venturialstd/workflow 0.1.159 → 0.1.161
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/modules/chatgpt/actions/chat-completion.action.d.ts +16 -0
- package/dist/modules/chatgpt/actions/chat-completion.action.d.ts.map +1 -1
- package/dist/modules/chatgpt/actions/chat-completion.action.js +57 -33
- package/dist/modules/chatgpt/actions/chat-completion.action.js.map +1 -1
- package/dist/modules/chatgpt/actions/create-embedding.action.d.ts.map +1 -1
- package/dist/modules/chatgpt/actions/create-embedding.action.js +10 -16
- package/dist/modules/chatgpt/actions/create-embedding.action.js.map +1 -1
- package/dist/modules/chatgpt/actions/generate-image.action.d.ts.map +1 -1
- package/dist/modules/chatgpt/actions/generate-image.action.js +19 -35
- package/dist/modules/chatgpt/actions/generate-image.action.js.map +1 -1
- package/dist/modules/chatgpt/actions/speech-to-text.action.d.ts.map +1 -1
- package/dist/modules/chatgpt/actions/speech-to-text.action.js +18 -31
- package/dist/modules/chatgpt/actions/speech-to-text.action.js.map +1 -1
- package/dist/modules/chatgpt/actions/text-to-speech.action.d.ts.map +1 -1
- package/dist/modules/chatgpt/actions/text-to-speech.action.js +15 -32
- package/dist/modules/chatgpt/actions/text-to-speech.action.js.map +1 -1
- package/dist/modules/chatgpt/auth/chatgpt-auth.service.d.ts +8 -0
- package/dist/modules/chatgpt/auth/chatgpt-auth.service.d.ts.map +1 -0
- package/dist/modules/chatgpt/auth/chatgpt-auth.service.js +65 -0
- package/dist/modules/chatgpt/auth/chatgpt-auth.service.js.map +1 -0
- package/dist/modules/chatgpt/auth/index.d.ts +2 -0
- package/dist/modules/chatgpt/auth/index.d.ts.map +1 -0
- package/dist/modules/chatgpt/auth/index.js +6 -0
- package/dist/modules/chatgpt/auth/index.js.map +1 -0
- package/dist/modules/chatgpt/chatgpt-nest.module.d.ts.map +1 -1
- package/dist/modules/chatgpt/chatgpt-nest.module.js +7 -4
- package/dist/modules/chatgpt/chatgpt-nest.module.js.map +1 -1
- package/dist/modules/chatgpt/chatgpt.module.d.ts.map +1 -1
- package/dist/modules/chatgpt/chatgpt.module.js +2 -0
- package/dist/modules/chatgpt/chatgpt.module.js.map +1 -1
- package/dist/modules/chatgpt/services/chat-completion.service.d.ts +1 -0
- package/dist/modules/chatgpt/services/chat-completion.service.d.ts.map +1 -1
- package/dist/modules/chatgpt/services/chat-completion.service.js +37 -15
- package/dist/modules/chatgpt/services/chat-completion.service.js.map +1 -1
- package/dist/modules/jobs/jobs-nest.module.d.ts.map +1 -1
- package/dist/modules/jobs/jobs-nest.module.js +3 -2
- package/dist/modules/jobs/jobs-nest.module.js.map +1 -1
- package/dist/modules/jobs/processors/workflow-job.processor.d.ts +3 -1
- package/dist/modules/jobs/processors/workflow-job.processor.d.ts.map +1 -1
- package/dist/modules/jobs/processors/workflow-job.processor.js +13 -1
- package/dist/modules/jobs/processors/workflow-job.processor.js.map +1 -1
- package/dist/modules/webhook/controllers/webhook-receiver.controller.d.ts +3 -1
- package/dist/modules/webhook/controllers/webhook-receiver.controller.d.ts.map +1 -1
- package/dist/modules/webhook/controllers/webhook-receiver.controller.js +16 -2
- package/dist/modules/webhook/controllers/webhook-receiver.controller.js.map +1 -1
- package/dist/services/workflow-execution.service.d.ts.map +1 -1
- package/dist/services/workflow-execution.service.js +9 -0
- package/dist/services/workflow-execution.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.ChatGptAuthService = void 0;
|
|
13
|
+
const common_1 = require("@nestjs/common");
|
|
14
|
+
const chatgpt_1 = require("@venturialstd/chatgpt");
|
|
15
|
+
let ChatGptAuthService = class ChatGptAuthService {
|
|
16
|
+
chatGptClient;
|
|
17
|
+
constructor(chatGptClient) {
|
|
18
|
+
this.chatGptClient = chatGptClient;
|
|
19
|
+
}
|
|
20
|
+
async authenticate(credentials) {
|
|
21
|
+
const apiKey = credentials.apiKey;
|
|
22
|
+
const baseUrl = credentials.baseUrl || 'https://api.openai.com/v1';
|
|
23
|
+
if (!apiKey || apiKey.trim().length === 0) {
|
|
24
|
+
return {
|
|
25
|
+
success: false,
|
|
26
|
+
message: 'OpenAI API key is required',
|
|
27
|
+
error: 'MISSING_API_KEY',
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
try {
|
|
31
|
+
const { client } = await this.chatGptClient.getClient({
|
|
32
|
+
apiKey,
|
|
33
|
+
baseUrl,
|
|
34
|
+
});
|
|
35
|
+
await client.models.list();
|
|
36
|
+
return {
|
|
37
|
+
success: true,
|
|
38
|
+
message: 'OpenAI credentials validated successfully',
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
if (error &&
|
|
43
|
+
typeof error === 'object' &&
|
|
44
|
+
'status' in error &&
|
|
45
|
+
(error.status === 401 || error.status === 403)) {
|
|
46
|
+
return {
|
|
47
|
+
success: false,
|
|
48
|
+
message: 'Invalid API key',
|
|
49
|
+
error: 'AUTH_FAILED',
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
return {
|
|
53
|
+
success: false,
|
|
54
|
+
message: error instanceof Error ? error.message : 'Unknown error occurred',
|
|
55
|
+
error: 'AUTH_ERROR',
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
exports.ChatGptAuthService = ChatGptAuthService;
|
|
61
|
+
exports.ChatGptAuthService = ChatGptAuthService = __decorate([
|
|
62
|
+
(0, common_1.Injectable)(),
|
|
63
|
+
__metadata("design:paramtypes", [chatgpt_1.ChatGptClient])
|
|
64
|
+
], ChatGptAuthService);
|
|
65
|
+
//# sourceMappingURL=chatgpt-auth.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chatgpt-auth.service.js","sourceRoot":"","sources":["../../../../src/modules/chatgpt/auth/chatgpt-auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAAsD;AAK/C,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IACA;IAA7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,YAAY,CAAC,WAAoC;QACrD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAgB,CAAC;QAC5C,MAAM,OAAO,GAAI,WAAW,CAAC,OAAkB,IAAI,2BAA2B,CAAC;QAE/E,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1C,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,4BAA4B;gBACrC,KAAK,EAAE,iBAAiB;aACzB,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;gBACpD,MAAM;gBACN,OAAO;aACR,CAAC,CAAC;YAEH,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAE3B,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,2CAA2C;aACrD,CAAC;QACJ,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IACE,KAAK;gBACL,OAAO,KAAK,KAAK,QAAQ;gBACzB,QAAQ,IAAI,KAAK;gBACjB,CAAC,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC,EAC9C,CAAC;gBACD,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,iBAAiB;oBAC1B,KAAK,EAAE,aAAa;iBACrB,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB;gBAC1E,KAAK,EAAE,YAAY;aACpB,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AAhDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAEiC,uBAAa;GAD9C,kBAAkB,CAgD9B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/chatgpt/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ChatGptAuthService = void 0;
|
|
4
|
+
var chatgpt_auth_service_1 = require("./chatgpt-auth.service");
|
|
5
|
+
Object.defineProperty(exports, "ChatGptAuthService", { enumerable: true, get: function () { return chatgpt_auth_service_1.ChatGptAuthService; } });
|
|
6
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/chatgpt/auth/index.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-nest.module.d.ts","sourceRoot":"","sources":["../../../src/modules/chatgpt/chatgpt-nest.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"chatgpt-nest.module.d.ts","sourceRoot":"","sources":["../../../src/modules/chatgpt/chatgpt-nest.module.ts"],"names":[],"mappings":"AAYA,qBAmBa,iBAAiB;CAAG"}
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.ChatGptNestModule = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
11
|
const chatgpt_1 = require("@venturialstd/chatgpt");
|
|
12
|
+
const auth_1 = require("./auth");
|
|
12
13
|
const services_1 = require("./services");
|
|
13
14
|
let ChatGptNestModule = class ChatGptNestModule {
|
|
14
15
|
};
|
|
@@ -17,18 +18,20 @@ exports.ChatGptNestModule = ChatGptNestModule = __decorate([
|
|
|
17
18
|
(0, common_1.Module)({
|
|
18
19
|
imports: [chatgpt_1.ChatGptModule],
|
|
19
20
|
providers: [
|
|
21
|
+
auth_1.ChatGptAuthService,
|
|
20
22
|
services_1.ChatCompletionService,
|
|
23
|
+
services_1.CreateEmbeddingService,
|
|
21
24
|
services_1.GenerateImageService,
|
|
22
|
-
services_1.TextToSpeechService,
|
|
23
25
|
services_1.SpeechToTextService,
|
|
24
|
-
services_1.
|
|
26
|
+
services_1.TextToSpeechService,
|
|
25
27
|
],
|
|
26
28
|
exports: [
|
|
29
|
+
auth_1.ChatGptAuthService,
|
|
27
30
|
services_1.ChatCompletionService,
|
|
31
|
+
services_1.CreateEmbeddingService,
|
|
28
32
|
services_1.GenerateImageService,
|
|
29
|
-
services_1.TextToSpeechService,
|
|
30
33
|
services_1.SpeechToTextService,
|
|
31
|
-
services_1.
|
|
34
|
+
services_1.TextToSpeechService,
|
|
32
35
|
],
|
|
33
36
|
})
|
|
34
37
|
], ChatGptNestModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt-nest.module.js","sourceRoot":"","sources":["../../../src/modules/chatgpt/chatgpt-nest.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,mDAAsD;AAEtD,yCAMoB;
|
|
1
|
+
{"version":3,"file":"chatgpt-nest.module.js","sourceRoot":"","sources":["../../../src/modules/chatgpt/chatgpt-nest.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,mDAAsD;AAEtD,iCAA4C;AAC5C,yCAMoB;AAqBb,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAAG,CAAA;AAApB,8CAAiB;4BAAjB,iBAAiB;IAnB7B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC;QACxB,SAAS,EAAE;YACT,yBAAkB;YAClB,gCAAqB;YACrB,iCAAsB;YACtB,+BAAoB;YACpB,8BAAmB;YACnB,8BAAmB;SACpB;QACD,OAAO,EAAE;YACP,yBAAkB;YAClB,gCAAqB;YACrB,iCAAsB;YACtB,+BAAoB;YACpB,8BAAmB;YACnB,8BAAmB;SACpB;KACF,CAAC;GACW,iBAAiB,CAAG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt.module.d.ts","sourceRoot":"","sources":["../../../src/modules/chatgpt/chatgpt.module.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"chatgpt.module.d.ts","sourceRoot":"","sources":["../../../src/modules/chatgpt/chatgpt.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAWpF,eAAO,MAAM,aAAa,EAAE,wBAkB3B,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.chatgptModule = void 0;
|
|
4
4
|
const actions_1 = require("./actions");
|
|
5
|
+
const auth_1 = require("./auth");
|
|
5
6
|
const credentials_1 = require("./credentials");
|
|
6
7
|
exports.chatgptModule = {
|
|
7
8
|
key: 'chatgpt',
|
|
@@ -10,6 +11,7 @@ exports.chatgptModule = {
|
|
|
10
11
|
icon: '🤖',
|
|
11
12
|
version: '1.0.0',
|
|
12
13
|
credentialFields: credentials_1.chatgptCredentials,
|
|
14
|
+
authServiceClass: auth_1.ChatGptAuthService,
|
|
13
15
|
actions: [
|
|
14
16
|
actions_1.chatCompletionAction,
|
|
15
17
|
actions_1.generateImageAction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt.module.js","sourceRoot":"","sources":["../../../src/modules/chatgpt/chatgpt.module.ts"],"names":[],"mappings":";;;AACA,uCAMmB;AACnB,+CAAmD;AAEtC,QAAA,aAAa,GAA6B;IACrD,GAAG,EAAE,SAAS;IACd,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,+DAA+D;IAC5E,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,OAAO;IAChB,gBAAgB,EAAE,gCAAkB;IACpC,OAAO,EAAE;QACP,8BAAoB;QACpB,6BAAmB;QACnB,4BAAkB;QAClB,4BAAkB;QAClB,+BAAqB;KACtB;IACD,QAAQ,EAAE,EAAE;CACb,CAAC"}
|
|
1
|
+
{"version":3,"file":"chatgpt.module.js","sourceRoot":"","sources":["../../../src/modules/chatgpt/chatgpt.module.ts"],"names":[],"mappings":";;;AACA,uCAMmB;AACnB,iCAA4C;AAC5C,+CAAmD;AAEtC,QAAA,aAAa,GAA6B;IACrD,GAAG,EAAE,SAAS;IACd,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,+DAA+D;IAC5E,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,OAAO;IAChB,gBAAgB,EAAE,gCAAkB;IACpC,gBAAgB,EAAE,yBAEiB;IACnC,OAAO,EAAE;QACP,8BAAoB;QACpB,6BAAmB;QACnB,4BAAkB;QAClB,4BAAkB;QAClB,+BAAqB;KACtB;IACD,QAAQ,EAAE,EAAE;CACb,CAAC"}
|
|
@@ -4,6 +4,7 @@ export declare class ChatCompletionService implements IWorkflowActionService {
|
|
|
4
4
|
private readonly chatGptChatService;
|
|
5
5
|
constructor(chatGptChatService: ChatGptChatService);
|
|
6
6
|
perform(inputs: Record<string, unknown>, context: WorkflowActionContext): Promise<Record<string, unknown>>;
|
|
7
|
+
private buildMessages;
|
|
7
8
|
private calculateCost;
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=chat-completion.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-completion.service.d.ts","sourceRoot":"","sources":["../../../../src/modules/chatgpt/services/chat-completion.service.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE5E,qBACa,qBAAsB,YAAW,sBAAsB;IACtD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAAlB,kBAAkB,EAAE,kBAAkB;IAE7D,OAAO,CACX,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-completion.service.d.ts","sourceRoot":"","sources":["../../../../src/modules/chatgpt/services/chat-completion.service.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAE5E,qBACa,qBAAsB,YAAW,sBAAsB;IACtD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAAlB,kBAAkB,EAAE,kBAAkB;IAE7D,OAAO,CACX,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAgDnC,OAAO,CAAC,aAAa;IAqCrB,OAAO,CAAC,aAAa;CAWtB"}
|
|
@@ -23,21 +23,9 @@ let ChatCompletionService = class ChatCompletionService {
|
|
|
23
23
|
if (!apiKey) {
|
|
24
24
|
throw new Error('OpenAI API key is required in credentials');
|
|
25
25
|
}
|
|
26
|
-
|
|
27
|
-
if (
|
|
28
|
-
|
|
29
|
-
const parsed = JSON.parse(inputs.messages);
|
|
30
|
-
messages = parsed;
|
|
31
|
-
}
|
|
32
|
-
catch (error) {
|
|
33
|
-
throw new Error(`Invalid JSON format for messages: ${error instanceof Error ? error.message : 'Unknown error'}`);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
else if (Array.isArray(inputs.messages)) {
|
|
37
|
-
messages = inputs.messages;
|
|
38
|
-
}
|
|
39
|
-
else {
|
|
40
|
-
throw new Error('Messages must be a JSON array or JSON string');
|
|
26
|
+
const messages = this.buildMessages(inputs);
|
|
27
|
+
if (messages.length === 0) {
|
|
28
|
+
throw new Error('Provide at least one of: System instructions, Your message, or Conversation history');
|
|
41
29
|
}
|
|
42
30
|
const model = inputs.model || 'gpt-4o';
|
|
43
31
|
const temperature = inputs.temperature || 0.7;
|
|
@@ -61,6 +49,40 @@ let ChatCompletionService = class ChatCompletionService {
|
|
|
61
49
|
messageId: completion.id,
|
|
62
50
|
};
|
|
63
51
|
}
|
|
52
|
+
buildMessages(inputs) {
|
|
53
|
+
const result = [];
|
|
54
|
+
const systemPrompt = inputs.systemPrompt;
|
|
55
|
+
if (systemPrompt != null && String(systemPrompt).trim()) {
|
|
56
|
+
result.push({ role: 'system', content: systemPrompt.trim() });
|
|
57
|
+
}
|
|
58
|
+
let conversation = [];
|
|
59
|
+
if (inputs.messages != null) {
|
|
60
|
+
if (typeof inputs.messages === 'string') {
|
|
61
|
+
try {
|
|
62
|
+
const parsed = JSON.parse(inputs.messages);
|
|
63
|
+
conversation = Array.isArray(parsed) ? parsed : [];
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
conversation = [];
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
else if (Array.isArray(inputs.messages)) {
|
|
70
|
+
conversation = inputs.messages;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
const validRoles = ['system', 'user', 'assistant'];
|
|
74
|
+
for (const m of conversation) {
|
|
75
|
+
if (m && typeof m === 'object' && typeof m.content === 'string') {
|
|
76
|
+
const role = validRoles.includes(m.role) ? m.role : 'user';
|
|
77
|
+
result.push({ role: role, content: m.content });
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
const userMessage = inputs.userMessage;
|
|
81
|
+
if (userMessage != null && String(userMessage).trim()) {
|
|
82
|
+
result.push({ role: 'user', content: userMessage.trim() });
|
|
83
|
+
}
|
|
84
|
+
return result;
|
|
85
|
+
}
|
|
64
86
|
calculateCost(model, tokens) {
|
|
65
87
|
const modelPricing = chatgpt_1.CHATGPT_MODEL_PRICING[model] || chatgpt_1.CHATGPT_MODEL_PRICING[chatgpt_1.CHATGPT_DEFAULT_MODELS.GPT_4O];
|
|
66
88
|
const estimatedInputTokens = tokens * 0.7;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-completion.service.js","sourceRoot":"","sources":["../../../../src/modules/chatgpt/services/chat-completion.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAK+B;AAKxB,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACH;IAA7B,YAA6B,kBAAsC;QAAtC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAAG,CAAC;IAEvE,KAAK,CAAC,OAAO,CACX,MAA+B,EAC/B,OAA8B;QAE9B,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,MAAgB,CAAC;QACrD,MAAM,OAAO,GAAI,OAAO,CAAC,WAAW,EAAE,OAAkB,IAAI,2BAA2B,CAAC;QAExF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,
|
|
1
|
+
{"version":3,"file":"chat-completion.service.js","sourceRoot":"","sources":["../../../../src/modules/chatgpt/services/chat-completion.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobs-nest.module.d.ts","sourceRoot":"","sources":["../../../src/modules/jobs/jobs-nest.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAU,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"jobs-nest.module.d.ts","sourceRoot":"","sources":["../../../src/modules/jobs/jobs-nest.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAU,MAAM,gBAAgB,CAAC;AAwBvE,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,gCAAgC,qCAAqC,CAAC;AACnF,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAEvE,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAE7D,MAAM,WAAW,yBAAyB;IAExC,UAAU,EAAE;QACV,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;CACH;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;IAC1B,UAAU,EAAE,CACV,GAAG,IAAI,EAAE,OAAO,EAAE,KACf,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;CACrE;AAED,qBACa,cAAc;IACzB,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,yBAAyB,GAAG,aAAa;IA6EjE,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,8BAA8B,GAAG,aAAa;CAiGjF"}
|
|
@@ -19,6 +19,7 @@ const ioredis_1 = __importDefault(require("ioredis"));
|
|
|
19
19
|
const workflow_execution_entity_1 = require("../../entities/workflow-execution.entity");
|
|
20
20
|
const workflow_job_entity_1 = require("../../entities/workflow-job.entity");
|
|
21
21
|
const workflow_node_entity_1 = require("../../entities/workflow-node.entity");
|
|
22
|
+
const workflow_entity_1 = require("../../entities/workflow.entity");
|
|
22
23
|
const workflow_core_module_1 = require("../../workflow-core.module");
|
|
23
24
|
const ioredis_lock_adapter_1 = require("./adapters/ioredis-lock.adapter");
|
|
24
25
|
const workflow_job_controller_1 = require("./controllers/workflow-job.controller");
|
|
@@ -59,7 +60,7 @@ let JobsNestModule = JobsNestModule_1 = class JobsNestModule {
|
|
|
59
60
|
module: JobsNestModule_1,
|
|
60
61
|
imports: [
|
|
61
62
|
workflow_core_module_1.WorkflowCoreModule,
|
|
62
|
-
typeorm_2.TypeOrmModule.forFeature([workflow_job_entity_1.WorkflowJob, workflow_execution_entity_1.WorkflowExecution, workflow_node_entity_1.WorkflowNode]),
|
|
63
|
+
typeorm_2.TypeOrmModule.forFeature([workflow_job_entity_1.WorkflowJob, workflow_execution_entity_1.WorkflowExecution, workflow_node_entity_1.WorkflowNode, workflow_entity_1.Workflow]),
|
|
63
64
|
],
|
|
64
65
|
controllers: [workflow_job_controller_1.WorkflowJobController],
|
|
65
66
|
providers: [
|
|
@@ -102,7 +103,7 @@ let JobsNestModule = JobsNestModule_1 = class JobsNestModule {
|
|
|
102
103
|
imports: [
|
|
103
104
|
...(asyncOptions.imports ?? []),
|
|
104
105
|
workflow_core_module_1.WorkflowCoreModule,
|
|
105
|
-
typeorm_2.TypeOrmModule.forFeature([workflow_job_entity_1.WorkflowJob, workflow_execution_entity_1.WorkflowExecution, workflow_node_entity_1.WorkflowNode]),
|
|
106
|
+
typeorm_2.TypeOrmModule.forFeature([workflow_job_entity_1.WorkflowJob, workflow_execution_entity_1.WorkflowExecution, workflow_node_entity_1.WorkflowNode, workflow_entity_1.Workflow]),
|
|
106
107
|
],
|
|
107
108
|
controllers: [workflow_job_controller_1.WorkflowJobController],
|
|
108
109
|
providers: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobs-nest.module.js","sourceRoot":"","sources":["../../../src/modules/jobs/jobs-nest.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAuE;AACvE,6CAAqD;AACrD,6CAAgD;AAChD,mCAAuC;AACvC,sDAA8C;AAG9C,wFAA6E;AAC7E,4EAAiE;AACjE,8EAAmE;AACnE,qEAAgE;AAChE,0EAA2E;AAC3E,mFAA8E;AAC9E,gFAA2E;AAE3E,kFAA6E;AAC7E,4EAI0C;AAC1C,0EAAqE;AAExD,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAC5C,QAAA,gCAAgC,GAAG,kCAAkC,CAAC;AACtE,QAAA,mBAAmB,GAAG,qBAAqB,CAAC;AAC5C,QAAA,0BAA0B,GAAG,4BAA4B,CAAC;AAE1D,QAAA,qBAAqB,GAAG,uBAAuB,CAAC;AAsBtD,IAAM,cAAc,sBAApB,MAAM,cAAc;IACzB,MAAM,CAAC,OAAO,CAAC,OAAkC;QAC/C,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAA0B,CAAC;QAC7D,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,iBAAiB,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAkB,IAAA,+CAAwB,EAAC,KAAK,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,IAAI,cAAK,CAAC,gDAAwB,EAAE,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACrF,MAAM,YAAY,GAAsB;YACtC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;gBAC9B,IAAI,IAAI,EAAE,MAAM,EAAE,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;oBACxD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAC7C,IAAI,CAAC,KAAK,EACV,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAChC,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;oBACF,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACxD,CAAC;gBACD,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACxC,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;YAClD,CAAC;YACD,qBAAqB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC;YAC7D,iBAAiB,EAAE,KAAK,IAAI,EAAE;gBAC5B,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC/D,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC5B,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE;oBACf,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE;iBACnB,CAAC,CAAC,CAAC;YACN,CAAC;SACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,gBAAc;YACtB,OAAO,EAAE;gBACP,yCAAkB;gBAClB,uBAAa,CAAC,UAAU,CAAC,CAAC,iCAAW,EAAE,6CAAiB,EAAE,mCAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"jobs-nest.module.js","sourceRoot":"","sources":["../../../src/modules/jobs/jobs-nest.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Repository } from 'typeorm';
|
|
|
2
2
|
import { WorkflowExecution } from '../../../entities/workflow-execution.entity';
|
|
3
3
|
import { WorkflowJob } from '../../../entities/workflow-job.entity';
|
|
4
4
|
import { WorkflowNode } from '../../../entities/workflow-node.entity';
|
|
5
|
+
import { Workflow } from '../../../entities/workflow.entity';
|
|
5
6
|
import { WorkflowExecutionService } from '../../../services/workflow-execution.service';
|
|
6
7
|
import { WorkflowJobService } from '../services/workflow-job.service';
|
|
7
8
|
import { JobSchedulerService } from '../services/job-scheduler.service';
|
|
@@ -16,12 +17,13 @@ export declare class WorkflowJobProcessor {
|
|
|
16
17
|
private readonly jobRepo;
|
|
17
18
|
private readonly executionRepo;
|
|
18
19
|
private readonly nodeRepo;
|
|
20
|
+
private readonly workflowRepo;
|
|
19
21
|
private readonly workflowJobService;
|
|
20
22
|
private readonly workflowExecutionService;
|
|
21
23
|
private readonly jobSchedulerService;
|
|
22
24
|
private readonly lockService;
|
|
23
25
|
private readonly logger;
|
|
24
|
-
constructor(jobRepo: Repository<WorkflowJob>, executionRepo: Repository<WorkflowExecution>, nodeRepo: Repository<WorkflowNode>, workflowJobService: WorkflowJobService, workflowExecutionService: WorkflowExecutionService, jobSchedulerService: JobSchedulerService, lockService: DistributedLockService);
|
|
26
|
+
constructor(jobRepo: Repository<WorkflowJob>, executionRepo: Repository<WorkflowExecution>, nodeRepo: Repository<WorkflowNode>, workflowRepo: Repository<Workflow>, workflowJobService: WorkflowJobService, workflowExecutionService: WorkflowExecutionService, jobSchedulerService: JobSchedulerService, lockService: DistributedLockService);
|
|
25
27
|
process(jobName: string, data: Record<string, unknown>): Promise<void>;
|
|
26
28
|
private processExecuteJob;
|
|
27
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-job.processor.d.ts","sourceRoot":"","sources":["../../../../src/modules/jobs/processors/workflow-job.processor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAGL,mBAAmB,EACpB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAK9E,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,qBACa,oBAAoB;IAK7B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"workflow-job.processor.d.ts","sourceRoot":"","sources":["../../../../src/modules/jobs/processors/workflow-job.processor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAGL,mBAAmB,EACpB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAK9E,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,qBACa,oBAAoB;IAK7B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAd9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAI7C,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,EAEhC,aAAa,EAAE,UAAU,CAAC,iBAAiB,CAAC,EAE5C,QAAQ,EAAE,UAAU,CAAC,YAAY,CAAC,EAElC,YAAY,EAAE,UAAU,CAAC,QAAQ,CAAC,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,wBAAwB,EAAE,wBAAwB,EAClD,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,sBAAsB;IAGhD,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAe9D,iBAAiB;CAsEhC"}
|
|
@@ -22,6 +22,7 @@ const workflow_constant_1 = require("../../../constants/workflow.constant");
|
|
|
22
22
|
const workflow_execution_entity_1 = require("../../../entities/workflow-execution.entity");
|
|
23
23
|
const workflow_job_entity_1 = require("../../../entities/workflow-job.entity");
|
|
24
24
|
const workflow_node_entity_1 = require("../../../entities/workflow-node.entity");
|
|
25
|
+
const workflow_entity_1 = require("../../../entities/workflow.entity");
|
|
25
26
|
const workflow_execution_service_1 = require("../../../services/workflow-execution.service");
|
|
26
27
|
const workflow_job_service_1 = require("../services/workflow-job.service");
|
|
27
28
|
const job_scheduler_service_1 = require("../services/job-scheduler.service");
|
|
@@ -32,15 +33,17 @@ let WorkflowJobProcessor = WorkflowJobProcessor_1 = class WorkflowJobProcessor {
|
|
|
32
33
|
jobRepo;
|
|
33
34
|
executionRepo;
|
|
34
35
|
nodeRepo;
|
|
36
|
+
workflowRepo;
|
|
35
37
|
workflowJobService;
|
|
36
38
|
workflowExecutionService;
|
|
37
39
|
jobSchedulerService;
|
|
38
40
|
lockService;
|
|
39
41
|
logger = new common_1.Logger(WorkflowJobProcessor_1.name);
|
|
40
|
-
constructor(jobRepo, executionRepo, nodeRepo, workflowJobService, workflowExecutionService, jobSchedulerService, lockService) {
|
|
42
|
+
constructor(jobRepo, executionRepo, nodeRepo, workflowRepo, workflowJobService, workflowExecutionService, jobSchedulerService, lockService) {
|
|
41
43
|
this.jobRepo = jobRepo;
|
|
42
44
|
this.executionRepo = executionRepo;
|
|
43
45
|
this.nodeRepo = nodeRepo;
|
|
46
|
+
this.workflowRepo = workflowRepo;
|
|
44
47
|
this.workflowJobService = workflowJobService;
|
|
45
48
|
this.workflowExecutionService = workflowExecutionService;
|
|
46
49
|
this.jobSchedulerService = jobSchedulerService;
|
|
@@ -79,6 +82,13 @@ let WorkflowJobProcessor = WorkflowJobProcessor_1 = class WorkflowJobProcessor {
|
|
|
79
82
|
if (!job || !job.isActive) {
|
|
80
83
|
return;
|
|
81
84
|
}
|
|
85
|
+
const workflow = await this.workflowRepo.findOne({
|
|
86
|
+
where: { id: job.workflowId },
|
|
87
|
+
});
|
|
88
|
+
if (!workflow || workflow.status !== workflow_constant_1.WORKFLOW_STATUS.ACTIVE) {
|
|
89
|
+
this.logger.debug(`Workflow ${job.workflowId} is not active, skipping schedule job ${job.id}`);
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
82
92
|
let triggerNode = null;
|
|
83
93
|
if (job.triggerNodeId) {
|
|
84
94
|
triggerNode = await this.nodeRepo.findOne({
|
|
@@ -123,7 +133,9 @@ exports.WorkflowJobProcessor = WorkflowJobProcessor = WorkflowJobProcessor_1 = _
|
|
|
123
133
|
__param(0, (0, typeorm_1.InjectRepository)(workflow_job_entity_1.WorkflowJob)),
|
|
124
134
|
__param(1, (0, typeorm_1.InjectRepository)(workflow_execution_entity_1.WorkflowExecution)),
|
|
125
135
|
__param(2, (0, typeorm_1.InjectRepository)(workflow_node_entity_1.WorkflowNode)),
|
|
136
|
+
__param(3, (0, typeorm_1.InjectRepository)(workflow_entity_1.Workflow)),
|
|
126
137
|
__metadata("design:paramtypes", [typeorm_2.Repository,
|
|
138
|
+
typeorm_2.Repository,
|
|
127
139
|
typeorm_2.Repository,
|
|
128
140
|
typeorm_2.Repository,
|
|
129
141
|
workflow_job_service_1.WorkflowJobService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-job.processor.js","sourceRoot":"","sources":["../../../../src/modules/jobs/processors/workflow-job.processor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,6CAAmD;AACnD,6CAA8C;AAC9C,qCAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"workflow-job.processor.js","sourceRoot":"","sources":["../../../../src/modules/jobs/processors/workflow-job.processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,14 @@ import { WorkflowExecutionService } from '../../../services/workflow-execution.s
|
|
|
4
4
|
import { WorkflowNodeService } from '../../../services/workflow-node.service';
|
|
5
5
|
import { WorkflowNodeExecutionService } from '../../../services/workflow-node-execution.service';
|
|
6
6
|
import { WorkflowWebhookService } from '../../../services/workflow-webhook.service';
|
|
7
|
+
import { WorkflowService } from '../../../services/workflow.service';
|
|
7
8
|
export declare class WebhookReceiverController {
|
|
8
9
|
private readonly workflowWebhookService;
|
|
9
10
|
private readonly workflowNodeService;
|
|
10
11
|
private readonly workflowExecutionService;
|
|
11
12
|
private readonly workflowNodeExecutionService;
|
|
12
|
-
|
|
13
|
+
private readonly workflowService;
|
|
14
|
+
constructor(workflowWebhookService: WorkflowWebhookService, workflowNodeService: WorkflowNodeService, workflowExecutionService: WorkflowExecutionService, workflowNodeExecutionService: WorkflowNodeExecutionService, workflowService: WorkflowService);
|
|
13
15
|
getWebhookByNodeId(nodeId: string): Promise<WorkflowWebhook | null>;
|
|
14
16
|
receiveWebhook(path: string, req: Request, res: Response, body: Record<string, unknown>, headers: Record<string, string>, query: Record<string, string>): Promise<Response<any, Record<string, any>>>;
|
|
15
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-receiver.controller.d.ts","sourceRoot":"","sources":["../../../../src/modules/webhook/controllers/webhook-receiver.controller.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAe,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"webhook-receiver.controller.d.ts","sourceRoot":"","sources":["../../../../src/modules/webhook/controllers/webhook-receiver.controller.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,EAAe,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,wBAAwB,EAAE,MAAM,8CAA8C,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,qBAEa,yBAAyB;IAElC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAJf,sBAAsB,EAAE,sBAAsB,EAC9C,mBAAmB,EAAE,mBAAmB,EACxC,wBAAwB,EAAE,wBAAwB,EAClD,4BAA4B,EAAE,4BAA4B,EAC1D,eAAe,EAAE,eAAe;IAO7C,kBAAkB,CAAkB,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAUpF,cAAc,CACH,IAAI,EAAE,MAAM,EACpB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAwHzC"}
|
|
@@ -21,16 +21,19 @@ const workflow_execution_service_1 = require("../../../services/workflow-executi
|
|
|
21
21
|
const workflow_node_service_1 = require("../../../services/workflow-node.service");
|
|
22
22
|
const workflow_node_execution_service_1 = require("../../../services/workflow-node-execution.service");
|
|
23
23
|
const workflow_webhook_service_1 = require("../../../services/workflow-webhook.service");
|
|
24
|
+
const workflow_service_1 = require("../../../services/workflow.service");
|
|
24
25
|
let WebhookReceiverController = class WebhookReceiverController {
|
|
25
26
|
workflowWebhookService;
|
|
26
27
|
workflowNodeService;
|
|
27
28
|
workflowExecutionService;
|
|
28
29
|
workflowNodeExecutionService;
|
|
29
|
-
|
|
30
|
+
workflowService;
|
|
31
|
+
constructor(workflowWebhookService, workflowNodeService, workflowExecutionService, workflowNodeExecutionService, workflowService) {
|
|
30
32
|
this.workflowWebhookService = workflowWebhookService;
|
|
31
33
|
this.workflowNodeService = workflowNodeService;
|
|
32
34
|
this.workflowExecutionService = workflowExecutionService;
|
|
33
35
|
this.workflowNodeExecutionService = workflowNodeExecutionService;
|
|
36
|
+
this.workflowService = workflowService;
|
|
34
37
|
}
|
|
35
38
|
async getWebhookByNodeId(nodeId) {
|
|
36
39
|
return this.workflowWebhookService.findByNodeId(nodeId);
|
|
@@ -48,6 +51,16 @@ let WebhookReceiverController = class WebhookReceiverController {
|
|
|
48
51
|
webhookId: webhook.id,
|
|
49
52
|
});
|
|
50
53
|
}
|
|
54
|
+
const workflow = await this.workflowService.repo.findOne({
|
|
55
|
+
where: { id: webhook.workflowId },
|
|
56
|
+
});
|
|
57
|
+
if (!workflow || workflow.status !== workflow_constant_1.WORKFLOW_STATUS.ACTIVE) {
|
|
58
|
+
return res.status(common_1.HttpStatus.SERVICE_UNAVAILABLE).json({
|
|
59
|
+
success: false,
|
|
60
|
+
message: 'Workflow is not active. Triggers are only executed when workflow status is Active.',
|
|
61
|
+
workflowId: webhook.workflowId,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
51
64
|
const node = await this.workflowNodeService.findOne({
|
|
52
65
|
where: { id: webhook.nodeId },
|
|
53
66
|
});
|
|
@@ -153,6 +166,7 @@ exports.WebhookReceiverController = WebhookReceiverController = __decorate([
|
|
|
153
166
|
__metadata("design:paramtypes", [workflow_webhook_service_1.WorkflowWebhookService,
|
|
154
167
|
workflow_node_service_1.WorkflowNodeService,
|
|
155
168
|
workflow_execution_service_1.WorkflowExecutionService,
|
|
156
|
-
workflow_node_execution_service_1.WorkflowNodeExecutionService
|
|
169
|
+
workflow_node_execution_service_1.WorkflowNodeExecutionService,
|
|
170
|
+
workflow_service_1.WorkflowService])
|
|
157
171
|
], WebhookReceiverController);
|
|
158
172
|
//# sourceMappingURL=webhook-receiver.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-receiver.controller.js","sourceRoot":"","sources":["../../../../src/modules/webhook/controllers/webhook-receiver.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAawB;AACxB,6CAAqE;AAGrE,
|
|
1
|
+
{"version":3,"file":"webhook-receiver.controller.js","sourceRoot":"","sources":["../../../../src/modules/webhook/controllers/webhook-receiver.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-execution.service.d.ts","sourceRoot":"","sources":["../../src/services/workflow-execution.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAQnF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAW5D,qBACa,wBAAyB,SAAQ,kBAAkB,CAAC,iBAAiB,CAAC;aAG/D,IAAI,EAAE,UAAU,CAAC,iBAAiB,CAAC;IAEnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,+BAA+B;IAChD,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAVX,IAAI,EAAE,UAAU,CAAC,iBAAiB,CAAC,EAElC,iBAAiB,EAAE,UAAU,CAAC,qBAAqB,CAAC,EACpD,mBAAmB,EAAE,mBAAmB,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,+BAA+B,EAAE,+BAA+B,EAChE,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,kBAAkB;IAM3C,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAO3E,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAUtE,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"workflow-execution.service.d.ts","sourceRoot":"","sources":["../../src/services/workflow-execution.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAQnF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAW5D,qBACa,wBAAyB,SAAQ,kBAAkB,CAAC,iBAAiB,CAAC;aAG/D,IAAI,EAAE,UAAU,CAAC,iBAAiB,CAAC;IAEnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,+BAA+B;IAChD,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAVX,IAAI,EAAE,UAAU,CAAC,iBAAiB,CAAC,EAElC,iBAAiB,EAAE,UAAU,CAAC,qBAAqB,CAAC,EACpD,mBAAmB,EAAE,mBAAmB,EACxC,mBAAmB,EAAE,mBAAmB,EACxC,+BAA+B,EAAE,+BAA+B,EAChE,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,kBAAkB;IAM3C,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAO3E,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAUtE,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA+B/D,iBAAiB,CACrB,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,OAAO,CAAC,iBAAiB,CAAC;IAwBvB,aAAa,CACjB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,OAAO,CAAC,iBAAiB,CAAC;IAuBvB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;YAcjF,qBAAqB;YAarB,kBAAkB;YA0ElB,qBAAqB;YAqCrB,iBAAiB;YA6CjB,eAAe;IA0E7B,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,wBAAwB;YAiDlB,kBAAkB;IA2B1B,eAAe,CACnB,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,MAAa,GAC3B,OAAO,CAAC,iBAAiB,CAAC;CAulC9B"}
|
|
@@ -76,6 +76,15 @@ let WorkflowExecutionService = WorkflowExecutionService_1 = class WorkflowExecut
|
|
|
76
76
|
this.logger.error(`Execution with id "${executionId}" not found`);
|
|
77
77
|
return {};
|
|
78
78
|
}
|
|
79
|
+
const workflow = await this.workflowService.repo.findOne({
|
|
80
|
+
where: { id: execution.workflowId },
|
|
81
|
+
});
|
|
82
|
+
if (!workflow || workflow.status !== workflow_constant_1.WORKFLOW_STATUS.ACTIVE) {
|
|
83
|
+
execution.status = workflow_constant_1.EXECUTION_STATUS.CANCELLED;
|
|
84
|
+
execution.completedAt = new Date();
|
|
85
|
+
await this.repo.save(execution);
|
|
86
|
+
return execution;
|
|
87
|
+
}
|
|
79
88
|
execution.status = workflow_constant_1.EXECUTION_STATUS.RUNNING;
|
|
80
89
|
execution.startedAt = new Date();
|
|
81
90
|
await this.repo.save(execution);
|