@promptbook/cli 0.74.0-7 → 0.74.0-8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/cli",
-    "version": "0.74.0-7",
+    "version": "0.74.0-8",
     "description": "Supercharge your use of large language models",
     "private": false,
     "sideEffects": false,
@@ -71,7 +71,7 @@
         "waitasecond": "1.11.83"
     },
     "bin": {
-        "promptbook": "node --no-warnings bin/promptbook-cli.js",
-        "ptbk": "node --no-warnings bin/promptbook-cli.js"
+        "promptbook": "bin/promptbook-cli.js",
+        "ptbk": "bin/promptbook-cli.js"
     }
 }

package/umd/index.umd.js

@@ -49,7 +49,7 @@
      *
      * @see https://github.com/webgptorg/promptbook
      */
-    var PROMPTBOOK_ENGINE_VERSION = '0.74.0-6';
+    var PROMPTBOOK_ENGINE_VERSION = '0.74.0-7';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      */
@@ -3211,10 +3211,12 @@
      * @public exported from `@promptbook/utils`
      */
     function countPages(text) {
-        var sentencesPerPage = 5; // Assuming each page has 5 sentences
-        var sentences = text.split(/[.!?]+/).filter(function (sentence) { return sentence.trim() !== ''; });
-        var pageCount = Math.ceil(sentences.length / sentencesPerPage);
-        return pageCount;
+        if (text === '') {
+            return 0;
+        }
+        var pagesByLinesCount = Math.ceil(countLines(text) / 44);
+        var pagesByCharactersCount = Math.ceil(countCharacters(text) / 2772);
+        return Math.max(pagesByLinesCount, pagesByCharactersCount);
     }
 
     /**
@@ -7938,7 +7940,7 @@
      * @public exported from `@promptbook/core`
      */
     function pipelineStringToJsonSync(pipelineString) {
-        var e_1, _a, e_2, _b;
+        var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
         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 */,
@@ -7966,7 +7968,7 @@
         // =============================================================
         // Note: 1️⃣ Parsing of the markdown into object
         if (pipelineString.startsWith('#!')) {
-            var _c = __read(pipelineString.split('\n')), shebangLine_1 = _c[0], restLines = _c.slice(1);
+            var _e = __read(pipelineString.split('\n')), shebangLine_1 = _e[0], restLines = _e.slice(1);
             if (!(shebangLine_1 || '').includes('ptbk')) {
                 throw new ParseError(spaceTrim.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                    "); }));
             }
@@ -7976,7 +7978,7 @@
         pipelineString = flattenMarkdown(pipelineString) /* <- Note: [🥞] */;
         pipelineString = pipelineString.replaceAll(/`\{(?<parameterName>[a-z0-9_]+)\}`/gi, '{$<parameterName>}');
         pipelineString = pipelineString.replaceAll(/`->\s+\{(?<parameterName>[a-z0-9_]+)\}`/gi, '-> {$<parameterName>}');
-        var _d = __read(splitMarkdownIntoSections(pipelineString).map(parseMarkdownSection)), pipelineHead = _d[0], pipelineSections = _d.slice(1); /* <- Note: [🥞] */
+        var _f = __read(splitMarkdownIntoSections(pipelineString).map(parseMarkdownSection)), pipelineHead = _f[0], pipelineSections = _f.slice(1); /* <- Note: [🥞] */
         if (pipelineHead === undefined) {
             throw new UnexpectedError(spaceTrim.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                "); }));
         }
@@ -8004,6 +8006,8 @@
                 if (parameterDescription) {
                     existingParameter.description = parameterDescription;
                 }
+                existingParameter.isInput = existingParameter.isInput || isInput;
+                existingParameter.isOutput = existingParameter.isOutput || isOutput;
             }
             else {
                 $pipelineJson.parameters.push({
@@ -8066,10 +8070,10 @@
             finally { if (e_1) throw e_1.error; }
         }
         var _loop_2 = function (section) {
-            var e_3, _e;
+            var e_5, _l, e_6, _m;
             // TODO: Parse template description (the content out of the codeblock and lists)
             var listItems_2 = extractAllListItemsFromMarkdown(section.content);
-            var _f = extractOneBlockFromMarkdown(section.content), language = _f.language, content = _f.content;
+            var _o = extractOneBlockFromMarkdown(section.content), language = _o.language, content = _o.content;
             // TODO: [🎾][1] DRY description
             var description_1 = section.content;
             // Note: Remove codeblocks - TODO: [🎾]
@@ -8110,7 +8114,7 @@
             }) === false) {
                 templateCommandParser.$applyToTemplateJson({ type: 'TEMPLATE', templateType: 'PROMPT_TEMPLATE' }, $templateJson, $pipelineJson);
             }
-            var _loop_3 = function (listItem, command) {
+            var _loop_4 = function (listItem, command) {
                 var commandParser = getParserForCommand(command);
                 if (commandParser.isUsedInPipelineTemplate !== true /* <- Note: [🦦][4] */) {
                     throw new ParseError(spaceTrim.spaceTrim(function (block) { return "\n                            Command ".concat(command.type, " is not allowed in the template of the promptbook ONLY at the pipeline head\n\n                            ").concat(block(getPipelineIdentification()), "\n                        "); })); // <- TODO: [🚞]
@@ -8133,17 +8137,17 @@
             };
             try {
                 // TODO [♓️] List commands and before apply order them to achieve order-agnostic commands
-                for (var commands_1 = (e_3 = void 0, __values(commands)), commands_1_1 = commands_1.next(); !commands_1_1.done; commands_1_1 = commands_1.next()) {
-                    var _g = commands_1_1.value, listItem = _g.listItem, command = _g.command;
-                    _loop_3(listItem, command);
+                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;
+                    _loop_4(listItem, command);
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
-                    if (commands_1_1 && !commands_1_1.done && (_e = commands_1.return)) _e.call(commands_1);
+                    if (commands_1_1 && !commands_1_1.done && (_l = commands_1.return)) _l.call(commands_1);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_5) throw e_5.error; }
             }
             // TODO: [🍧] Should be done in TEMPLATE command
             if ($templateJson.templateType === 'SCRIPT_TEMPLATE') {
@@ -8157,6 +8161,26 @@
                     language;
             }
             $templateJson.dependentParameterNames = Array.from(extractParameterNamesFromTemplate($templateJson));
+            try {
+                for (var _q = (e_6 = void 0, __values($templateJson.dependentParameterNames)), _r = _q.next(); !_r.done; _r = _q.next()) {
+                    var parameterName = _r.value;
+                    // TODO: [🧠] This definition should be made first in the template
+                    defineParam({
+                        parameterName: parameterName,
+                        parameterDescription: null,
+                        isInput: false,
+                        isOutput: false,
+                        // <- Note: In this case null+false+false means that we do not know yet if it is input or output and we will set it later
+                    });
+                }
+            }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            finally {
+                try {
+                    if (_r && !_r.done && (_m = _q.return)) _m.call(_q);
+                }
+                finally { if (e_6) throw e_6.error; }
+            }
             /*
             // TODO: [🍧] This should be checked in `MODEL` command + better error message
             if ($templateJson.templateType !== 'PROMPT_TEMPLATE' && $templateJson.modelRequirements !== undefined) {
@@ -8198,9 +8222,51 @@
             finally { if (e_2) throw e_2.error; }
         }
         // =============================================================
-        // Note: 5️⃣ Cleanup of undefined values
+        // Note: 5️⃣ 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.templates.some(function (template) { return template.resultingParameterName === parameter.name; });
+                if (!isThisParameterResulting) {
+                    parameter.isInput = true;
+                }
+            };
+            try {
+                for (var _g = __values($pipelineJson.parameters), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    var parameter = _h.value;
+                    _loop_3(parameter);
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (_h && !_h.done && (_c = _g.return)) _c.call(_g);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+        }
+        // =============================================================
+        // Note: 6️⃣ 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;
+                    if (!parameter.isInput) {
+                        parameter.isOutput = true;
+                    }
+                }
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
+                try {
+                    if (_k && !_k.done && (_d = _j.return)) _d.call(_j);
+                }
+                finally { if (e_4) throw e_4.error; }
+            }
+        }
+        // =============================================================
+        // Note: 7️⃣ Cleanup of undefined values
         $pipelineJson.templates.forEach(function (templates) {
-            var e_4, _a;
+            var e_7, _a;
             try {
                 for (var _b = __values(Object.entries(templates)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
@@ -8209,16 +8275,16 @@
                     }
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_7) throw e_7.error; }
             }
         });
         $pipelineJson.parameters.forEach(function (parameter) {
-            var e_5, _a;
+            var e_8, _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];
@@ -8227,12 +8293,12 @@
                     }
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_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_5) throw e_5.error; }
+                finally { if (e_8) throw e_8.error; }
             }
         });
         // =============================================================