@upstash/workflow 0.2.11 → 0.2.12

package/astro.d.mts

@@ -1,6 +1,6 @@
 import { APIContext, APIRoute } from 'astro';
-import { e as WorkflowContext, k as PublicServeOptions, t as InvokableWorkflow } from './types-DS9q8FyV.mjs';
-import { s as serveManyBase } from './serve-many-Fuovl7gl.mjs';
+import { e as WorkflowContext, k as PublicServeOptions, t as InvokableWorkflow } from './types-D1W0VOpy.mjs';
+import { s as serveManyBase } from './serve-many-DLguU9iR.mjs';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';

package/astro.d.ts

@@ -1,6 +1,6 @@
 import { APIContext, APIRoute } from 'astro';
-import { e as WorkflowContext, k as PublicServeOptions, t as InvokableWorkflow } from './types-DS9q8FyV.js';
-import { s as serveManyBase } from './serve-many-DNnLsDIp.js';
+import { e as WorkflowContext, k as PublicServeOptions, t as InvokableWorkflow } from './types-D1W0VOpy.js';
+import { s as serveManyBase } from './serve-many-BdMq5rFX.js';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';

package/astro.js

@@ -134,7 +134,7 @@ var formatWorkflowError = (error) => {
     message: error.message
   } : {
     error: "Error",
-    message: "An error occured while executing workflow."
+    message: `An error occured while executing workflow: '${typeof error === "string" ? error : JSON.stringify(error)}'`
   };
 };
 
@@ -2034,6 +2034,9 @@ var WorkflowApi = class extends BaseWorkflowApi {
   }
 };
 
+// src/agents/index.ts
+var import_openai3 = require("@ai-sdk/openai");
+
 // src/agents/adapters.ts
 var import_openai2 = require("@ai-sdk/openai");
 var import_ai = require("ai");
