Merge pull request #989 from polywrap/nk/improve-workflow

dOrgJelli · web-flow · commit 0b5a2db1aa7f · 2022-06-30T15:52:02.000-04:00
feat(cli): add job status in job result object
diff --git a/packages/cli/lang/en.json b/packages/cli/lang/en.json
@@ -182,6 +182,7 @@
   "commands_run_error_noApi": "API needs to be initialized",
   "commands_run_error_readFail": "Failed to read query {query}",
   "commands_run_error_unsupportedOutputFileExt": "Unsupported outputFile extention: ${outputFileExt}",
+  "commands_run_error_cueDoesNotExist": "Require cue to run validator, checkout https://cuelang.org/ for more information",
   "commands_run_error_noWorkflowScriptFound": "Workflow script not found at path: {path}",
   "commands_run_error_noTestEnvFound": "polywrap test-env not found, please run 'polywrap infra up --modules=eth-ens-ipfs'",
   "commands_testEnv_description": "Manage a test environment for Polywrap",
diff --git a/packages/cli/lang/es.json b/packages/cli/lang/es.json
@@ -182,6 +182,7 @@
   "commands_run_error_noApi": "API needs to be initialized",
   "commands_run_error_readFail": "Failed to read query {query}",
   "commands_run_error_unsupportedOutputFileExt": "Unsupported outputFile extention: ${outputFileExt}",
+  "commands_run_error_cueDoesNotExist": "Require cue to run validator, checkout https://cuelang.org/ for more information",
   "commands_run_error_noWorkflowScriptFound": "Workflow script not found at path: {path}",
   "commands_run_error_noTestEnvFound": "polywrap test-env not found, please run 'polywrap infra up --modules=eth-ens-ipfs'",
   "commands_testEnv_description": "Manage a test environment for Polywrap",
diff --git a/packages/cli/src/commands/run.ts b/packages/cli/src/commands/run.ts
@@ -7,7 +7,7 @@ import {
   validateOutput,
 } from "../lib";
 
-import { InvokeResult, Workflow } from "@polywrap/core-js";
+import { InvokeResult, Workflow, JobResult } from "@polywrap/core-js";
 import { PolywrapClient, PolywrapClientConfig } from "@polywrap/client-js";
 import path from "path";
 import yaml from "js-yaml";
