@vertesia/workflow 0.78.0-dev-28b447d → 0.79.0

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

@@ -1,98 +1,89 @@
 import { WorkflowExecutionPayload } from "@vertesia/common";
 import { getVertesiaClient } from "../../utils/client.js";
 import { buildAndPublishMemoryPack } from "../../utils/memory.js";
-import {
-    IterativeGenerationPayload,
-    OutputMemoryMeta,
-    Toc,
-    TocIndex,
-} from "../types.js";
+import { IterativeGenerationPayload, OutputMemoryMeta, Toc, TocIndex } from "../types.js";
 import { executeWithVars, tocIndex } from "../utils.js";
 import { parseCompletionResultsToJson } from "@llumiverse/common";
 
 const defaultTocSchema = {
-    type: "object",
-    properties: {
-        sections: {
-            type: "array",
-            items: {
-                type: "object",
-                properties: {
-                    id: {
-                        type: "string",
-                        description:
-                            "the id of the section, can be a filename if working on a file, a slug if working on a document or path, or a unique identifier if working on a model.",
+    "type": "object",
+    "properties": {
+        "sections": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string",
+                        "description": "the id of the section, can be a filename if working on a file, a slug if working on a document or path, or a unique identifier if working on a model."
                     },
-                    operation: {
-                        type: "string",
-                        enum: ["create", "update", "delete"],
-                        description:
-                            "The operation to perform on the section, create, update or delete. If update, you will be requested later to provide the list of change operation to perform.",
+                    "operation": {
+                        "type": "string",
+                        "enum": ["create", "update", "delete"],
+                        "description": "The operation to perform on the section, create, update or delete. If update, you will be requested later to provide the list of change operation to perform."
                     },
-                    name: {
-                        type: "string",
-                        description:
-                            "The name or title of the section, should be the path in the OpenAPI spec, of the title of the section/part.",
+                    "name": {
+                        "type": "string",
+                        "description": "The name or title of the section, should be the path in the OpenAPI spec, of the title of the section/part."
                     },
-                    description: {
-                        type: "string",
+                    "description": {
+                        "type": "string"
                     },
-                    instructions: {
-                        type: "string",
+                    "instructions": {
+                        "type": "string"
                     },
-                    parts: {
-                        type: "array",
-                        description:
-                            "when the section is too large, you can split it into parts, each part should have a title and description. Use it to split the section into subsection. When doing an API documentation, you can do one part for each path. When generating code, you can do one part for each method. When generating an OpenAPI spec, you can do one part for each operation.",
-                        items: {
-                            type: "object",
-                            properties: {
-                                id: {
-                                    type: "string",
-                                    description:
-                                        "the id of the part, can be a filename if working on a file, a slug if working on a document or path, or a unique identifier if working on a model.",
+                    "parts":
+                    {
+                        "type": "array",
+                        "description": "when the section is too large, you can split it into parts, each part should have a title and description. Use it to split the section into subsection. When doing an API documentation, you can do one part for each path. When generating code, you can do one part for each method. When generating an OpenAPI spec, you can do one part for each operation.",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string",
+                                    "description": "the id of the part, can be a filename if working on a file, a slug if working on a document or path, or a unique identifier if working on a model."
                                 },
-                                name: {
-                                    type: "string",
-                                    description:
-                                        "The name or title of the part, should be the path in the OpenAPI spec, of the title of the section/part.",
+                                "name": {
+                                    "type": "string",
+                                    "description": "The name or title of the part, should be the path in the OpenAPI spec, of the title of the section/part."
                                 },
                                 /*
                                 "description": {
                                     "type": "string"
                                 },
                                 */
-                                instructions: {
-                                    type: "string",
-                                },
+                                "instructions": {
+                                    "type": "string"
+                                }
                             },
-                            required: ["id", "name"],
-                        },
-                    },
+                            "required": [
+                                "id",
+                                "name",
+                            ]
+                        }
+                    }
                 },
-                required: ["id", "name", "operation"],
-            },
-        },
+                "required": [
+                    "id",
+                    "name",
+                    "operation"
+                ]
+            }
+        }
     },
-    required: ["sections"],
-};
+    "required": [
+        "sections"
+    ]
+}
 
-export async function it_gen_generateToc(
-    payload: WorkflowExecutionPayload,
-): Promise<TocIndex> {
+export async function it_gen_generateToc(payload: WorkflowExecutionPayload): Promise<TocIndex> {
     const vars = payload.vars as IterativeGenerationPayload;
 
     const schema = vars.toc_schema || defaultTocSchema;
 
-    const client = await getVertesiaClient(payload);
+    const client = getVertesiaClient(payload);
 
-    const run = await executeWithVars(
-        client,
-        vars.interaction,
-        vars,
-        undefined,
-        schema,
-    );
+    const run = await executeWithVars(client, vars.interaction, vars, undefined, schema);
 
     //Parse the CompletionResult[] to get a Toc object
     const jsonResults = parseCompletionResultsToJson(run.result);
@@ -101,17 +92,13 @@ export async function it_gen_generateToc(
         sections: jsonResults.sections
     };
 
-    await buildAndPublishMemoryPack(
-        client,
-        `${vars.memory}/output`,
-        async () => {
-            return {
-                toc,
-                lastProcessedPart: undefined, // the part index (a number array)
-                previouslyGenerated: "",
-            } satisfies OutputMemoryMeta;
-        },
-    );
+    await buildAndPublishMemoryPack(client, `${vars.memory}/output`, async () => {
+        return {
+            toc,
+            lastProcessedPart: undefined, // the part index (a number array)
+            previouslyGenerated: ""
+        } satisfies OutputMemoryMeta
+    });
 
     return tocIndex(toc);
 }

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/src/utils/blobs.ts

@@ -14,9 +14,7 @@ export async function fetchBlobAsStream(client: VertesiaClient, blobUri: string)
     } catch (err: any) {
         if (err.message.includes("not found")) {
             //TODO improve error handling with a fetch fail error class in the client
-            throw new DocumentNotFoundError(`Not found at ${blobUri}: ${err.message}`, []);
-        } else if (err.message.includes("forbidden")) {
-            throw new DocumentNotFoundError(`Forbidden at ${blobUri}: ${err.message}`);
+            throw new DocumentNotFoundError(`Failed to download blob ${blobUri}: ${err.message}`, []);
         } else {
             throw new Error(`Failed to download blob ${blobUri}: ${err.message}`);
         }

package/src/utils/client.ts

@@ -2,45 +2,31 @@
  * get a zeno client for a given token
  */
 
-import {
-    decodeJWT,
-    VertesiaClient,
-    VertesiaClientProps,
-} from "@vertesia/client";
+import { VertesiaClient } from "@vertesia/client";
 import { WorkflowExecutionBaseParams } from "@vertesia/common";
 import { WorkflowParamNotFoundError } from "../errors.js";
 
+
 export function getVertesiaClient(payload: WorkflowExecutionBaseParams) {
     return new VertesiaClient(getVertesiaClientOptions(payload));
 }
 
-export function getVertesiaClientOptions(
-    payload: WorkflowExecutionBaseParams,
-): VertesiaClientProps {
+export function getVertesiaClientOptions(payload: WorkflowExecutionBaseParams) {
     if (!payload.auth_token) {
-        throw new WorkflowParamNotFoundError(
-            "Authentication Token is missing from WorkflowExecutionPayload.authToken",
-        );
+        throw new WorkflowParamNotFoundError("Authentication Token is missing from WorkflowExecutionPayload.authToken");
     }
 
     if (!payload.config?.studio_url) {
-        throw new WorkflowParamNotFoundError(
-            "Content Store URL is missing from WorkflowExecutionPayload.servers.storeUrl",
-        );
+        throw new WorkflowParamNotFoundError("Content Store URL is missing from WorkflowExecutionPayload.servers.storeUrl");
     }
 
     if (!payload.config?.store_url) {
-        throw new WorkflowParamNotFoundError(
-            "Content Store URL is missing from WorkflowExecutionPayload.servers.storeUrl",
-        );
+        throw new WorkflowParamNotFoundError("Content Store URL is missing from WorkflowExecutionPayload.servers.storeUrl");
     }
 
-    const token = decodeJWT(payload.auth_token);
-
     return {
         serverUrl: payload.config.studio_url,
         storeUrl: payload.config.store_url,
-        tokenServerUrl: token.iss,
-        apikey: payload.auth_token,
+        apikey: payload.auth_token
     };
-}
+}