@promptbook/cli 0.85.0-0 → 0.85.0-2

package/bin/promptbook-cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 //               <- TODO: [🎺] Ensure correct version of Node.js is used
+// promptbook-cli.js
 
 /**
  * Note: [🔺] Purpose of this file is to run CLI in production environment

package/esm/index.es.js

@@ -2,12 +2,12 @@ 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 'path';
-import { stat, access, constants, readFile, writeFile, readdir, mkdir, unlink, rm, rmdir, rename } from 'fs/promises';
+import { basename, join, dirname } from 'node:path';
+import { stat, access, constants, readFile, writeFile, readdir, mkdir, unlink, rm, rmdir, rename } from 'node:fs/promises';
 import hexEncoder from 'crypto-js/enc-hex';
 import sha256 from 'crypto-js/sha256';
 import * as dotenv from 'dotenv';
-import { spawn } from 'child_process';
+import { spawn } from 'node:child_process';
 import { format } from 'prettier';
 import parserHtml from 'prettier/parser-html';
 import { BehaviorSubject, concat, from } from 'rxjs';
@@ -19,7 +19,7 @@ import glob from 'glob-promise';
 import prompts from 'prompts';
 import moment from 'moment';
 import express from 'express';
-import http from 'http';
+import http from 'node: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.84.0';
+var PROMPTBOOK_ENGINE_VERSION = '0.85.0-1';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -4921,9 +4921,9 @@ 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 resultSubject = new BehaviorSubject({});
+    var partialResultSubject = new BehaviorSubject({});
     var finalResultPromise = /* not await */ taskProcessCallback(function (newOngoingResult) {
-        resultSubject.next(newOngoingResult);
+        partialResultSubject.next(newOngoingResult);
     });
     function asPromise(options) {
         return __awaiter(this, void 0, void 0, function () {
@@ -4948,7 +4948,7 @@ function createTask(options) {
         taskId: taskId,
         asPromise: asPromise,
         asObservable: function () {
-            return concat(resultSubject.asObservable(), from(asPromise({
+            return concat(partialResultSubject.asObservable(), from(asPromise({
                 isCrashedOnError: true,
             })));
         },
@@ -11416,6 +11416,17 @@ function normalizeWhitespaces(sentence) {
     return sentence.replace(/\s+/gs, ' ').trim();
 }
 
+/**
+ * Adds suffix to the URL
+ *
+ * @public exported from `@promptbook/utils`
+ */
+function suffixUrl(value, suffix) {
+    var baseUrl = value.href.endsWith('/') ? value.href.slice(0, -1) : value.href;
+    var normalizedSuffix = suffix.replace(/\/+/g, '/');
+    return (baseUrl + normalizedSuffix);
+}
+
 /**
  * Function trimCodeBlock will trim starting and ending code block from the string if it is present.
  *
@@ -13508,9 +13519,9 @@ function $initializeRunCommand(program) {
                 case 17:
                     executionTask = _m.sent();
                     if (isVerbose) {
-                        executionTask.asObservable().subscribe(function (progress) {
+                        executionTask.asObservable().subscribe(function (partialResult) {
                             console.info(colors.gray('--- Progress ---'));
-                            console.info(progress);
+                            console.info(partialResult);
                         });
                     }
                     return [4 /*yield*/, executionTask.asPromise({
@@ -13746,11 +13757,33 @@ function $initializeTestCommand(program) {
  */
 function startRemoteServer(options) {
     var _this = this;
-    var _a = __assign({ isAnonymousModeAllowed: false, isApplicationModeAllowed: false, collection: null, createLlmExecutionTools: null }, options), port = _a.port, path = _a.path, collection = _a.collection, createLlmExecutionTools = _a.createLlmExecutionTools, isAnonymousModeAllowed = _a.isAnonymousModeAllowed, isApplicationModeAllowed = _a.isApplicationModeAllowed, _b = _a.isVerbose, isVerbose = _b === void 0 ? DEFAULT_IS_VERBOSE : _b;
+    var _a = __assign({ isAnonymousModeAllowed: false, isApplicationModeAllowed: false, collection: null, createLlmExecutionTools: null }, options), port = _a.port, collection = _a.collection, createLlmExecutionTools = _a.createLlmExecutionTools, isAnonymousModeAllowed = _a.isAnonymousModeAllowed, isApplicationModeAllowed = _a.isApplicationModeAllowed, _b = _a.isVerbose, isVerbose = _b === void 0 ? DEFAULT_IS_VERBOSE : _b;
     // <- TODO: [🦪] Some helper type to be able to use discriminant union types with destructuring
+    var _c = options.rootPath, rootPath = _c === void 0 ? '/' : _c;
+    if (!rootPath.startsWith('/')) {
+        rootPath = "/".concat(rootPath);
+    } /* not else */
+    if (rootPath.endsWith('/')) {
+        rootPath = rootPath.slice(0, -1);
+    } /* not else */
+    if (rootPath === '/') {
+        rootPath = '';
+    }
+    var socketioPath = '/' +
+        "".concat(rootPath, "/socket.io")
+            .split('/')
+            .filter(function (part) { return part !== ''; })
+            .join('/');
+    var startupDate = new Date();
     var app = express();
     app.use(express.json());
-    app.get('/', function (request, response) { return __awaiter(_this, void 0, void 0, function () {
+    app.use(function (request, response, next) {
+        response.setHeader('X-Powered-By', 'Promptbook engine');
+        next();
+    });
+    var runningExecutionTasks = [];
+    // 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;
         var _c;
@@ -13760,20 +13793,19 @@ function startRemoteServer(options) {
                     if ((_c = request.url) === null || _c === void 0 ? void 0 : _c.includes('socket.io')) {
                         return [2 /*return*/];
                     }
-                    _b = (_a = response).send;
-                    // TODO: !!!!!! Make this either valid html or text - http://localhost:4460/
+                    _b = (_a = response.type('text/markdown')).send;
                     return [4 /*yield*/, spaceTrim$1(function (block) { return __awaiter(_this, void 0, void 0, function () {
                             var _a, _b, _c, _d, _e;
                             return __generator(this, function (_f) {
                                 switch (_f.label) {
                                     case 0:
-                                        _b = (_a = "\n                    Server for processing promptbook remote requests is running.\n\n                    Version: ".concat(PROMPTBOOK_ENGINE_VERSION, "\n                    Socket.io path: ").concat(path, "/socket.io\n                    Anonymouse mode: ").concat(isAnonymousModeAllowed ? 'enabled' : 'disabled', "\n                    Application mode: ").concat(isApplicationModeAllowed ? 'enabled' : 'disabled', "\n                    ")).concat;
+                                        _b = (_a = "\n                    # Promptbook\n\n                    > ".concat(block(CLAIM), "\n\n                    **Book language version:** ").concat(BOOK_LANGUAGE_VERSION, "\n                    **Promptbook engine version:** ").concat(PROMPTBOOK_ENGINE_VERSION, "\n                    **Node.js version:** ").concat(process.version /* <- TODO: [🧠] Is it secure to expose this */, "\n\n                    ---\n\n                    ## Details\n\n                    **Server port:** ").concat(port, "\n                    **Server root path:** ").concat(rootPath, "\n                    **Socket.io path:** ").concat(socketioPath, "\n                    **Startup date:** ").concat(startupDate.toISOString(), "\n                    **Anonymouse mode:** ").concat(isAnonymousModeAllowed ? 'enabled' : 'disabled', "\n                    **Application mode:** ").concat(isApplicationModeAllowed ? 'enabled' : 'disabled', "\n                    ")).concat;
                                         _c = block;
                                         if (!(!isApplicationModeAllowed || collection === null)) return [3 /*break*/, 1];
                                         _d = '';
                                         return [3 /*break*/, 3];
                                     case 1:
-                                        _e = 'Pipelines in collection:\n';
+                                        _e = '**Pipelines in collection:**\n';
                                         return [4 /*yield*/, collection.listPipelines()];
                                     case 2:
                                         _d = _e +
@@ -13781,27 +13813,49 @@ function startRemoteServer(options) {
                                                 .map(function (pipelineUrl) { return "- ".concat(pipelineUrl); })
                                                 .join('\n');
                                         _f.label = 3;
-                                    case 3: return [2 /*return*/, _b.apply(_a, [_c.apply(void 0, [_d]), "\n\n                    For more information look at:\n                    https://github.com/webgptorg/promptbook\n            "])];
+                                    case 3: return [2 /*return*/, _b.apply(_a, [_c.apply(void 0, [_d]), "\n                    **Running executions:** "]).concat(runningExecutionTasks.length, "\n\n                    ---\n\n                    ## Paths\n\n                    ").concat(block(app._router.stack
+                                            .map(function (_a) {
+                                            var route = _a.route;
+                                            return (route === null || route === void 0 ? void 0 : route.path) || null;
+                                        })
+                                            .filter(function (path) { return path !== null; })
+                                            .map(function (path) { return "- ".concat(path); })
+                                            .join('\n')), "\n\n                    ---\n\n                    ## Instructions\n\n                    To connect to this server use:\n\n                    1) The client https://www.npmjs.com/package/@promptbook/remote-client\n                    2) OpenAI compatible client *(Not wotking yet)*\n                    3) REST API\n\n                    For more information look at:\n                    https://github.com/webgptorg/promptbook\n                ")];
                                 }
                             });
                         }); })];
                 case 1:
-                    _b.apply(_a, [
-                        // TODO: !!!!!! Make this either valid html or text - http://localhost:4460/
-                        _d.sent()]);
+                    _b.apply(_a, [_d.sent()]);
                     return [2 /*return*/];
             }
         });
     }); });
-    var runningExecutionTasks = [];
-    // TODO: !!!!!! Do here some garbage collection of finished tasks
-    app.get('/executions', function (request, response) { return __awaiter(_this, void 0, void 0, function () {
+    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) {
+                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]);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    app.get("".concat(rootPath, "/executions"), function (request, response) { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             response.send(runningExecutionTasks);
             return [2 /*return*/];
         });
     }); });
-    app.get('/executions/:taskId', function (request, response) { return __awaiter(_this, void 0, void 0, function () {
+    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;
@@ -13814,16 +13868,17 @@ function startRemoteServer(options) {
             return [2 /*return*/];
         });
     }); });
-    app.post('/executions/new', function (request, response) { return __awaiter(_this, void 0, void 0, function () {
-        var _a, pipelineUrl, inputParameters, pipeline, llm, fs, executables, tools, pipelineExecutor, executionTask;
-        var _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+    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 _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    _a = request.body, pipelineUrl = _a.pipelineUrl, inputParameters = _a.inputParameters;
+                    inputParameters = request.body.inputParameters;
+                    pipelineUrl = request.body.pipelineUrl || request.body.book;
                     return [4 /*yield*/, (collection === null || collection === void 0 ? void 0 : collection.getPipelineByUrl(pipelineUrl))];
                 case 1:
-                    pipeline = _c.sent();
+                    pipeline = _b.sent();
                     if (pipeline === undefined) {
                         response.status(404).send("Pipeline \"".concat(pipelineUrl, "\" not found"));
                         return [2 /*return*/];
@@ -13834,19 +13889,19 @@ function startRemoteServer(options) {
                             customOptions: {},
                         })];
                 case 2:
-                    llm = _c.sent();
+                    llm = _b.sent();
                     fs = $provideFilesystemForNode();
                     return [4 /*yield*/, $provideExecutablesForNode()];
                 case 3:
-                    executables = _c.sent();
-                    _b = {
+                    executables = _b.sent();
+                    _a = {
                         llm: llm,
                         fs: fs
                     };
                     return [4 /*yield*/, $provideScrapersForNode({ fs: fs, llm: llm, executables: executables })];
                 case 4:
-                    tools = (_b.scrapers = _c.sent(),
-                        _b);
+                    tools = (_a.scrapers = _b.sent(),
+                        _a);
                     pipelineExecutor = createPipelineExecutor(__assign({ pipeline: pipeline, tools: tools }, options));
                     executionTask = pipelineExecutor(inputParameters);
                     runningExecutionTasks.push(executionTask);
@@ -13857,7 +13912,7 @@ function startRemoteServer(options) {
     }); });
     var httpServer = http.createServer(app);
     var server = new Server(httpServer, {
-        path: path,
+        path: socketioPath,
         transports: [/*'websocket', <- TODO: [🌬] Make websocket transport work */ 'polling'],
         cors: {
             origin: '*',
@@ -14101,6 +14156,8 @@ function startRemoteServer(options) {
     };
 }
 /**
+ * TODO: !!!!!!! CORS and security
+ * TODO: !!!!!!! Allow to pass tokem here
  * TODO: [👩🏾‍🤝‍🧑🏾] Allow to pass custom fetch function here - PromptbookFetch
  * TODO: Split this file into multiple functions - handler for each request
  * TODO: Maybe use `$exportJson`
@@ -14124,21 +14181,80 @@ function startRemoteServer(options) {
 function $initializeStartServerCommand(program) {
     var _this = this;
     var startServerCommand = program.command('start-server');
+    startServerCommand.argument('[path]', 
+    // <- 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.description(spaceTrim("\n            @@@\n        "));
-    startServerCommand.action(function (_a) {
-        var port = _a.port;
+    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('--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;
         return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
-                startRemoteServer({
-                    path: '/promptbook',
-                    port: parseInt(port, 10),
-                    isAnonymousModeAllowed: true,
-                    isApplicationModeAllowed: true,
-                    // <- TODO: !!!!!!
-                });
-                console.error(colors.green("Server started on port ".concat(port)));
-                return [2 /*return*/];
+            var url, rootUrl, rootPath, prepareAndScrapeOptions, fs, llm, executables, tools, collection;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        url = !rawUrl ? null : new URL(rawUrl);
+                        if (url !== null && url.port !== port) {
+                            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;
+                        if (url !== null) {
+                            rootUrl = suffixUrl(url, '/books');
+                        }
+                        rootPath = '/';
+                        if (url !== null) {
+                            rootPath = url.pathname;
+                        }
+                        prepareAndScrapeOptions = {
+                            isVerbose: isVerbose,
+                            isCacheReloaded: isCacheReloaded,
+                        };
+                        fs = $provideFilesystemForNode(prepareAndScrapeOptions);
+                        return [4 /*yield*/, $provideLlmToolsForWizzardOrCli(prepareAndScrapeOptions)];
+                    case 1:
+                        llm = _c.sent();
+                        return [4 /*yield*/, $provideExecutablesForNode(prepareAndScrapeOptions)];
+                    case 2:
+                        executables = _c.sent();
+                        _b = {
+                            llm: llm,
+                            fs: fs
+                        };
+                        return [4 /*yield*/, $provideScrapersForNode({ fs: fs, llm: llm, executables: executables }, prepareAndScrapeOptions)];
+                    case 3:
+                        tools = (_b.scrapers = _c.sent(),
+                            _b.script = [
+                            /*new JavascriptExecutionTools(options)*/
+                            ],
+                            _b);
+                        return [4 /*yield*/, createCollectionFromDirectory(path, tools, {
+                                isVerbose: isVerbose,
+                                rootUrl: rootUrl,
+                                isRecursive: true,
+                                isLazyLoaded: false,
+                                isCrashedOnError: true,
+                                // <- TODO: [🍖] Add `intermediateFilesStrategy`
+                            })];
+                    case 4:
+                        collection = _c.sent();
+                        startRemoteServer({
+                            rootPath: rootPath,
+                            port: parseInt(port, 10),
+                            isAnonymousModeAllowed: isAnonymousModeAllowed,
+                            isApplicationModeAllowed: true,
+                            collection: collection,
+                            createLlmExecutionTools: function (options) {
+                                options.appId; options.userId;
+                                return llm;
+                            },
+                        });
+                        return [2 /*return*/];
+                }
             });
         });
     });