@workglow/task-graph 0.0.118 → 0.0.120

package/dist/node.js

@@ -1718,18 +1718,35 @@ class Task {
     return obj;
   }
   toJSON(_options) {
-    const extras = this.config.extras;
+    const ctor = this.constructor;
+    const schema = ctor.configSchema();
+    const schemaProperties = typeof schema !== "boolean" && schema?.properties ? schema.properties : {};
+    const config = {};
+    for (const [key, propSchema] of Object.entries(schemaProperties)) {
+      if (key === "id")
+        continue;
+      if (propSchema?.["x-ui-hidden"] === true && key !== "inputSchema" && key !== "outputSchema" && key !== "extras") {
+        continue;
+      }
+      const value = this.config[key];
+      if (value === undefined)
+        continue;
+      if (typeof value === "function" || typeof value === "symbol")
+        continue;
+      config[key] = value;
+    }
+    if (config.title === ctor.title)
+      delete config.title;
+    if (config.description === ctor.description)
+      delete config.description;
+    const extras = config.extras;
+    if (!extras || Object.keys(extras).length === 0)
+      delete config.extras;
     const json = this.stripSymbols({
       id: this.id,
       type: this.type,
       defaults: this.defaults,
-      config: {
-        ...this.config.title && this.config.title !== this.constructor.title ? { title: this.config.title } : {},
-        ...this.config.description && this.config.description !== this.constructor.description ? { description: this.config.description } : {},
-        ...this.config.inputSchema ? { inputSchema: this.config.inputSchema } : {},
-        ...this.config.outputSchema ? { outputSchema: this.config.outputSchema } : {},
-        ...extras && Object.keys(extras).length ? { extras } : {}
-      }
+      config
     });
     return json;
   }
@@ -2394,11 +2411,14 @@ class TaskGraphRunner {
         const narrowed = await task.narrowInput({ ...results }, this.registry);
         dataflow.setPortData(narrowed);
       } else {
-        getLogger2().warn("pushOutputFromNodeToEdge not compatible, not setting port data", {
-          dataflowId: dataflow.id,
-          compatibility,
-          resultsKeys: Object.keys(results)
-        });
+        const resultsKeys = Object.keys(results);
+        if (resultsKeys.length > 0) {
+          getLogger2().warn("pushOutputFromNodeToEdge not compatible, not setting port data", {
+            dataflowId: dataflow.id,
+            compatibility,
+            resultsKeys
+          });
+        }
       }
     }
   }
