@bian-womp/spark-graph 0.2.57 → 0.2.59
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/lib/cjs/index.cjs +110 -8
- package/lib/cjs/index.cjs.map +1 -1
- package/lib/cjs/src/core/categories.d.ts +2 -2
- package/lib/cjs/src/core/categories.d.ts.map +1 -1
- package/lib/cjs/src/core/types.d.ts +4 -2
- package/lib/cjs/src/core/types.d.ts.map +1 -1
- package/lib/cjs/src/index.d.ts +1 -1
- package/lib/cjs/src/index.d.ts.map +1 -1
- package/lib/cjs/src/misc/utils/merge.d.ts +13 -1
- package/lib/cjs/src/misc/utils/merge.d.ts.map +1 -1
- package/lib/cjs/src/runtime/GraphRuntime.d.ts.map +1 -1
- package/lib/esm/index.js +110 -8
- package/lib/esm/index.js.map +1 -1
- package/lib/esm/src/core/categories.d.ts +2 -2
- package/lib/esm/src/core/categories.d.ts.map +1 -1
- package/lib/esm/src/core/types.d.ts +4 -2
- package/lib/esm/src/core/types.d.ts.map +1 -1
- package/lib/esm/src/index.d.ts +1 -1
- package/lib/esm/src/index.d.ts.map +1 -1
- package/lib/esm/src/misc/utils/merge.d.ts +13 -1
- package/lib/esm/src/misc/utils/merge.d.ts.map +1 -1
- package/lib/esm/src/runtime/GraphRuntime.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { NodeCategoryId } from "@bian-womp/spark-protocol";
|
|
2
|
-
import type { ExecutionContext
|
|
1
|
+
import type { NodeCategoryId, ExecutionPolicy } from "@bian-womp/spark-protocol";
|
|
2
|
+
import type { ExecutionContext } from "./types";
|
|
3
3
|
export interface CategoryRuntime<State = unknown> {
|
|
4
4
|
onInputsChanged?: (inputs: Record<string, unknown>, ctx: ExecutionContext<State>) => void | Promise<void>;
|
|
5
5
|
onActivated?: () => void | Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"categories.d.ts","sourceRoot":"","sources":["../../../../src/core/categories.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"categories.d.ts","sourceRoot":"","sources":["../../../../src/core/categories.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,MAAM,WAAW,eAAe,CAAC,KAAK,GAAG,OAAO;IAC9C,eAAe,CAAC,EAAE,CAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,KACzB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,sBAAsB,CAAC,IAAI,GAAG,OAAO,EAAE,KAAK,GAAG,OAAO;IACrE,EAAE,EAAE,cAAc,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACpC,aAAa,EAAE,CAAC,OAAO,EAAE;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,IAAI,CAAC;QACX,YAAY,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;KAC/B,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACnC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { DataTypeId, NodeTypeId, HandleId, InputHandleDescriptor, NodeCategoryId, ResolvedHandles, ExecutionPolicy } from "@bian-womp/spark-protocol";
|
|
1
|
+
import type { DataTypeId, NodeTypeId, HandleId, InputHandleDescriptor, NodeCategoryId, ResolvedHandles, ExecutionPolicy, LogLevel } from "@bian-womp/spark-protocol";
|
|
2
2
|
export interface DataTypeDescriptor<T = unknown> {
|
|
3
3
|
id: DataTypeId;
|
|
4
4
|
displayName?: string;
|
|
@@ -23,6 +23,7 @@ export interface ExecutionContext<State> extends NodeContext<State> {
|
|
|
23
23
|
scheduleInputsChanged: () => void;
|
|
24
24
|
getInput: (handle: HandleId) => unknown;
|
|
25
25
|
reportProgress?: (value: number) => void;
|
|
26
|
+
log: (level: LogLevel, message: string, context?: Record<string, unknown>) => void;
|
|
26
27
|
}
|
|
27
28
|
/**
|
|
28
29
|
* Extract State type from ExecutionContext<State>
|
|
@@ -65,7 +66,6 @@ export declare function getTypedOutputTypeId(v: unknown): DataTypeId | undefined
|
|
|
65
66
|
export declare function getTypedOutputValue(v: unknown): unknown;
|
|
66
67
|
export declare function getInputTypeId(inputs: Record<string, InputHandleDescriptor> | undefined, handle: HandleId): DataTypeId | undefined;
|
|
67
68
|
export declare function isInputPrivate(inputs: Record<string, InputHandleDescriptor> | undefined, handle: HandleId): boolean;
|
|
68
|
-
export type { ExecutionPolicy } from "@bian-womp/spark-protocol";
|
|
69
69
|
type InferState<Impl, State> = ExtractStateFromImpl<Impl> extends never ? State : ExtractStateFromImpl<Impl>;
|
|
70
70
|
export interface NodeTypeDescriptor<I extends Record<string, InputHandleDescriptor> = Record<string, InputHandleDescriptor>, O extends Record<string, DataTypeId | DataTypeId[]> = Record<string, DataTypeId | DataTypeId[]>, State = unknown, Impl extends (inputs: any, ctx: ExecutionContext<any>) => any = (inputs: Record<string, unknown>, ctx: ExecutionContext<State>) => void | Record<string, unknown> | Promise<void | Record<string, unknown>>> {
|
|
71
71
|
id: NodeTypeId;
|
|
@@ -75,6 +75,7 @@ export interface NodeTypeDescriptor<I extends Record<string, InputHandleDescript
|
|
|
75
75
|
outputs: O;
|
|
76
76
|
impl: Impl;
|
|
77
77
|
policy?: Partial<ExecutionPolicy>;
|
|
78
|
+
logLevel?: LogLevel;
|
|
78
79
|
resolveHandles?: (ctx: {
|
|
79
80
|
environment: Record<string, unknown>;
|
|
80
81
|
params?: Record<string, unknown>;
|
|
@@ -86,4 +87,5 @@ export interface NodeTypeDescriptor<I extends Record<string, InputHandleDescript
|
|
|
86
87
|
dispose?: (ctx: NodeContext<InferState<Impl, State>>) => void;
|
|
87
88
|
};
|
|
88
89
|
}
|
|
90
|
+
export {};
|
|
89
91
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,QAAQ,EACR,qBAAqB,EACrB,cAAc,EACd,eAAe,EACf,eAAe,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/core/types.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/src/index.d.ts
CHANGED
|
@@ -21,6 +21,6 @@ export { createProgressGraphRegistry, createProgressGraphDef, } from "./examples
|
|
|
21
21
|
export { createValidationGraphRegistry, createValidationGraphDef, } from "./examples/validation";
|
|
22
22
|
export { installLogging } from "./examples/shared";
|
|
23
23
|
export { registerDelayNode, registerProgressNodes, generateId, } from "./misc/base";
|
|
24
|
-
export { mergeGraphDefinitions, computeGraphCenter, offsetImportedPositions, mergeInputsOutputs, mergeSnapshotData, buildValueConverter, type ConverterConfig, type ValueMappingConfig, type ValueConverter, } from "./misc/utils/merge";
|
|
24
|
+
export { mergeGraphDefinitions, computeGraphCenter, offsetImportedPositions, mergeInputsOutputs, mergeSnapshotData, buildValueConverter, type ConverterConfig, type ValueMappingConfig, type ValueConverter, type ValueConverterConfig, } from "./misc/utils/merge";
|
|
25
25
|
export { parseJsonPath, getValueAtPath, setValueAtPath, findMatchingPaths, type JsonPath, type PathSegment, } from "./misc/utils/json";
|
|
26
26
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,KAAK,EACL,aAAa,EACb,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,YAAY,EACV,eAAe,EACf,sBAAsB,GACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAChF,YAAY,EACV,MAAM,EACN,mBAAmB,EACnB,cAAc,EACd,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EACL,yBAAyB,EACzB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,UAAU,GACX,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,KAAK,EACL,aAAa,EACb,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,cAAc,GACf,MAAM,cAAc,CAAC;AACtB,YAAY,EACV,eAAe,EACf,sBAAsB,GACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAChF,YAAY,EACV,MAAM,EACN,mBAAmB,EACnB,cAAc,EACd,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EACL,yBAAyB,EACzB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,UAAU,GACX,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,oBAAoB,GAC1B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,aAAa,EACb,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,KAAK,QAAQ,EACb,KAAK,WAAW,GACjB,MAAM,mBAAmB,CAAC"}
|
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
import type { GraphDefinition, RuntimeSnapshotFull } from "@bian-womp/spark-protocol";
|
|
2
2
|
import { type JsonPath } from "./json";
|
|
3
|
+
/**
|
|
4
|
+
* Configuration object for value conversion.
|
|
5
|
+
*/
|
|
6
|
+
export interface ValueConverterConfig {
|
|
7
|
+
nodeId: string;
|
|
8
|
+
handleId: string;
|
|
9
|
+
value: unknown;
|
|
10
|
+
type: "input" | "output" | "inputDefault" | "initialInput";
|
|
11
|
+
nodeTypeId?: string;
|
|
12
|
+
handleDataType?: string;
|
|
13
|
+
runtimeTypeId?: string;
|
|
14
|
+
}
|
|
3
15
|
/**
|
|
4
16
|
* Merge two graph definitions, remapping IDs to avoid conflicts.
|
|
5
17
|
* Returns the merged graph and a mapping from source node IDs to new IDs.
|
|
6
18
|
*/
|
|
7
|
-
export type ValueConverter = (
|
|
19
|
+
export type ValueConverter = (config: ValueConverterConfig) => unknown;
|
|
8
20
|
export declare function mergeGraphDefinitions(target: GraphDefinition, source: GraphDefinition, converter?: ValueConverter): {
|
|
9
21
|
merged: GraphDefinition;
|
|
10
22
|
nodeIdMap: Record<string, string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../../src/misc/utils/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EAGf,mBAAmB,EACpB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAIL,KAAK,QAAQ,EACd,MAAM,QAAQ,CAAC;AAQhB
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../../src/misc/utils/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphRuntime.d.ts","sourceRoot":"","sources":["../../../../src/runtime/GraphRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,eAAe,
|
|
1
|
+
{"version":3,"file":"GraphRuntime.d.ts","sourceRoot":"","sources":["../../../../src/runtime/GraphRuntime.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/index.js
CHANGED
|
@@ -400,6 +400,14 @@ class Registry {
|
|
|
400
400
|
}
|
|
401
401
|
}
|
|
402
402
|
|
|
403
|
+
const LOG_LEVEL_VALUES = {
|
|
404
|
+
debug: 0,
|
|
405
|
+
info: 1,
|
|
406
|
+
warn: 2,
|
|
407
|
+
error: 3,
|
|
408
|
+
silent: 4,
|
|
409
|
+
};
|
|
410
|
+
|
|
403
411
|
// Helper: typed promise detection and unwrapping for T | Promise<T>
|
|
404
412
|
function isPromise(value) {
|
|
405
413
|
return !!value && typeof value.then === "function";
|
|
@@ -474,6 +482,7 @@ class GraphRuntime {
|
|
|
474
482
|
...desc.policy,
|
|
475
483
|
...n.params?.policy,
|
|
476
484
|
},
|
|
485
|
+
logLevel: desc.logLevel,
|
|
477
486
|
runSeq: 0,
|
|
478
487
|
activeControllers: new Set(),
|
|
479
488
|
queue: [],
|
|
@@ -641,6 +650,36 @@ class GraphRuntime {
|
|
|
641
650
|
((p) => {
|
|
642
651
|
node.stats.progress = Math.max(0, Math.min(1, Number(p) || 0));
|
|
643
652
|
});
|
|
653
|
+
// Create log function that respects node's logLevel
|
|
654
|
+
const log = (level, message, context) => {
|
|
655
|
+
const nodeLogLevel = node.logLevel ?? "info"; // Default to "info" if not set
|
|
656
|
+
const nodeLogValue = LOG_LEVEL_VALUES[nodeLogLevel] ?? 1;
|
|
657
|
+
const requestedValue = LOG_LEVEL_VALUES[level] ?? 1;
|
|
658
|
+
// Only log if requested level >= node's logLevel
|
|
659
|
+
if (requestedValue >= nodeLogValue && nodeLogLevel !== "silent") {
|
|
660
|
+
const contextStr = context
|
|
661
|
+
? ` ${Object.entries(context)
|
|
662
|
+
.map(([k, v]) => `${k}=${JSON.stringify(v)}`)
|
|
663
|
+
.join(" ")}`
|
|
664
|
+
: "";
|
|
665
|
+
const fullMessage = `[node:${runId || nodeId}:${node.typeId}] ${message}${contextStr}`;
|
|
666
|
+
// For other levels, use appropriate console method
|
|
667
|
+
switch (level) {
|
|
668
|
+
case "debug":
|
|
669
|
+
console.info(fullMessage);
|
|
670
|
+
break;
|
|
671
|
+
case "info":
|
|
672
|
+
console.info(fullMessage);
|
|
673
|
+
break;
|
|
674
|
+
case "warn":
|
|
675
|
+
console.warn(fullMessage);
|
|
676
|
+
break;
|
|
677
|
+
case "error":
|
|
678
|
+
console.error(fullMessage);
|
|
679
|
+
break;
|
|
680
|
+
}
|
|
681
|
+
}
|
|
682
|
+
};
|
|
644
683
|
return {
|
|
645
684
|
state: node.state,
|
|
646
685
|
setState: (next) => Object.assign(node.state, next),
|
|
@@ -656,6 +695,7 @@ class GraphRuntime {
|
|
|
656
695
|
runId,
|
|
657
696
|
abortSignal,
|
|
658
697
|
reportProgress,
|
|
698
|
+
log,
|
|
659
699
|
};
|
|
660
700
|
}
|
|
661
701
|
scheduleInputsChangedInternal(nodeId) {
|
|
@@ -720,7 +760,11 @@ class GraphRuntime {
|
|
|
720
760
|
const exec = async (attempt) => {
|
|
721
761
|
let hadError = false;
|
|
722
762
|
try {
|
|
723
|
-
node.lifecycle?.prepare
|
|
763
|
+
if (node.lifecycle?.prepare) {
|
|
764
|
+
ctx.log("debug", "prepare-start");
|
|
765
|
+
node.lifecycle.prepare(node.params ?? {}, ctx);
|
|
766
|
+
ctx.log("debug", "prepare-done");
|
|
767
|
+
}
|
|
724
768
|
await node.runtime.onInputsChanged?.(capturedInputs, ctx);
|
|
725
769
|
}
|
|
726
770
|
catch (err) {
|
|
@@ -761,12 +805,17 @@ class GraphRuntime {
|
|
|
761
805
|
runId,
|
|
762
806
|
durationMs: node.stats.lastDurationMs,
|
|
763
807
|
});
|
|
808
|
+
ctx.log("debug", "node-done", {
|
|
809
|
+
durationMs: node.stats.lastDurationMs,
|
|
810
|
+
hadError,
|
|
811
|
+
});
|
|
764
812
|
if (onDone)
|
|
765
813
|
onDone();
|
|
766
814
|
}
|
|
767
815
|
};
|
|
768
816
|
// fire node-start event
|
|
769
817
|
this.emit("stats", { kind: "node-start", nodeId, runId });
|
|
818
|
+
ctx.log("debug", "node-start");
|
|
770
819
|
exec(0);
|
|
771
820
|
};
|
|
772
821
|
const mode = policy.asyncConcurrency ?? "switch";
|
|
@@ -1165,7 +1214,11 @@ class GraphRuntime {
|
|
|
1165
1214
|
const effectiveInputs = this.getEffectiveInputs(node.nodeId);
|
|
1166
1215
|
const ctrl = new AbortController();
|
|
1167
1216
|
const ctx = this.createExecutionContext(node.nodeId, node, effectiveInputs, `${node.nodeId}:init`, ctrl.signal);
|
|
1168
|
-
node.lifecycle?.prepare
|
|
1217
|
+
if (node.lifecycle?.prepare) {
|
|
1218
|
+
ctx.log("debug", "prepare-start");
|
|
1219
|
+
node.lifecycle.prepare(node.params ?? {}, ctx);
|
|
1220
|
+
ctx.log("debug", "prepare-done");
|
|
1221
|
+
}
|
|
1169
1222
|
node.runtime.onActivated?.();
|
|
1170
1223
|
}
|
|
1171
1224
|
if (invalidate) {
|
|
@@ -1411,7 +1464,11 @@ class GraphRuntime {
|
|
|
1411
1464
|
const effectiveInputs = this.getEffectiveInputs(rn.nodeId);
|
|
1412
1465
|
const ctrl = new AbortController();
|
|
1413
1466
|
const ctx = this.createExecutionContext(rn.nodeId, rn, effectiveInputs, `${rn.nodeId}:init`, ctrl.signal);
|
|
1414
|
-
rn.lifecycle?.prepare
|
|
1467
|
+
if (rn.lifecycle?.prepare) {
|
|
1468
|
+
ctx.log("debug", "prepare-start");
|
|
1469
|
+
rn.lifecycle.prepare(rn.params ?? {}, ctx);
|
|
1470
|
+
ctx.log("debug", "prepare-done");
|
|
1471
|
+
}
|
|
1415
1472
|
rn.runtime.onActivated?.();
|
|
1416
1473
|
}
|
|
1417
1474
|
else {
|
|
@@ -1599,6 +1656,13 @@ class GraphRuntime {
|
|
|
1599
1656
|
return;
|
|
1600
1657
|
const token = (this.recomputeTokenByNode.get(nodeId) ?? 0) + 1;
|
|
1601
1658
|
this.recomputeTokenByNode.set(nodeId, token);
|
|
1659
|
+
// Log resolveHandles-start
|
|
1660
|
+
const nodeLogLevel = node.logLevel ?? "info";
|
|
1661
|
+
const nodeLogValue = LOG_LEVEL_VALUES[nodeLogLevel] ?? 1;
|
|
1662
|
+
const shouldLog = nodeLogValue <= LOG_LEVEL_VALUES.debug && nodeLogLevel !== "silent";
|
|
1663
|
+
if (shouldLog) {
|
|
1664
|
+
console.info(`[node:${nodeId}:${node.typeId}] resolveHandles-start`);
|
|
1665
|
+
}
|
|
1602
1666
|
let r;
|
|
1603
1667
|
try {
|
|
1604
1668
|
const res = resolveHandles({
|
|
@@ -1609,8 +1673,16 @@ class GraphRuntime {
|
|
|
1609
1673
|
r = await unwrapMaybePromise(res);
|
|
1610
1674
|
}
|
|
1611
1675
|
catch {
|
|
1676
|
+
// Log resolveHandles-done even on error
|
|
1677
|
+
if (shouldLog) {
|
|
1678
|
+
console.info(`[node:${nodeId}:${node.typeId}] resolveHandles-done (error)`);
|
|
1679
|
+
}
|
|
1612
1680
|
return;
|
|
1613
1681
|
}
|
|
1682
|
+
// Log resolveHandles-done
|
|
1683
|
+
if (shouldLog) {
|
|
1684
|
+
console.info(`[node:${nodeId}:${node.typeId}] resolveHandles-done`);
|
|
1685
|
+
}
|
|
1614
1686
|
// If a newer recompute was scheduled, drop this result
|
|
1615
1687
|
if ((this.recomputeTokenByNode.get(nodeId) ?? 0) !== token)
|
|
1616
1688
|
return;
|
|
@@ -3692,7 +3764,14 @@ function mergeGraphDefinitions(target, source, converter) {
|
|
|
3692
3764
|
? transformedNode.resolvedHandles.inputs[handleId]
|
|
3693
3765
|
: transformedNode.resolvedHandles.inputs[handleId]?.typeId
|
|
3694
3766
|
: undefined;
|
|
3695
|
-
transformedInitialInputs[handleId] = converter(
|
|
3767
|
+
transformedInitialInputs[handleId] = converter({
|
|
3768
|
+
nodeId: newId,
|
|
3769
|
+
handleId,
|
|
3770
|
+
value,
|
|
3771
|
+
type: "initialInput",
|
|
3772
|
+
nodeTypeId,
|
|
3773
|
+
handleDataType,
|
|
3774
|
+
});
|
|
3696
3775
|
}
|
|
3697
3776
|
transformedNode.initialInputs = transformedInitialInputs;
|
|
3698
3777
|
}
|
|
@@ -3705,7 +3784,14 @@ function mergeGraphDefinitions(target, source, converter) {
|
|
|
3705
3784
|
? transformedNode.resolvedHandles.inputs[handleId]
|
|
3706
3785
|
: transformedNode.resolvedHandles.inputs[handleId]?.typeId
|
|
3707
3786
|
: undefined;
|
|
3708
|
-
transformedInputDefaults[handleId] = converter(
|
|
3787
|
+
transformedInputDefaults[handleId] = converter({
|
|
3788
|
+
nodeId: newId,
|
|
3789
|
+
handleId,
|
|
3790
|
+
value,
|
|
3791
|
+
type: "inputDefault",
|
|
3792
|
+
nodeTypeId,
|
|
3793
|
+
handleDataType,
|
|
3794
|
+
});
|
|
3709
3795
|
}
|
|
3710
3796
|
transformedNode.resolvedHandles = {
|
|
3711
3797
|
...transformedNode.resolvedHandles,
|
|
@@ -3803,7 +3889,14 @@ function mergeInputsOutputs(targetInputs, targetOutputs, sourceInputs, sourceOut
|
|
|
3803
3889
|
for (const [handleId, value] of Object.entries(inputs)) {
|
|
3804
3890
|
const handleDataType = handleTypeMap?.get(oldId)?.get(handleId);
|
|
3805
3891
|
transformedInputs[handleId] = converter
|
|
3806
|
-
? converter(
|
|
3892
|
+
? converter({
|
|
3893
|
+
nodeId: newId,
|
|
3894
|
+
handleId,
|
|
3895
|
+
value,
|
|
3896
|
+
type: "input",
|
|
3897
|
+
nodeTypeId,
|
|
3898
|
+
handleDataType,
|
|
3899
|
+
})
|
|
3807
3900
|
: value;
|
|
3808
3901
|
}
|
|
3809
3902
|
mergedInputs[newId] = mergedInputs[newId]
|
|
@@ -3822,7 +3915,15 @@ function mergeInputsOutputs(targetInputs, targetOutputs, sourceInputs, sourceOut
|
|
|
3822
3915
|
? getTypedOutputTypeId(value)
|
|
3823
3916
|
: undefined;
|
|
3824
3917
|
transformedOutputs[handleId] = converter
|
|
3825
|
-
? converter(
|
|
3918
|
+
? converter({
|
|
3919
|
+
nodeId: newId,
|
|
3920
|
+
handleId,
|
|
3921
|
+
value,
|
|
3922
|
+
type: "output",
|
|
3923
|
+
nodeTypeId,
|
|
3924
|
+
handleDataType,
|
|
3925
|
+
runtimeTypeId,
|
|
3926
|
+
})
|
|
3826
3927
|
: value;
|
|
3827
3928
|
}
|
|
3828
3929
|
mergedOutputs[newId] = mergedOutputs[newId]
|
|
@@ -3895,7 +3996,8 @@ function matchesPattern(value, pattern) {
|
|
|
3895
3996
|
* - value exists in valueMap
|
|
3896
3997
|
*/
|
|
3897
3998
|
function buildValueConverter(config) {
|
|
3898
|
-
return (
|
|
3999
|
+
return (converterConfig) => {
|
|
4000
|
+
const { nodeId, handleId, value, type, nodeTypeId, handleDataType, runtimeTypeId, } = converterConfig;
|
|
3899
4001
|
const isTyped = isTypedOutput(value);
|
|
3900
4002
|
for (const mapping of config.mappings) {
|
|
3901
4003
|
if (!matchesPattern(handleId, mapping.handleId))
|