@vertesia/workflow 1.3.0 → 1.4.0-dev.20260615.051508Z

package/lib/{esm/activities → activities}/generateEmbeddings.js

@@ -1,31 +1,29 @@
-import { log } from "@temporalio/activity";
-import { ZenoClientNotFoundError } from "@vertesia/client";
-import { ImageRenditionFormat, SupportedEmbeddingTypes, } from "@vertesia/common";
-import { setupActivity } from "../dsl/setup/ActivityContext.js";
-import { DocumentNotFoundError } from "../errors.js";
-import { fetchBlobAsBase64, md5 } from "../utils/blobs.js";
-import { countTokens } from "../utils/tokens.js";
+import { log } from '@temporalio/activity';
+import { ZenoClientNotFoundError } from '@vertesia/client';
+import { ImageRenditionFormat, SupportedEmbeddingTypes, } from '@vertesia/common';
+import { setupActivity } from '../dsl/setup/ActivityContext.js';
+import { DocumentNotFoundError } from '../errors.js';
+import { fetchBlobAsBase64, md5 } from '../utils/blobs.js';
+import { countTokens } from '../utils/tokens.js';
 export async function generateEmbeddings(payload) {
     const { params, client, objectId, fetchProject } = await setupActivity(payload);
     const { force, type } = params;
     const projectData = await fetchProject();
     const config = projectData?.configuration.embeddings[type];
     if (!projectData) {
-        throw new DocumentNotFoundError("Project not found", [payload.project_id]);
+        throw new DocumentNotFoundError('Project not found', [payload.project_id]);
     }
     if (!config) {
-        throw new DocumentNotFoundError("Embeddings configuration not found", [
-            objectId,
-        ]);
+        throw new DocumentNotFoundError('Embeddings configuration not found', [objectId]);
     }
     if (!projectData) {
-        throw new DocumentNotFoundError("Project not found", [payload.project_id]);
+        throw new DocumentNotFoundError('Project not found', [payload.project_id]);
     }
     if (!projectData?.configuration.embeddings[type]?.enabled) {
         log.debug(`Embeddings generation disabled for type ${type} on project: ${projectData.name} (${projectData.namespace})`, { config });
         return {
             id: objectId,
-            status: "skipped",
+            status: 'skipped',
             message: `Embeddings generation disabled for type ${type}`,
         };
     }
@@ -34,11 +32,11 @@ export async function generateEmbeddings(payload) {
         config,
     });
     if (!config.environment) {
-        throw new Error("No environment found in project configuration. Set environment in project configuration to generate embeddings.");
+        throw new Error('No environment found in project configuration. Set environment in project configuration to generate embeddings.');
     }
     let document;
     try {
-        document = await client.objects.retrieve(objectId, "+text +parts +embeddings +tokens +properties");
+        document = await client.objects.retrieve(objectId, '+text +parts +embeddings +tokens +properties');
     }
     catch (error) {
         if (error instanceof ZenoClientNotFoundError) {
@@ -47,10 +45,7 @@ export async function generateEmbeddings(payload) {
         throw error;
     }
     if (!document) {
-        throw new DocumentNotFoundError("Document not found", [objectId]);
-    }
-    if (!document.content) {
-        throw new DocumentNotFoundError("Document content not found", [objectId]);
+        throw new DocumentNotFoundError('Document not found', [objectId]);
     }
     let res;
     switch (type) {
@@ -84,7 +79,7 @@ export async function generateEmbeddings(payload) {
         default:
             res = {
                 id: objectId,
-                status: "failed",
+                status: 'failed',
                 message: `unsupported embedding type: ${type}`,
             };
     }
@@ -92,49 +87,46 @@ export async function generateEmbeddings(payload) {
 }
 async function generateTextEmbeddings({ document, client, type, config, force }) {
     if (!document) {
-        return { status: "error", message: "document is null or undefined" };
+        return { status: 'error', message: 'document is null or undefined' };
     }
-    if (type !== SupportedEmbeddingTypes.text &&
-        type !== SupportedEmbeddingTypes.properties) {
+    if (type !== SupportedEmbeddingTypes.text && type !== SupportedEmbeddingTypes.properties) {
         return {
             id: document.id,
-            status: "failed",
+            status: 'failed',
             message: `unsupported embedding type: ${type}`,
         };
     }
-    if (type === SupportedEmbeddingTypes.text && !document.text) {
-        return { id: document.id, status: "failed", message: "no text found" };
-    }
-    if (type === SupportedEmbeddingTypes.properties && !document?.properties) {
+    const sourceText = type === SupportedEmbeddingTypes.text
+        ? document.text
+        : document.properties
+            ? JSON.stringify(document.properties)
+            : undefined;
+    if (!sourceText) {
         return {
             id: document.id,
-            status: "failed",
-            message: "no properties found",
+            type,
+            status: 'skipped',
+            message: type === SupportedEmbeddingTypes.text ? 'no text found' : 'no properties found',
         };
     }
     const { environment } = config;
-    // Compute text etag for comparison
-    const textEtag = document.text_etag ?? (document.text ? md5(document.text) : undefined);
+    if (!environment) {
+        throw new Error('No environment found in project configuration. Set environment in project configuration to generate embeddings.');
+    }
+    const sourceEtag = type === SupportedEmbeddingTypes.text ? (document.text_etag ?? md5(sourceText)) : md5(sourceText);
     // Skip if embeddings already exist with matching etag (unless force=true)
     const existingEmbedding = document.embeddings?.[type];
-    if (!force && existingEmbedding?.etag && textEtag && existingEmbedding.etag === textEtag) {
+    if (!force && existingEmbedding?.etag && existingEmbedding.etag === sourceEtag) {
         log.debug(`Skipping ${type} embeddings for document ${document.id} - etag unchanged`);
         return {
             id: document.id,
             type,
-            status: "skipped",
-            message: "embeddings already exist with matching etag",
+            status: 'skipped',
+            message: 'embeddings already exist with matching etag',
         };
     }
     // Count tokens if needed, do not rely on existing token count
-    let tokenCount = undefined;
-    if (type === SupportedEmbeddingTypes.text && document.text) {
-        tokenCount = countTokens(document.text).count;
-    }
-    if (type === SupportedEmbeddingTypes.properties && document.properties) {
-        const propertiesText = JSON.stringify(document.properties);
-        tokenCount = countTokens(propertiesText).count;
-    }
+    const tokenCount = countTokens(sourceText).count;
     const maxTokens = config.max_tokens ?? 8000;
     //generate embeddings for the main doc if document isn't too large
     log.debug(`Generating ${type} embeddings for document ${document.id}`);
@@ -143,47 +135,47 @@ async function generateTextEmbeddings({ document, client, type, config, force })
         log.warn(`Document too large for ${type} embeddings generation, skipping (${tokenCount} tokens)`);
         return {
             id: document.id,
-            status: "skipped",
+            status: 'skipped',
             message: `${type} embeddings generation, skipped for large document (${tokenCount} tokens)`,
         };
     }
     else {
         log.debug(`Generating ${type} embeddings for document`);
-        const res = await generateEmbeddingsFromStudio(JSON.stringify(document[type]), environment, client);
-        if (!res || !res.values) {
+        const res = await generateEmbeddingsFromStudio(sourceText, environment, client);
+        const values = res?.results?.[0]?.outputs?.[0]?.values;
+        if (!values) {
             return {
                 id: document.id,
-                status: "failed",
-                message: "no embeddings generated",
+                status: 'failed',
+                message: 'no embeddings generated',
             };
         }
         log.debug(`${type} embeddings generated for document ${document.id}`, {
-            len: res.values.length,
+            len: values.length,
         });
         await client.objects.setEmbedding(document.id, type, {
-            values: res.values,
+            values,
             model: res.model,
-            etag: textEtag,
+            etag: sourceEtag,
         });
         return {
             id: document.id,
             type,
-            status: "completed",
-            len: res.values.length,
+            status: 'completed',
+            len: values.length,
         };
     }
 }
-async function generateImageEmbeddings({ document, client, type, config, force, }) {
-    log.debug("Generating image embeddings for document " + document.id, {
+async function generateImageEmbeddings({ document, client, type, config, force }) {
+    log.debug(`Generating image embeddings for document ${document.id}`, {
         content: document.content,
     });
-    if (!document.content?.type?.startsWith("image/") &&
-        !document.content?.type?.includes("pdf")) {
+    if (!document.content?.type?.startsWith('image/') && !document.content?.type?.includes('pdf')) {
         return {
             id: document.id,
             type,
-            status: "failed",
-            message: "content is not an image",
+            status: 'failed',
+            message: 'content is not an image',
         };
     }
     // Use content etag for image change detection
@@ -195,71 +187,79 @@ async function generateImageEmbeddings({ document, client, type, config, force,
         return {
             id: document.id,
             type,
-            status: "skipped",
-            message: "embeddings already exist with matching etag",
+            status: 'skipped',
+            message: 'embeddings already exist with matching etag',
         };
     }
     const { environment, model } = config;
+    if (!environment) {
+        throw new Error('No environment found in project configuration. Set environment in project configuration to generate embeddings.');
+    }
     const resRnd = await client.store.objects.getRendition(document.id, {
         format: ImageRenditionFormat.jpeg,
         generate_if_missing: true,
         sign_url: true,
     });
-    if (resRnd.status === "generating") {
-        throw new Error("Rendition is generating, will retry later");
+    if (resRnd.status === 'generating') {
+        throw new Error('Rendition is generating, will retry later');
     }
-    else if (resRnd.status === "failed" ||
-        !resRnd.renditions ||
-        !resRnd.renditions.length) {
-        throw new DocumentNotFoundError("Rendition retrieval failed", [document.id]);
+    else if (resRnd.status === 'failed' || !resRnd.renditions || !resRnd.renditions.length) {
+        throw new DocumentNotFoundError('Rendition retrieval failed', [document.id]);
     }
     const renditions = resRnd.renditions;
     if (!renditions?.length) {
-        throw new DocumentNotFoundError("No source found in rendition", [
-            document.id,
-        ]);
+        throw new DocumentNotFoundError('No source found in rendition', [document.id]);
     }
     const rendition = renditions[0];
     const image = await fetchBlobAsBase64(client, rendition);
+    // TODO(task_type): Document embedding task — image inputs do not carry task_type, but this is a document-indexing call.
+    // Revisit if task_type support is added to ImageEmbeddingInput in a later PR.
     const res = await client.environments
         .embeddings(environment, {
-        image,
+        inputs: [
+            {
+                type: 'image',
+                source: { base64: image, mime_type: 'image/jpeg' },
+            },
+        ],
         model,
     })
         .then((res) => res)
         .catch((e) => {
-        log.error("Error generating embeddings for image", { error: e });
+        log.error('Error generating embeddings for image', { error: e });
         throw e;
     });
-    if (!res || !res.values) {
+    const values = res?.results?.[0]?.outputs?.[0]?.values;
+    if (!values) {
         return {
             id: document.id,
-            status: "failed",
-            message: "no embeddings generated",
+            status: 'failed',
+            message: 'no embeddings generated',
         };
     }
     await client.objects.setEmbedding(document.id, SupportedEmbeddingTypes.image, {
-        values: res.values,
+        values,
         model: res.model,
         etag: contentEtag,
     });
     return {
         id: document.id,
         type,
-        status: "completed",
-        len: res.values.length,
+        status: 'completed',
+        len: values.length,
     };
 }
 async function generateEmbeddingsFromStudio(text, env, client, model) {
     log.debug(`Generating embeddings for text of ${text.length} chars with environment ${env}`);
+    // TODO(task_type): Document embedding task — add task_type: "document" once task_type support is validated end-to-end.
     return client.environments
         .embeddings(env, {
-        text,
+        inputs: [{ type: 'text', text }],
         model,
     })
         .then((res) => res)
         .catch((e) => {
-        log.error("Error generating embeddings for text", { error: e });
+        log.error('Error generating embeddings for text', { error: e });
         throw e;
     });
 }

package/lib/activities/generateEmbeddings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateEmbeddings.js","sourceRoot":"","sources":["../../src/activities/generateEmbeddings.ts"],"names":[],"mappings":"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"}

package/lib/{types/activities → activities}/generateOrAssignContentType.d.ts

@@ -1,6 +1,6 @@
-import { DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
-import { TruncateSpec } from "../utils/tokens.js";
-import { InteractionExecutionParams } from "./executeInteraction.js";
+import { type DSLActivityExecutionPayload, type DSLActivitySpec } from '@vertesia/common';
+import { type TruncateSpec } from '../utils/tokens.js';
+import { type InteractionExecutionParams } from './executeInteraction.js';
 export interface GenerateOrAssignContentTypeParams extends InteractionExecutionParams {
     typesHint?: string[];
     /**
@@ -17,7 +17,7 @@ export interface GenerateOrAssignContentTypeParams extends InteractionExecutionP
     };
 }
 export interface GenerateOrAssignContentType extends DSLActivitySpec<GenerateOrAssignContentTypeParams> {
-    name: "generateOrAssignContentType";
+    name: 'generateOrAssignContentType';
 }
 export declare function generateOrAssignContentType(payload: DSLActivityExecutionPayload<GenerateOrAssignContentTypeParams>): Promise<{
     status: string;

package/lib/activities/generateOrAssignContentType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateOrAssignContentType.d.ts","sourceRoot":"","sources":["../../src/activities/generateOrAssignContentType.ts"],"names":[],"mappings":"AACA,OAAO,EAGH,KAAK,2BAA2B,EAChC,KAAK,eAAe,EAEvB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAkC,KAAK,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AA4B1G,MAAM,WAAW,iCAAkC,SAAQ,0BAA0B;IACjF,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB;;;OAGG;IACH,gBAAgB,CAAC,EAAE;QACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,qBAAqB,CAAC,EAAE,MAAM,CAAC;KAClC,CAAC;CACL;AAED,MAAM,WAAW,2BAA4B,SAAQ,eAAe,CAAC,iCAAiC,CAAC;IACnG,IAAI,EAAE,6BAA6B,CAAC;CACvC;AAED,wBAAsB,2BAA2B,CAC7C,OAAO,EAAE,2BAA2B,CAAC,iCAAiC,CAAC;;;;;;;;;;;;;;;;;;;;;GAiI1E"}

package/lib/{esm/activities → activities}/generateOrAssignContentType.js

@@ -1,16 +1,22 @@
-import { ApplicationFailure, log } from "@temporalio/activity";
-import { ImageRenditionFormat, } from "@vertesia/common";
-import { setupActivity, } from "../dsl/setup/ActivityContext.js";
-import { truncByMaxTokens } from "../utils/tokens.js";
-import { executeInteractionFromActivity, } from "./executeInteraction.js";
-const INT_SELECT_DOCUMENT_TYPE = "sys:SelectDocumentType";
-const INT_GENERATE_METADATA_MODEL = "sys:GenerateMetadataModel";
+import { ApplicationFailure, log } from '@temporalio/activity';
+import { ImageRenditionFormat, } from '@vertesia/common';
+import { setupActivity } from '../dsl/setup/ActivityContext.js';
+import { truncByMaxTokens } from '../utils/tokens.js';
+import { executeInteractionFromActivity } from './executeInteraction.js';
+const INT_SELECT_DOCUMENT_TYPE = 'sys:SelectDocumentType';
+const INT_GENERATE_METADATA_MODEL = 'sys:GenerateMetadataModel';
+function toRetryableError(error) {
+    if (error instanceof Error) {
+        return error;
+    }
+    return new Error(String(error));
+}
 export async function generateOrAssignContentType(payload) {
     const context = await setupActivity(payload);
     const { params, client, objectId } = context;
     const interactionName = params.interactionNames?.selectDocumentType ?? INT_SELECT_DOCUMENT_TYPE;
-    log.debug("SelectDocumentType for object: " + objectId, { payload });
-    const object = await client.objects.retrieve(objectId, "+text");
+    log.debug(`SelectDocumentType for object: ${objectId}`, { payload });
+    const object = await client.objects.retrieve(objectId, '+text');
     //Expects object.type to be null on first ingestion of content
     //User initiated Content Type change via the Composable UI,
     //sets object.type to null when they let Composable choose for them.
@@ -18,51 +24,47 @@ export async function generateOrAssignContentType(payload) {
     if (object.type) {
         log.warn(`Object ${objectId} has already a type. Skipping type creation.`);
         return {
-            status: "skipped",
-            message: "Object already has a type: " + object.type.name,
+            status: 'skipped',
+            message: `Object already has a type: ${object.type.name}`,
         };
     }
     if (!object ||
         (!object.text &&
-            !object.content?.type?.startsWith("image/") &&
-            !object.content?.type?.startsWith("application/pdf"))) {
+            !object.content?.type?.startsWith('image/') &&
+            !object.content?.type?.startsWith('application/pdf'))) {
         log.info(`Object ${objectId} not found or text is empty and not an image`, {
             object,
         });
-        return { status: "failed", error: "no-text" };
+        return { status: 'failed', error: 'no-text' };
     }
     const types = await client.types.catalog.list({
         schema: true,
     });
     //make a list of all existing types, and add hints if any
-    const existing_types = types.filter((t) => !["DocumentPart", "Rendition"].includes(t.name));
-    const content = object.text
-        ? truncByMaxTokens(object.text, params.truncate || 30000)
-        : undefined;
+    const existing_types = types.filter((t) => !['DocumentPart', 'Rendition'].includes(t.name));
+    const content = object.text ? truncByMaxTokens(object.text, params.truncate || 30000) : undefined;
     const getImage = async () => {
-        if (object.content?.type?.includes("pdf") &&
-            object.text?.length &&
-            object.text?.length < 100) {
-            return "store:" + objectId;
+        if (object.content?.type?.includes('pdf') && object.text?.length && object.text?.length < 100) {
+            return `store:${objectId}`;
         }
-        if (!object.content?.type?.startsWith("image/")) {
+        if (!object.content?.type?.startsWith('image/')) {
             return undefined;
         }
         const res = await client.objects.getRendition(objectId, {
             format: ImageRenditionFormat.jpeg,
             generate_if_missing: true,
         });
-        if (!res.renditions?.length && res.status === "generating") {
+        if (!res.renditions?.length && res.status === 'generating') {
             //throw to try again
             throw new Error(`Rendition for object ${objectId} is in progress`);
         }
         else if (res.renditions) {
-            return "store:" + objectId;
+            return `store:${objectId}`;
         }
     };
     const fileRef = await getImage();
-    log.info("Execute SelectDocumentType interaction on content with \nexisting types - passing full types: " +
-        existing_types.filter((t) => !t.tags?.includes("system")));
+    log.info('Execute SelectDocumentType interaction on content with \nexisting types - passing full types: ' +
+        existing_types.filter((t) => !t.tags?.includes('system')));
     let res;
     try {
         res = await executeInteractionFromActivity(client, interactionName, params, {
@@ -72,20 +74,19 @@ export async function generateOrAssignContentType(payload) {
         });
     }
     catch (error) {
-        log.error(`Failed to select document type`, { error, retryable: error.retryable });
-        const isRetryable = error.retryable !== undefined
-            ? error.retryable !== false
-            : undefined;
+        const selectionError = toRetryableError(error);
+        log.error(`Failed to select document type`, { error: selectionError, retryable: selectionError.retryable });
+        const isRetryable = selectionError.retryable !== undefined ? selectionError.retryable !== false : undefined;
         if (isRetryable !== undefined) {
             if (isRetryable) {
                 throw ApplicationFailure.create({
-                    message: `Document type selection failed: ${error.message}`,
+                    message: `Document type selection failed: ${selectionError.message}`,
                     nonRetryable: false,
                 });
             }
             else {
                 throw ApplicationFailure.create({
-                    message: `Non-retryable document type selection failed: ${error.message}`,
+                    message: `Non-retryable document type selection failed: ${selectionError.message}`,
                     nonRetryable: true,
                 });
             }
@@ -93,18 +94,18 @@ export async function generateOrAssignContentType(payload) {
         throw error;
     }
     const jsonResult = res.result.object();
-    log.info("Selected Content Type Result: " + JSON.stringify(jsonResult));
+    log.debug(`Selected Content Type Result: ${JSON.stringify(jsonResult)}`);
     //if type is not identified or not present in the database, generate a new type
-    let selectedType = undefined;
+    let selectedType;
     selectedType = types.find((t) => t.name === jsonResult.document_type);
     if (!selectedType) {
-        log.warn("Document type not identified: starting type generation");
+        log.warn('Document type not identified: starting type generation');
         const newType = await generateNewType(context, existing_types, content, fileRef);
         selectedType = { id: newType.id, name: newType.name };
     }
     if (!selectedType) {
-        log.error("Type not found: ", res.result);
-        throw new Error("Type not found: " + jsonResult.document_type);
+        log.error('Type not found: ', res.result);
+        throw new Error(`Type not found: ${jsonResult.document_type}`);
     }
     //update object with selected type
     await client.objects.update(objectId, {
@@ -119,8 +120,7 @@ export async function generateOrAssignContentType(payload) {
 async function generateNewType(context, existing_types, content, fileRef) {
     const { client, params } = context;
     const project = await context.fetchProject();
-    const interactionName = params.interactionNames?.generateMetadataModel ??
-        INT_GENERATE_METADATA_MODEL;
+    const interactionName = params.interactionNames?.generateMetadataModel ?? INT_GENERATE_METADATA_MODEL;
     let genTypeRes;
     try {
         genTypeRes = await executeInteractionFromActivity(client, interactionName, params, {
@@ -131,20 +131,22 @@ async function generateNewType(context, existing_types, content, fileRef) {
         });
     }
     catch (error) {
-        log.error(`Failed to generate new document type`, { error, retryable: error.retryable });
-        const isRetryable = error.retryable !== undefined
-            ? error.retryable !== false
-            : undefined;
+        const generationError = toRetryableError(error);
+        log.error(`Failed to generate new document type`, {
+            error: generationError,
+            retryable: generationError.retryable,
+        });
+        const isRetryable = generationError.retryable !== undefined ? generationError.retryable !== false : undefined;
         if (isRetryable !== undefined) {
             if (isRetryable) {
                 throw ApplicationFailure.create({
-                    message: `Document type generation failed: ${error.message}`,
+                    message: `Document type generation failed: ${generationError.message}`,
                     nonRetryable: false,
                 });
             }
             else {
                 throw ApplicationFailure.create({
-                    message: `Non-retryable document type generation failed: ${error.message}`,
+                    message: `Non-retryable document type generation failed: ${generationError.message}`,
                     nonRetryable: true,
                 });
             }
@@ -153,10 +155,10 @@ async function generateNewType(context, existing_types, content, fileRef) {
     }
     const jsonResult = genTypeRes.result.object();
     if (!jsonResult.document_type) {
-        log.error("No name generated for type", genTypeRes);
-        throw new Error("No name generated for type");
+        log.error('No name generated for type', genTypeRes);
+        throw new Error('No name generated for type');
     }
-    log.info("Generated schema for type", jsonResult.metadata_schema);
+    log.info('Generated schema for type', jsonResult.metadata_schema);
     const typeData = {
         name: jsonResult.document_type,
         description: jsonResult.document_type_description,

package/lib/activities/generateOrAssignContentType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateOrAssignContentType.js","sourceRoot":"","sources":["../../src/activities/generateOrAssignContentType.ts"],"names":[],"mappings":"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"}

package/lib/{types/activities → activities}/getObjectFromStore.d.ts

@@ -1,4 +1,4 @@
-import { ContentObject, DSLActivityExecutionPayload, DSLActivitySpec } from "@vertesia/common";
+import type { ContentObject, DSLActivityExecutionPayload, DSLActivitySpec } from '@vertesia/common';
 export interface GetObjectParams {
     select?: string;
 }

package/lib/activities/getObjectFromStore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getObjectFromStore.d.ts","sourceRoot":"","sources":["../../src/activities/getObjectFromStore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,2BAA2B,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKpG,MAAM,WAAW,eAAe;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,SAAU,SAAQ,eAAe,CAAC,eAAe,CAAC;IAC/D,IAAI,EAAE,WAAW,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACpC,OAAO,EAAE,2BAA2B,CAAC,eAAe,CAAC,GACtD,OAAO,CAAC,aAAa,CAAC,CAqBxB"}

package/lib/{esm/activities → activities}/getObjectFromStore.js

@@ -1,6 +1,6 @@
-import { DocumentNotFoundError } from "../errors.js";
-import { projectResult } from "../dsl/projections.js";
-import { setupActivity } from "../dsl/setup/ActivityContext.js";
+import { projectResult } from '../dsl/projections.js';
+import { setupActivity } from '../dsl/setup/ActivityContext.js';
+import { DocumentNotFoundError } from '../errors.js';
 /**
  * We are using a union type for the status parameter since typescript enums breaks the workflow code generation
  * @param objectId
@@ -21,6 +21,7 @@ export async function getObjectFromStore(payload) {
     }
     const projection = projectResult(payload, params, obj, obj);
     return {
+        ...obj,
         ...projection,
         id: obj.id,
     };

package/lib/activities/getObjectFromStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getObjectFromStore.js","sourceRoot":"","sources":["../../src/activities/getObjectFromStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAUrD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACpC,OAAqD;IAErD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAa,CAAkB,OAAO,CAAC,CAAC;IAEnF,IAAI,GAAkB,CAAC;IACvB,IAAI,CAAC;QACD,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACpB,MAAM,MAAM,GAAG,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAE,GAA0B,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1G,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YAClD,MAAM,IAAI,qBAAqB,CAAC,4BAA4B,MAAM,MAAM,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;QACpG,CAAC;QACD,MAAM,GAAG,CAAC;IACd,CAAC;IAED,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,CAA2B,CAAC;IAEtF,OAAO;QACH,GAAG,GAAG;QACN,GAAG,UAAU;QACb,EAAE,EAAE,GAAG,CAAC,EAAE;KACb,CAAC;AACN,CAAC"}

package/lib/{types/activities → activities}/handleError.d.ts

@@ -1,4 +1,4 @@
-import { DSLActivityExecutionPayload } from "@vertesia/common";
+import { type DSLActivityExecutionPayload } from '@vertesia/common';
 export interface HandleDslErrorParams {
     errorMessage: string;
 }

package/lib/activities/handleError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../src/activities/handleError.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAGzF,MAAM,WAAW,oBAAoB;IACjC,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,2BAA2B,CAAC,oBAAoB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAoC9G"}