@@ -2053,46 +2056,49 @@ you need from that agent.
 `;
 
 // src/agents/adapters.ts
-var createWorkflowOpenAI = (context, config) => {
-  const { baseURL, apiKey } = config ?? {};
-  return (0, import_openai2.createOpenAI)({
-    baseURL,
-    apiKey,
-    compatibility: "strict",
-    fetch: async (input, init) => {
-      try {
-        const headers = init?.headers ? Object.fromEntries(new Headers(init.headers).entries()) : {};
-        const body = init?.body ? JSON.parse(init.body) : void 0;
-        const agentName = headers[AGENT_NAME_HEADER];
-        const stepName = agentName ? `Call Agent ${agentName}` : "Call Agent";
-        const responseInfo = await context.call(stepName, {
-          url: input.toString(),
-          method: init?.method,
-          headers,
-          body
-        });
-        const responseHeaders = new Headers(
-          Object.entries(responseInfo.header).reduce(
-            (acc, [key, values]) => {
-              acc[key] = values.join(", ");
-              return acc;
-            },
-            {}
-          )
-        );
-        return new Response(JSON.stringify(responseInfo.body), {
-          status: responseInfo.status,
-          headers: responseHeaders
-        });
-      } catch (error) {
-        if (error instanceof Error && error.name === "WorkflowAbort") {
-          throw error;
-        } else {
-          console.error("Error in fetch implementation:", error);
-          throw error;
-        }
-      }
+var fetchWithContextCall = async (context, ...params) => {
+  const [input, init] = params;
+  try {
+    const headers = init?.headers ? Object.fromEntries(new Headers(init.headers).entries()) : {};
+    const body = init?.body ? JSON.parse(init.body) : void 0;
+    const agentName = headers[AGENT_NAME_HEADER];
+    const stepName = agentName ? `Call Agent ${agentName}` : "Call Agent";
+    const responseInfo = await context.call(stepName, {
+      url: input.toString(),
+      method: init?.method,
+      headers,
+      body
+    });
+    const responseHeaders = new Headers(
+      Object.entries(responseInfo.header).reduce(
+        (acc, [key, values]) => {
+          acc[key] = values.join(", ");
+          return acc;
+        },
+        {}
+      )
+    );
+    return new Response(JSON.stringify(responseInfo.body), {
+      status: responseInfo.status,
+      headers: responseHeaders
+    });
+  } catch (error) {
+    if (error instanceof Error && error.name === "WorkflowAbort") {
+      throw error;
+    } else {
+      console.error("Error in fetch implementation:", error);
+      throw error;
     }
+  }
+};
+var createWorkflowModel = ({
+  context,
+  provider,
+  providerParams
+}) => {
+  return provider({
+    fetch: (...params) => fetchWithContextCall(context, ...params),
+    ...providerParams
   });
 };
 var wrapTools = ({
@@ -2332,9 +2338,14 @@ var WorkflowAgents = class {
   openai(...params) {
     const [model, settings] = params;
     const { baseURL, apiKey, ...otherSettings } = settings ?? {};
-    const openai2 = createWorkflowOpenAI(this.context, { baseURL, apiKey });
-    return openai2(model, otherSettings);
+    const openaiModel = this.AISDKModel({
+      context: this.context,
+      provider: import_openai3.createOpenAI,
+      providerParams: { baseURL, apiKey, compatibility: "strict" }
+    });
+    return openaiModel(model, otherSettings);
   }
+  AISDKModel = createWorkflowModel;
 };
 
 // src/context/context.ts
@@ -3057,6 +3068,7 @@ var processOptions = (options) => {
     retries: DEFAULT_RETRIES,
     useJSONContent: false,
     disableTelemetry: false,
+    onError: console.error,
     ...options
   };
 };
@@ -3106,7 +3118,8 @@ var serveBase = (routeFunction, telemetry2, options) => {
     retries,
     useJSONContent,
     disableTelemetry,
-    flowControl
+    flowControl,
+    onError
   } = processOptions(options);
   telemetry2 = disableTelemetry ? void 0 : telemetry2;
   const debug = WorkflowLogger.getLogger(verbose);
@@ -3235,8 +3248,19 @@ var serveBase = (routeFunction, telemetry2, options) => {
     try {
       return await handler(request);
     } catch (error) {
-      console.error(error);
-      return new Response(JSON.stringify(formatWorkflowError(error)), {
+      const formattedError = formatWorkflowError(error);
+      try {
+        onError?.(error);
+      } catch (onErrorError) {
+        const formattedOnErrorError = formatWorkflowError(onErrorError);
+        const errorMessage = `Error while running onError callback: '${formattedOnErrorError.message}'.
+Original error: '${formattedError.message}'`;
+        console.error(errorMessage);
+        return new Response(errorMessage, {
+          status: 500
+        });
+      }
+      return new Response(JSON.stringify(formattedError), {
         status: 500
       });
     }

package/astro.mjs

@@ -2,7 +2,7 @@ import {
   SDK_TELEMETRY,
   serveBase,
   serveManyBase
-} from "./chunk-WQAJ2RSZ.mjs";
+} from "./chunk-4GTHIL7S.mjs";
 
 // platforms/astro.ts
 var telemetry = {

package/{chunk-WQAJ2RSZ.mjs → chunk-4GTHIL7S.mjs}

@@ -85,7 +85,7 @@ var formatWorkflowError = (error) => {
     message: error.message
   } : {
     error: "Error",
-    message: "An error occured while executing workflow."
+    message: `An error occured while executing workflow: '${typeof error === "string" ? error : JSON.stringify(error)}'`
   };
 };
 
@@ -1185,46 +1185,49 @@ you need from that agent.
 `;
 
 // src/agents/adapters.ts
