@promptbook/cli 0.74.0-3 → 0.74.0-5

package/esm/index.es.js

@@ -36,7 +36,7 @@ var BOOK_LANGUAGE_VERSION = '1.0.0';
  *
  * @see https://github.com/webgptorg/promptbook
  */
-var PROMPTBOOK_ENGINE_VERSION = '0.74.0-2';
+var PROMPTBOOK_ENGINE_VERSION = '0.74.0-4';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  */
@@ -1710,7 +1710,7 @@ function isValidPipelineUrl(url) {
     if (!url.startsWith('https://')) {
         return false;
     }
-    if (!url.endsWith('.ptbk.md')) {
+    if (!(url.endsWith('.book.md') || url.endsWith('.book') || url.endsWith('.ptbk.md') || url.endsWith('.ptbk'))) {
         return false;
     }
     if (url.includes('#')) {
@@ -10638,10 +10638,10 @@ function initializeRunCommand(program) {
     runCommand.action(function (path, _a) {
         var isCacheReloaded = _a.reload, isVerbose = _a.verbose;
         return __awaiter(_this, void 0, void 0, function () {
-            var options, fs, llm, executables, tools, pipelineString, pipeline, questions, response, inputParameters, pipelineExecutor, result, isSuccessful, errors, outputParameters, executionReport, _b, _c, key, value, separator;
-            var _d, e_1, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var options, fs, llm, executables, tools, pipelineString, pipeline, questions, response, inputParameters, pipelineExecutor, result, isSuccessful, errors, outputParameters, executionReport, _b, _c, error, _d, _e, key, value, separator;
+            var _f, e_1, _g, e_2, _h;
+            return __generator(this, function (_j) {
+                switch (_j.label) {
                     case 0:
                         options = {
                             isVerbose: isVerbose,
@@ -10663,30 +10663,30 @@ function initializeRunCommand(program) {
                         }
                         return [4 /*yield*/, $provideExecutablesForNode(options)];
                     case 1:
-                        executables = _f.sent();
-                        _d = {
+                        executables = _j.sent();
+                        _f = {
                             llm: llm,
                             fs: fs
                         };
                         return [4 /*yield*/, $provideScrapersForNode({ fs: fs, llm: llm, executables: executables }, options)];
                     case 2:
-                        tools = (_d.scrapers = _f.sent(),
-                            _d.script = [
+                        tools = (_f.scrapers = _j.sent(),
+                            _f.script = [
                             /*new JavascriptExecutionTools(options)*/
                             ],
-                            _d);
+                            _f);
                         return [4 /*yield*/, isFileExisting(path, fs)];
                     case 3:
-                        if (!(_f.sent())) {
+                        if (!(_j.sent())) {
                             console.error(colors.red("File \"".concat(path, "\" does not exist")));
                             return [2 /*return*/, process.exit(1)];
                         }
                         return [4 /*yield*/, fs.readFile(path, 'utf-8')];
                     case 4:
-                        pipelineString = (_f.sent());
+                        pipelineString = (_j.sent());
                         return [4 /*yield*/, pipelineStringToJson(pipelineString, tools)];
                     case 5:
-                        pipeline = _f.sent();
+                        pipeline = _j.sent();
                         validatePipeline(pipeline);
                         questions = pipeline.parameters
                             .filter(function (_a) {
@@ -10704,14 +10704,21 @@ function initializeRunCommand(program) {
                         });
                         return [4 /*yield*/, prompts(questions)];
                     case 6:
-                        response = _f.sent();
+                        response = _j.sent();
                         inputParameters = response;
                         // console.log(response);
                         return [4 /*yield*/, forTime(100)];
                     case 7:
                         // console.log(response);
-                        _f.sent();
-                        pipelineExecutor = createPipelineExecutor({ pipeline: pipeline, tools: tools, isNotPreparedWarningSupressed: true });
+                        _j.sent();
+                        pipelineExecutor = createPipelineExecutor({
+                            pipeline: pipeline,
+                            tools: tools,
+                            isNotPreparedWarningSupressed: true,
+                            maxExecutionAttempts: 3,
+                            //                          <- TODO: !!!!!! Why "LLM execution failed undefinedx"
+                            maxParallelCount: 1, // <- TODO: !!!!!! Pass
+                        });
                         return [4 /*yield*/, pipelineExecutor(inputParameters, function (taskProgress) {
                                 if (isVerbose) {
                                     // TODO: !!!!!!! Pretty print taskProgress
@@ -10719,28 +10726,41 @@ function initializeRunCommand(program) {
                                 }
                             })];
                     case 8:
-                        result = _f.sent();
+                        result = _j.sent();
                         isSuccessful = result.isSuccessful, errors = result.errors, outputParameters = result.outputParameters, executionReport = result.executionReport;
                         if (isVerbose) {
                             // TODO: !!!!!!! Pretty print
-                            console.log({ isSuccessful: isSuccessful, errors: errors, outputParameters: outputParameters, executionReport: executionReport });
+                            console.log({ isSuccessful: isSuccessful, errors: errors, /*!!! warnings,*/ outputParameters: outputParameters, executionReport: executionReport });
                             console.log(outputParameters);
                         }
                         console.info(colors.gray('--- Result: ---'));
                         try {
-                            for (_b = __values(Object.keys(outputParameters)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                key = _c.value;
+                            for (_b = __values(errors || []), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                error = _c.value;
+                                console.error(colors.red(colors.bold(error.name) + ': ' + error.message));
+                            }
+                        }
+                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        finally {
+                            try {
+                                if (_c && !_c.done && (_g = _b.return)) _g.call(_b);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                        }
+                        try {
+                            for (_d = __values(Object.keys(outputParameters)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                                key = _e.value;
                                 value = outputParameters[key] || colors.grey(colors.italic('(nothing)'));
                                 separator = countLines(value) > 1 || countWords(value) > 100 ? ':\n' : ': ';
                                 console.info(colors.green(colors.bold(key) + separator + value));
                             }
                         }
-                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
                         finally {
                             try {
-                                if (_c && !_c.done && (_e = _b.return)) _e.call(_b);
+                                if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
                             }
-                            finally { if (e_1) throw e_1.error; }
+                            finally { if (e_2) throw e_2.error; }
                         }
                         return [2 /*return*/, process.exit(0)];
                 }