@exellix/ai-tasks 7.8.2 → 8.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/BREAKING-CHANGES.md +24 -0
- package/README.md +10 -7
- package/RUNTASK_REQUEST.md +3 -3
- package/dist/builders/task-request-builder.d.ts +14 -21
- package/dist/builders/task-request-builder.d.ts.map +1 -1
- package/dist/builders/task-request-builder.js +33 -20
- package/dist/builders/task-request-builder.js.map +1 -1
- package/dist/compile/compileTaskConfiguration.d.ts.map +1 -1
- package/dist/compile/compileTaskConfiguration.js +3 -4
- package/dist/compile/compileTaskConfiguration.js.map +1 -1
- package/dist/core/task-sdk.d.ts.map +1 -1
- package/dist/core/task-sdk.js +4 -5
- package/dist/core/task-sdk.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/post-steps/audit/runAudit.d.ts.map +1 -1
- package/dist/post-steps/audit/runAudit.js +2 -1
- package/dist/post-steps/audit/runAudit.js.map +1 -1
- package/dist/strategies/direct-execution-strategy.d.ts.map +1 -1
- package/dist/strategies/direct-execution-strategy.js +3 -12
- package/dist/strategies/direct-execution-strategy.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/model-config.d.ts +30 -0
- package/dist/types/model-config.d.ts.map +1 -0
- package/dist/types/model-config.js +82 -0
- package/dist/types/model-config.js.map +1 -0
- package/dist/utils/routeModelConfigSlots.d.ts +2 -0
- package/dist/utils/routeModelConfigSlots.d.ts.map +1 -0
- package/dist/utils/routeModelConfigSlots.js +2 -0
- package/dist/utils/routeModelConfigSlots.js.map +1 -0
- package/dist/validation/helpers.d.ts +6 -0
- package/dist/validation/helpers.d.ts.map +1 -1
- package/dist/validation/helpers.js +95 -1
- package/dist/validation/helpers.js.map +1 -1
- package/dist/validation/validateRunTaskConfig.d.ts.map +1 -1
- package/dist/validation/validateRunTaskConfig.js +2 -2
- package/dist/validation/validateRunTaskConfig.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@ import { SkillExecutionTraceError } from "@exellix/ai-skills";
|
|
|
2
2
|
import { ExecutionType } from "../types/executionType.js";
|
|
3
3
|
import { LlmCallContextError } from "../types/llmCall.js";
|
|
4
4
|
import { pickRunSkillRequestFields } from "../utils/bridgeRunSkillGatewayMemory.js";
|
|
5
|
+
import { buildAiSkillsModelConfigForMain } from "../utils/routeModelConfigSlots.js";
|
|
5
6
|
/**
|
|
6
7
|
* Direct execution strategy.
|
|
7
8
|
*
|
|
@@ -33,18 +34,8 @@ export class DirectExecutionStrategy {
|
|
|
33
34
|
const coreSkillId = taskRequest.coreSkillId;
|
|
34
35
|
const traceMode = taskRequest.executionMode === "trace";
|
|
35
36
|
const skillBase = pickRunSkillRequestFields(taskRequest);
|
|
36
|
-
//
|
|
37
|
-
|
|
38
|
-
const baseModelConfig = skillBase.modelConfig ?? undefined;
|
|
39
|
-
const overlayedModelConfig = llmCall || baseModelConfig
|
|
40
|
-
? {
|
|
41
|
-
...(baseModelConfig ?? {}),
|
|
42
|
-
...(llmCall?.model !== undefined ? { model: llmCall.model } : {}),
|
|
43
|
-
...(llmCall?.temperature !== undefined ? { temperature: llmCall.temperature } : {}),
|
|
44
|
-
...(llmCall?.topP !== undefined ? { topP: llmCall.topP } : {}),
|
|
45
|
-
...(llmCall?.maxTokensCap !== undefined ? { maxTokens: llmCall.maxTokensCap } : {}),
|
|
46
|
-
}
|
|
47
|
-
: undefined;
|
|
37
|
+
// Route canonical slot pair → ai-skills `{ model, ...tuning }` at execution boundary only.
|
|
38
|
+
const overlayedModelConfig = buildAiSkillsModelConfigForMain(skillBase.modelConfig, llmCall);
|
|
48
39
|
const effectiveTimeoutMs = llmCall?.timeoutMs ?? skillBase.timeoutMs;
|
|
49
40
|
const runSkillRequest = {
|
|
50
41
|
...skillBase,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct-execution-strategy.js","sourceRoot":"","sources":["../../src/strategies/direct-execution-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAQ1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAEpF;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAO,uBAAuB;IAC1B,MAAM,CAAsB;IAEpC,YAAY,MAA+C;QACzD,IAAI,CAAC,MAAM,GAAG,MAA6B,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAO,CACX,OAAuB;QAEvB,MAAM,WAAW,GAAmB,EAAE,GAAG,OAAO,EAAE,CAAC;QAEnD,gHAAgH;QAChH,+FAA+F;QAC/F,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAChC,MAAM,WAAW,GAAI,WAAmB,CAAC,WAAW,CAAC;QACrD,MAAM,SAAS,GAAG,WAAW,CAAC,aAAa,KAAK,OAAO,CAAC;QACxD,MAAM,SAAS,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAC;QACzD,
|
|
1
|
+
{"version":3,"file":"direct-execution-strategy.js","sourceRoot":"","sources":["../../src/strategies/direct-execution-strategy.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -24,5 +24,6 @@ export type { NarrixModeKey } from "../task-strategies/canonicalNarrixModes.js";
|
|
|
24
24
|
export type { InputStrategyKey, ExecutionStrategyKey } from "../task-strategies/canonicalInputExecutionStrategies.js";
|
|
25
25
|
export type { NarrixRunInput, NarrixEnrichedAttachment } from "../narrix/types.js";
|
|
26
26
|
export type { ExellixSkillsClientOptions as WorexClientSkillsOptions, RunSkillRequest, ModelConfig, TemplateRenderOptions, GatewayTemplateTokens, } from "@exellix/ai-skills";
|
|
27
|
+
export type { RunTaskModelConfig } from "./model-config.js";
|
|
27
28
|
export type { JobHistory, TaskHistory } from "@x12i/execution-memory-manager";
|
|
28
29
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { LlmCallConfig } from "./llmCall.js";
|
|
2
|
+
/** Canonical resolved model pair on {@link RunTaskRequest} (graph-engine 7.x+). */
|
|
3
|
+
export interface RunTaskModelConfig {
|
|
4
|
+
xynthesisModel: string;
|
|
5
|
+
skillModel: string;
|
|
6
|
+
temperature?: number;
|
|
7
|
+
maxTokens?: number;
|
|
8
|
+
topP?: number;
|
|
9
|
+
frequencyPenalty?: number;
|
|
10
|
+
presencePenalty?: number;
|
|
11
|
+
[key: string]: unknown;
|
|
12
|
+
}
|
|
13
|
+
export declare const MODEL_CONFIG_SLOT_KEYS: readonly ["xynthesisModel", "skillModel"];
|
|
14
|
+
export declare function isRecord(v: unknown): v is Record<string, unknown>;
|
|
15
|
+
/** True when the value looks like a concrete provider model id (post alias resolution). */
|
|
16
|
+
export declare function isConcreteModelId(value: string): boolean;
|
|
17
|
+
/** True when the value looks like an unresolved graph profile alias. */
|
|
18
|
+
export declare function isAliasLikeModelValue(value: string): boolean;
|
|
19
|
+
export declare function getSkillModelFromSlots(modelConfig: unknown): string | undefined;
|
|
20
|
+
export declare function getXynthesisModelFromSlots(modelConfig: unknown): string | undefined;
|
|
21
|
+
/** Tuning fields from slot-based modelConfig (excludes slot keys and legacy `model`). */
|
|
22
|
+
export declare function modelConfigTuningPassthrough(modelConfig: Record<string, unknown> | undefined): Record<string, unknown>;
|
|
23
|
+
/**
|
|
24
|
+
* Build ai-skills-facing `modelConfig` for MAIN: `{ model, ...tuning }`.
|
|
25
|
+
* Does not mutate the inbound slot pair on the request.
|
|
26
|
+
*/
|
|
27
|
+
export declare function buildAiSkillsModelConfigForMain(modelConfig: Record<string, unknown> | undefined, llmCall?: LlmCallConfig): Record<string, unknown> | undefined;
|
|
28
|
+
/** Resolve PRE synthesis model from slots and optional overrides. */
|
|
29
|
+
export declare function resolveXynthesisModelForPre(modelConfig: unknown, llmCall?: LlmCallConfig): string | undefined;
|
|
30
|
+
//# sourceMappingURL=model-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-config.d.ts","sourceRoot":"","sources":["../../src/types/model-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,mFAAmF;AACnF,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,sBAAsB,2CAA4C,CAAC;AAiBhF,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEjE;AAED,2FAA2F;AAC3F,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,wEAAwE;AACxE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAK5D;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAI/E;AAED,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAInF;AAID,yFAAyF;AACzF,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAC/C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOzB;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAChD,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAYrC;AAED,qEAAqE;AACrE,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,OAAO,EACpB,OAAO,CAAC,EAAE,aAAa,GACtB,MAAM,GAAG,SAAS,CAEpB"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
export const MODEL_CONFIG_SLOT_KEYS = ["xynthesisModel", "skillModel"];
|
|
2
|
+
const KNOWN_PROFILE_ALIASES = new Set(["strong", "weak", "default"]);
|
|
3
|
+
const KNOWN_PROVIDER_PREFIXES = [
|
|
4
|
+
"openrouter/",
|
|
5
|
+
"anthropic/",
|
|
6
|
+
"openai/",
|
|
7
|
+
"google/",
|
|
8
|
+
"x-ai/",
|
|
9
|
+
"meta-llama/",
|
|
10
|
+
"mistral/",
|
|
11
|
+
"cohere/",
|
|
12
|
+
"deepseek/",
|
|
13
|
+
"groq/",
|
|
14
|
+
];
|
|
15
|
+
export function isRecord(v) {
|
|
16
|
+
return !!v && typeof v === "object" && !Array.isArray(v);
|
|
17
|
+
}
|
|
18
|
+
/** True when the value looks like a concrete provider model id (post alias resolution). */
|
|
19
|
+
export function isConcreteModelId(value) {
|
|
20
|
+
const trimmed = value.trim();
|
|
21
|
+
if (!trimmed)
|
|
22
|
+
return false;
|
|
23
|
+
if (trimmed.includes("/"))
|
|
24
|
+
return true;
|
|
25
|
+
return KNOWN_PROVIDER_PREFIXES.some((p) => trimmed.startsWith(p));
|
|
26
|
+
}
|
|
27
|
+
/** True when the value looks like an unresolved graph profile alias. */
|
|
28
|
+
export function isAliasLikeModelValue(value) {
|
|
29
|
+
const trimmed = value.trim();
|
|
30
|
+
if (!trimmed)
|
|
31
|
+
return false;
|
|
32
|
+
if (trimmed.includes("/"))
|
|
33
|
+
return false;
|
|
34
|
+
return KNOWN_PROFILE_ALIASES.has(trimmed.toLowerCase());
|
|
35
|
+
}
|
|
36
|
+
export function getSkillModelFromSlots(modelConfig) {
|
|
37
|
+
if (!isRecord(modelConfig))
|
|
38
|
+
return undefined;
|
|
39
|
+
const v = modelConfig.skillModel;
|
|
40
|
+
return typeof v === "string" && v.trim() ? v.trim() : undefined;
|
|
41
|
+
}
|
|
42
|
+
export function getXynthesisModelFromSlots(modelConfig) {
|
|
43
|
+
if (!isRecord(modelConfig))
|
|
44
|
+
return undefined;
|
|
45
|
+
const v = modelConfig.xynthesisModel;
|
|
46
|
+
return typeof v === "string" && v.trim() ? v.trim() : undefined;
|
|
47
|
+
}
|
|
48
|
+
const SLOT_AND_LEGACY_KEYS = new Set(["model", "xynthesisModel", "skillModel"]);
|
|
49
|
+
/** Tuning fields from slot-based modelConfig (excludes slot keys and legacy `model`). */
|
|
50
|
+
export function modelConfigTuningPassthrough(modelConfig) {
|
|
51
|
+
if (!modelConfig)
|
|
52
|
+
return {};
|
|
53
|
+
const out = {};
|
|
54
|
+
for (const [k, v] of Object.entries(modelConfig)) {
|
|
55
|
+
if (!SLOT_AND_LEGACY_KEYS.has(k))
|
|
56
|
+
out[k] = v;
|
|
57
|
+
}
|
|
58
|
+
return out;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Build ai-skills-facing `modelConfig` for MAIN: `{ model, ...tuning }`.
|
|
62
|
+
* Does not mutate the inbound slot pair on the request.
|
|
63
|
+
*/
|
|
64
|
+
export function buildAiSkillsModelConfigForMain(modelConfig, llmCall) {
|
|
65
|
+
const skillModel = getSkillModelFromSlots(modelConfig);
|
|
66
|
+
const tuning = modelConfigTuningPassthrough(modelConfig);
|
|
67
|
+
const model = llmCall?.model ?? skillModel;
|
|
68
|
+
if (!model && !llmCall && Object.keys(tuning).length === 0)
|
|
69
|
+
return undefined;
|
|
70
|
+
return {
|
|
71
|
+
...tuning,
|
|
72
|
+
...(model ? { model } : {}),
|
|
73
|
+
...(llmCall?.temperature !== undefined ? { temperature: llmCall.temperature } : {}),
|
|
74
|
+
...(llmCall?.topP !== undefined ? { topP: llmCall.topP } : {}),
|
|
75
|
+
...(llmCall?.maxTokensCap !== undefined ? { maxTokens: llmCall.maxTokensCap } : {}),
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
/** Resolve PRE synthesis model from slots and optional overrides. */
|
|
79
|
+
export function resolveXynthesisModelForPre(modelConfig, llmCall) {
|
|
80
|
+
return llmCall?.model ?? getXynthesisModelFromSlots(modelConfig);
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=model-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-config.js","sourceRoot":"","sources":["../../src/types/model-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routeModelConfigSlots.d.ts","sourceRoot":"","sources":["../../src/utils/routeModelConfigSlots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,GAC5B,MAAM,0BAA0B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routeModelConfigSlots.js","sourceRoot":"","sources":["../../src/utils/routeModelConfigSlots.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,GAC5B,MAAM,0BAA0B,CAAC"}
|
|
@@ -11,5 +11,11 @@ export declare function resolvePathInValidationContext(context: Record<string, u
|
|
|
11
11
|
export declare function valueIsPresent(v: unknown): boolean;
|
|
12
12
|
export declare function previewValue(v: unknown, max?: number): string | undefined;
|
|
13
13
|
export declare function validateLlmCallFields(llmCall: unknown, basePath: string, issues: RunTaskValidationIssue[]): void;
|
|
14
|
+
/**
|
|
15
|
+
* Validate canonical {@link RunTaskRequest.modelConfig}: `xynthesisModel` + `skillModel` only.
|
|
16
|
+
* Rejects legacy `model` and unresolved profile aliases.
|
|
17
|
+
*/
|
|
18
|
+
export declare function validateRunTaskModelConfig(modelConfig: unknown, basePath: string, issues: RunTaskValidationIssue[]): void;
|
|
19
|
+
/** Pipeline / step-level modelConfig (may use `model` on internal synthesis configs). */
|
|
14
20
|
export declare function validateModelConfigFields(modelConfig: unknown, basePath: string, issues: RunTaskValidationIssue[]): void;
|
|
15
21
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAG7D,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EAC1B,MAAM,YAAY,CAAC;AAEpB,wBAAgB,SAAS,CACvB,MAAM,EAAE,sBAAsB,EAAE,EAChC,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,UAAU,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,yBAAyB,CAAA;CAAE,GACzF,IAAI,CAEN;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,sBAAsB,EAAE,GAAG,uBAAuB,CASlG;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAExD;AAED,oGAAoG;AACpG,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA4B1F;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,IAAI,EAAE,MAAM,GACX,OAAO,CAST;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAMlD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,SAAM,GAAG,MAAM,GAAG,SAAS,CAatE;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,sBAAsB,EAAE,GAC/B,IAAI,CA2EN;AA4CD;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,sBAAsB,EAAE,GAC/B,IAAI,CAoCN;AAED,yFAAyF;AACzF,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,sBAAsB,EAAE,GAC/B,IAAI,CA2CN"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isAliasLikeModelValue, isConcreteModelId, isRecord, } from "../types/model-config.js";
|
|
1
2
|
import { getByPath } from "../utils/jsonPaths.js";
|
|
2
3
|
import { resolveXynthesizedSmartInputPath } from "../utils/xynthesizedSmartInputPaths.js";
|
|
3
4
|
export function pushIssue(issues, issue) {
|
|
@@ -154,10 +155,86 @@ export function validateLlmCallFields(llmCall, basePath, issues) {
|
|
|
154
155
|
}
|
|
155
156
|
}
|
|
156
157
|
}
|
|
158
|
+
function validateModelConfigSlot(value, slotPath, issues, options) {
|
|
159
|
+
if (value === undefined)
|
|
160
|
+
return;
|
|
161
|
+
if (typeof value !== "string") {
|
|
162
|
+
pushIssue(issues, {
|
|
163
|
+
code: "MODEL_CONFIG_SLOT_INVALID",
|
|
164
|
+
path: slotPath,
|
|
165
|
+
message: `${slotPath} must be a non-empty string when set.`,
|
|
166
|
+
});
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
if (!value.trim()) {
|
|
170
|
+
pushIssue(issues, {
|
|
171
|
+
code: "MODEL_CONFIG_SLOT_INVALID",
|
|
172
|
+
path: slotPath,
|
|
173
|
+
message: `${slotPath} must be non-empty when set.`,
|
|
174
|
+
});
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
177
|
+
if (!options.requireConcrete)
|
|
178
|
+
return;
|
|
179
|
+
if (isAliasLikeModelValue(value)) {
|
|
180
|
+
pushIssue(issues, {
|
|
181
|
+
code: "MODEL_CONFIG_NOT_RESOLVED",
|
|
182
|
+
path: slotPath,
|
|
183
|
+
message: `${slotPath} must be a concrete provider model id; profile aliases are resolved by graph-engine or the host before runTask.`,
|
|
184
|
+
});
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
if (!isConcreteModelId(value)) {
|
|
188
|
+
pushIssue(issues, {
|
|
189
|
+
code: "MODEL_CONFIG_NOT_CONCRETE",
|
|
190
|
+
path: slotPath,
|
|
191
|
+
message: `${slotPath} must look like a concrete provider model id (e.g. contain "/" or a known provider prefix).`,
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
/**
|
|
196
|
+
* Validate canonical {@link RunTaskRequest.modelConfig}: `xynthesisModel` + `skillModel` only.
|
|
197
|
+
* Rejects legacy `model` and unresolved profile aliases.
|
|
198
|
+
*/
|
|
199
|
+
export function validateRunTaskModelConfig(modelConfig, basePath, issues) {
|
|
200
|
+
if (modelConfig === undefined || modelConfig === null)
|
|
201
|
+
return;
|
|
202
|
+
if (!isRecord(modelConfig)) {
|
|
203
|
+
pushIssue(issues, {
|
|
204
|
+
code: "MODEL_CONFIG_NOT_OBJECT",
|
|
205
|
+
path: basePath,
|
|
206
|
+
message: `${basePath} must be a plain object when provided.`,
|
|
207
|
+
});
|
|
208
|
+
return;
|
|
209
|
+
}
|
|
210
|
+
if (modelConfig.model !== undefined) {
|
|
211
|
+
pushIssue(issues, {
|
|
212
|
+
code: "NON_CANONICAL_MODEL_CONFIG",
|
|
213
|
+
path: `${basePath}.model`,
|
|
214
|
+
message: `${basePath}.model is not accepted on RunTaskRequest; use skillModel and xynthesisModel (concrete provider ids after alias resolution).`,
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
const hasXynthesis = modelConfig.xynthesisModel !== undefined;
|
|
218
|
+
const hasSkill = modelConfig.skillModel !== undefined;
|
|
219
|
+
if (!hasXynthesis || !hasSkill) {
|
|
220
|
+
pushIssue(issues, {
|
|
221
|
+
code: "MODEL_CONFIG_SLOTS_REQUIRED",
|
|
222
|
+
path: basePath,
|
|
223
|
+
message: `${basePath} must include both xynthesisModel and skillModel when modelConfig is set.`,
|
|
224
|
+
});
|
|
225
|
+
}
|
|
226
|
+
validateModelConfigSlot(modelConfig.xynthesisModel, `${basePath}.xynthesisModel`, issues, {
|
|
227
|
+
requireConcrete: true,
|
|
228
|
+
});
|
|
229
|
+
validateModelConfigSlot(modelConfig.skillModel, `${basePath}.skillModel`, issues, {
|
|
230
|
+
requireConcrete: true,
|
|
231
|
+
});
|
|
232
|
+
}
|
|
233
|
+
/** Pipeline / step-level modelConfig (may use `model` on internal synthesis configs). */
|
|
157
234
|
export function validateModelConfigFields(modelConfig, basePath, issues) {
|
|
158
235
|
if (modelConfig === undefined || modelConfig === null)
|
|
159
236
|
return;
|
|
160
|
-
if (
|
|
237
|
+
if (!isRecord(modelConfig)) {
|
|
161
238
|
pushIssue(issues, {
|
|
162
239
|
code: "MODEL_CONFIG_NOT_OBJECT",
|
|
163
240
|
path: basePath,
|
|
@@ -165,6 +242,23 @@ export function validateModelConfigFields(modelConfig, basePath, issues) {
|
|
|
165
242
|
});
|
|
166
243
|
return;
|
|
167
244
|
}
|
|
245
|
+
const hasSlots = modelConfig.xynthesisModel !== undefined || modelConfig.skillModel !== undefined;
|
|
246
|
+
if (hasSlots) {
|
|
247
|
+
validateModelConfigSlot(modelConfig.xynthesisModel, `${basePath}.xynthesisModel`, issues, {
|
|
248
|
+
requireConcrete: false,
|
|
249
|
+
});
|
|
250
|
+
validateModelConfigSlot(modelConfig.skillModel, `${basePath}.skillModel`, issues, {
|
|
251
|
+
requireConcrete: false,
|
|
252
|
+
});
|
|
253
|
+
if (modelConfig.model !== undefined) {
|
|
254
|
+
pushIssue(issues, {
|
|
255
|
+
code: "NON_CANONICAL_MODEL_CONFIG",
|
|
256
|
+
path: `${basePath}.model`,
|
|
257
|
+
message: `${basePath} must not combine legacy model with xynthesisModel/skillModel slots.`,
|
|
258
|
+
});
|
|
259
|
+
}
|
|
260
|
+
return;
|
|
261
|
+
}
|
|
168
262
|
const m = modelConfig.model;
|
|
169
263
|
if (m !== undefined && typeof m !== "string") {
|
|
170
264
|
pushIssue(issues, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateRunTaskConfig.d.ts","sourceRoot":"","sources":["../../src/validation/validateRunTaskConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,cAAc,EAAmB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"validateRunTaskConfig.d.ts","sourceRoot":"","sources":["../../src/validation/validateRunTaskConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,cAAc,EAAmB,MAAM,wBAAwB,CAAC;AAe7F,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AA4E1D;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,GAAG,uBAAuB,CA0FtF"}
|
|
@@ -4,7 +4,7 @@ import { isTaskConfigurationCompileError } from "../errors/taskConfigurationComp
|
|
|
4
4
|
import { collectExecutionPipelineWarnings } from "../utils/runTaskRequestShape.js";
|
|
5
5
|
import { resolveRunTaskRuntimeKnobs } from "../internal/resolveRunTaskRuntimeKnobs.js";
|
|
6
6
|
import { collectSmartInputValidationIssues } from "./collectSmartInputValidationIssues.js";
|
|
7
|
-
import { finalizeValidationResult, isNonEmptyString, pushIssue, validateLlmCallFields, validateModelConfigFields, } from "./helpers.js";
|
|
7
|
+
import { finalizeValidationResult, isNonEmptyString, pushIssue, validateLlmCallFields, validateModelConfigFields, validateRunTaskModelConfig, } from "./helpers.js";
|
|
8
8
|
function validateExecutionPipeline(pipeline, issues) {
|
|
9
9
|
if (!pipeline?.length)
|
|
10
10
|
return;
|
|
@@ -137,7 +137,7 @@ export function validateRunTaskConfig(request) {
|
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
issues.push(...collectSmartInputValidationIssues(resolved.smartInput, skillKey));
|
|
140
|
-
|
|
140
|
+
validateRunTaskModelConfig(resolved.modelConfig, "modelConfig", issues);
|
|
141
141
|
validateLlmCallFields(resolved.llmCall, "llmCall", issues);
|
|
142
142
|
if (resolved.timeoutMs !== undefined) {
|
|
143
143
|
if (typeof resolved.timeoutMs !== "number" || !Number.isFinite(resolved.timeoutMs) || resolved.timeoutMs < 1) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateRunTaskConfig.js","sourceRoot":"","sources":["../../src/validation/validateRunTaskConfig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,wCAAwC,EAAE,MAAM,wCAAwC,CAAC;AAClG,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,gCAAgC,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,iCAAiC,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACrB,yBAAyB,
|
|
1
|
+
{"version":3,"file":"validateRunTaskConfig.js","sourceRoot":"","sources":["../../src/validation/validateRunTaskConfig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@exellix/ai-tasks",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0",
|
|
4
4
|
"description": "Task orchestration for the Exellix stack: runTask() with local handlers or LLM-backed execution, task-scoped memory/context enrichment, and executor dispatch via @exellix/ai-skills. ERC-compliant.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|