@promptbook/cli 0.85.0-3 → 0.85.0-5

package/bin/promptbook-cli.js

@@ -12,6 +12,6 @@ const { _CLI } = require('../umd/index.umd.js');
 _CLI._initialize_promptbookCli();
 
 /**
- * TODO: !!! During the build check that this file exists
+ * TODO: [👩‍👩‍👧‍👦] During the build check that this file exists
  * TODO: [🕌] When more functionalities, rename
  */

package/esm/index.es.js

@@ -1,16 +1,16 @@
 import colors from 'colors';
 import commander from 'commander';
 import spaceTrim, { spaceTrim as spaceTrim$1 } from 'spacetrim';
-import { forTime } from 'waitasecond';
-import { basename, join, dirname } from 'node:path';
-import { stat, access, constants, readFile, writeFile, readdir, mkdir, unlink, rm, rmdir, rename } from 'node:fs/promises';
+import { forTime, forEver } from 'waitasecond';
+import { basename, join, dirname } from 'path';
+import { stat, access, constants, readFile, writeFile, readdir, mkdir, unlink, rm, rmdir, rename } from 'fs/promises';
 import hexEncoder from 'crypto-js/enc-hex';
 import sha256 from 'crypto-js/sha256';
 import * as dotenv from 'dotenv';
-import { spawn } from 'node:child_process';
+import { spawn } from 'child_process';
 import { format } from 'prettier';
 import parserHtml from 'prettier/parser-html';
-import { BehaviorSubject, concat, from } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { randomBytes } from 'crypto';
 import { unparse, parse } from 'papaparse';
 import { SHA256 } from 'crypto-js';
@@ -19,7 +19,7 @@ import glob from 'glob-promise';
 import prompts from 'prompts';
 import moment from 'moment';
 import express from 'express';
-import http from 'node:http';
+import http from 'http';
 import { Server } from 'socket.io';
 import { io } from 'socket.io-client';
 import Anthropic from '@anthropic-ai/sdk';
