n8n 2.38.0 → 2.38.1
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/controllers/invitation.controller.d.ts +1 -5
- package/dist/controllers/invitation.controller.js +3 -32
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +2 -27
- package/dist/controllers/users.controller.js +6 -132
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/evaluation.ee/evaluation-test-run.service.d.ts +46 -0
- package/dist/evaluation.ee/evaluation-test-run.service.js +65 -0
- package/dist/evaluation.ee/evaluation-test-run.service.js.map +1 -0
- package/dist/evaluation.ee/insights/insights-context-builder.js +4 -2
- package/dist/evaluation.ee/insights/insights-context-builder.js.map +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.d.ts +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.js +5 -2
- package/dist/evaluation.ee/test-runs.controller.ee.js.map +1 -1
- package/dist/modules/agents/agent-interrupted-execution-sweeper.d.ts +5 -1
- package/dist/modules/agents/agent-interrupted-execution-sweeper.js +14 -2
- package/dist/modules/agents/agent-interrupted-execution-sweeper.js.map +1 -1
- package/dist/modules/agents/agent-runtime-reconstruction.service.d.ts +1 -0
- package/dist/modules/agents/agent-runtime-reconstruction.service.js +35 -2
- package/dist/modules/agents/agent-runtime-reconstruction.service.js.map +1 -1
- package/dist/modules/agents/agents.module.d.ts +1 -1
- package/dist/modules/agents/agents.module.js +3 -0
- package/dist/modules/agents/agents.module.js.map +1 -1
- package/dist/modules/agents/background/agent-background-job.service.d.ts +34 -0
- package/dist/modules/agents/background/agent-background-job.service.js +168 -0
- package/dist/modules/agents/background/agent-background-job.service.js.map +1 -0
- package/dist/modules/agents/background/background-job-tools.d.ts +21 -0
- package/dist/modules/agents/background/background-job-tools.js +157 -0
- package/dist/modules/agents/background/background-job-tools.js.map +1 -0
- package/dist/modules/agents/background/sub-agent-background-runner.d.ts +27 -0
- package/dist/modules/agents/background/sub-agent-background-runner.js +123 -0
- package/dist/modules/agents/background/sub-agent-background-runner.js.map +1 -0
- package/dist/modules/agents/builder/get-resource-locator-options.tool.d.ts +2 -2
- package/dist/modules/agents/entities/agent-background-job.entity.d.ts +18 -0
- package/dist/modules/agents/entities/agent-background-job.entity.js +78 -0
- package/dist/modules/agents/entities/agent-background-job.entity.js.map +1 -0
- package/dist/modules/agents/repositories/agent-background-job.repository.d.ts +37 -0
- package/dist/modules/agents/repositories/agent-background-job.repository.js +61 -0
- package/dist/modules/agents/repositories/agent-background-job.repository.js.map +1 -0
- package/dist/modules/agents/sub-agents/delegate-sub-agent-tool.d.ts +4 -5
- package/dist/modules/agents/sub-agents/delegate-sub-agent-tool.js +4 -14
- package/dist/modules/agents/sub-agents/delegate-sub-agent-tool.js.map +1 -1
- package/dist/modules/agents/sub-agents/format-sub-agent-tool-output.d.ts +3 -0
- package/dist/modules/agents/sub-agents/format-sub-agent-tool-output.js +14 -0
- package/dist/modules/agents/sub-agents/format-sub-agent-tool-output.js.map +1 -0
- package/dist/modules/agents/sub-agents/{sub-agent-foreground-runner.d.ts → sub-agent-runner.d.ts} +5 -5
- package/dist/modules/agents/sub-agents/{sub-agent-foreground-runner.js → sub-agent-runner.js} +8 -11
- package/dist/modules/agents/sub-agents/sub-agent-runner.js.map +1 -0
- package/dist/public-api/v1/handlers/evaluations/evaluations.handler.js +11 -35
- package/dist/public-api/v1/handlers/evaluations/evaluations.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/users/users.handler.ee.d.ts +1 -1
- package/dist/public-api/v1/handlers/users/users.handler.ee.js +16 -18
- package/dist/public-api/v1/handlers/users/users.handler.ee.js.map +1 -1
- package/dist/public-api/v1/handlers/users/users.mapper.d.ts +12 -0
- package/dist/public-api/v1/handlers/users/users.mapper.js +27 -0
- package/dist/public-api/v1/handlers/users/users.mapper.js.map +1 -0
- package/dist/scaling/constants.d.ts +2 -2
- package/dist/scaling/constants.js +1 -0
- package/dist/scaling/constants.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.event-map.d.ts +3 -0
- package/dist/scaling/pubsub/pubsub.types.d.ts +2 -1
- package/dist/services/project.service.ee.d.ts +1 -0
- package/dist/services/project.service.ee.js +3 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/user.service.d.ts +41 -8
- package/dist/services/user.service.js +174 -8
- package/dist/services/user.service.js.map +1 -1
- package/package.json +22 -22
- package/dist/modules/agents/sub-agents/sub-agent-foreground-runner.js.map +0 -1
- package/dist/public-api/v1/handlers/users/users.service.ee.d.ts +0 -21
- package/dist/public-api/v1/handlers/users/users.service.ee.js +0 -68
- package/dist/public-api/v1/handlers/users/users.service.ee.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delegate-sub-agent-tool.js","sourceRoot":"","sources":["../../../../src/modules/agents/sub-agents/delegate-sub-agent-tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"delegate-sub-agent-tool.js","sourceRoot":"","sources":["../../../../src/modules/agents/sub-agents/delegate-sub-agent-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.formatSubAgentToolOutput = formatSubAgentToolOutput;
|
|
4
|
+
const agents_1 = require("@n8n/agents");
|
|
5
|
+
function formatSubAgentToolOutput(result) {
|
|
6
|
+
const output = (0, agents_1.generateResultToDelegateSubAgentOutput)(result.taskPath, result.result, result.threadId);
|
|
7
|
+
return {
|
|
8
|
+
...output,
|
|
9
|
+
...(output.status === 'suspended' && result.resumeContext !== undefined
|
|
10
|
+
? { resumeContext: result.resumeContext }
|
|
11
|
+
: {}),
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=format-sub-agent-tool-output.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"format-sub-agent-tool-output.js","sourceRoot":"","sources":["../../../../src/modules/agents/sub-agents/format-sub-agent-tool-output.ts"],"names":[],"mappings":";;;AAAA,wCAGqB;AAUrB,kCAAyC,MAAyB;IACjE,MAAM,MAAM,GAAG,IAAA,+CAAsC,EACpD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,QAAQ,CACf,CAAC;IACF,OAAO;QACN,GAAG,MAAM;QACT,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS;YACtE,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE;YACzC,CAAC,CAAC,EAAE,CAAC;KACN,CAAC;AACH,CAAC"}
|
package/dist/modules/agents/sub-agents/{sub-agent-foreground-runner.d.ts → sub-agent-runner.d.ts}
RENAMED
|
@@ -9,7 +9,7 @@ import type { AgentSandboxRuntime } from '../agent-sandbox-runtime.service';
|
|
|
9
9
|
import { N8NCheckpointStorage } from '../integrations/n8n-checkpoint-storage';
|
|
10
10
|
import type { WorkflowToolExecutionMode } from '../tools/workflow-tool-factory';
|
|
11
11
|
import { SubAgentSourceResolver } from './sub-agent-source-resolver';
|
|
12
|
-
export interface
|
|
12
|
+
export interface SubAgentRunContext {
|
|
13
13
|
projectId: string;
|
|
14
14
|
parentAgentId?: string;
|
|
15
15
|
credentialProvider: CredentialProvider;
|
|
@@ -24,21 +24,21 @@ export interface SubAgentForegroundRunContext {
|
|
|
24
24
|
onChunk?: (chunk: StreamChunk) => void;
|
|
25
25
|
selfDelegationDifficulty?: SubAgentTaskDifficulty;
|
|
26
26
|
}
|
|
27
|
-
export interface
|
|
27
|
+
export interface SubAgentRunResult {
|
|
28
28
|
taskPath: SubAgentTaskPath;
|
|
29
29
|
threadId: string;
|
|
30
30
|
status: 'completed' | 'failed' | 'suspended';
|
|
31
31
|
result: GenerateResult;
|
|
32
32
|
resumeContext?: JSONValue;
|
|
33
33
|
}
|
|
34
|
-
export declare class
|
|
34
|
+
export declare class SubAgentRunner {
|
|
35
35
|
private readonly sourceResolver;
|
|
36
36
|
private readonly agentExecutionService;
|
|
37
37
|
private readonly checkpointStorage;
|
|
38
38
|
private readonly logger;
|
|
39
39
|
constructor(sourceResolver: SubAgentSourceResolver, agentExecutionService: AgentExecutionService, checkpointStorage: N8NCheckpointStorage, logger: Logger);
|
|
40
|
-
|
|
41
|
-
resumeForeground(request: DelegateSubAgentResumeRequest, context:
|
|
40
|
+
run(request: SubAgentSpawnRequest, context: SubAgentRunContext): Promise<SubAgentRunResult>;
|
|
41
|
+
resumeForeground(request: DelegateSubAgentResumeRequest, context: SubAgentRunContext, expectedSourceAgentId?: string): Promise<SubAgentRunResult>;
|
|
42
42
|
cancelForeground(request: DelegateSubAgentCancelRequest, expectedSourceAgentId?: string): Promise<void>;
|
|
43
43
|
private executeForeground;
|
|
44
44
|
private resolveSandboxPrincipalHash;
|
package/dist/modules/agents/sub-agents/{sub-agent-foreground-runner.js → sub-agent-runner.js}
RENAMED
|
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.SubAgentRunner = void 0;
|
|
13
13
|
const agents_1 = require("@n8n/agents");
|
|
14
14
|
const backend_common_1 = require("@n8n/backend-common");
|
|
15
15
|
const di_1 = require("@n8n/di");
|
|
@@ -24,17 +24,14 @@ const n8n_checkpoint_storage_1 = require("../integrations/n8n-checkpoint-storage
|
|
|
24
24
|
const from_json_config_1 = require("../json-config/from-json-config");
|
|
25
25
|
const agent_stream_1 = require("../utils/agent-stream");
|
|
26
26
|
const sub_agent_source_resolver_1 = require("./sub-agent-source-resolver");
|
|
27
|
-
let
|
|
27
|
+
let SubAgentRunner = class SubAgentRunner {
|
|
28
28
|
constructor(sourceResolver, agentExecutionService, checkpointStorage, logger) {
|
|
29
29
|
this.sourceResolver = sourceResolver;
|
|
30
30
|
this.agentExecutionService = agentExecutionService;
|
|
31
31
|
this.checkpointStorage = checkpointStorage;
|
|
32
32
|
this.logger = logger;
|
|
33
33
|
}
|
|
34
|
-
async
|
|
35
|
-
if (request.executionMode !== undefined && request.executionMode !== 'foreground') {
|
|
36
|
-
throw new n8n_workflow_1.UserError('Foreground sub-agent runner only supports foreground execution mode');
|
|
37
|
-
}
|
|
34
|
+
async run(request, context) {
|
|
38
35
|
const taskPath = request.taskPath;
|
|
39
36
|
(0, agents_1.assertSubAgentTaskPath)(taskPath);
|
|
40
37
|
return await this.executeForeground({ type: 'run', request, taskPath }, context);
|
|
@@ -63,7 +60,7 @@ let SubAgentForegroundRunner = class SubAgentForegroundRunner {
|
|
|
63
60
|
}
|
|
64
61
|
async executeForeground(operation, context) {
|
|
65
62
|
const runtimeSource = await this.sourceResolver.resolveForRuntime(operation.type === 'run' ? operation.request.source : operation.source, { projectId: context.projectId, usePublishedVersion: context.runType === 'production' });
|
|
66
|
-
const threadId = operation.type === 'run' ? (0, uuid_1.v4)() : operation.threadId;
|
|
63
|
+
const threadId = operation.type === 'run' ? (operation.request.childThreadId ?? (0, uuid_1.v4)()) : operation.threadId;
|
|
67
64
|
const resourceId = operation.type === 'run' ? (operation.request.parentResourceId ?? threadId) : threadId;
|
|
68
65
|
const sandboxPrincipalHash = await this.resolveSandboxPrincipalHash(operation, runtimeSource.source.sourceId, context.projectId);
|
|
69
66
|
const reconstructionService = await getReconstructionService();
|
|
@@ -282,11 +279,11 @@ let SubAgentForegroundRunner = class SubAgentForegroundRunner {
|
|
|
282
279
|
}
|
|
283
280
|
}
|
|
284
281
|
};
|
|
285
|
-
exports.
|
|
286
|
-
exports.
|
|
282
|
+
exports.SubAgentRunner = SubAgentRunner;
|
|
283
|
+
exports.SubAgentRunner = SubAgentRunner = __decorate([
|
|
287
284
|
(0, di_1.Service)(),
|
|
288
285
|
__metadata("design:paramtypes", [sub_agent_source_resolver_1.SubAgentSourceResolver, agent_execution_service_1.AgentExecutionService, n8n_checkpoint_storage_1.N8NCheckpointStorage, backend_common_1.Logger])
|
|
289
|
-
],
|
|
286
|
+
], SubAgentRunner);
|
|
290
287
|
async function getReconstructionService() {
|
|
291
288
|
const { AgentRuntimeReconstructionService } = await import('../agent-runtime-reconstruction.service.js');
|
|
292
289
|
return di_1.Container.get(AgentRuntimeReconstructionService);
|
|
@@ -396,4 +393,4 @@ function toKnownFinishReason(value) {
|
|
|
396
393
|
}
|
|
397
394
|
return undefined;
|
|
398
395
|
}
|
|
399
|
-
//# sourceMappingURL=sub-agent-
|
|
396
|
+
//# sourceMappingURL=sub-agent-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sub-agent-runner.js","sourceRoot":"","sources":["../../../../src/modules/agents/sub-agents/sub-agent-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAiBqB;AAOrB,wDAA6C;AAE7C,gCAA6C;AAC7C,oDAAgD;AAChD,+CAAyC;AACzC,+BAAkC;AAIlC,wEAAmE;AAEnE,wEAKoC;AAEpC,wDAAgF;AAEhF,8DAA0D;AAC1D,mFAA8E;AAC9E,sEAA6E;AAE7E,wDAA0D;AAC1D,2EAAqE;AAoE9D,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YACkB,cAAsC,EACtC,qBAA4C,EAC5C,iBAAuC,EACvC,MAAc;8BAHd,cAAc;qCACd,qBAAqB;iCACrB,iBAAiB;sBACjB,MAAM;IACrB,CAAC;IAEJ,KAAK,CAAC,GAAG,CACR,OAA6B,EAC7B,OAA2B;QAK3B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAClC,IAAA,+BAAsB,EAAC,QAAQ,CAAC,CAAC;QACjC,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,gBAAgB,CACrB,OAAsC,EACtC,OAA2B,EAC3B,qBAAqB,GAAG,OAAO,CAAC,UAAU;QAE1C,IAAA,+BAAsB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YAChF,MAAM,IAAI,wBAAS,CAAC,gEAAgE,CAAC,CAAC;QACvF,CAAC;QACD,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;QACtF,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAClC;YACC,IAAI,EAAE,QAAQ;YACd,OAAO;YACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,YAAY;YACpB,QAAQ,EAAE,OAAO,CAAC,aAAa;SAC/B,EACD,OAAO,CACP,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CACrB,OAAsC,EACtC,qBAAqB,GAAG,OAAO,CAAC,UAAU;QAE1C,IAAA,+BAAsB,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,IAAI,wBAAS,CAAC,gEAAgE,CAAC,CAAC;QACvF,CAAC;QACD,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;QACtF,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/E,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC9B,SAA8B,EAC9B,OAA2B;QAK3B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAChE,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,EACtE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,mBAAmB,EAAE,OAAO,CAAC,OAAO,KAAK,YAAY,EAAE,CACvF,CAAC;QAKF,MAAM,QAAQ,GACb,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,IAAI,IAAA,SAAI,GAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC7F,MAAM,UAAU,GACf,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QACxF,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAClE,SAAS,EACT,aAAa,CAAC,MAAM,CAAC,QAAQ,EAC7B,OAAO,CAAC,SAAS,CACjB,CAAC;QACF,MAAM,qBAAqB,GAAG,MAAM,wBAAwB,EAAE,CAAC;QAC/D,MAAM,cAAc,GAAG,4BAA4B,CAClD,aAAa,CAAC,MAAM,CAAC,MAAM,EAC3B,OAAO,CAAC,wBAAwB,CAChC,CAAC;QACF,MAAM,WAAW,GAChB,OAAO,CAAC,eAAe,EAAE,6BAA6B,EAAE,CAAC,cAAc,EAAE;YACxE,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ;SACzC,CAAC,IAAI,cAAc,CAAC;QACtB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,qBAAqB,CAAC,6BAA6B,CAAC;YAC3E,MAAM,EAAE,WAAW;YACnB,kBAAkB,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ;YACjD,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;YAC9C,eAAe,EAAE,aAAa,CAAC,eAAe;YAC9C,cAAc,EAAE,aAAa,CAAC,cAAc;YAC5C,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,cAAc,EAAE,WAAW;YAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,yBAAyB,EAAE,OAAO,CAAC,yBAAyB;YAC5D,0BAA0B,EAAE,OAAO,CAAC,aAAa;YACjD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,GAAG,CAAC,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,GAAG,CAAC,OAAO,CAAC,qBAAqB,KAAK,SAAS;gBAC9C,CAAC,CAAC;oBACA,eAAe,EAAE;wBAChB,MAAM,EAAE,OAAO,CAAC,qBAAqB;wBACrC,kBAAkB,EAAE,QAAQ;qBAC5B;iBACD;gBACF,CAAC,CAAC,EAAE,CAAC;SACN,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7D,MAAM,WAAW,GAChB,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,qCAA4B,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACnF,IAAI,WAA+B,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,sCAAiB,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC9D,IAAI,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,qBAAqB,CAAC,sBAAsB,CAAC;oBACjD,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ;oBACtC,QAAQ;oBACR,WAAW;oBACX,QAAQ;iBACR,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QACrC,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC;YACJ,MAAM,gBAAgB,GAAG;gBACxB,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClF,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjD,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC1C,CAAC;YACF,MAAM,YAAY,GACjB,SAAS,CAAC,IAAI,KAAK,KAAK;gBACvB,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,EAAE;oBACtC,GAAG,gBAAgB;oBACnB,WAAW,EAAE;wBACZ,UAAU;wBACV,QAAQ;wBACR,SAAS,EAAE,IAAI;wBACf,GAAG,CAAC,oBAAoB,KAAK,SAAS;4BACrC,CAAC,CAAC;gCACA,YAAY,EAAE,IAAA,wDAA8B,EAAC;oCAC5C,SAAS,EAAE,OAAO,CAAC,SAAS;oCAC5B,aAAa,EAAE,oBAAoB;iCACnC,CAAC;6BACF;4BACF,CAAC,CAAC,EAAE,CAAC;qBACN;iBACD,CAAC;gBACH,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE;oBAC3D,GAAG,gBAAgB;oBACnB,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,UAAU;oBACnC,UAAU,EAAE,SAAS,CAAC,OAAO,CAAC,eAAe;iBAC7C,CAAC,CAAC;YACN,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACjC,QAAQ,CAAC,kBAAkB,CAC1B,SAAS,CAAC,OAAO,CAAC,eAAe,EACjC,SAAS,CAAC,OAAO,CAAC,UAAU,CAC5B,CAAC;YACH,CAAC;YACD,IAAI,CAAC;gBACJ,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,CAClF;oBACC,QAAQ;oBACR,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ;oBACtC,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI;oBAC3C,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,WAAW;oBACX,MAAM,EAAE,UAAU;oBAClB,cAAc,EAAE;wBACf,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC,cAAc;wBAChD,aAAa,EAAE,OAAO,CAAC,aAAa;qBACpC;oBACD,SAAS,EAAE;wBACV,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,aAAa,EAAE,IAAA,4DAA0C,EACxD,aAAa,CAAC,MAAM,CAAC,MAAM,CAC3B;qBACD;iBACD,EACD,SAAS,CACT,CAAC;gBACF,WAAW,GAAG,kBAAkB,CAAC;YAClC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;oBAChE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ;oBACtC,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC7D,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,MAAM,kBAAkB,CACzD,YAAY,EACZ,QAAQ,EACR,OAAO,CAAC,OAAO,CACf,CAAC;YACF,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,KAAK,SAAS,IAAI,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;YAC1F,MAAM,UAAU,GAAG,SAAS;gBAC3B,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,SAAS,CAAC,IAAI,KAAK,QAAQ;oBAC5B,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,SAAS,CAAC;YACd,MAAM,IAAI,CAAC,uBAAuB,CAAC;gBAClC,aAAa,EAAE,aAAa,CAAC,MAAM;gBACnC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,QAAQ;gBACR,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC,cAAc;gBAChD,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,WAAW;gBACX,MAAM,EAAE,aAAa;gBACrB,WAAW;gBACX,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACnD,CAAC,CAAC;YACH,QAAQ,GAAG,IAAI,CAAC;YAEhB,OAAO;gBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,QAAQ;gBACR,MAAM,EAAE,SAAS;oBAChB,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,MAAM,CAAC,YAAY,KAAK,OAAO,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;wBAC9D,CAAC,CAAC,QAAQ;wBACV,CAAC,CAAC,WAAW;gBACf,MAAM;gBACN,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,mBAAmB,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClF,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC3D,MAAM,IAAI,CAAC,uBAAuB,CAAC;oBAClC,aAAa,EAAE,aAAa,CAAC,MAAM;oBACnC,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,QAAQ;oBACR,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC,cAAc;oBAChD,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,WAAW;oBACX,MAAM,EAAE,QAAQ,CAAC,gBAAgB,EAAE;oBACnC,WAAW;oBACX,GAAG,CAAC,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC1E,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;gBAAS,CAAC;YACV,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACnC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,SAAS,CAAC,IAAI,EAAE,EAAE;oBACpE,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;iBAC7D,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACxC,SAA8B,EAC9B,YAAoB,EACpB,SAAiB;QAEjB,IAAI,SAAS,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,0BAA0B,CAAC;YAC3D,IAAI,KAAK,KAAK,SAAS;gBAAE,OAAO,SAAS,CAAC;YAC1C,IAAI,CAAC,IAAA,qDAA2B,EAAC,KAAK,CAAC,EAAE,CAAC;gBACzC,MAAM,IAAI,wBAAS,CAAC,iDAAiD,CAAC,CAAC;YACxE,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CACnD,SAAS,CAAC,OAAO,CAAC,UAAU,EAC5B,YAAY,CACZ,CAAC;QACF,MAAM,KAAK,GAAG,IAAA,wDAA8B,EAAC,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QACpF,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QAC7B,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,wBAAS,CAAC,iDAAiD,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,KAAK,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,MAarC;QACA,MAAM,EACL,aAAa,EACb,SAAS,EACT,QAAQ,EACR,cAAc,EACd,aAAa,EACb,OAAO,EACP,QAAQ,EACR,WAAW,EACX,MAAM,EACN,WAAW,EACX,UAAU,GACV,GAAG,MAAM,CAAC;QAEX,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,WAAW,EAAE;gBAC/D,QAAQ;gBACR,OAAO,EAAE,aAAa,CAAC,QAAQ;gBAC/B,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI;gBACpC,SAAS;gBACT,WAAW;gBACX,MAAM;gBACN,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,MAAM,EAAE,UAAU;gBAClB,cAAc,EAAE;oBACf,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3D,GAAG,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACzD;gBACD,SAAS,EAAE;oBACV,OAAO;oBACP,aAAa,EAAE,IAAA,4DAA0C,EAAC,aAAa,CAAC,MAAM,CAAC;iBAC/E;aACD,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE;gBACvD,OAAO,EAAE,aAAa,CAAC,QAAQ;gBAC/B,QAAQ;gBACR,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;CACD,CAAA;;yBAtVY,cAAc;IAD1B,IAAA,YAAO,GAAE;qCAGyB,kDAAsB,EACf,+CAAqB,EACzB,6CAAoB,EAC/B,uBAAM;GALpB,cAAc,CAsV1B;AAOD,KAAK,UAAU,wBAAwB;IAEtC,MAAM,EAAE,iCAAiC,EAAE,GAAG,MAAM,MAAM,CACzD,4CAA4C,CAC5C,CAAC;IACF,OAAO,cAAS,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;AACzD,CAAC;AAED,KAAK,UAAU,kBAAkB,CAChC,YAA0B,EAC1B,QAA2B,EAC3B,OAAsC;IAEtC,MAAM,cAAc,GAAkD,EAAE,CAAC;IACzE,IAAI,gBAAyB,CAAC;IAE9B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAA,gCAAiB,EAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;QAClE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;QACjB,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC1C,cAAc,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACjF,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACrE,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC3C,CAAC;IACF,CAAC;IAED,MAAM,aAAa,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAC;IAClD,OAAO;QACN,aAAa;QACb,MAAM,EAAE,6BAA6B,CACpC,YAAY,CAAC,KAAK,EAClB,aAAa,EACb,gBAAgB,EAChB,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,EAC7B,cAAc,CACd;KACD,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,aAAqC;IACjE,OAAO;QACN,OAAO,EAAE,aAAa,CAAC,QAAQ;QAC/B,GAAG,CAAC,aAAa,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxF,CAAC;AACH,CAAC;AAED,SAAS,4BAA4B,CACpC,MAA+B,EAC/B,UAAmC;IAEnC,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,IAAI,CAAC,WAAW;QAAE,OAAO,MAAM,CAAC;IAEhC,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CACvC,IAAA,6CAA0B,EAAC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAC3F,CAAC;IACF,OAAO;QACN,GAAG,MAAM;QACT,KAAK,EAAE,WAAW,CAAC,KAAK;QACxB,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,aAAa;KACb,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAC1B,aAAwB,EACxB,qBAA6B;IAE7B,IACC,CAAC,IAAA,oBAAQ,EAAC,aAAa,CAAC;QACxB,OAAO,aAAa,CAAC,OAAO,KAAK,QAAQ;QACzC,aAAa,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAClC,aAAa,CAAC,OAAO,KAAK,qBAAqB,EAC9C,CAAC;QACF,MAAM,IAAI,wBAAS,CAAC,2DAA2D,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC;IAC1C,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,IAAI,wBAAS,CAAC,2DAA2D,CAAC,CAAC;IAClF,CAAC;IACD,OAAO;QACN,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC;AACH,CAAC;AAED,SAAS,6BAA6B,CACrC,KAAa,EACb,MAAqB,EACrB,gBAAyB,EACzB,QAAsC,EACtC,cAAc,GAAkD,EAAE;IAElE,MAAM,QAAQ,GAAG,uBAAuB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAmB;QAC9B,KAAK;QACL,QAAQ;QACR,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI;YACxB,CAAC,CAAC;gBACA,KAAK,EAAE;oBACN,GAAG,MAAM,CAAC,KAAK;oBACf,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAChE;aACD;YACF,CAAC,CAAC,EAAE,CAAC;QACN,GAAG,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,GAAG,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,QAAQ;KACR,CAAC;IACF,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAY;IAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,CAAC;IAE5B,OAAO;QACN;YACC,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SACjC;KACD,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAC3B,KAAa;IAEb,IACC,KAAK,KAAK,MAAM;QAChB,KAAK,KAAK,QAAQ;QAClB,KAAK,KAAK,gBAAgB;QAC1B,KAAK,KAAK,YAAY;QACtB,KAAK,KAAK,OAAO;QACjB,KAAK,KAAK,OAAO;QACjB,KAAK,KAAK,gBAAgB,EACzB,CAAC;QACF,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC"}
|
|
@@ -1,36 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const backend_common_1 = require("@n8n/backend-common");
|
|
3
|
-
const constants_1 = require("@n8n/constants");
|
|
4
|
-
const db_1 = require("@n8n/db");
|
|
5
3
|
const di_1 = require("@n8n/di");
|
|
6
4
|
const n8n_core_1 = require("n8n-core");
|
|
7
5
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
|
+
const evaluations_mapper_1 = require("./evaluations.mapper");
|
|
7
|
+
const global_middleware_1 = require("../../shared/middlewares/global.middleware");
|
|
8
|
+
const pagination_service_1 = require("../../shared/services/pagination.service");
|
|
8
9
|
const conflict_error_1 = require("../../../../errors/response-errors/conflict.error");
|
|
9
10
|
const forbidden_error_1 = require("../../../../errors/response-errors/forbidden.error");
|
|
10
11
|
const not_found_error_1 = require("../../../../errors/response-errors/not-found.error");
|
|
11
|
-
const
|
|
12
|
+
const evaluation_test_run_service_1 = require("../../../../evaluation.ee/evaluation-test-run.service");
|
|
12
13
|
const test_runner_service_ee_1 = require("../../../../evaluation.ee/test-runner/test-runner.service.ee");
|
|
13
14
|
const workflow_finder_service_1 = require("../../../../workflows/workflow-finder.service");
|
|
14
|
-
const evaluations_mapper_1 = require("./evaluations.mapper");
|
|
15
|
-
const global_middleware_1 = require("../../shared/middlewares/global.middleware");
|
|
16
|
-
const pagination_service_1 = require("../../shared/services/pagination.service");
|
|
17
15
|
function assertEvaluationsEnabled() {
|
|
18
16
|
if (di_1.Container.get(backend_common_1.LicenseState).getMaxWorkflowsWithEvaluations() === 0) {
|
|
19
17
|
throw new forbidden_error_1.ForbiddenError('Evaluations are not available on your plan');
|
|
20
18
|
}
|
|
21
19
|
}
|
|
22
|
-
async function assertEvaluationQuotaAvailable(workflowId) {
|
|
23
|
-
const limit = di_1.Container.get(backend_common_1.LicenseState).getMaxWorkflowsWithEvaluations();
|
|
24
|
-
if (limit === constants_1.UNLIMITED_LICENSE_QUOTA)
|
|
25
|
-
return;
|
|
26
|
-
const alreadyCounts = (await di_1.Container.get(db_1.TestRunRepository).countByWorkflowId(workflowId)) > 0;
|
|
27
|
-
if (alreadyCounts)
|
|
28
|
-
return;
|
|
29
|
-
const used = await di_1.Container.get(db_1.WorkflowRepository).getWorkflowsWithEvaluationCount();
|
|
30
|
-
if (used >= limit) {
|
|
31
|
-
throw new payment_required_error_1.PaymentRequiredError(`Evaluation quota exceeded: ${used}/${limit} workflows already have evaluations`);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
20
|
const evaluationsHandlers = {
|
|
35
21
|
getTestRuns: [
|
|
36
22
|
(0, global_middleware_1.publicApiScope)('testRun:list'),
|
|
@@ -39,11 +25,7 @@ const evaluationsHandlers = {
|
|
|
39
25
|
async (req, res) => {
|
|
40
26
|
const { id: workflowId } = req.params;
|
|
41
27
|
const { offset = 0, limit = 100, status } = req.query;
|
|
42
|
-
const
|
|
43
|
-
const [testRuns, count] = await Promise.all([
|
|
44
|
-
testRunRepository.getMany(workflowId, { skip: offset, take: limit }, status),
|
|
45
|
-
testRunRepository.countByWorkflowId(workflowId, status),
|
|
46
|
-
]);
|
|
28
|
+
const { testRuns, count } = await di_1.Container.get(evaluation_test_run_service_1.EvaluationTestRunService).findManyAndCount(workflowId, { offset, limit }, status);
|
|
47
29
|
return res.json({
|
|
48
30
|
data: testRuns.map(evaluations_mapper_1.toTestRunSummaryDto),
|
|
49
31
|
nextCursor: (0, pagination_service_1.encodeNextCursor)({ offset, limit, numberOfTotalRecords: count }),
|
|
@@ -55,7 +37,7 @@ const evaluationsHandlers = {
|
|
|
55
37
|
(0, global_middleware_1.projectScope)('workflow:read', 'workflow'),
|
|
56
38
|
async (req, res) => {
|
|
57
39
|
const { id: workflowId, runId } = req.params;
|
|
58
|
-
const summary = await di_1.Container.get(
|
|
40
|
+
const summary = await di_1.Container.get(evaluation_test_run_service_1.EvaluationTestRunService).findSummaryByWorkflowId(runId, workflowId);
|
|
59
41
|
if (!summary)
|
|
60
42
|
throw new not_found_error_1.NotFoundError('Test run not found');
|
|
61
43
|
return res.json((0, evaluations_mapper_1.toTestRunSummaryDto)({
|
|
@@ -71,14 +53,10 @@ const evaluationsHandlers = {
|
|
|
71
53
|
async (req, res) => {
|
|
72
54
|
const { id: workflowId, runId } = req.params;
|
|
73
55
|
const { offset = 0, limit = 100 } = req.query;
|
|
74
|
-
|
|
56
|
+
const result = await di_1.Container.get(evaluation_test_run_service_1.EvaluationTestRunService).findTestCasesAndCount(runId, workflowId, { offset, limit });
|
|
57
|
+
if (!result)
|
|
75
58
|
throw new not_found_error_1.NotFoundError('Test run not found');
|
|
76
|
-
}
|
|
77
|
-
const testCaseExecutionRepository = di_1.Container.get(db_1.TestCaseExecutionRepository);
|
|
78
|
-
const [testCases, count] = await Promise.all([
|
|
79
|
-
testCaseExecutionRepository.getManyByTestRunId(runId, { skip: offset, take: limit }),
|
|
80
|
-
testCaseExecutionRepository.countByTestRunId(runId),
|
|
81
|
-
]);
|
|
59
|
+
const { testCases, count } = result;
|
|
82
60
|
return res.json({
|
|
83
61
|
data: testCases.map(evaluations_mapper_1.toTestCaseExecutionDto),
|
|
84
62
|
nextCursor: (0, pagination_service_1.encodeNextCursor)({ offset, limit, numberOfTotalRecords: count }),
|
|
@@ -99,7 +77,7 @@ const evaluationsHandlers = {
|
|
|
99
77
|
if (!hasTrigger) {
|
|
100
78
|
throw new conflict_error_1.ConflictError('Workflow has no evaluation trigger');
|
|
101
79
|
}
|
|
102
|
-
await assertEvaluationQuotaAvailable(workflowId);
|
|
80
|
+
await di_1.Container.get(evaluation_test_run_service_1.EvaluationTestRunService).assertEvaluationQuotaAvailable(workflowId);
|
|
103
81
|
const { testRun, finished } = await testRunnerService.startTestRun(req.user, workflowId, 1, {
|
|
104
82
|
via: 'public-api',
|
|
105
83
|
});
|
|
@@ -119,9 +97,7 @@ const evaluationsHandlers = {
|
|
|
119
97
|
const { id: workflowId, runId } = req.params;
|
|
120
98
|
assertEvaluationsEnabled();
|
|
121
99
|
const testRunnerService = di_1.Container.get(test_runner_service_ee_1.TestRunnerService);
|
|
122
|
-
const testRun = await di_1.Container.get(
|
|
123
|
-
where: { id: runId, workflow: { id: workflowId } },
|
|
124
|
-
});
|
|
100
|
+
const testRun = await di_1.Container.get(evaluation_test_run_service_1.EvaluationTestRunService).findOneByIdAndWorkflowId(runId, workflowId);
|
|
125
101
|
if (!testRun)
|
|
126
102
|
throw new not_found_error_1.NotFoundError('Test run not found');
|
|
127
103
|
if (testRunnerService.canBeCancelled(testRun)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluations.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/evaluations/evaluations.handler.ts"],"names":[],"mappings":";AACA,wDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"evaluations.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/evaluations/evaluations.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { InviteUsersRequestDto, RoleChangeRequestDto } from '@n8n/api-types';
|
|
2
2
|
import { type AuthenticatedRequest } from '@n8n/db';
|
|
3
|
-
import type { UserRequest } from '../../../../requests';
|
|
4
3
|
import type { PublicAPIEndpoint } from '../../shared/handler.types';
|
|
4
|
+
import type { UserRequest } from '../../../../requests';
|
|
5
5
|
type Create = AuthenticatedRequest<{}, {}, InviteUsersRequestDto>;
|
|
6
6
|
type Delete = UserRequest.Delete;
|
|
7
7
|
type ChangeRole = AuthenticatedRequest<{
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const api_types_1 = require("@n8n/api-types");
|
|
3
|
-
const db_1 = require("@n8n/db");
|
|
4
3
|
const di_1 = require("@n8n/di");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
4
|
+
const users_mapper_1 = require("./users.mapper");
|
|
5
|
+
const global_middleware_1 = require("../../shared/middlewares/global.middleware");
|
|
6
|
+
const pagination_service_1 = require("../../shared/services/pagination.service");
|
|
7
7
|
const bad_request_error_1 = require("../../../../errors/response-errors/bad-request.error");
|
|
8
8
|
const not_found_error_1 = require("../../../../errors/response-errors/not-found.error");
|
|
9
9
|
const event_service_1 = require("../../../../events/event.service");
|
|
10
|
+
const project_service_ee_1 = require("../../../../services/project.service.ee");
|
|
10
11
|
const user_service_1 = require("../../../../services/user.service");
|
|
11
|
-
const users_service_ee_1 = require("./users.service.ee");
|
|
12
|
-
const global_middleware_1 = require("../../shared/middlewares/global.middleware");
|
|
13
|
-
const pagination_service_1 = require("../../shared/services/pagination.service");
|
|
14
12
|
const usersHandlers = {
|
|
15
13
|
getUser: [
|
|
16
14
|
global_middleware_1.validLicenseWithUserQuota,
|
|
@@ -18,7 +16,7 @@ const usersHandlers = {
|
|
|
18
16
|
async (req, res) => {
|
|
19
17
|
const { includeRole = false } = req.query;
|
|
20
18
|
const { id } = req.params;
|
|
21
|
-
const user = await (
|
|
19
|
+
const user = await di_1.Container.get(user_service_1.UserService).getUser(id);
|
|
22
20
|
if (!user) {
|
|
23
21
|
throw new not_found_error_1.NotFoundError(`Could not find user with id: ${id}`);
|
|
24
22
|
}
|
|
@@ -26,7 +24,7 @@ const usersHandlers = {
|
|
|
26
24
|
userId: req.user.id,
|
|
27
25
|
publicApi: true,
|
|
28
26
|
});
|
|
29
|
-
return res.json((0,
|
|
27
|
+
return res.json((0, users_mapper_1.toPublicApiUser)(user, { includeRole }));
|
|
30
28
|
},
|
|
31
29
|
],
|
|
32
30
|
getUsers: [
|
|
@@ -35,22 +33,22 @@ const usersHandlers = {
|
|
|
35
33
|
global_middleware_1.validCursor,
|
|
36
34
|
async (req, res) => {
|
|
37
35
|
const { offset = 0, limit = 100, includeRole = false, projectId } = req.query;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
const userService = di_1.Container.get(user_service_1.UserService);
|
|
37
|
+
await userService.assertGetUsersAccess(req.user, projectId);
|
|
38
|
+
const userIdsInProject = projectId
|
|
39
|
+
? await di_1.Container.get(project_service_ee_1.ProjectService).findUserIdsByProjectId(projectId)
|
|
41
40
|
: undefined;
|
|
42
|
-
const
|
|
43
|
-
|
|
41
|
+
const { users, count } = await userService.getUsersAndCount({
|
|
42
|
+
ids: userIdsInProject,
|
|
44
43
|
limit,
|
|
45
44
|
offset,
|
|
46
|
-
in: _in,
|
|
47
45
|
});
|
|
48
46
|
di_1.Container.get(event_service_1.EventService).emit('user-retrieved-all-users', {
|
|
49
47
|
userId: req.user.id,
|
|
50
48
|
publicApi: true,
|
|
51
49
|
});
|
|
52
50
|
return res.json({
|
|
53
|
-
data: (0,
|
|
51
|
+
data: (0, users_mapper_1.toPublicApiUser)(users, { includeRole }),
|
|
54
52
|
nextCursor: (0, pagination_service_1.encodeNextCursor)({
|
|
55
53
|
offset,
|
|
56
54
|
limit,
|
|
@@ -66,14 +64,14 @@ const usersHandlers = {
|
|
|
66
64
|
if (error) {
|
|
67
65
|
throw new bad_request_error_1.BadRequestError(error.errors[0]?.message ?? 'Invalid request body');
|
|
68
66
|
}
|
|
69
|
-
const usersInvited = await di_1.Container.get(
|
|
67
|
+
const usersInvited = await di_1.Container.get(user_service_1.UserService).inviteUser(req.user, data);
|
|
70
68
|
return res.status(201).json(usersInvited);
|
|
71
69
|
},
|
|
72
70
|
],
|
|
73
71
|
deleteUser: [
|
|
74
72
|
(0, global_middleware_1.apiKeyHasScopeWithGlobalScopeFallback)({ scope: 'user:delete' }),
|
|
75
73
|
async (req, res) => {
|
|
76
|
-
await di_1.Container.get(
|
|
74
|
+
await di_1.Container.get(user_service_1.UserService).deleteUser(req.user, req.params.id, req.query.transferId);
|
|
77
75
|
return res.status(204).send();
|
|
78
76
|
},
|
|
79
77
|
],
|
|
@@ -85,7 +83,7 @@ const usersHandlers = {
|
|
|
85
83
|
if (validation.error) {
|
|
86
84
|
throw new bad_request_error_1.BadRequestError(validation.error.errors[0]?.message ?? 'Invalid request body');
|
|
87
85
|
}
|
|
88
|
-
await di_1.Container.get(
|
|
86
|
+
await di_1.Container.get(user_service_1.UserService).changeGlobalRole(req.user, req.params.id, validation.data);
|
|
89
87
|
return res.status(204).send();
|
|
90
88
|
},
|
|
91
89
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.handler.ee.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/users/users.handler.ee.ts"],"names":[],"mappings":";AAAA,8CAA6E;
|
|
1
|
+
{"version":3,"file":"users.handler.ee.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/users/users.handler.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { User } from '@n8n/db';
|
|
2
|
+
declare const userProperties: readonly ['id', 'email', 'firstName', 'lastName', 'createdAt', 'updatedAt', 'isPending', 'mfaEnabled'];
|
|
3
|
+
type PublicApiUser = Pick<User, (typeof userProperties)[number]> & {
|
|
4
|
+
role?: string;
|
|
5
|
+
};
|
|
6
|
+
export declare function toPublicApiUser(user: User, options?: {
|
|
7
|
+
includeRole: boolean;
|
|
8
|
+
}): PublicApiUser;
|
|
9
|
+
export declare function toPublicApiUser(users: User[], options?: {
|
|
10
|
+
includeRole: boolean;
|
|
11
|
+
}): PublicApiUser[];
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.toPublicApiUser = toPublicApiUser;
|
|
7
|
+
const pick_1 = __importDefault(require("lodash/pick"));
|
|
8
|
+
const userProperties = [
|
|
9
|
+
'id',
|
|
10
|
+
'email',
|
|
11
|
+
'firstName',
|
|
12
|
+
'lastName',
|
|
13
|
+
'createdAt',
|
|
14
|
+
'updatedAt',
|
|
15
|
+
'isPending',
|
|
16
|
+
'mfaEnabled',
|
|
17
|
+
];
|
|
18
|
+
function mapToPublicApiUser(user, options) {
|
|
19
|
+
const publicApiUser = (0, pick_1.default)(user, ...userProperties);
|
|
20
|
+
return options?.includeRole ? { ...publicApiUser, role: user.role?.slug } : publicApiUser;
|
|
21
|
+
}
|
|
22
|
+
function toPublicApiUser(users, options) {
|
|
23
|
+
return Array.isArray(users)
|
|
24
|
+
? users.map((user) => mapToPublicApiUser(user, options))
|
|
25
|
+
: mapToPublicApiUser(users, options);
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=users.mapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"users.mapper.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/users/users.mapper.ts"],"names":[],"mappings":";;;;;;AACA,uDAA+B;AAE/B,MAAM,cAAc,GAAG;IACtB,IAAI;IACJ,OAAO;IACP,WAAW;IACX,UAAU;IACV,WAAW;IACX,WAAW;IACX,WAAW;IACX,YAAY;CACH,CAAC;AAIX,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAkC;IACzE,MAAM,aAAa,GAAG,IAAA,cAAI,EAAC,IAAI,EAAE,GAAG,cAAc,CAAC,CAAC;IAEpD,OAAO,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;AAC3F,CAAC;AAID,yBACC,KAAoB,EACpB,OAAkC;IAElC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC1B,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -4,5 +4,5 @@ export declare const COMMAND_PUBSUB_CHANNEL = "n8n.commands";
|
|
|
4
4
|
export declare const WORKER_RESPONSE_PUBSUB_CHANNEL = "n8n.worker-response";
|
|
5
5
|
export declare const MCP_RELAY_PUBSUB_CHANNEL = "n8n.mcp-relay";
|
|
6
6
|
export declare const MAX_PUBSUB_PAYLOAD_BYTES: number;
|
|
7
|
-
export declare const SELF_SEND_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-execution-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "workflow-publish-wake-up">;
|
|
8
|
-
export declare const IMMEDIATE_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-execution-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "workflow-publish-wake-up">;
|
|
7
|
+
export declare const SELF_SEND_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-agent-background-job" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-execution-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "workflow-publish-wake-up">;
|
|
8
|
+
export declare const IMMEDIATE_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-agent-background-job" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-execution-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "workflow-publish-wake-up">;
|
|
@@ -19,6 +19,7 @@ exports.IMMEDIATE_COMMANDS = new Set([
|
|
|
19
19
|
'relay-chat-stream-event',
|
|
20
20
|
'relay-agent-execution-update',
|
|
21
21
|
'resume-agent-workflow-tool',
|
|
22
|
+
'cancel-agent-background-job',
|
|
22
23
|
'relay-instance-ai-event',
|
|
23
24
|
'relay-instance-ai-task-control',
|
|
24
25
|
'agent-chat-subscription-changed',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/scaling/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,MAAM,CAAC;AAEpB,QAAA,aAAa,GAAG,KAAK,CAAC;AAGtB,QAAA,sBAAsB,GAAG,cAAc,CAAC;AAGxC,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAGvD,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAM3C,QAAA,wBAAwB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAK3C,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAE7B,0BAA0B;CAC1B,CAAC,CAAC;AAMU,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAC7B,iCAAiC;IACjC,yBAAyB;IACzB,8BAA8B;IAC9B,4BAA4B;IAC5B,yBAAyB;IACzB,gCAAgC;IAChC,iCAAiC;IACjC,gCAAgC;IAGhC,mCAAmC;IACnC,kCAAkC;IAClC,iBAAiB;IACjB,gBAAgB;IAChB,6BAA6B;IAC7B,+BAA+B;IAC/B,mCAAmC;IACnC,qCAAqC;IACrC,0BAA0B;CAC1B,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/scaling/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,MAAM,CAAC;AAEpB,QAAA,aAAa,GAAG,KAAK,CAAC;AAGtB,QAAA,sBAAsB,GAAG,cAAc,CAAC;AAGxC,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAGvD,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAM3C,QAAA,wBAAwB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAK3C,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAE7B,0BAA0B;CAC1B,CAAC,CAAC;AAMU,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAC7B,iCAAiC;IACjC,yBAAyB;IACzB,8BAA8B;IAC9B,4BAA4B;IAC5B,6BAA6B;IAC7B,yBAAyB;IACzB,gCAAgC;IAChC,iCAAiC;IACjC,gCAAgC;IAGhC,mCAAmC;IACnC,kCAAkC;IAClC,iBAAiB;IACjB,gBAAgB;IAChB,6BAA6B;IAC7B,+BAA+B;IAC/B,mCAAmC;IACnC,qCAAqC;IACrC,0BAA0B;CAC1B,CAAC,CAAC"}
|
|
@@ -39,6 +39,7 @@ export declare namespace PubSub {
|
|
|
39
39
|
type RelayExecutionLifecycleEvent = ToCommand<'relay-execution-lifecycle-event'>;
|
|
40
40
|
type RelayAgentExecutionUpdate = ToCommand<'relay-agent-execution-update'>;
|
|
41
41
|
type ResumeAgentWorkflowTool = ToCommand<'resume-agent-workflow-tool'>;
|
|
42
|
+
type CancelAgentBackgroundJob = ToCommand<'cancel-agent-background-job'>;
|
|
42
43
|
type RelayChatStreamEvent = ToCommand<'relay-chat-stream-event'>;
|
|
43
44
|
type RelayInstanceAiEvent = ToCommand<'relay-instance-ai-event'>;
|
|
44
45
|
type RelayInstanceAiTaskControl = ToCommand<'relay-instance-ai-task-control'>;
|
|
@@ -60,7 +61,7 @@ export declare namespace PubSub {
|
|
|
60
61
|
type AgentTasksChanged = ToCommand<'agent-tasks-changed'>;
|
|
61
62
|
type RedactionFloorChanged = ToCommand<'redaction-floor-changed'>;
|
|
62
63
|
}
|
|
63
|
-
export type Command = Commands.ReloadLicense | Commands.RestartEventBus | Commands.ReloadExternalSecretsProviders | Commands.CommunityPackageInstall | Commands.CommunityPackageUpdate | Commands.CommunityPackageUninstall | Commands.GetWorkerId | Commands.GetWorkerStatus | Commands.StopExecution | Commands.AddWebhooksTriggersAndPollers | Commands.RemoveTriggersAndPollers | Commands.DisplayWorkflowActivation | Commands.DisplayWorkflowDeactivation | Commands.DisplayWorkflowActivationError | Commands.DisplayWorkflowPublicationStatus | Commands.WorkflowPublishWakeUp | Commands.RelayExecutionLifecycleEvent | Commands.RelayAgentExecutionUpdate | Commands.ResumeAgentWorkflowTool | Commands.RelayChatStreamEvent | Commands.RelayInstanceAiEvent | Commands.RelayInstanceAiTaskControl | Commands.RelayChatHumanMessage | Commands.RelayChatMessageEdit | Commands.ClearTestWebhooks | Commands.ReloadOIDCConfiguration | Commands.ReloadSamlConfiguration | Commands.ReloadCredentialsOverwrites | Commands.ReloadSsoProvisioningConfiguration | Commands.ReloadSourceControlConfiguration | Commands.ReloadMcpRegistry | Commands.ReloadOtelConfig | Commands.ReloadInstanceAiSettings | Commands.CancelTestRun | Commands.CancelCollection | Commands.AgentChatIntegrationChanged | Commands.AgentChatSubscriptionChanged | Commands.AgentChatLeaderChannelRequest | Commands.AgentChatLeaderChannelResult | Commands.AgentConfigChanged | Commands.AgentTasksChanged | Commands.RedactionFloorChanged;
|
|
64
|
+
export type Command = Commands.ReloadLicense | Commands.RestartEventBus | Commands.ReloadExternalSecretsProviders | Commands.CommunityPackageInstall | Commands.CommunityPackageUpdate | Commands.CommunityPackageUninstall | Commands.GetWorkerId | Commands.GetWorkerStatus | Commands.StopExecution | Commands.AddWebhooksTriggersAndPollers | Commands.RemoveTriggersAndPollers | Commands.DisplayWorkflowActivation | Commands.DisplayWorkflowDeactivation | Commands.DisplayWorkflowActivationError | Commands.DisplayWorkflowPublicationStatus | Commands.WorkflowPublishWakeUp | Commands.RelayExecutionLifecycleEvent | Commands.RelayAgentExecutionUpdate | Commands.ResumeAgentWorkflowTool | Commands.CancelAgentBackgroundJob | Commands.RelayChatStreamEvent | Commands.RelayInstanceAiEvent | Commands.RelayInstanceAiTaskControl | Commands.RelayChatHumanMessage | Commands.RelayChatMessageEdit | Commands.ClearTestWebhooks | Commands.ReloadOIDCConfiguration | Commands.ReloadSamlConfiguration | Commands.ReloadCredentialsOverwrites | Commands.ReloadSsoProvisioningConfiguration | Commands.ReloadSourceControlConfiguration | Commands.ReloadMcpRegistry | Commands.ReloadOtelConfig | Commands.ReloadInstanceAiSettings | Commands.CancelTestRun | Commands.CancelCollection | Commands.AgentChatIntegrationChanged | Commands.AgentChatSubscriptionChanged | Commands.AgentChatLeaderChannelRequest | Commands.AgentChatLeaderChannelResult | Commands.AgentConfigChanged | Commands.AgentTasksChanged | Commands.RedactionFloorChanged;
|
|
64
65
|
type _ToWorkerResponse<WorkerResponseKey extends keyof PubSubWorkerResponseMap> = {
|
|
65
66
|
senderId: string;
|
|
66
67
|
targets?: string[];
|
|
@@ -144,6 +144,7 @@ export declare class ProjectService {
|
|
|
144
144
|
getProject(projectId: string): Promise<Project>;
|
|
145
145
|
findProject(projectId: string): Promise<Project | null>;
|
|
146
146
|
getProjectRelations(projectId: string): Promise<ProjectRelation[]>;
|
|
147
|
+
findUserIdsByProjectId(projectId: string): Promise<string[]>;
|
|
147
148
|
getProjectRelationForUserAndProject(userId: string, projectId: string): Promise<ProjectRelation | null>;
|
|
148
149
|
getProjectMembersAndCount(projectId: string, { offset, limit }: {
|
|
149
150
|
offset: number;
|
|
@@ -600,6 +600,9 @@ let ProjectService = class ProjectService {
|
|
|
600
600
|
relations: { user: true, role: true },
|
|
601
601
|
});
|
|
602
602
|
}
|
|
603
|
+
async findUserIdsByProjectId(projectId) {
|
|
604
|
+
return await this.projectRelationRepository.findUserIdsByProjectId(projectId);
|
|
605
|
+
}
|
|
603
606
|
async getProjectRelationForUserAndProject(userId, projectId) {
|
|
604
607
|
return await this.projectRelationRepository.findOne({
|
|
605
608
|
where: { projectId, userId },
|