-var createWorkflowOpenAI = (context, config) => {
-  const { baseURL, apiKey } = config ?? {};
-  return createOpenAI({
-    baseURL,
-    apiKey,
-    compatibility: "strict",
-    fetch: async (input, init) => {
-      try {
-        const headers = init?.headers ? Object.fromEntries(new Headers(init.headers).entries()) : {};
-        const body = init?.body ? JSON.parse(init.body) : void 0;
-        const agentName = headers[AGENT_NAME_HEADER];
-        const stepName = agentName ? `Call Agent ${agentName}` : "Call Agent";
-        const responseInfo = await context.call(stepName, {
-          url: input.toString(),
-          method: init?.method,
-          headers,
-          body
-        });
-        const responseHeaders = new Headers(
-          Object.entries(responseInfo.header).reduce(
-            (acc, [key, values]) => {
-              acc[key] = values.join(", ");
-              return acc;
-            },
-            {}
-          )
-        );
-        return new Response(JSON.stringify(responseInfo.body), {
-          status: responseInfo.status,
-          headers: responseHeaders
-        });
-      } catch (error) {
-        if (error instanceof Error && error.name === "WorkflowAbort") {
-          throw error;
-        } else {
-          console.error("Error in fetch implementation:", error);
-          throw error;
-        }
-      }
+var fetchWithContextCall = async (context, ...params) => {
+  const [input, init] = params;
+  try {
+    const headers = init?.headers ? Object.fromEntries(new Headers(init.headers).entries()) : {};
+    const body = init?.body ? JSON.parse(init.body) : void 0;
+    const agentName = headers[AGENT_NAME_HEADER];
+    const stepName = agentName ? `Call Agent ${agentName}` : "Call Agent";
+    const responseInfo = await context.call(stepName, {
+      url: input.toString(),
+      method: init?.method,
+      headers,
+      body
+    });
+    const responseHeaders = new Headers(
+      Object.entries(responseInfo.header).reduce(
+        (acc, [key, values]) => {
+          acc[key] = values.join(", ");
+          return acc;
+        },
+        {}
+      )
+    );
+    return new Response(JSON.stringify(responseInfo.body), {
+      status: responseInfo.status,
+      headers: responseHeaders
+    });
+  } catch (error) {
+    if (error instanceof Error && error.name === "WorkflowAbort") {
+      throw error;
+    } else {
+      console.error("Error in fetch implementation:", error);
+      throw error;
     }
+  }
+};
+var createWorkflowModel = ({
+  context,
+  provider,
+  providerParams
+}) => {
+  return provider({
+    fetch: (...params) => fetchWithContextCall(context, ...params),
+    ...providerParams
   });
 };
 var wrapTools = ({
@@ -2169,6 +2172,9 @@ var WorkflowApi = class extends BaseWorkflowApi {
   }
 };
 
+// src/agents/index.ts
+import { createOpenAI as createOpenAI2 } from "@ai-sdk/openai";
+
 // src/agents/agent.ts
 import { z } from "zod";
 import { generateText, tool as tool2, ToolExecutionError } from "ai";
@@ -2374,9 +2380,14 @@ var WorkflowAgents = class {
   openai(...params) {
     const [model, settings] = params;
     const { baseURL, apiKey, ...otherSettings } = settings ?? {};
-    const openai2 = createWorkflowOpenAI(this.context, { baseURL, apiKey });
-    return openai2(model, otherSettings);
+    const openaiModel = this.AISDKModel({
+      context: this.context,
+      provider: createOpenAI2,
+      providerParams: { baseURL, apiKey, compatibility: "strict" }
+    });
+    return openaiModel(model, otherSettings);
   }
+  AISDKModel = createWorkflowModel;
 };
 
 // src/context/context.ts
@@ -3099,6 +3110,7 @@ var processOptions = (options) => {
     retries: DEFAULT_RETRIES,
     useJSONContent: false,
     disableTelemetry: false,
+    onError: console.error,
     ...options
   };
 };
@@ -3148,7 +3160,8 @@ var serveBase = (routeFunction, telemetry, options) => {
     retries,
     useJSONContent,
     disableTelemetry,
-    flowControl
+    flowControl,
+    onError
   } = processOptions(options);
   telemetry = disableTelemetry ? void 0 : telemetry;
   const debug = WorkflowLogger.getLogger(verbose);
@@ -3277,8 +3290,19 @@ var serveBase = (routeFunction, telemetry, options) => {
     try {
       return await handler(request);
     } catch (error) {
-      console.error(error);
-      return new Response(JSON.stringify(formatWorkflowError(error)), {
+      const formattedError = formatWorkflowError(error);
+      try {
+        onError?.(error);
+      } catch (onErrorError) {
+        const formattedOnErrorError = formatWorkflowError(onErrorError);
+        const errorMessage = `Error while running onError callback: '${formattedOnErrorError.message}'.
+Original error: '${formattedError.message}'`;
+        console.error(errorMessage);
+        return new Response(errorMessage, {
+          status: 500
+        });
+      }
+      return new Response(JSON.stringify(formattedError), {
         status: 500
       });
     }

package/cloudflare.d.mts

@@ -1,5 +1,5 @@
-import { R as RouteFunction, k as PublicServeOptions, t as InvokableWorkflow } from './types-DS9q8FyV.mjs';
-import { s as serveManyBase } from './serve-many-Fuovl7gl.mjs';
+import { R as RouteFunction, k as PublicServeOptions, t as InvokableWorkflow } from './types-D1W0VOpy.mjs';
+import { s as serveManyBase } from './serve-many-DLguU9iR.mjs';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';

package/cloudflare.d.ts

@@ -1,5 +1,5 @@
-import { R as RouteFunction, k as PublicServeOptions, t as InvokableWorkflow } from './types-DS9q8FyV.js';
-import { s as serveManyBase } from './serve-many-DNnLsDIp.js';
+import { R as RouteFunction, k as PublicServeOptions, t as InvokableWorkflow } from './types-D1W0VOpy.js';
+import { s as serveManyBase } from './serve-many-BdMq5rFX.js';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';

package/cloudflare.js

@@ -134,7 +134,7 @@ var formatWorkflowError = (error) => {
     message: error.message
   } : {
     error: "Error",
-    message: "An error occured while executing workflow."
+    message: `An error occured while executing workflow: '${typeof error === "string" ? error : JSON.stringify(error)}'`
   };
 };
 
@@ -2034,6 +2034,9 @@ var WorkflowApi = class extends BaseWorkflowApi {
   }
 };
 
+// src/agents/index.ts
+var import_openai3 = require("@ai-sdk/openai");
+
 // src/agents/adapters.ts
 var import_openai2 = require("@ai-sdk/openai");
 var import_ai = require("ai");
@@ -2053,46 +2056,49 @@ you need from that agent.
 `;
 
 // src/agents/adapters.ts
-var createWorkflowOpenAI = (context, config) => {
-  const { baseURL, apiKey } = config ?? {};
-  return (0, import_openai2.createOpenAI)({
-    baseURL,
-    apiKey,
-    compatibility: "strict",
-    fetch: async (input, init) => {
-      try {
-        const headers = init?.headers ? Object.fromEntries(new Headers(init.headers).entries()) : {};
-        const body = init?.body ? JSON.parse(init.body) : void 0;
-        const agentName = headers[AGENT_NAME_HEADER];
-        const stepName = agentName ? `Call Agent ${agentName}` : "Call Agent";
-        const responseInfo = await context.call(stepName, {
-          url: input.toString(),
-          method: init?.method,
-          headers,
-          body
-        });
-        const responseHeaders = new Headers(
-          Object.entries(responseInfo.header).reduce(
-            (acc, [key, values]) => {
-              acc[key] = values.join(", ");
-              return acc;
-            },
-            {}
-          )
-        );
-        return new Response(JSON.stringify(responseInfo.body), {
-          status: responseInfo.status,
-          headers: responseHeaders
-        });
-      } catch (error) {
-        if (error instanceof Error && error.name === "WorkflowAbort") {
-          throw error;
-        } else {
-          console.error("Error in fetch implementation:", error);
-          throw error;
-        }
-      }
+var fetchWithContextCall = async (context, ...params) => {
+  const [input, init] = params;
+  try {
+    const headers = init?.headers ? Object.fromEntries(new Headers(init.headers).entries()) : {};
+    const body = init?.body ? JSON.parse(init.body) : void 0;
+    const agentName = headers[AGENT_NAME_HEADER];
+    const stepName = agentName ? `Call Agent ${agentName}` : "Call Agent";
+    const responseInfo = await context.call(stepName, {
+      url: input.toString(),
+      method: init?.method,
+      headers,
+      body
+    });
+    const responseHeaders = new Headers(
+      Object.entries(responseInfo.header).reduce(
+        (acc, [key, values]) => {
+          acc[key] = values.join(", ");
+          return acc;
+        },
+        {}
+      )
+    );
+    return new Response(JSON.stringify(responseInfo.body), {
+      status: responseInfo.status,
+      headers: responseHeaders
+    });
+  } catch (error) {
+    if (error instanceof Error && error.name === "WorkflowAbort") {
+      throw error;
+    } else {
+      console.error("Error in fetch implementation:", error);
+      throw error;
     }
+  }
+};
+var createWorkflowModel = ({
+  context,
+  provider,
+  providerParams
+}) => {
+  return provider({
+    fetch: (...params) => fetchWithContextCall(context, ...params),
+    ...providerParams
   });
 };
 var wrapTools = ({
@@ -2332,9 +2338,14 @@ var WorkflowAgents = class {
   openai(...params) {
     const [model, settings] = params;
     const { baseURL, apiKey, ...otherSettings } = settings ?? {};
-    const openai2 = createWorkflowOpenAI(this.context, { baseURL, apiKey });
-    return openai2(model, otherSettings);
+    const openaiModel = this.AISDKModel({
+      context: this.context,
+      provider: import_openai3.createOpenAI,
+      providerParams: { baseURL, apiKey, compatibility: "strict" }
+    });
+    return openaiModel(model, otherSettings);
   }
+  AISDKModel = createWorkflowModel;
 };
 
 // src/context/context.ts
@@ -3057,6 +3068,7 @@ var processOptions = (options) => {
     retries: DEFAULT_RETRIES,
     useJSONContent: false,
     disableTelemetry: false,
+    onError: console.error,
     ...options
   };
 };
@@ -3106,7 +3118,8 @@ var serveBase = (routeFunction, telemetry2, options) => {
     retries,
     useJSONContent,
     disableTelemetry,
-    flowControl
+    flowControl,
+    onError
   } = processOptions(options);
   telemetry2 = disableTelemetry ? void 0 : telemetry2;
   const debug = WorkflowLogger.getLogger(verbose);
@@ -3235,8 +3248,19 @@ var serveBase = (routeFunction, telemetry2, options) => {
     try {
       return await handler(request);
     } catch (error) {
-      console.error(error);
-      return new Response(JSON.stringify(formatWorkflowError(error)), {
+      const formattedError = formatWorkflowError(error);
+      try {
+        onError?.(error);
+      } catch (onErrorError) {
+        const formattedOnErrorError = formatWorkflowError(onErrorError);
+        const errorMessage = `Error while running onError callback: '${formattedOnErrorError.message}'.
+Original error: '${formattedError.message}'`;
+        console.error(errorMessage);
+        return new Response(errorMessage, {
+          status: 500
+        });
+      }
+      return new Response(JSON.stringify(formattedError), {
         status: 500
       });
     }

package/cloudflare.mjs

@@ -2,7 +2,7 @@ import {
   SDK_TELEMETRY,
   serveBase,
   serveManyBase
-} from "./chunk-WQAJ2RSZ.mjs";
+} from "./chunk-4GTHIL7S.mjs";
 
 // platforms/cloudflare.ts
 var getArgs = (args) => {

package/express.d.mts

@@ -1,7 +1,7 @@
 import * as express_serve_static_core from 'express-serve-static-core';
-import { R as RouteFunction, W as WorkflowServeOptions, t as InvokableWorkflow } from './types-DS9q8FyV.mjs';
+import { R as RouteFunction, W as WorkflowServeOptions, t as InvokableWorkflow } from './types-D1W0VOpy.mjs';
 import { Router } from 'express';
-import { s as serveManyBase } from './serve-many-Fuovl7gl.mjs';
+import { s as serveManyBase } from './serve-many-DLguU9iR.mjs';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';

package/express.d.ts

@@ -1,7 +1,7 @@
 import * as express_serve_static_core from 'express-serve-static-core';
-import { R as RouteFunction, W as WorkflowServeOptions, t as InvokableWorkflow } from './types-DS9q8FyV.js';
+import { R as RouteFunction, W as WorkflowServeOptions, t as InvokableWorkflow } from './types-D1W0VOpy.js';
 import { Router } from 'express';
-import { s as serveManyBase } from './serve-many-DNnLsDIp.js';
+import { s as serveManyBase } from './serve-many-BdMq5rFX.js';
 import '@upstash/qstash';
 import 'zod';
 import 'ai';