@teamkeel/functions-runtime 0.413.0-next.1 → 0.413.2-next.2

package/dist/index.cjs

@@ -2333,6 +2333,7 @@ __name(tryExecuteFlow, "tryExecuteFlow");
 // src/flows/ui/elements/input/text.ts
 var textInput = /* @__PURE__ */ __name((name, options) => {
   return {
+    __type: "input",
     uiConfig: {
       __type: "ui.input.text",
       name,
@@ -2352,6 +2353,7 @@ var textInput = /* @__PURE__ */ __name((name, options) => {
 // src/flows/ui/elements/input/number.ts
 var numberInput = /* @__PURE__ */ __name((name, options) => {
   return {
+    __type: "input",
     uiConfig: {
       __type: "ui.input.number",
       name,
@@ -2379,6 +2381,7 @@ var divider = /* @__PURE__ */ __name((options) => {
 // src/flows/ui/elements/input/boolean.ts
 var booleanInput = /* @__PURE__ */ __name((name, options) => {
   return {
+    __type: "input",
     uiConfig: {
       __type: "ui.input.boolean",
       name,
@@ -2420,11 +2423,12 @@ var table = /* @__PURE__ */ __name((options) => {
   };
 }, "table");
 
-// src/flows/ui/elements/select/single.ts
+// src/flows/ui/elements/select/one.ts
 var selectOne = /* @__PURE__ */ __name((name, options) => {
   return {
+    __type: "input",
     uiConfig: {
-      __type: "ui.select.single",
+      __type: "ui.select.one",
       name,
       label: options?.label || name,
       defaultValue: options?.defaultValue,
@@ -2436,6 +2440,20 @@ var selectOne = /* @__PURE__ */ __name((name, options) => {
   };
 }, "selectOne");
 
+// src/flows/ui/page.ts
+var page = /* @__PURE__ */ __name((options) => {
+  const content = options.content;
+  const contentUiConfig = content.map((c) => c.uiConfig).filter(Boolean);
+  return {
+    __type: "ui.page",
+    stage: options.stage,
+    title: options.title,
+    description: options.description,
+    content: contentUiConfig,
+    actions: options.actions
+  };
+}, "page");
+
 // src/flows/disrupts.ts
 var FlowDisrupt = class {
   static {
@@ -2454,18 +2472,17 @@ var UIRenderDisrupt = class extends FlowDisrupt {
     __name(this, "UIRenderDisrupt");
   }
 };
-var StepErrorDisrupt = class extends FlowDisrupt {
-  constructor(message) {
-    super();
-    this.message = message;
-  }
+var StepCreatedDisrupt = class extends FlowDisrupt {
   static {
-    __name(this, "StepErrorDisrupt");
+    __name(this, "StepCreatedDisrupt");
+  }
+  constructor() {
+    super();
   }
 };
-var StepCompletedDisrupt = class extends FlowDisrupt {
+var ExhuastedRetriesDisrupt = class extends FlowDisrupt {
   static {
-    __name(this, "StepCompletedDisrupt");
+    __name(this, "ExhuastedRetriesDisrupt");
   }
   constructor() {
     super();
@@ -2513,7 +2530,14 @@ var grid = /* @__PURE__ */ __name((options) => {
   return {
     uiConfig: {
       __type: "ui.display.grid",
-      data: options.data.map(options.render)
+      data: options.data.map((item) => {
+        const rendered = options.render(item);
+        return {
+          title: rendered.title,
+          description: rendered.description,
+          image: rendered.image
+        };
+      })
     }
   };
 }, "grid");
@@ -2523,7 +2547,14 @@ var list = /* @__PURE__ */ __name((options) => {
   return {
     uiConfig: {
       __type: "ui.display.list",
-      data: options.data.map(options.render)
+      data: options.data.map((item) => {
+        const rendered = options.render(item);
+        return {
+          title: rendered.title,
+          description: rendered.description,
+          image: rendered.image
+        };
+      })
     }
   };
 }, "list");
@@ -2547,46 +2578,80 @@ var defaultOpts = {
 };
 function createFlowContext(runId, data, spanId) {
   return {
-    step: /* @__PURE__ */ __name(async (name, options, fn) => {
+    step: /* @__PURE__ */ __name(async (name, optionsOrFn, fn) => {
+      const options = typeof optionsOrFn === "function" ? {} : optionsOrFn;
+      const actualFn = typeof optionsOrFn === "function" ? optionsOrFn : fn;
       const db = useDatabase();
-      const completed = await db.selectFrom("keel_flow_step").where("run_id", "=", runId).where("name", "=", name).where("status", "=", "COMPLETED" /* COMPLETED */).selectAll().executeTakeFirst();
-      if (completed) {
-        return completed.value;
+      const past = await db.selectFrom("keel_flow_step").where("run_id", "=", runId).where("name", "=", name).selectAll().execute();
+      const newSteps = past.filter((step) => step.status === "NEW" /* NEW */);
+      const completedSteps = past.filter(
+        (step) => step.status === "COMPLETED" /* COMPLETED */
+      );
+      const failedSteps = past.filter(
+        (step) => step.status === "FAILED" /* FAILED */
+      );
+      if (newSteps.length > 1) {
+        throw new Error("Multiple NEW steps found for the same step");
+      }
+      if (completedSteps.length > 1) {
+        throw new Error("Multiple completed steps found for the same step");
+      }
+      if (completedSteps.length > 1 && newSteps.length > 1) {
+        throw new Error(
+          "Multiple completed and new steps found for the same step"
+        );
+      }
+      if (completedSteps.length === 1) {
+        return completedSteps[0].value;
+      }
+      if (newSteps.length === 1) {
+        let result = null;
+        await db.updateTable("keel_flow_step").set({
+          startTime: /* @__PURE__ */ new Date()
+        }).where("id", "=", newSteps[0].id).returningAll().executeTakeFirst();
+        try {
+          result = await withTimeout(
+            actualFn(),
+            options.timeoutInMs ?? defaultOpts.timeoutInMs
+          );
+        } catch (e) {
+          await db.updateTable("keel_flow_step").set({
+            status: "FAILED" /* FAILED */,
+            spanId,
+            endTime: /* @__PURE__ */ new Date(),
+            error: e instanceof Error ? e.message : "An error occurred"
+          }).where("id", "=", newSteps[0].id).returningAll().executeTakeFirst();
+          if (failedSteps.length + 1 >= (options.maxRetries ?? defaultOpts.maxRetries)) {
+            throw new ExhuastedRetriesDisrupt();
+          }
+          await db.insertInto("keel_flow_step").values({
+            run_id: runId,
+            name,
+            stage: options.stage,
+            status: "NEW" /* NEW */,
+            type: "FUNCTION" /* FUNCTION */
+          }).returningAll().executeTakeFirst();
+          throw new StepCreatedDisrupt();
+        }
+        await db.updateTable("keel_flow_step").set({
+          status: "COMPLETED" /* COMPLETED */,
+          value: JSON.stringify(result),
+          spanId,
+          endTime: /* @__PURE__ */ new Date()
+        }).where("id", "=", newSteps[0].id).returningAll().executeTakeFirst();
+        return result;
       }
-      const step = await db.insertInto("keel_flow_step").values({
+      await db.insertInto("keel_flow_step").values({
         run_id: runId,
         name,
         stage: options.stage,
         status: "NEW" /* NEW */,
-        type: "FUNCTION" /* FUNCTION */,
-        maxRetries: options?.maxRetries ?? defaultOpts.maxRetries,
-        timeoutInMs: options?.timeoutInMs ?? defaultOpts.timeoutInMs
+        type: "FUNCTION" /* FUNCTION */
       }).returningAll().executeTakeFirst();
-      if (!step) {
-        throw new Error("Failed to create step");
-      }
-      let result = null;
-      try {
-        result = await withTimeout(fn(), step.timeoutInMs);
-      } catch (e) {
-        await db.updateTable("keel_flow_step").set({
-          status: "FAILED" /* FAILED */,
-          spanId
-          // TODO: store error message
-        }).where("id", "=", step.id).returningAll().executeTakeFirst();
-        throw new StepErrorDisrupt(
-          e instanceof Error ? e.message : "an error occurred"
-        );
-      }
-      await db.updateTable("keel_flow_step").set({
-        status: "COMPLETED" /* COMPLETED */,
-        value: JSON.stringify(result),
-        spanId
-      }).where("id", "=", step.id).returningAll().executeTakeFirst();
-      throw new StepCompletedDisrupt();
+      throw new StepCreatedDisrupt();
     }, "step"),
     ui: {
-      page: /* @__PURE__ */ __name(async (name, page) => {
+      page: /* @__PURE__ */ __name(async (name, options) => {
         const db = useDatabase();
         let step = await db.selectFrom("keel_flow_step").where("run_id", "=", runId).where("name", "=", name).selectAll().executeTakeFirst();
         if (step && step.status === "COMPLETED" /* COMPLETED */) {
@@ -2596,26 +2661,23 @@ function createFlowContext(runId, data, spanId) {
           step = await db.insertInto("keel_flow_step").values({
             run_id: runId,
             name,
-            stage: page.stage,
+            stage: options.stage,
             status: "PENDING" /* PENDING */,
             type: "UI" /* UI */,
-            maxRetries: 3,
-            timeoutInMs: 1e3
+            startTime: /* @__PURE__ */ new Date()
           }).returningAll().executeTakeFirst();
+          throw new UIRenderDisrupt(step?.id, page(options));
         }
-        if (!step) {
-          throw new Error("Failed to create step");
-        }
-        if (data) {
-          await db.updateTable("keel_flow_step").set({
-            status: "COMPLETED" /* COMPLETED */,
-            value: JSON.stringify(data),
-            spanId
-          }).where("id", "=", step.id).returningAll().executeTakeFirst();
-          return data;
-        } else {
-          throw new UIRenderDisrupt(step.id, page);
+        if (!data) {
+          throw new UIRenderDisrupt(step?.id, page(options));
         }
+        await db.updateTable("keel_flow_step").set({
+          status: "COMPLETED" /* COMPLETED */,
+          value: JSON.stringify(data),
+          spanId,
+          endTime: /* @__PURE__ */ new Date()
+        }).where("id", "=", step.id).returningAll().executeTakeFirst();
+        return data;
       }, "page"),
       inputs: {
         text: textInput,
@@ -2634,7 +2696,7 @@ function createFlowContext(runId, data, spanId) {
         list
       },
       select: {
-        single: selectOne
+        one: selectOne
       }
     }
   };
@@ -2648,7 +2710,7 @@ function withTimeout(promiseFn, timeout) {
   return Promise.race([
     promiseFn,
     wait(timeout).then(() => {
-      throw new Error(`flow times out after ${timeout}ms`);
+      throw new Error(`Step function timed out after ${timeout}ms`);
     })
   ]);
 }
@@ -2706,7 +2768,7 @@ async function handleFlow(request, config) {
           config: flowConfig
         });
       } catch (e) {
-        if (e instanceof StepCompletedDisrupt) {
+        if (e instanceof StepCreatedDisrupt) {
           return (0, import_json_rpc_26.createJSONRPCSuccessResponse)(request.id, {
             runId,
             runCompleted: false,
@@ -2726,11 +2788,19 @@ async function handleFlow(request, config) {
           code: opentelemetry6.SpanStatusCode.ERROR,
           message: e.message
         });
-        return (0, import_json_rpc_26.createJSONRPCSuccessResponse)(request.id, {
-          runId,
-          runCompleted: false,
-          config: flowConfig
-        });
+        if (e instanceof ExhuastedRetriesDisrupt) {
+          return (0, import_json_rpc_26.createJSONRPCSuccessResponse)(request.id, {
+            runId,
+            runCompleted: true,
+            error: "flow failed due to exhausted step retries",
+            config: flowConfig
+          });
+        }
+        return (0, import_json_rpc_26.createJSONRPCErrorResponse)(
+          request.id,
+          import_json_rpc_26.JSONRPCErrorCode.InternalError,
+          e.message
+        );
       } finally {
         if (db) {
           await db.destroy();