@vertesia/workflow 1.0.0-dev.20260203.130115Z → 1.0.0-dev.20260227.112605Z

package/src/dsl/workflow-exec-child.test.ts

@@ -1,6 +1,6 @@
 import * as protos from '@temporalio/proto';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker } from '@temporalio/worker';
+import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import { ContentEventName, DSLActivityExecutionPayload, DSLWorkflowExecutionPayload, DSLWorkflowStep } from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, test } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
@@ -119,6 +119,7 @@ const steps3: DSLWorkflowStep[] = [
 describe('DSL Workflow with child workflows', () => {
 
     let testEnv: TestWorkflowEnvironment;
+    let workflowBundle: WorkflowBundleWithSourceMap;
 
     beforeAll(async () => {
         testEnv = await TestWorkflowEnvironment.createLocal();
@@ -133,7 +134,10 @@ describe('DSL Workflow with child workflows', () => {
                 InitiatedBy: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
             },
         });
-    });
+        workflowBundle = await bundleWorkflowCode({
+            workflowsPath: new URL('./test/test-child-workflow.ts', import.meta.url).pathname,
+        });
+    }, 60_000);
 
     afterAll(async () => {
         await testEnv?.teardown();
@@ -148,7 +152,7 @@ describe('DSL Workflow with child workflows', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./test/test-child-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayHelloFromParent, prepareResult },
         });
 
@@ -173,7 +177,7 @@ describe('DSL Workflow with child workflows', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,
@@ -192,7 +196,7 @@ describe('DSL Workflow with child workflows', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./test/test-child-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayHelloFromParent, prepareResult, sayHelloFromDSLChild },
         });
 
@@ -217,7 +221,7 @@ describe('DSL Workflow with child workflows', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,
@@ -236,7 +240,7 @@ describe('DSL Workflow with child workflows', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./test/test-child-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayHelloFromParent, prepareResult, sayHelloFromDSLChild },
         });
 
@@ -261,7 +265,7 @@ describe('DSL Workflow with child workflows', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test-vars',
             taskQueue,

package/src/dsl/workflow-fetch.test.ts

@@ -1,7 +1,7 @@
+import { TestWorkflowEnvironment } from '@temporalio/testing';
+import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import { VertesiaClient } from '@vertesia/client';
 import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload, FindPayload } from '@vertesia/common';
-import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker } from '@temporalio/worker';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
 import { setupActivity } from "./setup/ActivityContext.js";
