@promptbook/cli 0.77.0 → 0.77.1

package/README.md

@@ -92,7 +92,7 @@ There is also a javascript and json format available.
 ## Prettify
 
 ```bash
-npx ptbk prettify promptbook/**/*.book.md
+npx ptbk prettify 'promptbook/**/*.book.md'
 ```
 
 This will prettify all promptbooks in `promptbook` directory and adds Mermaid graphs to them.

package/esm/index.es.js

@@ -37,7 +37,7 @@ var BOOK_LANGUAGE_VERSION = '1.0.0';
  *
  * @see https://github.com/webgptorg/promptbook
  */
-var PROMPTBOOK_ENGINE_VERSION = '0.77.0-6';
+var PROMPTBOOK_ENGINE_VERSION = '0.77.0';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -3623,7 +3623,7 @@ var LimitReachedError = /** @class */ (function (_super) {
  *
  * @public exported from `@promptbook/core`
  */
-var ERRORS = {
+var PROMPTBOOK_ERRORS = {
     AbstractFormatError: AbstractFormatError,
     CsvFormatError: CsvFormatError,
     CollectionError: CollectionError,
@@ -3641,6 +3641,35 @@ var ERRORS = {
     UnexpectedError: UnexpectedError,
     // TODO: [🪑]> VersionMismatchError,
 };
+/**
+ * Index of all javascript errors
+ *
+ * @private for internal usage
+ */
+var COMMON_JAVASCRIPT_ERRORS = {
+    Error: Error,
+    EvalError: EvalError,
+    RangeError: RangeError,
+    ReferenceError: ReferenceError,
+    SyntaxError: SyntaxError,
+    TypeError: TypeError,
+    URIError: URIError,
+    AggregateError: AggregateError,
+    /*
+  Note: Not widely supported
+  > InternalError,
+  > ModuleError,
+  > HeapError,
+  > WebAssemblyCompileError,
+  > WebAssemblyRuntimeError,
+  */
+};
+/**
+ * Index of all errors
+ *
+ * @private for internal usage
+ */
+var ALL_ERRORS = __assign(__assign({}, PROMPTBOOK_ERRORS), COMMON_JAVASCRIPT_ERRORS);
 /**
  * Note: [💞] Ignore a discrepancy between file name and entity name
  */
@@ -3651,11 +3680,11 @@ var ERRORS = {
  * @public exported from `@promptbook/utils`
  */
 function deserializeError(error) {
-    if (error.name === 'Error') {
-        return new Error(error.message);
+    var ErrorClass = ALL_ERRORS[error.name];
+    if (ErrorClass === undefined) {
+        return new Error("".concat(error.name, ": ").concat(error.message));
     }
-    var CustomError = ERRORS[error.name];
-    return new CustomError(error.message);
+    return new ErrorClass(error.message);
 }
 
 /**
@@ -3729,8 +3758,8 @@ function isPipelinePrepared(pipeline) {
  */
 function serializeError(error) {
     var name = error.name, message = error.message, stack = error.stack;
-    if (!__spreadArray(['Error'], __read(Object.keys(ERRORS)), false).includes(name)) {
-        throw new UnexpectedError(spaceTrim$1(function (block) { return "\n          \n                    Cannot serialize error with name \"".concat(name, "\"\n\n                    ").concat(block(stack || message), "\n                \n                "); }));
+    if (!Object.keys(ALL_ERRORS).includes(name)) {
+        console.error(spaceTrim$1(function (block) { return "\n          \n                    Cannot serialize error with name \"".concat(name, "\"\n\n                    ").concat(block(stack || message), "\n                \n                "); }));
     }
     return {
         name: name,
@@ -9043,7 +9072,7 @@ function removeContentComments(content) {
  * @public exported from `@promptbook/core`
  */
 function pipelineStringToJsonSync(pipelineString) {
-    var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
+    var e_1, _a, e_2, _b, e_3, _c, e_4, _d, e_5, _e;
     var $pipelineJson = {
         title: undefined /* <- Note: [🍙] Putting here placeholder to keep `title` on top at final JSON */,
         pipelineUrl: undefined /* <- Note: Putting here placeholder to keep `pipelineUrl` on top at final JSON */,
@@ -9072,7 +9101,7 @@ function pipelineStringToJsonSync(pipelineString) {
     // =============================================================
     // Note: 1️⃣ Parsing of the markdown into object
     if (pipelineString.startsWith('#!')) {
-        var _e = __read(pipelineString.split('\n')), shebangLine_1 = _e[0], restLines = _e.slice(1);
+        var _f = __read(pipelineString.split('\n')), shebangLine_1 = _f[0], restLines = _f.slice(1);
         if (!(shebangLine_1 || '').includes('ptbk')) {
             throw new ParseError(spaceTrim(function (block) { return "\n                        It seems that you try to parse a book file which has non-standard shebang line for book files:\n                        Shebang line must contain 'ptbk'\n\n                        You have:\n                        ".concat(block(shebangLine_1 || '(empty line)'), "\n\n                        It should look like this:\n                        #!/usr/bin/env ptbk\n\n                        ").concat(block(getPipelineIdentification()), "\n                    "); }));
         }
@@ -9082,7 +9111,7 @@ function pipelineStringToJsonSync(pipelineString) {
     pipelineString = flattenMarkdown(pipelineString) /* <- Note: [🥞] */;
     pipelineString = pipelineString.replaceAll(/`\{(?<parameterName>[a-z0-9_]+)\}`/gi, '{$<parameterName>}');
     pipelineString = pipelineString.replaceAll(/`->\s+\{(?<parameterName>[a-z0-9_]+)\}`/gi, '-> {$<parameterName>}');
-    var _f = __read(splitMarkdownIntoSections(pipelineString).map(parseMarkdownSection)), pipelineHead = _f[0], pipelineSections = _f.slice(1); /* <- Note: [🥞] */
+    var _g = __read(splitMarkdownIntoSections(pipelineString).map(parseMarkdownSection)), pipelineHead = _g[0], pipelineSections = _g.slice(1); /* <- Note: [🥞] */
     if (pipelineHead === undefined) {
         throw new UnexpectedError(spaceTrim(function (block) { return "\n                    Pipeline head is not defined\n\n                    ".concat(block(getPipelineIdentification()), "\n\n                    This should never happen, because the pipeline already flattened\n                "); }));
     }
@@ -9173,11 +9202,41 @@ function pipelineStringToJsonSync(pipelineString) {
         }
         finally { if (e_1) throw e_1.error; }
     }
+    // =============================================================
+    // Note: 4️⃣ Prepare unique section names with indexes when needed
+    var sectionCounts = {};
+    try {
+        for (var pipelineSections_1 = __values(pipelineSections), pipelineSections_1_1 = pipelineSections_1.next(); !pipelineSections_1_1.done; pipelineSections_1_1 = pipelineSections_1.next()) {
+            var section = pipelineSections_1_1.value;
+            var name_1 = titleToName(section.title);
+            if (sectionCounts[name_1] === undefined) {
+                sectionCounts[name_1] = { count: 0, currentIndex: 0 };
+            }
+            sectionCounts[name_1].count++;
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (pipelineSections_1_1 && !pipelineSections_1_1.done && (_b = pipelineSections_1.return)) _b.call(pipelineSections_1);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    var getUniqueSectionName = function (title) {
+        var name = titleToName(title);
+        var count = sectionCounts[name];
+        if (count.count === 1) {
+            return name;
+        }
+        var nameWithSuffix = "".concat(name, "-").concat(count.currentIndex);
+        count.currentIndex++;
+        return nameWithSuffix;
+    };
     var _loop_2 = function (section) {
-        var e_5, _l, e_6, _m;
+        var e_6, _m, e_7, _o;
         // TODO: Parse section's description (the content out of the codeblock and lists)
         var listItems_2 = extractAllListItemsFromMarkdown(section.content);
-        var _o = extractOneBlockFromMarkdown(section.content), language = _o.language, content = _o.content;
+        var _p = extractOneBlockFromMarkdown(section.content), language = _p.language, content = _p.content;
         // TODO: [🎾][1] DRY description
         var description_1 = section.content;
         // Note: Remove codeblocks - TODO: [🎾]
@@ -9193,7 +9252,7 @@ function pipelineStringToJsonSync(pipelineString) {
             isSectionTypeSet: false,
             isTask: true,
             taskType: undefined /* <- Note: [🍙] Putting here placeholder to keep `taskType` on top at final JSON */,
-            name: titleToName(section.title),
+            name: getUniqueSectionName(section.title),
             title: section.title,
             description: description_1,
             content: content,
@@ -9241,17 +9300,17 @@ function pipelineStringToJsonSync(pipelineString) {
         };
         try {
             // TODO [♓️] List commands and before apply order them to achieve order-agnostic commands
-            for (var commands_1 = (e_5 = void 0, __values(commands)), commands_1_1 = commands_1.next(); !commands_1_1.done; commands_1_1 = commands_1.next()) {
-                var _p = commands_1_1.value, listItem = _p.listItem, command = _p.command;
+            for (var commands_1 = (e_6 = void 0, __values(commands)), commands_1_1 = commands_1.next(); !commands_1_1.done; commands_1_1 = commands_1.next()) {
+                var _q = commands_1_1.value, listItem = _q.listItem, command = _q.command;
                 _loop_4(listItem, command);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
-                if (commands_1_1 && !commands_1_1.done && (_l = commands_1.return)) _l.call(commands_1);
+                if (commands_1_1 && !commands_1_1.done && (_m = commands_1.return)) _m.call(commands_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         // TODO: [🍧] Should be done in SECTION command
         if ($taskJson.taskType === 'SCRIPT_TASK') {
@@ -9265,8 +9324,8 @@ function pipelineStringToJsonSync(pipelineString) {
         }
         $taskJson.dependentParameterNames = Array.from(extractParameterNamesFromTask($taskJson));
         try {
-            for (var _q = (e_6 = void 0, __values($taskJson.dependentParameterNames)), _r = _q.next(); !_r.done; _r = _q.next()) {
-                var parameterName = _r.value;
+            for (var _r = (e_7 = void 0, __values($taskJson.dependentParameterNames)), _s = _r.next(); !_s.done; _s = _r.next()) {
+                var parameterName = _s.value;
                 // TODO: [🧠] This definition should be made first in the task
                 defineParam({
                     parameterName: parameterName,
@@ -9277,12 +9336,12 @@ function pipelineStringToJsonSync(pipelineString) {
                 });
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
-                if (_r && !_r.done && (_m = _q.return)) _m.call(_q);
+                if (_s && !_s.done && (_o = _r.return)) _o.call(_r);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         /*
         // TODO: [🍧] This should be checked in `MODEL` command + better error message
@@ -9311,21 +9370,21 @@ function pipelineStringToJsonSync(pipelineString) {
     };
     try {
         // =============================================================
-        // Note: 4️⃣ Process each section of the pipeline
-        for (var pipelineSections_1 = __values(pipelineSections), pipelineSections_1_1 = pipelineSections_1.next(); !pipelineSections_1_1.done; pipelineSections_1_1 = pipelineSections_1.next()) {
-            var section = pipelineSections_1_1.value;
+        // Note: 5️⃣ Process each section of the pipeline
+        for (var pipelineSections_2 = __values(pipelineSections), pipelineSections_2_1 = pipelineSections_2.next(); !pipelineSections_2_1.done; pipelineSections_2_1 = pipelineSections_2.next()) {
+            var section = pipelineSections_2_1.value;
             _loop_2(section);
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
     finally {
         try {
-            if (pipelineSections_1_1 && !pipelineSections_1_1.done && (_b = pipelineSections_1.return)) _b.call(pipelineSections_1);
+            if (pipelineSections_2_1 && !pipelineSections_2_1.done && (_c = pipelineSections_2.return)) _c.call(pipelineSections_2);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_3) throw e_3.error; }
     }
     // =============================================================
-    // Note: 5️⃣ Mark parameters as INPUT if not explicitly set
+    // Note: 6️⃣ Mark parameters as INPUT if not explicitly set
     if ($pipelineJson.parameters.every(function (parameter) { return !parameter.isInput; })) {
         var _loop_3 = function (parameter) {
             var isThisParameterResulting = $pipelineJson.tasks.some(function (task) { return task.resultingParameterName === parameter.name; });
@@ -9334,42 +9393,42 @@ function pipelineStringToJsonSync(pipelineString) {
             }
         };
         try {
-            for (var _g = __values($pipelineJson.parameters), _h = _g.next(); !_h.done; _h = _g.next()) {
-                var parameter = _h.value;
+            for (var _h = __values($pipelineJson.parameters), _j = _h.next(); !_j.done; _j = _h.next()) {
+                var parameter = _j.value;
                 _loop_3(parameter);
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
-                if (_h && !_h.done && (_c = _g.return)) _c.call(_g);
+                if (_j && !_j.done && (_d = _h.return)) _d.call(_h);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_4) throw e_4.error; }
         }
     }
     // =============================================================
-    // Note: 6️⃣ Mark all non-INPUT parameters as OUTPUT if any OUTPUT is not set
+    // Note: 7️⃣ Mark all non-INPUT parameters as OUTPUT if any OUTPUT is not set
     if ($pipelineJson.parameters.every(function (parameter) { return !parameter.isOutput; })) {
         try {
-            for (var _j = __values($pipelineJson.parameters), _k = _j.next(); !_k.done; _k = _j.next()) {
-                var parameter = _k.value;
+            for (var _k = __values($pipelineJson.parameters), _l = _k.next(); !_l.done; _l = _k.next()) {
+                var parameter = _l.value;
                 if (!parameter.isInput) {
                     parameter.isOutput = true;
                 }
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
-                if (_k && !_k.done && (_d = _j.return)) _d.call(_j);
+                if (_l && !_l.done && (_e = _k.return)) _e.call(_k);
             }
-            finally { if (e_4) throw e_4.error; }
+            finally { if (e_5) throw e_5.error; }
         }
     }
     // =============================================================
-    // Note: 7️⃣ Cleanup of undefined values
+    // Note: 8️⃣ Cleanup of undefined values
     $pipelineJson.tasks.forEach(function (tasks) {
-        var e_7, _a;
+        var e_8, _a;
         try {
             for (var _b = __values(Object.entries(tasks)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
@@ -9378,16 +9437,16 @@ function pipelineStringToJsonSync(pipelineString) {
                 }
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_8) throw e_8.error; }
         }
     });
     $pipelineJson.parameters.forEach(function (parameter) {
-        var e_8, _a;
+        var e_9, _a;
         try {
             for (var _b = __values(Object.entries(parameter)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
@@ -9396,12 +9455,12 @@ function pipelineStringToJsonSync(pipelineString) {
                 }
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.error; }
         }
     });
     // =============================================================
@@ -10981,18 +11040,19 @@ function addAutoGeneratedSection(content, options) {
     var warningLine = "<!-- ".concat(GENERATOR_WARNING, " -->");
     var sectionRegex = new RegExp("<!--".concat(sectionName, "-->([\\s\\S]*?)<!--/").concat(sectionName, "-->"), 'g');
     var sectionMatch = content.match(sectionRegex);
+    var contentToInsert = spaceTrim(function (block) { return "\n            <!--".concat(sectionName, "-->\n            ").concat(block(warningLine), "\n            ").concat(block(sectionContent), "\n            <!--/").concat(sectionName, "-->\n        "); });
     if (sectionMatch) {
-        return content.replace(sectionRegex, spaceTrim(function (block) { return "\n                    <!--".concat(sectionName, "-->\n                    ").concat(block(warningLine), "\n                    ").concat(block(sectionContent), "\n                    <!--/").concat(sectionName, "-->\n                "); }));
+        return content.replace(sectionRegex, contentToInsert);
     }
+    // Note: Following is the case when the section is not found in the file so we add it there
     var placeForSection = removeContentComments(content).match(/^##.*$/im);
-    if (!placeForSection) {
-        throw new ParseError(
-        // <- [🧠] Maybe something better tha `ParseError`
-        "No place where to put the section <!--".concat(sectionName, "-->"));
-        // <- [🚞]
+    if (placeForSection !== null) {
+        var _a = __read(placeForSection, 1), heading_1 = _a[0];
+        return content.replace(heading_1, spaceTrim(function (block) { return "\n                    ".concat(block(contentToInsert), "\n                    \n                    ").concat(block(heading_1), "\n                "); }));
     }
-    var _a = __read(placeForSection, 1), heading = _a[0];
-    return content.replace(heading, "<!--".concat(sectionName, "-->\n").concat(warningLine, "\n").concat(sectionContent, "\n<!--/").concat(sectionName, "-->\n\n").concat(heading));
+    console.warn("No place where to put the section <!--".concat(sectionName, "-->, using the end of the file"));
+    // <- TODO: [🚎] Some better way how to get warnings from pipeline parsing / logic
+    return spaceTrim(function (block) { return "\n            ".concat(block(content), "\n            \n            ").concat(block(contentToInsert), "\n        "); });
 }
 /**
  * TODO: [🏛] This can be part of markdown builder
@@ -11020,7 +11080,7 @@ function renderPromptbookMermaid(pipelineJson, options) {
         if (!task) {
             throw new Error("Could not find task for {".concat(parameterName, "}"));
         }
-        return normalizeTo_camelCase('task-' + titleToName(task.title));
+        return task.name || normalizeTo_camelCase('task-' + titleToName(task.title));
     };
     var promptbookMermaid = spaceTrim(function (block) { return "\n\n            %% \uD83D\uDD2E Tip: Open this on GitHub or in the VSCode website to see the Mermaid graph visually\n\n            flowchart LR\n              subgraph \"".concat(pipelineJson.title, "\"\n\n                  direction TB\n\n                  input((Input)):::input\n                  ").concat(block(pipelineJson.tasks
         .flatMap(function (_a) {
@@ -11083,7 +11143,7 @@ function prettifyPipelineString(pipelineString, options) {
                             return { href: "#".concat(task.name), title: task.title };
                         },
                     });
-                    promptbookMermaidBlock = spaceTrim(function (block) { return "\n            ```mermaid\n            ".concat(block(promptbookMermaid_1), "\n            ```\n        "); });
+                    promptbookMermaidBlock = spaceTrim(function (block) { return "\n                ```mermaid\n                ".concat(block(promptbookMermaid_1), "\n                ```\n            "); });
                     pipelineString = addAutoGeneratedSection(pipelineString, {
                         sectionName: 'Graph',
                         sectionContent: promptbookMermaidBlock,