@@ -85,7 +85,9 @@ const _run = async (workflowPath: string, options: WorkflowCommandOptions) => {
     workflow,
     config: clientConfig,
     ids: jobs,
-    onExecution: async (id: string, data: unknown, error: Error) => {
+    onExecution: async (id: string, jobResult: JobResult) => {
+      const { data, error } = jobResult;
+
       if (!quiet) {
         console.log("-----------------------------------");
         console.log(`ID: ${id}`);
diff --git a/packages/cli/src/lib/helpers/workflow-validator.ts b/packages/cli/src/lib/helpers/workflow-validator.ts
@@ -1,4 +1,5 @@
 import { runCommand } from "../system";
+import { intlMsg } from "../intl";
 
 import fs from "fs";
 import { InvokeResult } from "@polywrap/core-js";
@@ -19,6 +20,10 @@ export async function validateOutput(
   result: InvokeResult,
   validateScriptPath: string
 ): Promise<void> {
+  if (!(await cueExists())) {
+    console.warn(intlMsg.commands_run_error_cueDoesNotExist());
+  }
+
   const index = id.lastIndexOf(".");
   const jobId = id.substring(0, index);
   const stepId = id.substring(index + 1);
@@ -29,12 +34,17 @@ export async function validateOutput(
   await fs.promises.writeFile(jsonOutput, JSON.stringify(result, null, 2));
 
   try {
-    await runCommand(
-      `cue vet -d ${selector} ${validateScriptPath} ${jsonOutput}`
+    const { stderr } = await runCommand(
+      `cue vet -d ${selector} ${validateScriptPath} ${jsonOutput}`,
+      true
     );
+
+    if (stderr) {
+      console.error(stderr);
+      console.log("-----------------------------------");
+    }
   } catch (e) {
     console.error(e);
-    console.log(e);
     console.log("-----------------------------------");
     process.exitCode = 1;
   }
diff --git a/packages/js/client/src/__tests__/e2e/workflow.spec.ts b/packages/js/client/src/__tests__/e2e/workflow.spec.ts
@@ -6,7 +6,7 @@ import {
   ensAddresses,
   providers
 } from "@polywrap/test-env-js";
-import { createPolywrapClient, PolywrapClient, PolywrapClientConfig } from "../..";
+import { createPolywrapClient, JobResult, PolywrapClient, PolywrapClientConfig } from "../..";
 import { outPropWorkflow, sanityWorkflow } from "./workflow-test-cases";
 
 jest.setTimeout(200000);
@@ -89,17 +89,17 @@ describe("workflow", () => {
     test("sanity workflow", async () => {
       await client.run({
         workflow: sanityWorkflow,
-        onExecution: async (id: string, data: unknown, error: unknown) => {
-          await tests[id](data, error);
+        onExecution: async (id: string, jobResult: JobResult) => {
+          await tests[id](jobResult.data, jobResult.error);
         },
       });
     });
 
     test("workflow with output propagation", async () => {
       await client.run({
         workflow: outPropWorkflow,
-        onExecution: async (id: string, data: unknown, error: unknown) => {
-          await tests[id](data, error);
+        onExecution: async (id: string, jobResult: JobResult) => {
+          await tests[id](jobResult.data, jobResult.error);
         },
       });
     });
diff --git a/packages/js/core/src/types/Workflow.ts b/packages/js/core/src/types/Workflow.ts
@@ -23,6 +23,17 @@ export type Workflow<TUri extends Uri | string = string> = {
   jobs: Job<TUri>;
 };
 
+export enum JobStatus {
+  SUCCEED,
+  FAILED,
+  SKIPPED,
+}
+
+export interface JobResult<TData extends unknown = unknown>
+  extends InvokeResult<TData> {
+  status: JobStatus;
+}
+
 export interface RunOptions<
   TData extends Record<string, unknown> = Record<string, unknown>,
   TUri extends Uri | string = string
@@ -32,11 +43,7 @@ export interface RunOptions<
   contextId?: string;
   ids?: string[];
 
-  onExecution?(
-    id: string,
-    data?: InvokeResult<TData>["data"],
-    error?: InvokeResult<TData>["error"]
-  ): MaybeAsync<void>;
+  onExecution?(id: string, jobResult: JobResult<TData>): MaybeAsync<void>;
 }
 
 export interface WorkflowHandler {
diff --git a/packages/js/core/src/workflow/JobRunner.ts b/packages/js/core/src/workflow/JobRunner.ts
@@ -1,8 +1,9 @@
 import {
   Client,
   executeMaybeAsyncFunction,
-  InvokeResult,
   Job,
+  JobResult,
+  JobStatus,
   MaybeAsync,
   Uri,
 } from "../types";
@@ -19,14 +20,13 @@ export class JobRunner<
   TData extends unknown = unknown,
   TUri extends Uri | string = string
 > {
-  private jobOutput: Map<string, InvokeResult<TData>>;
+  private jobOutput: Map<string, JobResult<TData>>;
 
   constructor(
     private client: Client,
     private onExecution?: (
       id: string,
-      data?: InvokeResult<TData>["data"],
-      error?: InvokeResult<TData>["error"]
+      JobResult: JobResult<TData>
     ) => MaybeAsync<void>
   ) {
     this.jobOutput = new Map();
@@ -45,27 +45,47 @@ export class JobRunner<
       const steps = jobs[jobId].steps;
       if (steps) {
         for (let i = 0; i < steps.length; i++) {
+          let result: JobResult<TData> | undefined;
+          let args: Record<string, unknown> | undefined;
+
           const step = steps[i];
           const absoluteId = parentId
             ? `${parentId}.${jobId}.${i}`
             : `${jobId}.${i}`;
-          const args = this.resolveArgs(absoluteId, step.args);
-          const result = await this.client.invoke<TData, TUri>({
-            uri: step.uri,
-            method: step.method,
-            config: step.config,
-            args: args,
-          });
-
-          this.jobOutput.set(absoluteId, result);
-
-          if (this.onExecution && typeof this.onExecution === "function") {
-            await executeMaybeAsyncFunction(
-              this.onExecution,
-              absoluteId,
-              result.data,
-              result.error
-            );
+          try {
+            args = this.resolveArgs(absoluteId, step.args);
+          } catch (e) {
+            result = {
+              error: e,
+              status: JobStatus.SKIPPED,
+            };
+          }
+
+          if (args) {
+            const invokeResult = await this.client.invoke<TData, TUri>({
+              uri: step.uri,
+              method: step.method,
+              config: step.config,
+              args: args,
+            });
+
+            if (invokeResult.error) {
+              result = { ...invokeResult, status: JobStatus.FAILED };
+            } else {
+              result = { ...invokeResult, status: JobStatus.SUCCEED };
+            }
+          }
+
+          if (result) {
+            this.jobOutput.set(absoluteId, result);
+
+            if (this.onExecution && typeof this.onExecution === "function") {
+              await executeMaybeAsyncFunction(
+                this.onExecution,
+                absoluteId,
+                result
+              );
+            }
           }
         }
       }
@@ -124,8 +144,21 @@ export class JobRunner<
             }
           }
           const output = outputs.get(absStepId);
-          if (output && output[dataOrErr]) {
-            return output[dataOrErr];
+          if (
+            output &&
+            dataOrErr === "data" &&
+            output.status === JobStatus.SUCCEED &&
+            output.data
+          ) {
+            return output.data;
+          }
+          if (
+            output &&
+            dataOrErr === "error" &&
+            output.status === JobStatus.FAILED &&
+            output.error
+          ) {
+            return output.error;
           }
         }
 