@@ -77,10 +77,14 @@ const activities: DSLActivitySpec[] = [
 describe('DSL Workflow', () => {
 
     let testEnv: TestWorkflowEnvironment;
+    let workflowBundle: WorkflowBundleWithSourceMap;
 
     beforeAll(async () => {
         testEnv = await TestWorkflowEnvironment.createLocal();
-    });
+        workflowBundle = await bundleWorkflowCode({
+            workflowsPath: new URL('./dsl-workflow.ts', import.meta.url).pathname,
+        });
+    }, 60_000);
 
     afterAll(async () => {
         await testEnv?.teardown();
@@ -95,7 +99,7 @@ describe('DSL Workflow', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./dsl-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayMessage },
         });
 
@@ -105,7 +109,6 @@ describe('DSL Workflow', () => {
             vars: {},
             account_id: '123',
             project_id: '123',
-            timestamp: Date.now(),
             wf_rule_name: 'test',
             auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
@@ -121,7 +124,7 @@ describe('DSL Workflow', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,

package/src/dsl/workflow-import.test.ts

@@ -1,12 +1,12 @@
-import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload } from '@vertesia/common';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker } from '@temporalio/worker';
+import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
+import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload } from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
 import { setupActivity } from "./setup/ActivityContext.js";
 
 
-async function testImportedVars(payload: DSLActivityExecutionPayload) {
+async function testImportedVars(payload: DSLActivityExecutionPayload<Record<string, any>>) {
     const { params } = await setupActivity(payload);
     if (!params.object_name) throw new Error('object_name is required');
     console.log('!!!!!!!!!!@@@@@@@@@@@@@@!!!!!!!!!!!!!!', params.object_name);
@@ -28,10 +28,14 @@ const activities: DSLActivitySpec[] = [
 describe('DSL Workflow import vars', () => {
 
     let testEnv: TestWorkflowEnvironment;
+    let workflowBundle: WorkflowBundleWithSourceMap;
 
     beforeAll(async () => {
         testEnv = await TestWorkflowEnvironment.createLocal();
-    });
+        workflowBundle = await bundleWorkflowCode({
+            workflowsPath: new URL('./dsl-workflow.ts', import.meta.url).pathname,
+        });
+    }, 60_000);
 
     afterAll(async () => {
         await testEnv?.teardown();
@@ -49,7 +53,7 @@ describe('DSL Workflow import vars', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./dsl-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { testImportedVars },
         });
 
@@ -59,7 +63,6 @@ describe('DSL Workflow import vars', () => {
             vars: {},
             account_id: '123',
             project_id: '123',
-            timestamp: Date.now(),
             wf_rule_name: 'test',
             auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
@@ -75,7 +78,7 @@ describe('DSL Workflow import vars', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,

package/src/dsl/workflow.test.ts

@@ -1,22 +1,22 @@
 import * as protos from '@temporalio/proto';
 import { TestWorkflowEnvironment } from '@temporalio/testing';
-import { Worker } from '@temporalio/worker';
+import { Worker, bundleWorkflowCode, type WorkflowBundleWithSourceMap } from '@temporalio/worker';
 import { ContentEventName, DSLActivityExecutionPayload, DSLActivitySpec, DSLWorkflowExecutionPayload } from '@vertesia/common';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 import { dslWorkflow } from './dsl-workflow.js';
 import { setupActivity } from "./setup/ActivityContext.js";
 
-async function sayHello(payload: DSLActivityExecutionPayload): Promise<string> {
+async function sayHello(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
     const { params } = await setupActivity(payload);
     return params.lang === 'fr' ? "Bonjour" : "Hello";
 }
 
-async function sayName(payload: DSLActivityExecutionPayload): Promise<string> {
+async function sayName(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
     const { params } = await setupActivity(payload);
     return params.lang === 'fr' ? "Monde" : "World";
 }
 
-async function sayGreeting(payload: DSLActivityExecutionPayload): Promise<string> {
+async function sayGreeting(payload: DSLActivityExecutionPayload<Record<string, any>>): Promise<string> {
     const { params } = await setupActivity(payload);
     return `${params.hello}, ${params.name}!`;
 }
@@ -50,6 +50,7 @@ const activities: DSLActivitySpec[] = [
 describe('DSL Workflow', () => {
 
     let testEnv: TestWorkflowEnvironment;
+    let workflowBundle: WorkflowBundleWithSourceMap;
 
     beforeAll(async () => {
         testEnv = await TestWorkflowEnvironment.createLocal();
@@ -64,7 +65,10 @@ describe('DSL Workflow', () => {
                 InitiatedBy: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
             },
         });
-    });
+        workflowBundle = await bundleWorkflowCode({
+            workflowsPath: new URL('./dsl-workflow.ts', import.meta.url).pathname,
+        });
+    }, 60_000);
 
     afterAll(async () => {
         await testEnv?.teardown();
@@ -79,7 +83,7 @@ describe('DSL Workflow', () => {
         const worker = await Worker.create({
             connection: nativeConnection,
             taskQueue,
-            workflowsPath: new URL("./dsl-workflow.ts", import.meta.url).pathname,
+            workflowBundle,
             activities: { sayHello, sayName, sayGreeting },
         });
 
@@ -89,7 +93,6 @@ describe('DSL Workflow', () => {
             vars: {},
             account_id: '123',
             project_id: '123',
-            timestamp: Date.now(),
             wf_rule_name: 'test',
             auth_token: process.env.VERTESIA_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJodHRwOi8vbW9jay10b2tlbi1zZXJ2ZXIiLCJzdWIiOiJ0ZXN0In0.signature',
             config: {
@@ -105,7 +108,7 @@ describe('DSL Workflow', () => {
             }
         }
 
-        let result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
+        const result = await worker.runUntil(client.workflow.execute(dslWorkflow, {
             args: [payload],
             workflowId: 'test',
             taskQueue,

package/src/dsl.ts

@@ -1,3 +1,4 @@
 export * from "./dsl/dslProxyActivities.js";
 export * from "./errors.js";
 export * from "./result-types.js";
+

package/src/errors.ts

@@ -91,6 +91,19 @@ export class TokenExpiredError extends ApplicationFailure {
     }
 }
 
+export class WorkflowExecutionError extends ApplicationFailure {
+    constructor(
+        message: string,
+        public workflow?: DSLWorkflowSpec,
+    ) {
+        super(
+            message,
+            "WorkflowExecutionError",
+            true, // non-retryable
+        );
+    }
+}
+
 export const WF_NON_RETRYABLE_ERRORS = [
     "DocumentNotFoundError",
     "ActivityParamInvalidError",
@@ -99,4 +112,5 @@ export const WF_NON_RETRYABLE_ERRORS = [
     "InvalidContentTypeError",
     "TokenExpiredError",
     "ZenoClientNotFoundError",
+    "WorkflowExecutionError",
 ];

package/src/index.ts

@@ -18,15 +18,15 @@ export * from "./activities/executeInteraction.js";
 export * from "./activities/extractDocumentText.js";
 export * from "./activities/generateDocumentProperties.js";
 export * from "./activities/generateEmbeddings.js";
-export * from "./activities/renditions/generateImageRendition.js";
-export * from "./activities/renditions/generateVideoRendition.js";
 export * from "./activities/generateOrAssignContentType.js";
+export * from "./activities/media/prepareAudio.js";
+export * from "./activities/media/prepareVideo.js";
 export * from "./activities/notifyWebhook.js";
 export * from "./activities/rateLimiter.js";
+export * from "./activities/renditions/generateImageRendition.js";
+export * from "./activities/renditions/generateVideoRendition.js";
 export * from "./activities/setDocumentStatus.js";
 export * from "./iterative-generation/activities/index.js";
-export * from "./activities/media/prepareVideo.js";
-export * from "./activities/media/prepareAudio.js";
 
 export * from "./dsl/setup/ActivityContext.js";
 export * from "./errors.js";
@@ -34,8 +34,9 @@ export * from "./result-types.js";
 export * from "./utils/blobs.js";
 export * from "./utils/client.js";
 export * from "./utils/memory.js";
-export * from "./utils/tokens.js";
 export * from "./utils/renditions.js";
 export * from "./utils/storage.js";
+export * from "./utils/text-preview-utils.js";
+export * from "./utils/tokens.js";
 
 export * from "./conversion/image.js";

package/src/result-types.ts

@@ -5,7 +5,11 @@
  * The result of a text extraction operation.
  */
 export interface TextExtractionResult {
-    objectId: string;
+    objectId?: string;
+    file?: {   
+        source_url: string;
+        result_url?: string;
+    }
     status: TextExtractionStatus;
     hasText: boolean;
     message?: string;

package/src/utils/renditions.ts

@@ -9,6 +9,8 @@ import { imageResizer } from "../conversion/image.js";
 export interface ImageRenditionParams {
     max_hw: number; //maximum size of the longest side of the image
     format: ImageRenditionFormat;
+    /** Custom upload path — overrides default renditions/{etag}/{max_hw}/{page}.{format} path */
+    outputPath?: string;
 }
 
 /**
@@ -53,7 +55,7 @@ export async function uploadRenditionPages(
     params: ImageRenditionParams,
     concurrency?: number,
 ) {
-    log.info(
+    log.debug(
         `Uploading rendition for etag ${contentEtag} with ${files.length} pages (max_hw: ${params.max_hw}, format: ${params.format})`,
         { files },
     );
@@ -61,11 +63,15 @@ export async function uploadRenditionPages(
     const limit = pLimit(concurrency ?? 20);
 
     const uploads = files.map((file, i) => limit(async () => {
-        const pageId = getRenditionPagePath(contentEtag, params, i);
+        const pageId = params.outputPath
+            ? (files.length === 1
+                ? params.outputPath
+                : `${params.outputPath}/${String(i).padStart(4, "0")}.${params.format}`)
+            : getRenditionPagePath(contentEtag, params, i);
         let resizedImagePath = null;
 
         try {
-            log.info(`Resizing image for ${contentEtag} page ${i}`, {
+            log.debug(`Resizing image for ${contentEtag} page ${i}`, {
                 file,
                 params,
             });
@@ -87,7 +93,7 @@ export async function uploadRenditionPages(
                 pageId,
             );
 
-            log.info(
+            log.debug(
                 `Uploading rendition for ${contentEtag} page ${i} with max_hw: ${params.max_hw} and format: ${params.format}`,
                 {
                     resizedImagePath,
@@ -110,7 +116,7 @@ export async function uploadRenditionPages(
                     );
                     return Promise.reject(`Upload failed: ${err.message}`);
                 });
-            log.info(`Rendition uploaded for ${contentEtag} page ${i}`, {
+            log.debug(`Rendition uploaded for ${contentEtag} page ${i}`, {
                 result,
             });
 

package/src/utils/text-preview-utils.ts

@@ -0,0 +1,62 @@
+import { log } from "@temporalio/activity";
+import { VertesiaClient } from "@vertesia/client";
+import { NodeStreamSource } from "@vertesia/client/node";
+import { Readable } from "stream";
+import { TextExtractionResult, TextExtractionStatus } from "../result-types.js";
+
+/**
+ * Uploads extracted text preview to cloud storage
+ */
+export async function uploadTextPreviewToStorage(
+    vertesia: VertesiaClient,
+    text: string,
+    storagePath: string,
+    fileType: string
+): Promise<string> {
+
+    const source = new NodeStreamSource(
+        Readable.from(text),
+        storagePath,
+        'text/markdown',
+        storagePath
+    );
+
+    const uploadedPath = await vertesia.files.uploadFile(source);
+    log.info(`Uploaded ${fileType} preview text to ${uploadedPath}`);
+
+    return uploadedPath;
+}
+
+/**
+ * Creates the TextExtractionResult for file_source mode
+ */
+export function createFileSourceResult(
+    sourceUrl: string,
+    storagePath: string,
+    text: string | null
+): TextExtractionResult {
+    return {
+        hasText: !!text,
+        file: {
+            source_url: sourceUrl,
+            result_url: text && storagePath ? storagePath : undefined,
+        },
+        status: TextExtractionStatus.success,
+    };
+}
+
+/**
+ * Saves extracted text to an object in the object store
+ */
+export async function saveTextToObject(
+    vertesia: VertesiaClient,
+    objectId: string,
+    text: string
+): Promise<void> {
+    const object = await vertesia.objects.retrieve(objectId);
+    await vertesia.objects.update(objectId, {
+        text: text,
+        text_etag: object.content?.etag,
+    });
+    log.info(`Saved text to object ${objectId}`);
+}