@promptbook/cli 0.74.0-6 → 0.74.0-7

package/esm/index.es.js

@@ -1,6 +1,6 @@
+import colors from 'colors';
 import commander from 'commander';
 import spaceTrim$1, { spaceTrim } from 'spacetrim';
-import colors from 'colors';
 import { forTime } from 'waitasecond';
 import { stat, access, constants, readFile, writeFile, readdir, mkdir, unlink, rm, rmdir, rename } from 'fs/promises';
 import { join, basename, dirname } from 'path';
@@ -37,7 +37,7 @@ var BOOK_LANGUAGE_VERSION = '1.0.0';
  *
  * @see https://github.com/webgptorg/promptbook
  */
-var PROMPTBOOK_ENGINE_VERSION = '0.74.0-5';
+var PROMPTBOOK_ENGINE_VERSION = '0.74.0-6';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  */
@@ -7953,11 +7953,18 @@ function pipelineStringToJsonSync(pipelineString) {
     }
     // =============================================================
     // 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);
+        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                    "); }));
+        }
+        pipelineString = restLines.join('\n');
+    }
     pipelineString = removeContentComments(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 _c = __read(splitMarkdownIntoSections(pipelineString).map(parseMarkdownSection)), pipelineHead = _c[0], pipelineSections = _c.slice(1); /* <- Note: [🥞] */
+    var _d = __read(splitMarkdownIntoSections(pipelineString).map(parseMarkdownSection)), pipelineHead = _d[0], pipelineSections = _d.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                "); }));
     }
@@ -8047,10 +8054,10 @@ function pipelineStringToJsonSync(pipelineString) {
         finally { if (e_1) throw e_1.error; }
     }
     var _loop_2 = function (section) {
-        var e_3, _d;
+        var e_3, _e;
         // TODO: Parse template description (the content out of the codeblock and lists)
         var listItems_2 = extractAllListItemsFromMarkdown(section.content);
-        var _e = extractOneBlockFromMarkdown(section.content), language = _e.language, content = _e.content;
+        var _f = extractOneBlockFromMarkdown(section.content), language = _f.language, content = _f.content;
         // TODO: [🎾][1] DRY description
         var description_1 = section.content;
         // Note: Remove codeblocks - TODO: [🎾]
@@ -8115,14 +8122,14 @@ function pipelineStringToJsonSync(pipelineString) {
         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 _f = commands_1_1.value, listItem = _f.listItem, command = _f.command;
+                var _g = commands_1_1.value, listItem = _g.listItem, command = _g.command;
                 _loop_3(listItem, command);
             }
         }
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (commands_1_1 && !commands_1_1.done && (_d = commands_1.return)) _d.call(commands_1);
+                if (commands_1_1 && !commands_1_1.done && (_e = commands_1.return)) _e.call(commands_1);
             }
             finally { if (e_3) throw e_3.error; }
         }
