@vertesia/workflow 0.78.0 → 0.79.1

package/src/dsl/workflow.test.ts

@@ -60,6 +60,7 @@ describe('DSL Workflow', () => {
                 AccountId: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
                 DocumentId: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
                 ProjectId: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
+                TenantId: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
                 InitiatedBy: protos.temporal.api.enums.v1.IndexedValueType.INDEXED_VALUE_TYPE_KEYWORD,
             },
         });

package/src/errors.ts

@@ -51,9 +51,37 @@ export class WorkflowParamNotFoundError extends ApplicationFailure {
     }
 }
 
+export class ResourceExhaustedError extends ApplicationFailure {
+    constructor(
+        public statusCode: number = 429,
+        message?: string,
+    ) {
+        super(
+            message || "Resource exhausted - rate limit exceeded",
+            "ResourceExhaustedError",
+            true, // non-retryable
+        );
+    }
+}
+
+export class InvalidContentTypeError extends ApplicationFailure {
+    constructor(
+        public objectId: string,
+        public expectedType: string,
+        public actualType: string,
+    ) {
+        super(
+            `Document ${objectId} has invalid content type. Expected ${expectedType}, got ${actualType}`,
+            "InvalidContentTypeError",
+            true, // non-retryable
+        );
+    }
+}
+
 export const WF_NON_RETRYABLE_ERRORS = [
     "DocumentNotFoundError",
     "ActivityParamInvalidError",
     "ActivityParamNotFoundError",
     "WorkflowParamNotFoundError",
+    "InvalidContentTypeError",
 ];

package/src/index.ts

@@ -18,13 +18,14 @@ export * from "./activities/executeInteraction.js";
 export * from "./activities/extractDocumentText.js";
 export * from "./activities/generateDocumentProperties.js";
 export * from "./activities/generateEmbeddings.js";
-export * from "./activities/identifyTextSections.js";
 export * from "./activities/renditions/generateImageRendition.js";
 export * from "./activities/renditions/generateVideoRendition.js";
 export * from "./activities/generateOrAssignContentType.js";
 export * from "./activities/notifyWebhook.js";
+export * from "./activities/rateLimiter.js";
 export * from "./activities/setDocumentStatus.js";
 export * from "./iterative-generation/activities/index.js";
+export * from "./activities/media/prepareVideo.js";
 
 export * from "./dsl/setup/ActivityContext.js";
 export * from "./errors.js";

package/src/iterative-generation/activities/generatePart.ts

@@ -56,7 +56,7 @@ export async function it_gen_generatePart(payload: WorkflowExecutionPayload, pat
         }
     });
 
