@vertesia/workflow 0.79.0 → 0.79.1

package/package.json

@@ -1,136 +1,136 @@
 {
-  "name": "@vertesia/workflow",
-  "version": "0.79.0",
-  "type": "module",
-  "description": "Vertesia workflow DSL",
-  "main": "./lib/esm/index.js",
-  "files": [
-    "lib",
-    "src"
-  ],
-  "bin": {
-    "bundle-workflows": "./bin/bundle-workflows.mjs"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/vertesia/composableai.git",
-    "directory": "zeno/workflow"
-  },
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "@smithy/types": "^3.7.2",
-    "@temporalio/proto": "^1.11.5",
-    "@temporalio/testing": "^1.11.5",
-    "@temporalio/worker": "^1.11.5",
-    "@types/jsonwebtoken": "^9.0.7",
-    "@types/node": "^22.5.1",
-    "@types/papaparse": "^5.3.15",
-    "@types/tmp": "^0.2.6",
-    "ts-dual-module": "^0.6.3",
-    "vitest": "^3.0.9"
-  },
-  "dependencies": {
-    "@aws-sdk/client-s3": "^3.693.0",
-    "@aws-sdk/client-textract": "^3.693.0",
-    "@aws-sdk/credential-providers": "^3.693.0",
-    "@temporalio/activity": "^1.11.5",
-    "@temporalio/workflow": "^1.11.5",
-    "@types/json-schema": "^7.0.15",
-    "fast-deep-equal": "^3.1.3",
-    "jsonwebtoken": "^9.0.2",
-    "mime": "^4.0.0",
-    "ms": "3.0.0-canary.1",
-    "node-web-stream-adapters": "^0.2.1",
-    "p-limit": "^6.2.0",
-    "papaparse": "^5.4.1",
-    "seedrandom": "^3.0.5",
-    "sharp": "^0.33.4",
-    "tiktoken": "^1.0.15",
-    "tmp": "^0.2.3",
-    "tmp-promise": "^3.0.3",
-    "yaml": "^2.6.0",
-    "@llumiverse/common": "0.22.0",
-    "@vertesia/client": "0.79.0",
-    "@vertesia/api-fetch-client": "0.79.0",
-    "@vertesia/common": "0.79.0",
-    "@vertesia/memory": "0.50.0"
-  },
-  "ts_dual_module": {
-    "outDir": "lib",
-    "exports": {
-      "activities": "./activities/index.js",
-      "dsl-activities": "./activities/index-dsl.js",
-      "workflows": "./workflows",
-      "workflows-bundle": "./workflows-bundle.js",
-      "vars": "./vars"
-    }
-  },
-  "exports": {
-    ".": {
-      "types": "./lib/types/index.d.ts",
-      "import": "./lib/esm/index.js",
-      "require": "./lib/cjs/index.js"
+    "name": "@vertesia/workflow",
+    "version": "0.79.1",
+    "type": "module",
+    "description": "Vertesia workflow DSL",
+    "main": "./lib/esm/index.js",
+    "files": [
+        "lib",
+        "src"
+    ],
+    "bin": {
+        "bundle-workflows": "./bin/bundle-workflows.mjs"
     },
-    "./vars": {
-      "types": "./lib/types/vars.d.ts",
-      "import": "./lib/esm/vars.js",
-      "require": "./lib/cjs/vars.js"
+    "scripts": {
+        "test": "vitest run",
+        "build": "pnpm exec tsmod build && node ./bin/bundle-workflows.mjs lib/esm/workflows.js lib/workflows-bundle.js",
+        "clean": "rm -rf ./lib tsconfig.tsbuildinfo"
     },
-    "./activities": {
-      "types": "./lib/types/activities/index.d.ts",
-      "import": "./lib/esm/activities/index.js",
-      "require": "./lib/cjs/activities/index.js"
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/vertesia/composableai.git",
+        "directory": "zeno/workflow"
     },
-    "./dsl-activities": {
-      "types": "./lib/types/activities/index-dsl.d.ts",
-      "import": "./lib/esm/activities/index-dsl.js",
-      "require": "./lib/cjs/activities/index-dsl.js"
+    "license": "Apache-2.0",
+    "devDependencies": {
+        "@smithy/types": "^3.7.2",
+        "@temporalio/proto": "^1.11.5",
+        "@temporalio/testing": "^1.11.5",
+        "@temporalio/worker": "^1.11.5",
+        "@types/jsonwebtoken": "^9.0.7",
+        "@types/node": "^22.5.1",
+        "@types/papaparse": "^5.3.15",
+        "@types/tmp": "^0.2.6",
+        "ts-dual-module": "^0.6.3",
+        "vitest": "^3.0.9"
     },
-    "./workflows": {
-      "types": "./lib/types/workflows.d.ts",
-      "import": "./lib/esm/workflows.js",
-      "require": "./lib/cjs/workflows.js"
+    "dependencies": {
+        "@aws-sdk/client-s3": "^3.693.0",
+        "@aws-sdk/client-textract": "^3.693.0",
+        "@aws-sdk/credential-providers": "^3.693.0",
+        "@llumiverse/common": "workspace:*",
+        "@temporalio/activity": "^1.11.5",
+        "@temporalio/workflow": "^1.11.5",
+        "@types/json-schema": "^7.0.15",
+        "@vertesia/api-fetch-client": "workspace:*",
+        "@vertesia/client": "workspace:*",
+        "@vertesia/common": "workspace:*",
+        "@vertesia/memory": "workspace:*",
+        "fast-deep-equal": "^3.1.3",
+        "jsonwebtoken": "^9.0.2",
+        "mime": "^4.0.0",
+        "ms": "3.0.0-canary.1",
+        "node-web-stream-adapters": "^0.2.1",
+        "p-limit": "^6.2.0",
+        "papaparse": "^5.4.1",
+        "seedrandom": "^3.0.5",
+        "sharp": "^0.33.4",
+        "tiktoken": "^1.0.15",
+        "tmp": "^0.2.3",
+        "tmp-promise": "^3.0.3",
+        "yaml": "^2.6.0"
     },
-    "./dsl": {
-      "types": "./lib/types/dsl.d.ts",
-      "import": "./lib/esm/dsl.js",
-      "require": "./lib/cjs/dsl.js"
+    "ts_dual_module": {
+        "outDir": "lib",
+        "exports": {
+            "activities": "./activities/index.js",
+            "dsl-activities": "./activities/index-dsl.js",
+            "workflows": "./workflows",
+            "workflows-bundle": "./workflows-bundle.js",
+            "vars": "./vars"
+        }
     },
-    "./workflows-bundle": {
-      "import": "./lib/workflows-bundle.js"
+    "exports": {
+        ".": {
+            "types": "./lib/types/index.d.ts",
+            "import": "./lib/esm/index.js",
+            "require": "./lib/cjs/index.js"
+        },
+        "./vars": {
+            "types": "./lib/types/vars.d.ts",
+            "import": "./lib/esm/vars.js",
+            "require": "./lib/cjs/vars.js"
+        },
+        "./activities": {
+            "types": "./lib/types/activities/index.d.ts",
+            "import": "./lib/esm/activities/index.js",
+            "require": "./lib/cjs/activities/index.js"
+        },
+        "./dsl-activities": {
+            "types": "./lib/types/activities/index-dsl.d.ts",
+            "import": "./lib/esm/activities/index-dsl.js",
+            "require": "./lib/cjs/activities/index-dsl.js"
+        },
+        "./workflows": {
+            "types": "./lib/types/workflows.d.ts",
+            "import": "./lib/esm/workflows.js",
+            "require": "./lib/cjs/workflows.js"
+        },
+        "./dsl": {
+            "types": "./lib/types/dsl.d.ts",
+            "import": "./lib/esm/dsl.js",
+            "require": "./lib/cjs/dsl.js"
+        },
+        "./workflows-bundle": {
+            "import": "./lib/workflows-bundle.js"
+        },
+        "./errors": {
+            "types": "./lib/types/errors.d.ts",
+            "import": "./lib/esm/errors.js",
+            "require": "./lib/cjs/errors.js"
+        }
     },
-    "./errors": {
-      "types": "./lib/types/errors.d.ts",
-      "import": "./lib/esm/errors.js",
-      "require": "./lib/cjs/errors.js"
-    }
-  },
-  "types": "./lib/types/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "activities": [
-        "./lib/types/activities/index.d.ts"
-      ],
-      "dsl-activities": [
-        "./lib/types/activities/index-dsl.d.ts"
-      ],
-      "workflows": [
-        "./lib/types/workflows.d.ts"
-      ],
-      "dsl": [
-        "./lib/types/dsl.d.ts"
-      ],
-      "vars": [
-        "./lib/types/dsl/vars.d.ts"
-      ],
-      "errors": [
-        "./lib/types/errors.d.ts"
-      ]
+    "types": "./lib/types/index.d.ts",
+    "typesVersions": {
+        "*": {
+            "activities": [
+                "./lib/types/activities/index.d.ts"
+            ],
+            "dsl-activities": [
+                "./lib/types/activities/index-dsl.d.ts"
+            ],
+            "workflows": [
+                "./lib/types/workflows.d.ts"
+            ],
+            "dsl": [
+                "./lib/types/dsl.d.ts"
+            ],
+            "vars": [
+                "./lib/types/dsl/vars.d.ts"
+            ],
+            "errors": [
+                "./lib/types/errors.d.ts"
+            ]
+        }
     }
-  },
-  "scripts": {
-    "test": "vitest run",
-    "build": "pnpm exec tsmod build && node ./bin/bundle-workflows.mjs lib/esm/workflows.js lib/workflows-bundle.js",
-    "clean": "rm -rf ./lib tsconfig.tsbuildinfo"
-  }
-}
+}

package/src/activities/advanced/createDocumentTypeFromInteractionRun.ts

@@ -1,9 +1,9 @@
-import { CreateContentObjectTypePayload, DSLActivityExecutionPayload, DSLActivitySpec, ExecutionRun } from "@vertesia/common";
 import { log } from "@temporalio/activity";
+import { InteractionOutput } from "@vertesia/client";
+import { CreateContentObjectTypePayload, DSLActivityExecutionPayload, DSLActivitySpec, ExecutionRun } from "@vertesia/common";
 import { projectResult } from "../../dsl/projections.js";
 import { setupActivity } from "../../dsl/setup/ActivityContext.js";
 import { ActivityParamNotFoundError } from "../../errors.js";
-import { parseCompletionResultsToJson } from "@llumiverse/common";
 
 
 export interface CreateDocumentTypeFromInteractionRunParams {
@@ -29,12 +29,10 @@ export async function createDocumentTypeFromInteractionRun(payload: DSLActivityE
         throw new ActivityParamNotFoundError("run", payload.activity);
     }
 
-    const genTypeRes = params.run.result;
-
-    const jsonResult = parseCompletionResultsToJson(params.run.result);
+    const jsonResult = InteractionOutput.from(params.run.result).object();
 
     if (!jsonResult.document_type) {
-        log.error("No name generated for type: " + JSON.stringify(genTypeRes), genTypeRes);
+        log.error("No name generated for type: " + JSON.stringify(jsonResult), jsonResult);
         throw new Error("No name generated for type");
     }
 

package/src/activities/advanced/createOrUpdateDocumentFromInteractionRun.ts

@@ -2,7 +2,6 @@ import { log } from "@temporalio/activity";
 import { ContentObjectStatus, DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
 import { setupActivity } from "../../dsl/setup/ActivityContext.js";
 import { ActivityParamNotFoundError, DocumentNotFoundError } from "../../errors.js";
-import { parseCompletionResultsToJson, completionResultToString } from "@llumiverse/common";
 
 interface CreateOrUpdateObjectFromInteractionRunParams {
     /**
@@ -69,16 +68,23 @@ export async function createOrUpdateDocumentFromInteractionRun(payload: DSLActiv
 
 
     const result = run.result;
-    const jsonResult = parseCompletionResultsToJson(run.result);
     const inputData = run.parameters;
 
-    const name = jsonResult['name'] || jsonResult["title"] || inputData['name'] || params.fallback_name || 'Untitled';
+    // Try to parse result as JSON, fallback to text if not valid JSON
+    let jsonResult: any = null;
+    try {
+        jsonResult = result.object();
+    } catch (e) {
+        log.info("Result is not valid JSON, will use text content instead", { error: e instanceof Error ? e.message : String(e) });
+    }
+
+    const name = jsonResult?.['name'] || jsonResult?.["title"] || inputData['name'] || params.fallback_name || undefined;
 
     const docPayload = {
         name,
         parent: params.parent ?? undefined,
         properties: jsonResult ? jsonResult : {},
-        text: !jsonResult ? result.map(completionResultToString).join('\n') : undefined,
+        text: !jsonResult ? result.text() : undefined,
         type: type?.id,
         status: ContentObjectStatus.completed,
         generation_run_info: {

package/src/activities/advanced/updateDocumentFromInteractionRun.ts

@@ -1,7 +1,7 @@
+import { InteractionOutput } from "@vertesia/client";
 import { DSLActivityExecutionPayload, DSLActivitySpec, ExecutionRun } from "@vertesia/common";
 import { setupActivity } from "../../dsl/setup/ActivityContext.js";
 import { ActivityParamNotFoundError } from "../../errors.js";
-import { parseCompletionResultsToJson } from "@llumiverse/common";
 
 
 export interface UpdateDocumentFromInteractionRunParams {
@@ -23,15 +23,13 @@ export async function updateDocumentFromInteractionRun(payload: DSLActivityExecu
         throw new ActivityParamNotFoundError("run", payload.activity);
     }
 
-    const docProps = params.run.result;
+    const docProps = InteractionOutput.from(params.run.result).object();
 
     if (!docProps) {
         return { status: "failed", error: "no-props" };
     }
 
-    const jsonResult = parseCompletionResultsToJson(params.run.result);
-
-    await client.objects.update(objectId, jsonResult);
+    await client.objects.update(objectId, docProps);
 
     return { status: "success" };
 }

package/src/activities/chunkDocument.ts

@@ -3,7 +3,6 @@ import { DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
 import { setupActivity } from "../dsl/setup/ActivityContext.js";
 import { DocPart } from "../utils/chunks.js";
 import { InteractionExecutionParams, executeInteractionFromActivity } from "./executeInteraction.js";
-import { parseCompletionResultsToJson } from "@llumiverse/common";
 
 const INT_CHUNK_DOCUMENT = "sys:ChunkDocument"
 
@@ -83,7 +82,7 @@ export async function chunkDocument(payload: DSLActivityExecutionPayload<ChunkDo
         content: instrumented
     });
 
-    const jsonResult = parseCompletionResultsToJson(res.result);
+    const jsonResult = res.result.object();
 
     const parts = jsonResult.parts as DocPart[];
     if (!parts || parts.length === 0) {

package/src/activities/executeInteraction.ts

@@ -1,4 +1,4 @@
-import { Modalities, ModelOptions } from "@llumiverse/common";
+import { CompletionResult, Modalities, ModelOptions } from "@llumiverse/common";
 import { activityInfo, log } from "@temporalio/activity";
 import { VertesiaClient } from "@vertesia/client";
 import { NodeStreamSource } from "@vertesia/client/node";
@@ -155,40 +155,42 @@ export async function executeInteraction(payload: DSLActivityExecutionPayload<Ex
             prompt_data,
             payload.debug_mode,
         );
-        
+
+        let completionResult: CompletionResult[] = res.result;
+
         // Handle image uploads if the result contains base64 images
         if (res.output_modality === Modalities.image) {
-            const images = res.result.filter((r: { type: string; }) => r.type === 'image');
+            const images = res.result.images();
             const uploadedImages = await Promise.all(
-                images.map((image: { value: string; }, index: number) => {
+                images.map((image: string, index: number) => {
                     // Extract base64 data and create buffer
-                    const base64Data = image.value.replace(/^data:image\/[a-z]+;base64,/, "");
+                    const base64Data = image.replace(/^data:image\/[a-z]+;base64,/, "");
                     const buffer = Buffer.from(base64Data, 'base64');
-                    
+
                     // Generate filename
                     const { runId } = activityInfo().workflowExecution;
                     const { activityId } = activityInfo();
                     const filename = `generated-image-${runId}-${activityId}-${index}.png`;
-                
+
                     // Create a readable stream from the buffer
                     const stream = Readable.from(buffer);
-                    
+
                     const source = new NodeStreamSource(
                         stream,
                         filename,
                         "image/png",
                     );
-                    
+
                     return client.files.uploadFile(source);
                 })
             );
-            res.result = uploadedImages.map(file => ({ type: "image", value: file }));
+            completionResult = uploadedImages.map(file => ({ type: "image", value: file }));
         }
 
         return projectResult(payload, params, res, {
             runId: res.id,
             status: res.status,
-            result: res.result,
+            result: completionResult,
         });
 
     } catch (error: any) {

package/src/activities/generateDocumentProperties.ts

@@ -3,7 +3,6 @@ import { DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
 import { setupActivity } from "../dsl/setup/ActivityContext.js";
 import { TruncateSpec, truncByMaxTokens } from "../utils/tokens.js";
 import { InteractionExecutionParams, executeInteractionFromActivity } from "./executeInteraction.js";
-import { parseCompletionResultsToJson } from "@llumiverse/common";
 
 const INT_EXTRACT_INFORMATION = "sys:ExtractInformation";
 export interface GenerateDocumentPropertiesParams extends InteractionExecutionParams {
@@ -89,7 +88,7 @@ export async function generateDocumentProperties(
             return undefined;
         }
         let text = "";
-        const jsonResult = parseCompletionResultsToJson(infoRes.result);
+        const jsonResult = infoRes.result.object();
         if (jsonResult.title) {
             text += jsonResult.title + "\n";
         }
@@ -106,7 +105,7 @@ export async function generateDocumentProperties(
     log.info(`Extracted information from object ${objectId} with type ${type.name}`, { runId: infoRes.id });
     await client.objects.update(doc.id, {
         properties: {
-            ...parseCompletionResultsToJson(infoRes.result),
+            ...infoRes.result.object(),
             etag: doc.text_etag,
         },
         text: getText(),

package/src/activities/generateOrAssignContentType.ts

@@ -15,7 +15,6 @@ import {
   InteractionExecutionParams,
   executeInteractionFromActivity,
 } from "./executeInteraction.js";
-import { parseCompletionResultsToJson } from "@llumiverse/common";
 
 const INT_SELECT_DOCUMENT_TYPE = "sys:SelectDocumentType";
 const INT_GENERATE_METADATA_MODEL = "sys:GenerateMetadataModel";
@@ -134,7 +133,7 @@ export async function generateOrAssignContentType(
     },
   );
 
-  const jsonResult = parseCompletionResultsToJson(res.result);
+  const jsonResult = res.result.object();
 
   log.info("Selected Content Type Result: " + JSON.stringify(jsonResult));
 
@@ -197,7 +196,7 @@ async function generateNewType(
     },
   );
 
-  const jsonResult = parseCompletionResultsToJson(genTypeRes.result);
+  const jsonResult = genTypeRes.result.object();
 
   if (!jsonResult.document_type) {
     log.error("No name generated for type", genTypeRes);

package/src/activities/index-dsl.ts

@@ -15,6 +15,7 @@ export { getObjectFromStore } from "./getObjectFromStore.js";
 export { handleDslError } from "./handleError.js";
 export { convertPdfToStructuredText } from "./media/processPdfWithTextract.js";
 export { transcribeMedia } from "./media/transcribeMediaWithGladia.js";
+export { prepareVideo } from "./media/prepareVideo.js";
 export { notifyWebhook } from "./notifyWebhook.js";
 export { setDocumentStatus } from "./setDocumentStatus.js";
 export { checkRateLimit } from "./rateLimiter.js";