@@ -10974,10 +10981,10 @@ function initializeRunCommand(program) {
     runCommand.option('-v, --verbose', "Is output verbose", false);
     runCommand.option('--no-interactive', "Input is not interactive", false);
     runCommand.option('-s, --save-report <path>', "Save report to file");
-    // TODO: !!!!!! Interactive mode
+    // TODO: !!!!!! Implement non-interactive mode - allow to pass input parameters as JSON
     // TODO: !!!!!! JSON output
     runCommand.action(function (filePathRaw, options) { return __awaiter(_this, void 0, void 0, function () {
-        var isCacheReloaded, isVerbose, saveReport, prepareAndScrapeOptions, fs, filePath, filePathCandidates, filePathCandidates_1, filePathCandidates_1_1, filePathCandidate, e_1_1, llm, executables, tools, pipelineString, pipeline, pipelineExecutor, questions, response, inputParameters, result, isSuccessful, errors, warnings, outputParameters, executionReport, executionReportString, _a, _b, error, _c, _d, warning, _e, _f, key, value, separator;
+        var isCacheReloaded, isVerbose, saveReport, prepareAndScrapeOptions, fs, filePath, filePathCandidates, filePathCandidates_1, filePathCandidates_1_1, filePathCandidate, e_1_1, llm, executables, tools, pipelineString, pipeline, error_1, pipelineExecutor, questions, response, inputParameters, result, isSuccessful, errors, warnings, outputParameters, executionReport, executionReportString, _a, _b, error, _c, _d, warning, _e, _f, key, value, separator;
         var e_1, _g, _h, e_2, _j, e_3, _k, e_4, _l;
         return __generator(this, function (_m) {
             switch (_m.label) {
@@ -11076,12 +11083,25 @@ function initializeRunCommand(program) {
                     if (isVerbose) {
                         console.info(colors.gray('--- Preparing pipeline ---'));
                     }
-                    return [4 /*yield*/, pipelineStringToJson(pipelineString, tools)];
+                    _m.label = 12;
                 case 12:
+                    _m.trys.push([12, 14, , 15]);
+                    return [4 /*yield*/, pipelineStringToJson(pipelineString, tools)];
+                case 13:
                     pipeline = _m.sent();
+                    return [3 /*break*/, 15];
+                case 14:
+                    error_1 = _m.sent();
+                    if (!(error_1 instanceof ParseError)) {
+                        throw error_1;
+                    }
+                    console.error(colors.red(spaceTrim$1(function (block) { return "\n                            ".concat(block(error_1.message), "\n\n                            in ").concat(filePath, "\n                        "); })));
+                    return [2 /*return*/, process.exit(1)];
+                case 15:
                     if (isVerbose) {
                         console.info(colors.gray('--- Validating pipeline ---'));
                     }
+                    // TODO: !!!!!! Same try-catch for LogicError
                     validatePipeline(pipeline);
                     if (isVerbose) {
                         console.info(colors.gray('--- Creating executor ---'));
@@ -11103,16 +11123,26 @@ function initializeRunCommand(program) {
                         return isInput;
                     })
                         .map(function (_a) {
-                        var name = _a.name;
-                        return ({
+                        var name = _a.name, exampleValues = _a.exampleValues;
+                        var message = name;
+                        var initial = '';
+                        if (exampleValues && exampleValues.length > 0) {
+                            var exampleValuesFiltered = exampleValues.filter(function (exampleValue) { return countLines(exampleValue) <= 1 && countCharacters(exampleValue) <= 30; });
+                            if (exampleValuesFiltered.length !== 0) {
+                                message += " (e.g. ".concat(exampleValuesFiltered.join(', '), ")");
+                            }
+                            initial = exampleValues[0] || '';
+                        }
+                        return {
                             type: 'text',
                             name: name,
-                            message: name,
+                            message: message,
+                            initial: initial,
                             // TODO: Maybe use> validate: value => value < 18 ? `Forbidden` : true
-                        });
+                        };
                     });
                     return [4 /*yield*/, prompts(questions)];
-                case 13:
+                case 16:
                     response = _m.sent();
                     inputParameters = response;
                     if (isVerbose) {
@@ -11124,26 +11154,26 @@ function initializeRunCommand(program) {
                                 console.info(taskProgress);
                             }
                         })];
-                case 14:
+                case 17:
                     result = _m.sent();
                     isSuccessful = result.isSuccessful, errors = result.errors, warnings = result.warnings, outputParameters = result.outputParameters, executionReport = result.executionReport;
                     if (isVerbose) {
                         console.info(colors.gray('--- Detailed Result ---'));
                         console.info({ isSuccessful: isSuccessful, errors: errors, warnings: warnings, outputParameters: outputParameters, executionReport: executionReport });
                     }
-                    if (!(saveReport && saveReport.endsWith('.json'))) return [3 /*break*/, 16];
+                    if (!(saveReport && saveReport.endsWith('.json'))) return [3 /*break*/, 19];
                     return [4 /*yield*/, writeFile(saveReport, JSON.stringify(executionReport, null, 4) + '\n', 'utf-8')];
-                case 15:
+                case 18:
                     _m.sent();
-                    return [3 /*break*/, 18];
-                case 16:
-                    if (!(saveReport && saveReport.endsWith('.md'))) return [3 /*break*/, 18];
+                    return [3 /*break*/, 21];
+                case 19:
+                    if (!(saveReport && saveReport.endsWith('.md'))) return [3 /*break*/, 21];
                     executionReportString = executionReportJsonToString(executionReport);
                     return [4 /*yield*/, writeFile(saveReport, executionReportString, 'utf-8')];
-                case 17:
+                case 20:
                     _m.sent();
-                    _m.label = 18;
-                case 18:
+                    _m.label = 21;
+                case 21:
                     if (saveReport && isVerbose) {
                         console.info(colors.green("Report saved to ".concat(saveReport)));
                     }
@@ -11337,11 +11367,16 @@ function initializeTestCommand(program) {
  */
 function promptbookCli() {
     return __awaiter(this, void 0, void 0, function () {
-        var program;
+        var isVerbose, program;
         return __generator(this, function (_a) {
             if (!$isRunningInNode()) {
                 throw new EnvironmentMismatchError(spaceTrim("\n                Function promptbookCli is initiator of CLI script and should be run in Node.js environment.\n\n                - In browser use function exported from `@promptbook/utils` or  `@promptbook/core` directly, for example `prettifyPipelineString`.\n\n            "));
             }
+            isVerbose = process.argv.some(function (arg) { return arg === '--verbose' || arg === '-v'; });
+            //     <- TODO: Can be this be done with commander before the commander commands are initialized?
+            if (isVerbose) {
+                console.info(colors.gray("Promptbook CLI version ".concat(PROMPTBOOK_ENGINE_VERSION, " in ").concat(__filename.split('\\').join('/'))));
+            }
             program = new commander.Command();
             program.name('promptbook');
             program.alias('ptbk');
@@ -13675,12 +13710,9 @@ function $execCommandNormalizeOptions(options) {
     })
         .filter(function (arg) { return arg !== ''; });
     if (_.length > 1) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         _a = __read(_), command = _a[0], args = _a.slice(1);
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     if (options.args) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         args = __spreadArray(__spreadArray([], __read(args), false), __read(options.args), false);
     }
     var humanReadableCommand = !['npx', 'npm'].includes(command) ? command : args[0];