-    const result = r.result as string;
+    const result = r.result.text();
     content[content.length - 1].content += result;
     meta.lastProcessedPart = path;
     await buildAndPublishMemoryPack(client, `${memory}/output`, async ({ copyText }) => {

package/src/iterative-generation/activities/generateToc.ts

@@ -84,14 +84,19 @@ export async function it_gen_generateToc(payload: WorkflowExecutionPayload): Pro
 
     const run = await executeWithVars(client, vars.interaction, vars, undefined, schema);
 
-    const toc = run.result as Toc;
+    //Parse the CompletionResult[] to get a Toc object
+    const jsonResults = run.result.object();
+
+    const toc: Toc = {
+        sections: jsonResults.sections
+    };
 
     await buildAndPublishMemoryPack(client, `${vars.memory}/output`, async () => {
         return {
             toc,
             lastProcessedPart: undefined, // the part index (a number array)
             previouslyGenerated: ""
-        } as OutputMemoryMeta
+        } satisfies OutputMemoryMeta
     });
 
     return tocIndex(toc);

package/src/iterative-generation/utils.ts

@@ -1,8 +1,7 @@
-import { VertesiaClient } from "@vertesia/client";
-import { ExecutionRun } from "@vertesia/common";
+import { ModelOptions, TextFallbackOptions } from "@llumiverse/common";
 import { ApplicationFailure } from "@temporalio/workflow";
+import { VertesiaClient } from "@vertesia/client";
 import { OutputMemoryMeta, PartIndex, Toc, TocIndex, TocSection } from "./types.js";
-import { ModelOptions, TextFallbackOptions } from "@llumiverse/common";
 
 //TODO: For whole file, support for options beyond max_tokens and temperature and multiple modalities.
 export interface ExecuteOptions {
@@ -15,7 +14,7 @@ export interface ExecuteOptions {
     result_schema?: Record<string, any>;
 }
 
-export async function execute<T = any>(client: VertesiaClient, options: ExecuteOptions): Promise<ExecutionRun<any, T>> {
+export async function execute(client: VertesiaClient, options: ExecuteOptions) {
     return client.interactions.executeByName(options.interaction, {
         data: {
             ...options.memory_mapping,
@@ -30,7 +29,7 @@ export async function execute<T = any>(client: VertesiaClient, options: ExecuteO
     });
 }
 
-export function executeWithVars<T = any>(client: VertesiaClient, interaction: string, vars: Record<string, any>, mapping?: Record<string, any>, result_schema?: Record<string, any>): Promise<ExecutionRun<any, T>> {
+export function executeWithVars(client: VertesiaClient, interaction: string, vars: Record<string, any>, mapping?: Record<string, any>, result_schema?: Record<string, any>) {
     if (mapping) {
         mapping = { ...vars.input_mapping, ...mapping };
     } else {

package/src/system/notifyWebhookWorkflow.ts

@@ -1,6 +1,6 @@
 
-import { log } from "@temporalio/workflow";
-import { WorkflowExecutionPayload } from "@vertesia/common";
+import { log, workflowInfo } from "@temporalio/workflow";
+import { WebHookSpec, WorkflowExecutionPayload } from "@vertesia/common";
 import * as activities from "../activities/notifyWebhook.js";
 import { dslProxyActivities } from "../dsl/dslProxyActivities.js";
 import { WF_NON_RETRYABLE_ERRORS } from "../errors.js";
@@ -19,19 +19,25 @@ const {
 });
 
 export interface NotifyWebhookWorfklowParams {
-    endpoints: string[],
+    workflow_type: string;
+    endpoints: (string | WebHookSpec)[],
     data: Record<string, any>
 }
 
 
 export async function notifyWebhookWorkflow(payload: WorkflowExecutionPayload<NotifyWebhookWorfklowParams>): Promise<any> {
 
+    const info = workflowInfo();
     const { objectIds, vars } = payload;
     const notifications = [];
     const endpoints = vars.endpoints ?? (vars as any).webhooks ?? [];
     const data = vars.data ?? (vars as any).webhook_data ?? undefined;
+    const workflow_type = vars.workflow_type ?? info.workflowType;
     const eventName = payload.event;
 
+    const workflowId = info.parent?.workflowId || info.workflowId;
+    const workflowRunId = info.parent?.runId || info.runId;
+
     if (!endpoints.length) {
         log.info(`No webhooks to notify`);
         return { notifications: [], message: "No webhooks to notify" };
@@ -39,11 +45,14 @@ export async function notifyWebhookWorkflow(payload: WorkflowExecutionPayload<No
 
     for (const ep of endpoints) {
         const n = notifyWebhook(payload, {
-            target_url: ep,
+            webhook: ep,
             method: 'POST',
-            payload: {
+            workflow_type,
+            workflow_id: workflowId,
+            workflow_run_id: workflowRunId,
+            event_name: eventName,
+            detail: {
                 object_ids: objectIds,
-                event: eventName,
                 data
             }
         }).then(res => {

package/lib/cjs/activities/identifyTextSections.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.identifyTextSections = identifyTextSections;
-const activity_1 = require("@temporalio/activity");
-const ActivityContext_js_1 = require("../dsl/setup/ActivityContext.js");
-const executeInteraction_js_1 = require("./executeInteraction.js");
-const INT_GENERATE_TEXT_PARTS = "sys:IdentifyTextSections";
-async function identifyTextSections(payload) {
-    const context = await (0, ActivityContext_js_1.setupActivity)(payload);
-    const { params, client, objectId } = context;
-    const interactionName = params.interactionName ?? INT_GENERATE_TEXT_PARTS;
-    const project = await context.fetchProject();
-    const doc = await client.objects.retrieve(objectId, "+text");
-    const text = doc.text;
-    if (!text || text.length === 0) {
-        activity_1.log.warn(`No text found for object ${objectId}`);
-        return;
-    }
-    //instrument the text with line numbers
-    const lines = text.split('\n');
-    const instrumented = lines.map((l, i) => `{%${i}%}${l}`).join('\n');
-    const promptData = {
-        content: instrumented ?? undefined,
-        human_context: project?.configuration?.human_context ?? undefined,
-    };
-    const infoRes = await (0, executeInteraction_js_1.executeInteractionFromActivity)(client, interactionName, {
-        ...params,
-        include_previous_error: true,
-        validate_result: true,
-    }, promptData, payload.debug_mode ?? false);
-    const parts = infoRes.result.parts;
-    if (!parts || !Array.isArray(parts) || parts.length === 0) {
-        activity_1.log.warn(`No text parts generated for object ${objectId}`);
-        return;
-    }
-    const existingMetadata = doc.metadata;
-    const updatedMetadata = {
-        type: "document",
-        ...existingMetadata,
-        generation_runs: existingMetadata?.generation_runs ?? [],
-        sections: parts
-    };
-    await client.objects.update(doc.id, {
-        metadata: updatedMetadata,
-    });
-    return { status: "completed" };
-}
-//# sourceMappingURL=identifyTextSections.js.map

package/lib/cjs/activities/identifyTextSections.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"identifyTextSections.js","sourceRoot":"","sources":["../../../src/activities/identifyTextSections.ts"],"names":[],"mappings":";;AAaA,oDAyDC;AAtED,mDAA2C;AAE3C,wEAAgE;AAChE,mEAAqG;AAErG,MAAM,uBAAuB,GAAG,0BAA0B,CAAC;AAQpD,KAAK,UAAU,oBAAoB,CACtC,OAAgE;IAEhE,MAAM,OAAO,GAAG,MAAM,IAAA,kCAAa,EAA6B,OAAO,CAAC,CAAC;IACzE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,uBAAuB,CAAC;IAE1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;IAE7C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE7D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,cAAG,CAAC,IAAI,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;QACjD,OAAO;IACX,CAAC;IAED,uCAAuC;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9B,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEnE,MAAM,UAAU,GAAG;QACf,OAAO,EAAE,YAAY,IAAI,SAAS;QAClC,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,IAAI,SAAS;KACpE,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,IAAA,sDAA8B,EAChD,MAAM,EACN,eAAe,EACf;QACI,GAAG,MAAM;QACT,sBAAsB,EAAE,IAAI;QAC5B,eAAe,EAAE,IAAI;KACxB,EACD,UAAU,EACV,OAAO,CAAC,UAAU,IAAI,KAAK,CAC9B,CAAC;IAEF,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IACnC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxD,cAAG,CAAC,IAAI,CAAC,sCAAsC,QAAQ,EAAE,CAAC,CAAC;QAC3D,OAAO;IACX,CAAC;IAED,MAAM,gBAAgB,GAAG,GAAG,CAAC,QAAwC,CAAC;IACtE,MAAM,eAAe,GAAqB;QACtC,IAAI,EAAE,UAAU;QAChB,GAAG,gBAAgB;QACnB,eAAe,EAAE,gBAAgB,EAAE,eAAe,IAAI,EAAE;QACxD,QAAQ,EAAE,KAAK;KAClB,CAAC;IAEF,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;QAChC,QAAQ,EAAE,eAAe;KAC5B,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AACnC,CAAC"}

package/lib/esm/activities/identifyTextSections.js

@@ -1,45 +0,0 @@
-import { log } from "@temporalio/activity";
-import { setupActivity } from "../dsl/setup/ActivityContext.js";
-import { executeInteractionFromActivity } from "./executeInteraction.js";
-const INT_GENERATE_TEXT_PARTS = "sys:IdentifyTextSections";
-export async function identifyTextSections(payload) {
-    const context = await setupActivity(payload);
-    const { params, client, objectId } = context;
-    const interactionName = params.interactionName ?? INT_GENERATE_TEXT_PARTS;
-    const project = await context.fetchProject();
-    const doc = await client.objects.retrieve(objectId, "+text");
-    const text = doc.text;
-    if (!text || text.length === 0) {
-        log.warn(`No text found for object ${objectId}`);
-        return;
-    }
-    //instrument the text with line numbers
-    const lines = text.split('\n');
-    const instrumented = lines.map((l, i) => `{%${i}%}${l}`).join('\n');
-    const promptData = {
-        content: instrumented ?? undefined,
-        human_context: project?.configuration?.human_context ?? undefined,
-    };
-    const infoRes = await executeInteractionFromActivity(client, interactionName, {
-        ...params,
-        include_previous_error: true,
-        validate_result: true,
-    }, promptData, payload.debug_mode ?? false);
-    const parts = infoRes.result.parts;
-    if (!parts || !Array.isArray(parts) || parts.length === 0) {
-        log.warn(`No text parts generated for object ${objectId}`);
-        return;
-    }
-    const existingMetadata = doc.metadata;
-    const updatedMetadata = {
-        type: "document",
-        ...existingMetadata,
-        generation_runs: existingMetadata?.generation_runs ?? [],
-        sections: parts
-    };
-    await client.objects.update(doc.id, {
-        metadata: updatedMetadata,
-    });
-    return { status: "completed" };
-}
-//# sourceMappingURL=identifyTextSections.js.map

package/lib/esm/activities/identifyTextSections.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"identifyTextSections.js","sourceRoot":"","sources":["../../../src/activities/identifyTextSections.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAA8B,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAErG,MAAM,uBAAuB,GAAG,0BAA0B,CAAC;AAQ3D,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,OAAgE;IAEhE,MAAM,OAAO,GAAG,MAAM,aAAa,CAA6B,OAAO,CAAC,CAAC;IACzE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,uBAAuB,CAAC;IAE1E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;IAE7C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE7D,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;QACjD,OAAO;IACX,CAAC;IAED,uCAAuC;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9B,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEnE,MAAM,UAAU,GAAG;QACf,OAAO,EAAE,YAAY,IAAI,SAAS;QAClC,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,IAAI,SAAS;KACpE,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,8BAA8B,CAChD,MAAM,EACN,eAAe,EACf;QACI,GAAG,MAAM;QACT,sBAAsB,EAAE,IAAI;QAC5B,eAAe,EAAE,IAAI;KACxB,EACD,UAAU,EACV,OAAO,CAAC,UAAU,IAAI,KAAK,CAC9B,CAAC;IAEF,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IACnC,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,IAAI,CAAC,sCAAsC,QAAQ,EAAE,CAAC,CAAC;QAC3D,OAAO;IACX,CAAC;IAED,MAAM,gBAAgB,GAAG,GAAG,CAAC,QAAwC,CAAC;IACtE,MAAM,eAAe,GAAqB;QACtC,IAAI,EAAE,UAAU;QAChB,GAAG,gBAAgB;QACnB,eAAe,EAAE,gBAAgB,EAAE,eAAe,IAAI,EAAE;QACxD,QAAQ,EAAE,KAAK;KAClB,CAAC;IAEF,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;QAChC,QAAQ,EAAE,eAAe;KAC5B,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AACnC,CAAC"}

package/lib/types/activities/identifyTextSections.d.ts

@@ -1,12 +0,0 @@
-import { DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
-import { InteractionExecutionParams } from "./executeInteraction.js";
-export interface identifyTextSectionsParams extends InteractionExecutionParams {
-    interactionName?: string;
-}
-export interface identifyTextSections extends DSLActivitySpec<identifyTextSectionsParams> {
-    name: "identifyTextSections";
-}
-export declare function identifyTextSections(payload: DSLActivityExecutionPayload<identifyTextSectionsParams>): Promise<{
-    status: string;
-} | undefined>;
-//# sourceMappingURL=identifyTextSections.d.ts.map

package/lib/types/activities/identifyTextSections.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"identifyTextSections.d.ts","sourceRoot":"","sources":["../../../src/activities/identifyTextSections.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,2BAA2B,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElG,OAAO,EAAE,0BAA0B,EAAkC,MAAM,yBAAyB,CAAC;AAGrG,MAAM,WAAW,0BAA2B,SAAQ,0BAA0B;IAC1E,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AACD,MAAM,WAAW,oBAAqB,SAAQ,eAAe,CAAC,0BAA0B,CAAC;IACrF,IAAI,EAAE,sBAAsB,CAAC;CAChC;AAED,wBAAsB,oBAAoB,CACtC,OAAO,EAAE,2BAA2B,CAAC,0BAA0B,CAAC;;eAwDnE"}

package/src/activities/identifyTextSections.ts

@@ -1,71 +0,0 @@
-import { log } from "@temporalio/activity";
-import { DocumentMetadata, DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
-import { setupActivity } from "../dsl/setup/ActivityContext.js";
-import { InteractionExecutionParams, executeInteractionFromActivity } from "./executeInteraction.js";
-
-const INT_GENERATE_TEXT_PARTS = "sys:IdentifyTextSections";
-export interface identifyTextSectionsParams extends InteractionExecutionParams {
-    interactionName?: string;
-}
-export interface identifyTextSections extends DSLActivitySpec<identifyTextSectionsParams> {
-    name: "identifyTextSections";
-}
-
-export async function identifyTextSections(
-    payload: DSLActivityExecutionPayload<identifyTextSectionsParams>,
-) {
-    const context = await setupActivity<identifyTextSectionsParams>(payload);
-    const { params, client, objectId } = context;
-    const interactionName = params.interactionName ?? INT_GENERATE_TEXT_PARTS;
-
-    const project = await context.fetchProject();
-
-    const doc = await client.objects.retrieve(objectId, "+text");
-
-    const text = doc.text;
-    if (!text || text.length === 0) {
-        log.warn(`No text found for object ${objectId}`);
-        return;
-    }
-
-    //instrument the text with line numbers
-    const lines = text.split('\n')
-    const instrumented = lines.map((l, i) => `{%${i}%}${l}`).join('\n')
-
-    const promptData = {
-        content: instrumented ?? undefined,
-        human_context: project?.configuration?.human_context ?? undefined,
-    };
-
-    const infoRes = await executeInteractionFromActivity(
-        client,
-        interactionName,
-        {
-            ...params,
-            include_previous_error: true,
-            validate_result: true,
-        },
-        promptData,
-        payload.debug_mode ?? false,
-    );
-
-    const parts = infoRes.result.parts;
-    if (!parts || !Array.isArray(parts) || parts.length === 0) {
-        log.warn(`No text parts generated for object ${objectId}`);
-        return;
-    }
-
-    const existingMetadata = doc.metadata as DocumentMetadata | undefined;
-    const updatedMetadata: DocumentMetadata = {
-        type: "document",
-        ...existingMetadata,
-        generation_runs: existingMetadata?.generation_runs ?? [],
-        sections: parts
-    };
-
-    await client.objects.update(doc.id, {
-        metadata: updatedMetadata,
-    });
-
-    return { status: "completed" };
-}