@@ -2758,7 +2778,7 @@ class TaskGraphRunner {
   async handleError(error) {
     await Promise.allSettled(this.graph.getTasks().map(async (task) => {
       if (task.status === TaskStatus.PROCESSING || task.status === TaskStatus.STREAMING) {
-        task.abort();
+        return task.abort();
       }
     }));
     this.running = false;
@@ -2774,11 +2794,11 @@ class TaskGraphRunner {
     this.reactiveRunning = false;
   }
   async handleAbort() {
-    this.graph.getTasks().map(async (task) => {
+    await Promise.allSettled(this.graph.getTasks().map(async (task) => {
       if (task.status === TaskStatus.PROCESSING || task.status === TaskStatus.STREAMING) {
-        task.abort();
+        return task.abort();
       }
-    });
+    }));
     this.running = false;
     if (this.telemetrySpan) {
       this.telemetrySpan.setStatus(SpanStatusCode2.ERROR, "aborted");
@@ -2807,7 +2827,9 @@ class TaskGraphRunner {
       progress = Math.round(completed / total);
     }
     this.pushStatusFromNodeToEdges(this.graph, task);
-    await this.pushOutputFromNodeToEdges(task, task.runOutputData);
+    if (task.runOutputData && Object.keys(task.runOutputData).length > 0) {
+      await this.pushOutputFromNodeToEdges(task, task.runOutputData);
+    }
     this.graph.emit("graph_progress", progress, message, args);
   }
 }
@@ -2833,13 +2855,16 @@ var init_GraphAsTaskRunner = __esm(() => {
       });
       const results = await this.task.subGraph.run(input, {
         parentSignal: this.abortController?.signal,
-        outputCache: this.outputCache
+        outputCache: this.outputCache,
+        registry: this.registry
       });
       unsubscribe();
       return results;
     }
     async executeTaskChildrenReactive() {
-      return this.task.subGraph.runReactive(this.task.runInputData);
+      return this.task.subGraph.runReactive(this.task.runInputData, {
+        registry: this.registry
+      });
     }
     async handleDisable() {
       if (this.task.hasChildren()) {
@@ -3956,6 +3981,11 @@ class Workflow {
     const tasks = graph.getTasks();
     for (const task of tasks) {
       if (task.type === "InputTask") {
+        const existingConfig = task.config;
+        const existingSchema = existingConfig?.inputSchema ?? existingConfig?.outputSchema;
+        if (existingSchema && typeof existingSchema === "object" && existingSchema["x-ui-manual"] === true) {
+          continue;
+        }
         const outgoing = graph.getTargetDataflows(task.id);
         if (outgoing.length === 0)
           continue;
@@ -4170,9 +4200,15 @@ class Workflow {
         const earlierTask = earlierTasks[i];
         const earlierOutputSchema = earlierTask.outputSchema();
         if (earlierTask.type === "InputTask") {
+          const inputConfig = earlierTask.config;
+          const inputSchema = inputConfig?.inputSchema ?? inputConfig?.outputSchema;
+          const isManualSchema = inputSchema && typeof inputSchema === "object" && inputSchema["x-ui-manual"] === true;
+          const inputProperties = isManualSchema && inputSchema && typeof inputSchema === "object" && "properties" in inputSchema && inputSchema.properties && typeof inputSchema.properties === "object" ? new Set(Object.keys(inputSchema.properties)) : undefined;
           for (const requiredInputId of [...unmatchedRequired]) {
             if (matches.has(requiredInputId))
               continue;
+            if (inputProperties && !inputProperties.has(requiredInputId))
+              continue;
             matches.set(requiredInputId, requiredInputId);
             graph.addDataflow(new Dataflow(earlierTask.id, requiredInputId, targetTask.id, requiredInputId));
           }
@@ -4646,7 +4682,8 @@ class FallbackTaskRunner extends GraphAsTaskRunner {
         const mergedInput = { ...input, ...alternative };
         const results = await this.task.subGraph.run(mergedInput, {
           parentSignal: this.abortController?.signal,
-          outputCache: this.outputCache
+          outputCache: this.outputCache,
+          registry: this.registry
         });
         const mergedOutput = this.task.subGraph.mergeExecuteOutputsToRunOutput(results, this.task.compoundMerge);
         await this.handleProgress(100, `Data alternative ${attemptNumber}/${totalAttempts} succeeded`);
@@ -4914,7 +4951,8 @@ class IteratorTaskRunner extends GraphAsTaskRunner {
     const graphClone = this.cloneGraph(this.task.subGraph);
     const results = await graphClone.run(input, {
       parentSignal: this.abortController?.signal,
-      outputCache: this.outputCache
+      outputCache: this.outputCache,
+      registry: this.registry
     });
     if (results.length === 0) {
       return;
@@ -6238,11 +6276,13 @@ class JobQueueTask extends GraphAsTask {
     }
     return registeredQueue;
   }
-  async abort() {
+  abort() {
     if (this.currentQueueName && this.currentJobId) {
       const registeredQueue = getTaskQueueRegistry().getQueue(this.currentQueueName);
       if (registeredQueue) {
-        await registeredQueue.client.abort(this.currentJobId);
+        registeredQueue.client.abort(this.currentJobId).catch((err) => {
+          console.warn(`Failed to abort remote job ${this.currentJobId}`, err);
+        });
       }
     }
     super.abort();
@@ -6833,4 +6873,4 @@ export {
   ConditionalTask
 };
 
-//# debugId=130AE55EFB9420D864756E2164756E21
+//# debugId=65F073C748987DA264756E2164756E21