@@ -43,7 +43,7 @@ var BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-var PROMPTBOOK_ENGINE_VERSION = '0.85.0-2';
+var PROMPTBOOK_ENGINE_VERSION = '0.85.0-4';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -4920,11 +4920,29 @@ function assertsTaskSuccessful(executionResult) {
  */
 function createTask(options) {
     var taskType = options.taskType, taskProcessCallback = options.taskProcessCallback;
-    var taskId = "".concat(taskType.toLowerCase(), "-").concat($randomToken(256 /* <- TODO: !!! To global config */));
+    var taskId = "".concat(taskType.toLowerCase().substring(0, 4), "-").concat($randomToken(8 /* <- TODO: !!! To global config + Use Base58 to avoid simmilar char conflicts   */));
     var partialResultSubject = new BehaviorSubject({});
     var finalResultPromise = /* not await */ taskProcessCallback(function (newOngoingResult) {
         partialResultSubject.next(newOngoingResult);
     });
+    finalResultPromise
+        .catch(function (error) {
+        // console.error('!!!!! Task failed:', error);
+        partialResultSubject.error(error);
+    })
+        .then(function (value) {
+        // console.error('!!!!! Task finished:', value);
+        if (value) {
+            try {
+                assertsTaskSuccessful(value);
+                partialResultSubject.next(value);
+            }
+            catch (error) {
+                partialResultSubject.error(error);
+            }
+        }
+        partialResultSubject.complete();
+    });
     function asPromise(options) {
         return __awaiter(this, void 0, void 0, function () {
             var _a, isCrashedOnError, finalResult;
@@ -4935,7 +4953,9 @@ function createTask(options) {
                         return [4 /*yield*/, finalResultPromise];
                     case 1:
                         finalResult = _b.sent();
+                        console.error('!!!!! finalResult:', finalResult);
                         if (isCrashedOnError) {
+                            console.error('!!!!! isCrashedOnError:', finalResult);
                             assertsTaskSuccessful(finalResult);
                         }
                         return [2 /*return*/, finalResult];
@@ -4948,9 +4968,10 @@ function createTask(options) {
         taskId: taskId,
         asPromise: asPromise,
         asObservable: function () {
-            return concat(partialResultSubject.asObservable(), from(asPromise({
-                isCrashedOnError: true,
-            })));
+            return partialResultSubject.asObservable();
+        },
+        get currentValue() {
+            return partialResultSubject.value;
         },
     };
 }
@@ -13782,7 +13803,7 @@ function startRemoteServer(options) {
         next();
     });
     var runningExecutionTasks = [];
-    // TODO: !!!!!! Do here some garbage collection of finished tasks
+    // TODO: [🧠] Do here some garbage collection of finished tasks
     app.get(['/', rootPath], function (request, response) { return __awaiter(_this, void 0, void 0, function () {
         var _a, _b;
         var _this = this;
@@ -13831,20 +13852,19 @@ function startRemoteServer(options) {
         });
     }); });
     app.get("".concat(rootPath, "/books"), function (request, response) { return __awaiter(_this, void 0, void 0, function () {
-        var _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        var pipelines;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
-                    _b = (_a = response).send;
-                    if (!(collection === null)) return [3 /*break*/, 1];
-                    _c = [];
-                    return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, collection.listPipelines()];
-                case 2:
-                    _c = _d.sent();
-                    _d.label = 3;
-                case 3:
-                    _b.apply(_a, [_c]);
+                    if (collection === null) {
+                        response.status(500).send('No collection available');
+                        return [2 /*return*/];
+                    }
+                    return [4 /*yield*/, collection.listPipelines()];
+                case 1:
+                    pipelines = _a.sent();
+                    // <- TODO: [🧠][👩🏾‍🤝‍🧑🏿] List `inputParameters` required for the execution
+                    response.send(pipelines);
                     return [2 /*return*/];
             }
         });
@@ -13858,22 +13878,23 @@ function startRemoteServer(options) {
     app.get("".concat(rootPath, "/executions/:taskId"), function (request, response) { return __awaiter(_this, void 0, void 0, function () {
         var taskId, execution;
         return __generator(this, function (_a) {
-            taskId = request.query.taskId;
+            taskId = request.params.taskId;
             execution = runningExecutionTasks.find(function (executionTask) { return executionTask.taskId === taskId; });
             if (execution === undefined) {
                 response.status(404).send("Execution \"".concat(taskId, "\" not found"));
                 return [2 /*return*/];
             }
-            response.send(execution);
+            response.send(execution.currentValue);
             return [2 /*return*/];
         });
     }); });
     app.post("".concat(rootPath, "/executions/new"), function (request, response) { return __awaiter(_this, void 0, void 0, function () {
-        var inputParameters, pipelineUrl, pipeline, llm, fs, executables, tools, pipelineExecutor, executionTask;
+        var inputParameters, pipelineUrl, pipeline, llm, fs, executables, tools, pipelineExecutor, executionTask, error_1;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
+                    _b.trys.push([0, 6, , 7]);
                     inputParameters = request.body.inputParameters;
                     pipelineUrl = request.body.pipelineUrl || request.body.book;
                     return [4 /*yield*/, (collection === null || collection === void 0 ? void 0 : collection.getPipelineByUrl(pipelineUrl))];
@@ -13905,8 +13926,21 @@ function startRemoteServer(options) {
                     pipelineExecutor = createPipelineExecutor(__assign({ pipeline: pipeline, tools: tools }, options));
                     executionTask = pipelineExecutor(inputParameters);
                     runningExecutionTasks.push(executionTask);
+                    return [4 /*yield*/, forTime(10)];
+                case 5:
+                    _b.sent();
+                    // <- Note: Wait for a while to wait for quick responses or sudden but asynchronous errors
+                    // <- TODO: Put this into configuration
                     response.send(executionTask);
-                    return [2 /*return*/];
+                    return [3 /*break*/, 7];
+                case 6:
+                    error_1 = _b.sent();
+                    if (!(error_1 instanceof Error)) {
+                        throw error_1;
+                    }
+                    response.status(400).send({ error: serializeError(error_1) });
+                    return [3 /*break*/, 7];
+                case 7: return [2 /*return*/];
             }
         });
     }); });
@@ -13971,7 +14005,7 @@ function startRemoteServer(options) {
         }); };
         // -----------
         socket.on('prompt-request', function (request) { return __awaiter(_this, void 0, void 0, function () {
-            var identification, prompt, executionTools, llm, _a, promptResult, _b, error_1;
+            var identification, prompt, executionTools, llm, _a, promptResult, _b, error_2;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -14040,11 +14074,11 @@ function startRemoteServer(options) {
                         socket.emit('prompt-response', { promptResult: promptResult } /* <- Note: [🤛] */);
                         return [3 /*break*/, 15];
                     case 13:
-                        error_1 = _c.sent();
-                        if (!(error_1 instanceof Error)) {
-                            throw error_1;
+                        error_2 = _c.sent();
+                        if (!(error_2 instanceof Error)) {
+                            throw error_2;
                         }
-                        socket.emit('error', serializeError(error_1) /* <- Note: [🤛] */);
+                        socket.emit('error', serializeError(error_2) /* <- Note: [🤛] */);
                         return [3 /*break*/, 15];
                     case 14:
                         socket.disconnect();
@@ -14056,7 +14090,7 @@ function startRemoteServer(options) {
         // -----------
         // TODO: [👒] Listing models (and checking configuration) probbably should go through REST API not Socket.io
         socket.on('listModels-request', function (request) { return __awaiter(_this, void 0, void 0, function () {
-            var identification, executionTools, llm, models, error_2;
+            var identification, executionTools, llm, models, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -14077,11 +14111,11 @@ function startRemoteServer(options) {
                         socket.emit('listModels-response', { models: models } /* <- Note: [🤛] */);
                         return [3 /*break*/, 6];
                     case 4:
-                        error_2 = _a.sent();
-                        if (!(error_2 instanceof Error)) {
-                            throw error_2;
+                        error_3 = _a.sent();
+                        if (!(error_3 instanceof Error)) {
+                            throw error_3;
                         }
-                        socket.emit('error', serializeError(error_2));
+                        socket.emit('error', serializeError(error_3));
                         return [3 /*break*/, 6];
                     case 5:
                         socket.disconnect();
@@ -14093,7 +14127,7 @@ function startRemoteServer(options) {
         // -----------
         // TODO: [👒] Listing models (and checking configuration) probbably should go through REST API not Socket.io
         socket.on('preparePipeline-request', function (request) { return __awaiter(_this, void 0, void 0, function () {
-            var identification, pipeline, executionTools, preparedPipeline, error_3;
+            var identification, pipeline, executionTools, preparedPipeline, error_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -14113,11 +14147,11 @@ function startRemoteServer(options) {
                         socket.emit('preparePipeline-response', { preparedPipeline: preparedPipeline } /* <- Note: [🤛] */);
                         return [3 /*break*/, 6];
                     case 4:
-                        error_3 = _a.sent();
-                        if (!(error_3 instanceof Error)) {
-                            throw error_3;
+                        error_4 = _a.sent();
+                        if (!(error_4 instanceof Error)) {
+                            throw error_4;
                         }
-                        socket.emit('error', serializeError(error_3));
+                        socket.emit('error', serializeError(error_4));
                         return [3 /*break*/, 6];
                     case 5:
                         socket.disconnect();
@@ -14185,21 +14219,30 @@ function $initializeStartServerCommand(program) {
     // <- TODO: [🧟‍♂️] Unite path to promptbook collection argument
     'Path to promptbook collection directory', DEFAULT_BOOKS_DIRNAME);
     startServerCommand.option('--port <port>', "Port to start the server on", '4460');
-    startServerCommand.option('-u, --url', spaceTrim("\n            Public root url of the server\n            It is used for following purposes:\n\n            1) It is suffixed with /books and used as rootUrl for all served books\n            2) Path (if not just /) is used as rootPath for the server\n        "));
+    startServerCommand.option('-u, --url <url>', spaceTrim("\n            Public root url of the server\n            It is used for following purposes:\n\n            1) It is suffixed with /books and used as rootUrl for all served books\n            2) Path (if not just /) is used as rootPath for the server\n        "));
     startServerCommand.option('--allow-anonymous', "Is anonymous mode allowed", false);
     startServerCommand.option('-r, --reload', "Call LLM models even if same prompt with result is in the cache", false);
     startServerCommand.option('-v, --verbose', "Is output verbose", false);
     startServerCommand.description(spaceTrim("\n            Starts a remote server to execute books\n        "));
     startServerCommand.action(function (path, _a) {
-        var port = _a.port, rawUrl = _a.url, isAnonymousModeAllowed = _a.allowAnonymous, isCacheReloaded = _a.reload, isVerbose = _a.verbose;
+        var portRaw = _a.port, rawUrl = _a.url, isAnonymousModeAllowed = _a.allowAnonymous, isCacheReloaded = _a.reload, isVerbose = _a.verbose;
         return __awaiter(_this, void 0, void 0, function () {
-            var url, rootUrl, rootPath, prepareAndScrapeOptions, fs, llm, executables, tools, collection;
+            var port, url, rootUrl, rootPath, prepareAndScrapeOptions, fs, llm, executables, tools, collection;
             var _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        if (rawUrl && !isValidUrl(rawUrl)) {
+                            console.error(colors.red("Invalid URL: ".concat(rawUrl)));
+                            return [2 /*return*/, process.exit(1)];
+                        }
+                        port = parseInt(portRaw, 10);
+                        if (isNaN(port) || port <= 0 || port > 65535) {
+                            console.error(colors.red("Invalid port number: ".concat(portRaw)));
+                            return [2 /*return*/, process.exit(1)];
+                        }
                         url = !rawUrl ? null : new URL(rawUrl);
-                        if (url !== null && url.port !== port) {
+                        if (url !== null && url.port !== port.toString()) {
                             console.warn(colors.yellow("Port in --url is different from --port which the server will listen on, this is ok only if you proxy from one port to another, for exaple via nginx or docker"));
                         }
                         rootUrl = undefined;
@@ -14244,7 +14287,7 @@ function $initializeStartServerCommand(program) {
                         collection = _c.sent();
                         startRemoteServer({
                             rootPath: rootPath,
-                            port: parseInt(port, 10),
+                            port: port,
                             isAnonymousModeAllowed: isAnonymousModeAllowed,
                             isApplicationModeAllowed: true,
                             collection: collection,
@@ -14253,7 +14296,11 @@ function $initializeStartServerCommand(program) {
                                 return llm;
                             },
                         });
-                        return [2 /*return*/];
+                        return [4 /*yield*/, forEver()];
+                    case 5: 
+                    // Note: Already logged by `startRemoteServer`
+                    // console.error(colors.green(`Server started on port ${port}`));
+                    return [2 /*return*/, _c.sent()];
                 }
             });
         });