@vertesia/workflow 0.78.0 → 0.79.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/activities/advanced/createDocumentTypeFromInteractionRun.js +8 -7
- package/lib/cjs/activities/advanced/createDocumentTypeFromInteractionRun.js.map +1 -1
- package/lib/cjs/activities/advanced/createOrUpdateDocumentFromInteractionRun.js +10 -9
- package/lib/cjs/activities/advanced/createOrUpdateDocumentFromInteractionRun.js.map +1 -1
- package/lib/cjs/activities/advanced/updateDocumentFromInteractionRun.js +2 -1
- package/lib/cjs/activities/advanced/updateDocumentFromInteractionRun.js.map +1 -1
- package/lib/cjs/activities/chunkDocument.js +2 -1
- package/lib/cjs/activities/chunkDocument.js.map +1 -1
- package/lib/cjs/activities/executeInteraction.js +11 -7
- package/lib/cjs/activities/executeInteraction.js.map +1 -1
- package/lib/cjs/activities/generateDocumentProperties.js +11 -6
- package/lib/cjs/activities/generateDocumentProperties.js.map +1 -1
- package/lib/cjs/activities/generateOrAssignContentType.js +12 -10
- package/lib/cjs/activities/generateOrAssignContentType.js.map +1 -1
- package/lib/cjs/activities/index-dsl.js +5 -3
- package/lib/cjs/activities/index-dsl.js.map +1 -1
- package/lib/cjs/activities/media/prepareVideo.js +429 -0
- package/lib/cjs/activities/media/prepareVideo.js.map +1 -0
- package/lib/cjs/activities/media/transcribeMediaWithGladia.js +48 -15
- package/lib/cjs/activities/media/transcribeMediaWithGladia.js.map +1 -1
- package/lib/cjs/activities/notifyWebhook.js +137 -12
- package/lib/cjs/activities/notifyWebhook.js.map +1 -1
- package/lib/cjs/activities/rateLimiter.js +30 -0
- package/lib/cjs/activities/rateLimiter.js.map +1 -0
- package/lib/cjs/conversion/image.js +4 -2
- package/lib/cjs/conversion/image.js.map +1 -1
- package/lib/cjs/dsl/dsl-workflow.js +66 -0
- package/lib/cjs/dsl/dsl-workflow.js.map +1 -1
- package/lib/cjs/dsl/setup/ActivityContext.js +7 -4
- package/lib/cjs/dsl/setup/ActivityContext.js.map +1 -1
- package/lib/cjs/errors.js +22 -1
- package/lib/cjs/errors.js.map +1 -1
- package/lib/cjs/index.js +2 -1
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/iterative-generation/activities/extractToc.js +2 -2
- package/lib/cjs/iterative-generation/activities/extractToc.js.map +1 -1
- package/lib/cjs/iterative-generation/activities/finalizeOutput.js +7 -4
- package/lib/cjs/iterative-generation/activities/finalizeOutput.js.map +1 -1
- package/lib/cjs/iterative-generation/activities/generatePart.js +18 -13
- package/lib/cjs/iterative-generation/activities/generatePart.js.map +1 -1
- package/lib/cjs/iterative-generation/activities/generateToc.js +50 -55
- package/lib/cjs/iterative-generation/activities/generateToc.js.map +1 -1
- package/lib/cjs/iterative-generation/utils.js.map +1 -1
- package/lib/cjs/system/notifyWebhookWorkflow.js +10 -3
- package/lib/cjs/system/notifyWebhookWorkflow.js.map +1 -1
- package/lib/cjs/utils/blobs.js +4 -1
- package/lib/cjs/utils/blobs.js.map +1 -1
- package/lib/cjs/utils/client.js +3 -1
- package/lib/cjs/utils/client.js.map +1 -1
- package/lib/esm/activities/advanced/createDocumentTypeFromInteractionRun.js +8 -7
- package/lib/esm/activities/advanced/createDocumentTypeFromInteractionRun.js.map +1 -1
- package/lib/esm/activities/advanced/createOrUpdateDocumentFromInteractionRun.js +10 -9
- package/lib/esm/activities/advanced/createOrUpdateDocumentFromInteractionRun.js.map +1 -1
- package/lib/esm/activities/advanced/updateDocumentFromInteractionRun.js +2 -1
- package/lib/esm/activities/advanced/updateDocumentFromInteractionRun.js.map +1 -1
- package/lib/esm/activities/chunkDocument.js +2 -1
- package/lib/esm/activities/chunkDocument.js.map +1 -1
- package/lib/esm/activities/executeInteraction.js +12 -8
- package/lib/esm/activities/executeInteraction.js.map +1 -1
- package/lib/esm/activities/generateDocumentProperties.js +11 -6
- package/lib/esm/activities/generateDocumentProperties.js.map +1 -1
- package/lib/esm/activities/generateOrAssignContentType.js +12 -10
- package/lib/esm/activities/generateOrAssignContentType.js.map +1 -1
- package/lib/esm/activities/index-dsl.js +2 -1
- package/lib/esm/activities/index-dsl.js.map +1 -1
- package/lib/esm/activities/media/prepareVideo.js +390 -0
- package/lib/esm/activities/media/prepareVideo.js.map +1 -0
- package/lib/esm/activities/media/transcribeMediaWithGladia.js +50 -17
- package/lib/esm/activities/media/transcribeMediaWithGladia.js.map +1 -1
- package/lib/esm/activities/notifyWebhook.js +137 -12
- package/lib/esm/activities/notifyWebhook.js.map +1 -1
- package/lib/esm/activities/rateLimiter.js +27 -0
- package/lib/esm/activities/rateLimiter.js.map +1 -0
- package/lib/esm/conversion/image.js +4 -2
- package/lib/esm/conversion/image.js.map +1 -1
- package/lib/esm/dsl/dsl-workflow.js +68 -2
- package/lib/esm/dsl/dsl-workflow.js.map +1 -1
- package/lib/esm/dsl/setup/ActivityContext.js +10 -7
- package/lib/esm/dsl/setup/ActivityContext.js.map +1 -1
- package/lib/esm/errors.js +19 -0
- package/lib/esm/errors.js.map +1 -1
- package/lib/esm/index.js +2 -1
- package/lib/esm/index.js.map +1 -1
- package/lib/esm/iterative-generation/activities/extractToc.js +3 -3
- package/lib/esm/iterative-generation/activities/extractToc.js.map +1 -1
- package/lib/esm/iterative-generation/activities/finalizeOutput.js +9 -6
- package/lib/esm/iterative-generation/activities/finalizeOutput.js.map +1 -1
- package/lib/esm/iterative-generation/activities/generatePart.js +19 -14
- package/lib/esm/iterative-generation/activities/generatePart.js.map +1 -1
- package/lib/esm/iterative-generation/activities/generateToc.js +50 -55
- package/lib/esm/iterative-generation/activities/generateToc.js.map +1 -1
- package/lib/esm/iterative-generation/utils.js.map +1 -1
- package/lib/esm/system/notifyWebhookWorkflow.js +11 -4
- package/lib/esm/system/notifyWebhookWorkflow.js.map +1 -1
- package/lib/esm/utils/blobs.js +4 -1
- package/lib/esm/utils/blobs.js.map +1 -1
- package/lib/esm/utils/client.js +4 -2
- package/lib/esm/utils/client.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -0
- package/lib/types/activities/advanced/createDocumentTypeFromInteractionRun.d.ts.map +1 -1
- package/lib/types/activities/advanced/createOrUpdateDocumentFromInteractionRun.d.ts +1 -1
- package/lib/types/activities/advanced/createOrUpdateDocumentFromInteractionRun.d.ts.map +1 -1
- package/lib/types/activities/advanced/updateDocumentFromInteractionRun.d.ts.map +1 -1
- package/lib/types/activities/chunkDocument.d.ts.map +1 -1
- package/lib/types/activities/executeInteraction.d.ts +5 -1
- package/lib/types/activities/executeInteraction.d.ts.map +1 -1
- package/lib/types/activities/generateDocumentProperties.d.ts.map +1 -1
- package/lib/types/activities/generateOrAssignContentType.d.ts.map +1 -1
- package/lib/types/activities/index-dsl.d.ts +2 -1
- package/lib/types/activities/index-dsl.d.ts.map +1 -1
- package/lib/types/activities/media/prepareVideo.d.ts +30 -0
- package/lib/types/activities/media/prepareVideo.d.ts.map +1 -0
- package/lib/types/activities/media/transcribeMediaWithGladia.d.ts.map +1 -1
- package/lib/types/activities/notifyWebhook.d.ts +14 -3
- package/lib/types/activities/notifyWebhook.d.ts.map +1 -1
- package/lib/types/activities/rateLimiter.d.ts +11 -0
- package/lib/types/activities/rateLimiter.d.ts.map +1 -0
- package/lib/types/conversion/image.d.ts.map +1 -1
- package/lib/types/dsl/dsl-workflow.d.ts.map +1 -1
- package/lib/types/dsl/setup/ActivityContext.d.ts.map +1 -1
- package/lib/types/errors.d.ts +10 -0
- package/lib/types/errors.d.ts.map +1 -1
- package/lib/types/index.d.ts +2 -1
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/iterative-generation/activities/extractToc.d.ts.map +1 -1
- package/lib/types/iterative-generation/activities/finalizeOutput.d.ts.map +1 -1
- package/lib/types/iterative-generation/activities/generatePart.d.ts.map +1 -1
- package/lib/types/iterative-generation/activities/generateToc.d.ts.map +1 -1
- package/lib/types/iterative-generation/utils.d.ts +3 -4
- package/lib/types/iterative-generation/utils.d.ts.map +1 -1
- package/lib/types/system/notifyWebhookWorkflow.d.ts +3 -2
- package/lib/types/system/notifyWebhookWorkflow.d.ts.map +1 -1
- package/lib/types/utils/blobs.d.ts.map +1 -1
- package/lib/types/utils/client.d.ts +2 -6
- package/lib/types/utils/client.d.ts.map +1 -1
- package/lib/workflows-bundle.js +8413 -5201
- package/package.json +128 -120
- package/src/activities/advanced/createDocumentTypeFromInteractionRun.ts +9 -8
- package/src/activities/advanced/createOrUpdateDocumentFromInteractionRun.ts +11 -9
- package/src/activities/advanced/updateDocumentFromInteractionRun.ts +2 -1
- package/src/activities/chunkDocument.ts +3 -1
- package/src/activities/executeInteraction.ts +23 -14
- package/src/activities/generateDocumentProperties.ts +12 -7
- package/src/activities/generateOrAssignContentType.ts +16 -11
- package/src/activities/index-dsl.ts +2 -1
- package/src/activities/media/prepareVideo.ts +622 -0
- package/src/activities/media/transcribeMediaWithGladia.ts +52 -21
- package/src/activities/notifyWebhook.test.ts +121 -19
- package/src/activities/notifyWebhook.ts +165 -16
- package/src/activities/rateLimiter.ts +41 -0
- package/src/conversion/image.ts +6 -3
- package/src/dsl/dsl-workflow.ts +86 -0
- package/src/dsl/workflow-exec-child.test.ts +1 -0
- package/src/dsl/workflow.test.ts +1 -0
- package/src/errors.ts +28 -0
- package/src/index.ts +2 -1
- package/src/iterative-generation/activities/generatePart.ts +1 -1
- package/src/iterative-generation/activities/generateToc.ts +7 -2
- package/src/iterative-generation/utils.ts +4 -5
- package/src/system/notifyWebhookWorkflow.ts +15 -6
- package/lib/cjs/activities/identifyTextSections.js +0 -48
- package/lib/cjs/activities/identifyTextSections.js.map +0 -1
- package/lib/esm/activities/identifyTextSections.js +0 -45
- package/lib/esm/activities/identifyTextSections.js.map +0 -1
- package/lib/types/activities/identifyTextSections.d.ts +0 -12
- package/lib/types/activities/identifyTextSections.d.ts.map +0 -1
- package/src/activities/identifyTextSections.ts +0 -71
|
@@ -7,36 +7,37 @@ const memory_js_1 = require("../../utils/memory.js");
|
|
|
7
7
|
const utils_js_1 = require("../utils.js");
|
|
8
8
|
async function it_gen_generatePart(payload, path) {
|
|
9
9
|
const vars = payload.vars;
|
|
10
|
-
const client = (0, client_js_1.getVertesiaClient)(payload);
|
|
10
|
+
const client = await (0, client_js_1.getVertesiaClient)(payload);
|
|
11
11
|
const memory = vars.memory;
|
|
12
12
|
const [sectionIndex, partIndex] = path;
|
|
13
13
|
const outMemory = await (0, memory_js_1.loadMemoryPack)(client, `${memory}/output`);
|
|
14
|
-
const meta = await outMemory.getMetadata();
|
|
14
|
+
const meta = (await outMemory.getMetadata());
|
|
15
15
|
// the section we build is the section at the given index
|
|
16
16
|
const section = meta.toc.sections[sectionIndex];
|
|
17
17
|
if (!section) {
|
|
18
|
-
throw workflow_1.ApplicationFailure.nonRetryable(
|
|
18
|
+
throw workflow_1.ApplicationFailure.nonRetryable("Section not found in the TOC", "SectionNotFound", { memory, path });
|
|
19
19
|
}
|
|
20
20
|
let part;
|
|
21
21
|
if (partIndex !== undefined) {
|
|
22
22
|
part = section.parts?.[partIndex];
|
|
23
23
|
if (!part) {
|
|
24
|
-
throw workflow_1.ApplicationFailure.nonRetryable(
|
|
24
|
+
throw workflow_1.ApplicationFailure.nonRetryable("Part not found in the TOC section", "PartNotFound", { memory, path });
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
(0, utils_js_1.expectMemoryIsConsistent)(meta, path);
|
|
28
28
|
const content = await loadGeneratedContent(outMemory);
|
|
29
29
|
let previously_generated = getPreviouslyGeneratedContent(content, !part, vars.remembrance_strategy);
|
|
30
|
-
if (!part) {
|
|
30
|
+
if (!part) {
|
|
31
|
+
// a new section
|
|
31
32
|
content.push({
|
|
32
33
|
id: section.id,
|
|
33
34
|
name: section.name,
|
|
34
35
|
description: section.description,
|
|
35
|
-
content:
|
|
36
|
+
content: "",
|
|
36
37
|
});
|
|
37
38
|
}
|
|
38
39
|
else if (!content.length) {
|
|
39
|
-
throw workflow_1.ApplicationFailure.nonRetryable(
|
|
40
|
+
throw workflow_1.ApplicationFailure.nonRetryable("content.json is empty while generating a part", "InvalidIterationState", { memory, path });
|
|
40
41
|
}
|
|
41
42
|
const interaction = vars.iterative_interaction || vars.interaction;
|
|
42
43
|
const r = await (0, utils_js_1.executeWithVars)(client, interaction, vars, {
|
|
@@ -46,9 +47,9 @@ async function it_gen_generatePart(payload, path) {
|
|
|
46
47
|
section: section.name,
|
|
47
48
|
part: part?.name,
|
|
48
49
|
path: path,
|
|
49
|
-
}
|
|
50
|
+
},
|
|
50
51
|
});
|
|
51
|
-
const result = r.result;
|
|
52
|
+
const result = r.result.text();
|
|
52
53
|
content[content.length - 1].content += result;
|
|
53
54
|
meta.lastProcessedPart = path;
|
|
54
55
|
await (0, memory_js_1.buildAndPublishMemoryPack)(client, `${memory}/output`, async ({ copyText }) => {
|
|
@@ -57,17 +58,21 @@ async function it_gen_generatePart(payload, path) {
|
|
|
57
58
|
});
|
|
58
59
|
}
|
|
59
60
|
async function loadGeneratedContent(memory) {
|
|
60
|
-
const content = await memory.getEntryText(
|
|
61
|
+
const content = await memory.getEntryText("content.json");
|
|
61
62
|
return content ? JSON.parse(content) : [];
|
|
62
63
|
}
|
|
63
64
|
function getPreviouslyGeneratedContent(sections, isNewSection, strategy) {
|
|
64
65
|
switch (strategy) {
|
|
65
66
|
case "document":
|
|
66
|
-
return sections
|
|
67
|
+
return sections
|
|
68
|
+
.map((section) => section.content || "")
|
|
69
|
+
.join("\n\n");
|
|
67
70
|
case "none":
|
|
68
|
-
return
|
|
71
|
+
return "";
|
|
69
72
|
default:
|
|
70
|
-
return isNewSection
|
|
73
|
+
return isNewSection
|
|
74
|
+
? ""
|
|
75
|
+
: sections[sections.length - 1]?.content || "";
|
|
71
76
|
}
|
|
72
77
|
}
|
|
73
78
|
//# sourceMappingURL=generatePart.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatePart.js","sourceRoot":"","sources":["../../../../src/iterative-generation/activities/generatePart.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generatePart.js","sourceRoot":"","sources":["../../../../src/iterative-generation/activities/generatePart.ts"],"names":[],"mappings":";;AAiBA,kDAiFC;AAlGD,mDAA0D;AAG1D,qDAA0D;AAC1D,qDAG+B;AAQ/B,0CAAwE;AAEjE,KAAK,UAAU,mBAAmB,CACrC,OAAiC,EACjC,IAAc;IAEd,MAAM,IAAI,GAAG,OAAO,CAAC,IAAkC,CAAC;IACxD,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAiB,EAAC,OAAO,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAE3B,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;IACvC,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAc,EAAC,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,CAAC,MAAM,SAAS,CAAC,WAAW,EAAE,CAAqB,CAAC;IAEjE,yDAAyD;IACzD,MAAM,OAAO,GAAe,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC5D,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,MAAM,6BAAkB,CAAC,YAAY,CACjC,8BAA8B,EAC9B,iBAAiB,EACjB,EAAE,MAAM,EAAE,IAAI,EAAE,CACnB,CAAC;IACN,CAAC;IACD,IAAI,IAAyB,CAAC;IAC9B,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,6BAAkB,CAAC,YAAY,CACjC,mCAAmC,EACnC,cAAc,EACd,EAAE,MAAM,EAAE,IAAI,EAAE,CACnB,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAA,mCAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErC,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAEtD,IAAI,oBAAoB,GAAG,6BAA6B,CACpD,OAAO,EACP,CAAC,IAAI,EACL,IAAI,CAAC,oBAAoB,CAC5B,CAAC;IAEF,IAAI,CAAC,IAAI,EAAE,CAAC;QACR,gBAAgB;QAChB,OAAO,CAAC,IAAI,CAAC;YACT,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,OAAO,EAAE,EAAE;SACd,CAAC,CAAC;IACP,CAAC;SAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,6BAAkB,CAAC,YAAY,CACjC,+CAA+C,EAC/C,uBAAuB,EACvB,EAAE,MAAM,EAAE,IAAI,EAAE,CACnB,CAAC;IACN,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,IAAI,IAAI,CAAC,WAAW,CAAC;IACnE,MAAM,CAAC,GAAG,MAAM,IAAA,0BAAe,EAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE;QACvD,SAAS,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,oBAAoB;YACpB,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,IAAI,EAAE,IAAI,EAAE,IAAI;YAChB,IAAI,EAAE,IAAI;SACb;KACJ,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/B,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC;IAC9C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAC9B,MAAM,IAAA,qCAAyB,EAC3B,MAAM,EACN,GAAG,MAAM,SAAS,EAClB,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;QACnB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IAChB,CAAC,CACJ,CAAC;AACN,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,MAAkB;IAClD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAC1D,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,6BAA6B,CAClC,QAAmB,EACnB,YAAqB,EACrB,QAA0C;IAE1C,QAAQ,QAAQ,EAAE,CAAC;QACf,KAAK,UAAU;YACX,OAAO,QAAQ;iBACV,GAAG,CAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;iBAChD,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,KAAK,MAAM;YACP,OAAO,EAAE,CAAC;QACd;YACI,OAAO,YAAY;gBACf,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC;IAC3D,CAAC;AACL,CAAC"}
|
|
@@ -5,85 +5,80 @@ const client_js_1 = require("../../utils/client.js");
|
|
|
5
5
|
const memory_js_1 = require("../../utils/memory.js");
|
|
6
6
|
const utils_js_1 = require("../utils.js");
|
|
7
7
|
const defaultTocSchema = {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
8
|
+
type: "object",
|
|
9
|
+
properties: {
|
|
10
|
+
sections: {
|
|
11
|
+
type: "array",
|
|
12
|
+
items: {
|
|
13
|
+
type: "object",
|
|
14
|
+
properties: {
|
|
15
|
+
id: {
|
|
16
|
+
type: "string",
|
|
17
|
+
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.",
|
|
18
18
|
},
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
operation: {
|
|
20
|
+
type: "string",
|
|
21
|
+
enum: ["create", "update", "delete"],
|
|
22
|
+
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.",
|
|
23
23
|
},
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
name: {
|
|
25
|
+
type: "string",
|
|
26
|
+
description: "The name or title of the section, should be the path in the OpenAPI spec, of the title of the section/part.",
|
|
27
27
|
},
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
description: {
|
|
29
|
+
type: "string",
|
|
30
30
|
},
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
instructions: {
|
|
32
|
+
type: "string",
|
|
33
33
|
},
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
34
|
+
parts: {
|
|
35
|
+
type: "array",
|
|
36
|
+
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.",
|
|
37
|
+
items: {
|
|
38
|
+
type: "object",
|
|
39
|
+
properties: {
|
|
40
|
+
id: {
|
|
41
|
+
type: "string",
|
|
42
|
+
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.",
|
|
43
43
|
},
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
name: {
|
|
45
|
+
type: "string",
|
|
46
|
+
description: "The name or title of the part, should be the path in the OpenAPI spec, of the title of the section/part.",
|
|
47
47
|
},
|
|
48
48
|
/*
|
|
49
49
|
"description": {
|
|
50
50
|
"type": "string"
|
|
51
51
|
},
|
|
52
52
|
*/
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
53
|
+
instructions: {
|
|
54
|
+
type: "string",
|
|
55
|
+
},
|
|
56
56
|
},
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
]
|
|
61
|
-
}
|
|
62
|
-
}
|
|
57
|
+
required: ["id", "name"],
|
|
58
|
+
},
|
|
59
|
+
},
|
|
63
60
|
},
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
"operation"
|
|
68
|
-
]
|
|
69
|
-
}
|
|
70
|
-
}
|
|
61
|
+
required: ["id", "name", "operation"],
|
|
62
|
+
},
|
|
63
|
+
},
|
|
71
64
|
},
|
|
72
|
-
|
|
73
|
-
"sections"
|
|
74
|
-
]
|
|
65
|
+
required: ["sections"],
|
|
75
66
|
};
|
|
76
67
|
async function it_gen_generateToc(payload) {
|
|
77
68
|
const vars = payload.vars;
|
|
78
69
|
const schema = vars.toc_schema || defaultTocSchema;
|
|
79
|
-
const client = (0, client_js_1.getVertesiaClient)(payload);
|
|
70
|
+
const client = await (0, client_js_1.getVertesiaClient)(payload);
|
|
80
71
|
const run = await (0, utils_js_1.executeWithVars)(client, vars.interaction, vars, undefined, schema);
|
|
81
|
-
|
|
72
|
+
//Parse the CompletionResult[] to get a Toc object
|
|
73
|
+
const jsonResults = run.result.object();
|
|
74
|
+
const toc = {
|
|
75
|
+
sections: jsonResults.sections
|
|
76
|
+
};
|
|
82
77
|
await (0, memory_js_1.buildAndPublishMemoryPack)(client, `${vars.memory}/output`, async () => {
|
|
83
78
|
return {
|
|
84
79
|
toc,
|
|
85
80
|
lastProcessedPart: undefined, // the part index (a number array)
|
|
86
|
-
previouslyGenerated: ""
|
|
81
|
+
previouslyGenerated: "",
|
|
87
82
|
};
|
|
88
83
|
});
|
|
89
84
|
return (0, utils_js_1.tocIndex)(toc);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateToc.js","sourceRoot":"","sources":["../../../../src/iterative-generation/activities/generateToc.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generateToc.js","sourceRoot":"","sources":["../../../../src/iterative-generation/activities/generateToc.ts"],"names":[],"mappings":";;AA8EA,gDAqCC;AAlHD,qDAA0D;AAC1D,qDAAkE;AAOlE,0CAAwD;AAExD,MAAM,gBAAgB,GAAG;IACrB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,QAAQ,EAAE;YACN,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,EAAE,EAAE;wBACA,IAAI,EAAE,QAAQ;wBACd,WAAW,EACP,uJAAuJ;qBAC9J;oBACD,SAAS,EAAE;wBACP,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC;wBACpC,WAAW,EACP,+JAA+J;qBACtK;oBACD,IAAI,EAAE;wBACF,IAAI,EAAE,QAAQ;wBACd,WAAW,EACP,6GAA6G;qBACpH;oBACD,WAAW,EAAE;wBACT,IAAI,EAAE,QAAQ;qBACjB;oBACD,YAAY,EAAE;wBACV,IAAI,EAAE,QAAQ;qBACjB;oBACD,KAAK,EAAE;wBACH,IAAI,EAAE,OAAO;wBACb,WAAW,EACP,iWAAiW;wBACrW,KAAK,EAAE;4BACH,IAAI,EAAE,QAAQ;4BACd,UAAU,EAAE;gCACR,EAAE,EAAE;oCACA,IAAI,EAAE,QAAQ;oCACd,WAAW,EACP,oJAAoJ;iCAC3J;gCACD,IAAI,EAAE;oCACF,IAAI,EAAE,QAAQ;oCACd,WAAW,EACP,0GAA0G;iCACjH;gCACD;;;;kCAIE;gCACF,YAAY,EAAE;oCACV,IAAI,EAAE,QAAQ;iCACjB;6BACJ;4BACD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;yBAC3B;qBACJ;iBACJ;gBACD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC;aACxC;SACJ;KACJ;IACD,QAAQ,EAAE,CAAC,UAAU,CAAC;CACzB,CAAC;AAEK,KAAK,UAAU,kBAAkB,CACpC,OAAiC;IAEjC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAkC,CAAC;IAExD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,IAAI,gBAAgB,CAAC;IAEnD,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAiB,EAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,IAAA,0BAAe,EAC7B,MAAM,EACN,IAAI,CAAC,WAAW,EAChB,IAAI,EACJ,SAAS,EACT,MAAM,CACT,CAAC;IAEF,kDAAkD;IAClD,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAExC,MAAM,GAAG,GAAQ;QACb,QAAQ,EAAE,WAAW,CAAC,QAAQ;KACjC,CAAC;IAEF,MAAM,IAAA,qCAAyB,EAC3B,MAAM,EACN,GAAG,IAAI,CAAC,MAAM,SAAS,EACvB,KAAK,IAAI,EAAE;QACP,OAAO;YACH,GAAG;YACH,iBAAiB,EAAE,SAAS,EAAE,kCAAkC;YAChE,mBAAmB,EAAE,EAAE;SACC,CAAC;IACjC,CAAC,CACJ,CAAC;IAEF,OAAO,IAAA,mBAAQ,EAAC,GAAG,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/iterative-generation/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/iterative-generation/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,22 +15,29 @@ const { notifyWebhook } = (0, dslProxyActivities_js_1.dslProxyActivities)("notif
|
|
|
15
15
|
},
|
|
16
16
|
});
|
|
17
17
|
async function notifyWebhookWorkflow(payload) {
|
|
18
|
+
const info = (0, workflow_1.workflowInfo)();
|
|
18
19
|
const { objectIds, vars } = payload;
|
|
19
20
|
const notifications = [];
|
|
20
21
|
const endpoints = vars.endpoints ?? vars.webhooks ?? [];
|
|
21
22
|
const data = vars.data ?? vars.webhook_data ?? undefined;
|
|
23
|
+
const workflow_type = vars.workflow_type ?? info.workflowType;
|
|
22
24
|
const eventName = payload.event;
|
|
25
|
+
const workflowId = info.parent?.workflowId || info.workflowId;
|
|
26
|
+
const workflowRunId = info.parent?.runId || info.runId;
|
|
23
27
|
if (!endpoints.length) {
|
|
24
28
|
workflow_1.log.info(`No webhooks to notify`);
|
|
25
29
|
return { notifications: [], message: "No webhooks to notify" };
|
|
26
30
|
}
|
|
27
31
|
for (const ep of endpoints) {
|
|
28
32
|
const n = notifyWebhook(payload, {
|
|
29
|
-
|
|
33
|
+
webhook: ep,
|
|
30
34
|
method: 'POST',
|
|
31
|
-
|
|
35
|
+
workflow_type,
|
|
36
|
+
workflow_id: workflowId,
|
|
37
|
+
workflow_run_id: workflowRunId,
|
|
38
|
+
event_name: eventName,
|
|
39
|
+
detail: {
|
|
32
40
|
object_ids: objectIds,
|
|
33
|
-
event: eventName,
|
|
34
41
|
data
|
|
35
42
|
}
|
|
36
43
|
}).then(res => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifyWebhookWorkflow.js","sourceRoot":"","sources":["../../../src/system/notifyWebhookWorkflow.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"notifyWebhookWorkflow.js","sourceRoot":"","sources":["../../../src/system/notifyWebhookWorkflow.ts"],"names":[],"mappings":";;AA2BA,sDA0CC;AApED,mDAAyD;AAGzD,wEAAkE;AAClE,4CAAuD;AAEvD,MAAM,EACF,aAAa,EAChB,GAAG,IAAA,0CAAkB,EAAoB,uBAAuB,EAAE;IAC/D,mBAAmB,EAAE,UAAU;IAC/B,KAAK,EAAE;QACH,eAAe,EAAE,IAAI;QACrB,kBAAkB,EAAE,CAAC;QACrB,eAAe,EAAE,CAAC;QAClB,eAAe,EAAE,GAAG,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI;QACtC,sBAAsB,EAAE,mCAAuB;KAClD;CACJ,CAAC,CAAC;AASI,KAAK,UAAU,qBAAqB,CAAC,OAA8D;IAEtG,MAAM,IAAI,GAAG,IAAA,uBAAY,GAAE,CAAC;IAC5B,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAK,IAAY,CAAC,QAAQ,IAAI,EAAE,CAAC;IACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAK,IAAY,CAAC,YAAY,IAAI,SAAS,CAAC;IAClE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,YAAY,CAAC;IAC9D,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;IAEhC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC;IAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC;IAEvD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACpB,cAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAClC,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnE,CAAC;IAED,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,aAAa,CAAC,OAAO,EAAE;YAC7B,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,MAAM;YACd,aAAa;YACb,WAAW,EAAE,UAAU;YACvB,eAAe,EAAE,aAAa;YAC9B,UAAU,EAAE,SAAS;YACrB,MAAM,EAAE;gBACJ,UAAU,EAAE,SAAS;gBACrB,IAAI;aACP;SACJ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACV,cAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,wBAAwB,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YACjF,OAAO,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;QACH,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC7C,cAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE9B,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC;AAEhE,CAAC"}
|
package/lib/cjs/utils/blobs.js
CHANGED
|
@@ -22,7 +22,10 @@ async function fetchBlobAsStream(client, blobUri) {
|
|
|
22
22
|
catch (err) {
|
|
23
23
|
if (err.message.includes("not found")) {
|
|
24
24
|
//TODO improve error handling with a fetch fail error class in the client
|
|
25
|
-
throw new errors_js_1.DocumentNotFoundError(`
|
|
25
|
+
throw new errors_js_1.DocumentNotFoundError(`Not found at ${blobUri}: ${err.message}`, []);
|
|
26
|
+
}
|
|
27
|
+
else if (err.message.includes("forbidden")) {
|
|
28
|
+
throw new errors_js_1.DocumentNotFoundError(`Forbidden at ${blobUri}: ${err.message}`);
|
|
26
29
|
}
|
|
27
30
|
else {
|
|
28
31
|
throw new Error(`Failed to download blob ${blobUri}: ${err.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blobs.js","sourceRoot":"","sources":["../../../src/utils/blobs.ts"],"names":[],"mappings":";;;;;AAUA,
|
|
1
|
+
{"version":3,"file":"blobs.js","sourceRoot":"","sources":["../../../src/utils/blobs.ts"],"names":[],"mappings":";;;;;AAUA,8CAaC;AACD,8CAOC;AAED,8CAGC;AAWD,gDAOC;AAED,kBAEC;AAzDD,oDAA4B;AAC5B,2BAAuC;AACvC,mCAAkC;AAClC,8CAA2C;AAC3C,8CAAsB;AACtB,4CAAqD;AAErD,aAAG,CAAC,kBAAkB,EAAE,CAAC;AAElB,KAAK,UAAU,iBAAiB,CAAC,MAAsB,EAAE,OAAe;IAC3E,IAAI,CAAC;QACD,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAChB,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,yEAAyE;YACzE,MAAM,IAAI,iCAAqB,CAAC,gBAAgB,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QACnF,CAAC;aAAM,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,iCAAqB,CAAC,gBAAgB,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,2BAA2B,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1E,CAAC;IACL,CAAC;AACL,CAAC;AACM,KAAK,UAAU,iBAAiB,CAAC,MAAsB,EAAE,OAAe;IAC3E,IAAI,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAEM,KAAK,UAAU,iBAAiB,CAAC,MAAsB,EAAE,OAAe;IAC3E,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,MAAsB,EAAE,OAAe,EAAE,MAAc;IACjF,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,iBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAA,sBAAiB,EAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,IAAA,mBAAQ,EAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,uCAAuC;AAC9E,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,MAAsB,EAAE,OAAe,EAAE,OAAgB;IAC9F,MAAM,OAAO,GAAG,aAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,EAAE,oBAAoB;QAC5B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE;KACxC,CAAC,CAAC;IACH,MAAM,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,OAAO,OAAO,CAAC,IAAI,CAAC;AACxB,CAAC;AAED,SAAgB,GAAG,CAAC,QAAgB;IAChC,OAAO,gBAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC"}
|
package/lib/cjs/utils/client.js
CHANGED
|
@@ -20,10 +20,12 @@ function getVertesiaClientOptions(payload) {
|
|
|
20
20
|
if (!payload.config?.store_url) {
|
|
21
21
|
throw new errors_js_1.WorkflowParamNotFoundError("Content Store URL is missing from WorkflowExecutionPayload.servers.storeUrl");
|
|
22
22
|
}
|
|
23
|
+
const token = (0, client_1.decodeJWT)(payload.auth_token);
|
|
23
24
|
return {
|
|
24
25
|
serverUrl: payload.config.studio_url,
|
|
25
26
|
storeUrl: payload.config.store_url,
|
|
26
|
-
|
|
27
|
+
tokenServerUrl: token.iss,
|
|
28
|
+
apikey: payload.auth_token,
|
|
27
29
|
};
|
|
28
30
|
}
|
|
29
31
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":";AAAA;;GAEG;;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAUH,8CAEC;AAED,4DA6BC;AAzCD,6CAI0B;AAE1B,4CAA0D;AAE1D,SAAgB,iBAAiB,CAAC,OAAoC;IAClE,OAAO,IAAI,uBAAc,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAgB,wBAAwB,CACpC,OAAoC;IAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACtB,MAAM,IAAI,sCAA0B,CAChC,yEAAyE,CAC5E,CAAC;IACN,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,sCAA0B,CAChC,6EAA6E,CAChF,CAAC;IACN,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,sCAA0B,CAChC,6EAA6E,CAChF,CAAC;IACN,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,kBAAS,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE5C,OAAO;QACH,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU;QACpC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS;QAClC,cAAc,EAAE,KAAK,CAAC,GAAG;QACzB,MAAM,EAAE,OAAO,CAAC,UAAU;KAC7B,CAAC;AACN,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { log } from "@temporalio/activity";
|
|
2
|
+
import { InteractionOutput } from "@vertesia/client";
|
|
2
3
|
import { projectResult } from "../../dsl/projections.js";
|
|
3
4
|
import { setupActivity } from "../../dsl/setup/ActivityContext.js";
|
|
4
5
|
import { ActivityParamNotFoundError } from "../../errors.js";
|
|
@@ -7,16 +8,16 @@ export async function createDocumentTypeFromInteractionRun(payload) {
|
|
|
7
8
|
if (!params.run) {
|
|
8
9
|
throw new ActivityParamNotFoundError("run", payload.activity);
|
|
9
10
|
}
|
|
10
|
-
const
|
|
11
|
-
if (!
|
|
12
|
-
log.error("No name generated for type: " + JSON.stringify(
|
|
11
|
+
const jsonResult = InteractionOutput.from(params.run.result).object();
|
|
12
|
+
if (!jsonResult.document_type) {
|
|
13
|
+
log.error("No name generated for type: " + JSON.stringify(jsonResult), jsonResult);
|
|
13
14
|
throw new Error("No name generated for type");
|
|
14
15
|
}
|
|
15
|
-
log.info("Generated schema for type",
|
|
16
|
+
log.info("Generated schema for type", jsonResult.metadata_schema);
|
|
16
17
|
const typeData = {
|
|
17
|
-
name:
|
|
18
|
-
object_schema:
|
|
19
|
-
is_chunkable: !!
|
|
18
|
+
name: jsonResult.document_type,
|
|
19
|
+
object_schema: jsonResult.metadata_schema,
|
|
20
|
+
is_chunkable: !!jsonResult.is_chunkable,
|
|
20
21
|
};
|
|
21
22
|
const type = await client.types.create(typeData);
|
|
22
23
|
if (params.updateObjectId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDocumentTypeFromInteractionRun.js","sourceRoot":"","sources":["../../../../src/activities/advanced/createDocumentTypeFromInteractionRun.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createDocumentTypeFromInteractionRun.js","sourceRoot":"","sources":["../../../../src/activities/advanced/createDocumentTypeFromInteractionRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAmB7D,MAAM,CAAC,KAAK,UAAU,oCAAoC,CAAC,OAAgF;IACvI,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAA6C,OAAO,CAAC,CAAC;IAEpG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;IAEtE,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC5B,GAAG,CAAC,KAAK,CAAC,8BAA8B,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC;QACnF,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAClD,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,UAAU,CAAC,eAAe,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAmC;QAC7C,IAAI,EAAE,UAAU,CAAC,aAAa;QAC9B,aAAa,EAAE,UAAU,CAAC,eAAe;QACzC,YAAY,EAAE,CAAC,CAAC,UAAU,CAAC,YAAY;KAC1C,CAAA;IAED,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEjD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,EAAE;SAChB,CAAC,CAAC;IACP,CAAC;IAED,OAAO,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AAClF,CAAC"}
|
|
@@ -22,27 +22,28 @@ export async function createOrUpdateDocumentFromInteractionRun(payload) {
|
|
|
22
22
|
})
|
|
23
23
|
: undefined;
|
|
24
24
|
const result = run.result;
|
|
25
|
-
const resultIsObject = typeof result === 'object';
|
|
26
25
|
const inputData = run.parameters;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
// Try to parse result as JSON, fallback to text if not valid JSON
|
|
27
|
+
let jsonResult = null;
|
|
28
|
+
try {
|
|
29
|
+
jsonResult = result.object();
|
|
30
30
|
}
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
catch (e) {
|
|
32
|
+
log.info("Result is not valid JSON, will use text content instead", { error: e instanceof Error ? e.message : String(e) });
|
|
33
33
|
}
|
|
34
|
+
const name = jsonResult?.['name'] || jsonResult?.["title"] || inputData['name'] || params.fallback_name || undefined;
|
|
34
35
|
const docPayload = {
|
|
35
36
|
name,
|
|
36
37
|
parent: params.parent ?? undefined,
|
|
37
|
-
properties:
|
|
38
|
-
text: !
|
|
38
|
+
properties: jsonResult ? jsonResult : {},
|
|
39
|
+
text: !jsonResult ? result.text() : undefined,
|
|
39
40
|
type: type?.id,
|
|
40
41
|
status: ContentObjectStatus.completed,
|
|
41
42
|
generation_run_info: {
|
|
42
43
|
id: run.id,
|
|
43
44
|
date: new Date().toISOString(),
|
|
44
45
|
model: run.modelId,
|
|
45
|
-
target:
|
|
46
|
+
target: jsonResult ? 'properties' : 'text'
|
|
46
47
|
}
|
|
47
48
|
};
|
|
48
49
|
if (params.update_text_from_property) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createOrUpdateDocumentFromInteractionRun.js","sourceRoot":"","sources":["../../../../src/activities/advanced/createOrUpdateDocumentFromInteractionRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAgD,MAAM,kBAAkB,CAAC;AACrG,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAwCpF,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAAC,OAAkF;IAC7I,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAA+C,OAAO,CAAC,CAAC;IAEtG,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5B,MAAM,cAAc,GAAG,MAAM,CAAC,WAAW,CAAC;IAE1C,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,MAAM,IAAI,0BAA0B,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAChD,MAAM,IAAI,0BAA0B,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1E,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,2CAA2C,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;IAEjF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACtD,MAAM,IAAI,qBAAqB,CAAC,sBAAsB,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC;QACzB,MAAM,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACzD,MAAM,IAAI,qBAAqB,CAAC,uBAAuB,cAAc,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3F,CAAC,CAAC;QACF,CAAC,CAAC,SAAS,CAAC;IAGhB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,
|
|
1
|
+
{"version":3,"file":"createOrUpdateDocumentFromInteractionRun.js","sourceRoot":"","sources":["../../../../src/activities/advanced/createOrUpdateDocumentFromInteractionRun.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { InteractionOutput } from "@vertesia/client";
|
|
1
2
|
import { setupActivity } from "../../dsl/setup/ActivityContext.js";
|
|
2
3
|
import { ActivityParamNotFoundError } from "../../errors.js";
|
|
3
4
|
export async function updateDocumentFromInteractionRun(payload) {
|
|
@@ -5,7 +6,7 @@ export async function updateDocumentFromInteractionRun(payload) {
|
|
|
5
6
|
if (!params.run) {
|
|
6
7
|
throw new ActivityParamNotFoundError("run", payload.activity);
|
|
7
8
|
}
|
|
8
|
-
const docProps = params.run.result;
|
|
9
|
+
const docProps = InteractionOutput.from(params.run.result).object();
|
|
9
10
|
if (!docProps) {
|
|
10
11
|
return { status: "failed", error: "no-props" };
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateDocumentFromInteractionRun.js","sourceRoot":"","sources":["../../../../src/activities/advanced/updateDocumentFromInteractionRun.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"updateDocumentFromInteractionRun.js","sourceRoot":"","sources":["../../../../src/activities/advanced/updateDocumentFromInteractionRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAe7D,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,OAA4E;IAC/H,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAa,CAAyC,OAAO,CAAC,CAAC;IAE1G,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;IAEpE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IACnD,CAAC;IAED,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAEhD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AACjC,CAAC"}
|
|
@@ -29,7 +29,8 @@ export async function chunkDocument(payload) {
|
|
|
29
29
|
objectId: objectId,
|
|
30
30
|
content: instrumented
|
|
31
31
|
});
|
|
32
|
-
const
|
|
32
|
+
const jsonResult = res.result.object();
|
|
33
|
+
const parts = jsonResult.parts;
|
|
33
34
|
if (!parts || parts.length === 0) {
|
|
34
35
|
log.warn('No parts found for object ID: ' + objectId, res);
|
|
35
36
|
return { id: objectId, status: "failed", parts: [], message: "no parts found" };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunkDocument.js","sourceRoot":"","sources":["../../../src/activities/chunkDocument.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,OAAO,EAA8B,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAErG,MAAM,kBAAkB,GAAG,mBAAmB,CAAA;AAyC9C,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAyD;IACzF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAa,CAAsB,OAAO,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACzB,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,kBAAkB,CAAC;IAErE,GAAG,CAAC,IAAI,CAAC,UAAU,QAAQ,mBAAmB,CAAC,CAAC;IAEhD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAElE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEvF,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC;QACtB,GAAG,CAAC,IAAI,CAAC,uCAAuC,GAAG,QAAQ,CAAC,CAAC;QAC7D,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAA;IAC7E,CAAC;IAED,0BAA0B;IAC1B,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACjB,GAAG,CAAC,IAAI,CAAC,+BAA+B,GAAG,QAAQ,CAAC,CAAC;QACrD,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,CAAA;IACvE,CAAC;IAED,IAAI,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;QACtG,GAAG,CAAC,IAAI,CAAC,0CAA0C,GAAG,QAAQ,CAAC,CAAC;QAChE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,4CAA4C,EAAE,CAAA;IACrG,CAAC;IAED,uCAAuC;IACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACvC,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,GAAG,GAAG,MAAM,8BAA8B,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE;QAC9E,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,YAAY;KACxB,CAAC,CAAC;IAEH,MAAM,
|
|
1
|
+
{"version":3,"file":"chunkDocument.js","sourceRoot":"","sources":["../../../src/activities/chunkDocument.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { NodeStreamSource } from "@vertesia/client/node";
|
|
|
4
4
|
import { ExecutionRunStatus, } from "@vertesia/common";
|
|
5
5
|
import { projectResult } from "../dsl/projections.js";
|
|
6
6
|
import { setupActivity } from "../dsl/setup/ActivityContext.js";
|
|
7
|
-
import { ActivityParamInvalidError, ActivityParamNotFoundError } from "../errors.js";
|
|
7
|
+
import { ActivityParamInvalidError, ActivityParamNotFoundError, ResourceExhaustedError } from "../errors.js";
|
|
8
8
|
import { truncByMaxTokens } from "../utils/tokens.js";
|
|
9
9
|
import { Readable } from "stream";
|
|
10
10
|
//Example:
|
|
@@ -71,9 +71,10 @@ export async function executeInteraction(payload) {
|
|
|
71
71
|
}
|
|
72
72
|
try {
|
|
73
73
|
const res = await executeInteractionFromActivity(client, interactionName, params, prompt_data, payload.debug_mode);
|
|
74
|
+
let completionResult = res.result;
|
|
74
75
|
// Handle image uploads if the result contains base64 images
|
|
75
76
|
if (res.output_modality === Modalities.image) {
|
|
76
|
-
const images = res.result.images;
|
|
77
|
+
const images = res.result.images();
|
|
77
78
|
const uploadedImages = await Promise.all(images.map((image, index) => {
|
|
78
79
|
// Extract base64 data and create buffer
|
|
79
80
|
const base64Data = image.replace(/^data:image\/[a-z]+;base64,/, "");
|
|
@@ -87,17 +88,20 @@ export async function executeInteraction(payload) {
|
|
|
87
88
|
const source = new NodeStreamSource(stream, filename, "image/png");
|
|
88
89
|
return client.files.uploadFile(source);
|
|
89
90
|
}));
|
|
90
|
-
|
|
91
|
+
completionResult = uploadedImages.map(file => ({ type: "image", value: file }));
|
|
91
92
|
}
|
|
92
93
|
return projectResult(payload, params, res, {
|
|
93
94
|
runId: res.id,
|
|
94
95
|
status: res.status,
|
|
95
|
-
result:
|
|
96
|
+
result: completionResult,
|
|
96
97
|
});
|
|
97
98
|
}
|
|
98
99
|
catch (error) {
|
|
99
|
-
log.error(
|
|
100
|
-
if (error.
|
|
100
|
+
log.error(`Failed to execute interaction ${interactionName}`, { error });
|
|
101
|
+
if (error.statusCode === 429 && params.exit_on_resource_exhaustion) {
|
|
102
|
+
throw new ResourceExhaustedError(error.statusCode, "Resource exhausted - rate limit exceeded");
|
|
103
|
+
}
|
|
104
|
+
else if (error.message.includes("Failed to validate merged prompt schema")) {
|
|
101
105
|
//issue with the input data, don't retry
|
|
102
106
|
throw new ActivityParamInvalidError("prompt_data", payload.activity, error.message);
|
|
103
107
|
}
|
|
@@ -106,7 +110,7 @@ export async function executeInteraction(payload) {
|
|
|
106
110
|
throw new ActivityParamInvalidError("model", payload.activity, error.message);
|
|
107
111
|
}
|
|
108
112
|
else {
|
|
109
|
-
throw error;
|
|
113
|
+
throw new Error(`Interaction Execution failed ${interactionName}: ${error.message}`);
|
|
110
114
|
}
|
|
111
115
|
}
|
|
112
116
|
}
|
|
@@ -168,7 +172,7 @@ export async function executeInteractionFromActivity(client, interactionName, pa
|
|
|
168
172
|
})
|
|
169
173
|
.catch((err) => {
|
|
170
174
|
log.error(`Error executing interaction ${interactionName}`, { err });
|
|
171
|
-
throw
|
|
175
|
+
throw err;
|
|
172
176
|
});
|
|
173
177
|
if (debug) {
|
|
174
178
|
log.info(`Interaction executed ${interactionName}`, res);
|