@promptbook/remote-server 0.85.0-3 → 0.85.0-5

package/esm/typings/src/execution/ExecutionTask.d.ts

@@ -1,7 +1,7 @@
 import type { Observable } from 'rxjs';
 import { PartialDeep } from 'type-fest';
-import type { string_SCREAMING_CASE } from '../utils/normalization/normalizeTo_SCREAMING_CASE';
 import type { task_id } from '../types/typeAliases';
+import type { string_SCREAMING_CASE } from '../utils/normalization/normalizeTo_SCREAMING_CASE';
 import type { AbstractTaskResult } from './AbstractTaskResult';
 import type { PipelineExecutorResult } from './PipelineExecutorResult';
 /**
@@ -30,7 +30,7 @@ export declare function createTask<TTaskResult extends AbstractTaskResult>(optio
  */
 export type ExecutionTask = AbstractTask<PipelineExecutorResult> & {
     readonly taskType: 'EXECUTION';
-    readonly taskId: `execution-${task_id}`;
+    readonly taskId: `exec-${task_id}`;
 };
 /**
  * Represents a task that prepares a pipeline
@@ -38,7 +38,7 @@ export type ExecutionTask = AbstractTask<PipelineExecutorResult> & {
  */
 export type PreparationTask = AbstractTask<PipelineExecutorResult> & {
     readonly taskType: 'PREPARATION';
-    readonly taskId: `preparation-${task_id}`;
+    readonly taskId: `prep-${task_id}`;
 };
 /**
  * Base interface for all task types
@@ -62,6 +62,10 @@ export type AbstractTask<TTaskResult extends AbstractTaskResult> = {
      * Gets an observable stream of partial task results
      */
     asObservable(): Observable<PartialDeep<TTaskResult>>;
+    /**
+     * Gets just the current value which is mutated during the task processing
+     */
+    currentValue: PartialDeep<TTaskResult>;
 };
 export type Task = ExecutionTask | PreparationTask;
 export {};

package/esm/typings/src/execution/FilesystemTools.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type fs from 'node:fs/promises';
+import type fs from 'fs/promises';
 /**
  * Container for all the tools needed to manipulate with filesystem
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/remote-server",
-    "version": "0.85.0-3",
+    "version": "0.85.0-5",
     "description": "It's time for a paradigm shift. The future of software in plain English, French or Latin",
     "private": false,
     "sideEffects": false,
@@ -47,7 +47,7 @@
     "module": "./esm/index.es.js",
     "typings": "./esm/typings/src/_packages/remote-server.index.d.ts",
     "peerDependencies": {
-        "@promptbook/core": "0.85.0-3"
+        "@promptbook/core": "0.85.0-5"
     },
     "dependencies": {
         "colors": "1.4.0",

package/umd/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('colors'), require('express'), require('node:http'), require('socket.io'), require('spacetrim'), require('node:child_process'), require('waitasecond'), require('node:fs/promises'), require('node:path'), require('rxjs'), require('crypto'), require('prettier'), require('prettier/parser-html'), require('crypto-js/enc-hex'), require('crypto-js/sha256'), require('crypto-js'), require('mime-types'), require('papaparse')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'colors', 'express', 'node:http', 'socket.io', 'spacetrim', 'node:child_process', 'waitasecond', 'node:fs/promises', 'node:path', 'rxjs', 'crypto', 'prettier', 'prettier/parser-html', 'crypto-js/enc-hex', 'crypto-js/sha256', 'crypto-js', 'mime-types', 'papaparse'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-remote-server"] = {}, global.colors, global.express, global.http, global.socket_io, global.spaceTrim, global.node_child_process, global.waitasecond, global.promises, global.node_path, global.rxjs, global.crypto, global.prettier, global.parserHtml, global.hexEncoder, global.sha256, global.cryptoJs, global.mimeTypes, global.papaparse));
-})(this, (function (exports, colors, express, http, socket_io, spaceTrim, node_child_process, waitasecond, promises, node_path, rxjs, crypto, prettier, parserHtml, hexEncoder, sha256, cryptoJs, mimeTypes, papaparse) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('colors'), require('express'), require('http'), require('socket.io'), require('spacetrim'), require('waitasecond'), require('child_process'), require('fs/promises'), require('path'), require('rxjs'), require('crypto'), require('prettier'), require('prettier/parser-html'), require('crypto-js/enc-hex'), require('crypto-js/sha256'), require('crypto-js'), require('mime-types'), require('papaparse')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'colors', 'express', 'http', 'socket.io', 'spacetrim', 'waitasecond', 'child_process', 'fs/promises', 'path', 'rxjs', 'crypto', 'prettier', 'prettier/parser-html', 'crypto-js/enc-hex', 'crypto-js/sha256', 'crypto-js', 'mime-types', 'papaparse'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-remote-server"] = {}, global.colors, global.express, global.http, global.socket_io, global.spaceTrim, global.waitasecond, global.child_process, global.promises, global.path, global.rxjs, global.crypto, global.prettier, global.parserHtml, global.hexEncoder, global.sha256, global.cryptoJs, global.mimeTypes, global.papaparse));
+})(this, (function (exports, colors, express, http, socket_io, spaceTrim, waitasecond, child_process, promises, path, rxjs, crypto, prettier, parserHtml, hexEncoder, sha256, cryptoJs, mimeTypes, papaparse) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -28,7 +28,7 @@
      * @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
@@ -777,7 +777,7 @@
                 console.info(colors__default["default"].yellow(cwd) + ' ' + colors__default["default"].green(command) + ' ' + colors__default["default"].blue(args.join(' ')));
             }
             try {
-                var commandProcess = node_child_process.spawn(command, args, { cwd: cwd, shell: true });
+                var commandProcess = child_process.spawn(command, args, { cwd: cwd, shell: true });
                 if (isVerbose) {
                     commandProcess.on('message', function (message) {
                         console.info({ message: message });
@@ -987,7 +987,7 @@
     function locateAppOnWindows(_a) {
         var appName = _a.appName, windowsSuffix = _a.windowsSuffix;
         return __awaiter(this, void 0, void 0, function () {
-            var prefixes, prefixes_1, prefixes_1_1, prefix, path, e_1_1, error_1;
+            var prefixes, prefixes_1, prefixes_1_1, prefix, path$1, e_1_1, error_1;
             var e_1, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -995,7 +995,7 @@
                         _c.trys.push([0, 9, , 10]);
                         prefixes = [
                             process.env.LOCALAPPDATA,
-                            node_path.join(process.env.LOCALAPPDATA || '', 'Programs'),
+                            path.join(process.env.LOCALAPPDATA || '', 'Programs'),
                             process.env.PROGRAMFILES,
                             process.env['PROGRAMFILES(X86)'],
                         ];
@@ -1007,11 +1007,11 @@
                     case 2:
                         if (!!prefixes_1_1.done) return [3 /*break*/, 5];
                         prefix = prefixes_1_1.value;
-                        path = prefix + windowsSuffix;
-                        return [4 /*yield*/, isExecutable(path, $provideFilesystemForNode())];
+                        path$1 = prefix + windowsSuffix;
+                        return [4 /*yield*/, isExecutable(path$1, $provideFilesystemForNode())];
                     case 3:
                         if (_c.sent()) {
-                            return [2 /*return*/, path];
+                            return [2 /*return*/, path$1];
                         }
                         _c.label = 4;
                     case 4:
@@ -2006,11 +2006,29 @@
      */
     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 rxjs.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;
@@ -2021,7 +2039,9 @@
                             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];
@@ -2034,9 +2054,10 @@
             taskId: taskId,
             asPromise: asPromise,
             asObservable: function () {
-                return rxjs.concat(partialResultSubject.asObservable(), rxjs.from(asPromise({
-                    isCrashedOnError: true,
-                })));
+                return partialResultSubject.asObservable();
+            },
+            get currentValue() {
+                return partialResultSubject.value;
             },
         };
     }
@@ -3979,7 +4000,7 @@
             value = value.replace(/\.html$/, '');
         }
         else if (isValidFilePath(value)) {
-            value = node_path.basename(value);
+            value = path.basename(value);
             // Note: Keeping extension in the name
         }
         value = value.split('/').join('-');
@@ -4085,9 +4106,9 @@
                         }
                         basename = url.split('/').pop() || titleToName(url);
                         hash = sha256__default["default"](hexEncoder__default["default"].parse(url)).toString( /* hex */);
-                        rootDirname_1 = node_path.join(process.cwd(), DEFAULT_DOWNLOAD_CACHE_DIRNAME);
-                        filepath = node_path.join.apply(void 0, __spreadArray(__spreadArray([], __read(nameToSubfolderPath(hash /* <- TODO: [🎎] Maybe add some SHA256 prefix */)), false), ["".concat(basename.substring(0, MAX_FILENAME_LENGTH), ".").concat(mimeTypeToExtension(mimeType))], false));
-                        return [4 /*yield*/, tools.fs.mkdir(node_path.dirname(node_path.join(rootDirname_1, filepath)), { recursive: true })];
+                        rootDirname_1 = path.join(process.cwd(), DEFAULT_DOWNLOAD_CACHE_DIRNAME);
+                        filepath = path.join.apply(void 0, __spreadArray(__spreadArray([], __read(nameToSubfolderPath(hash /* <- TODO: [🎎] Maybe add some SHA256 prefix */)), false), ["".concat(basename.substring(0, MAX_FILENAME_LENGTH), ".").concat(mimeTypeToExtension(mimeType))], false));
+                        return [4 /*yield*/, tools.fs.mkdir(path.dirname(path.join(rootDirname_1, filepath)), { recursive: true })];
                     case 2:
                         _h.sent();
                         _g = (_f = Buffer).from;
@@ -4097,7 +4118,7 @@
                         if (fileContent.length > DEFAULT_MAX_FILE_SIZE /* <- TODO: Allow to pass different value to remote server */) {
                             throw new LimitReachedError("File is too large (".concat(Math.round(fileContent.length / 1024 / 1024), "MB). Maximum allowed size is ").concat(Math.round(DEFAULT_MAX_FILE_SIZE / 1024 / 1024), "MB."));
                         }
-                        return [4 /*yield*/, tools.fs.writeFile(node_path.join(rootDirname_1, filepath), fileContent)];
+                        return [4 /*yield*/, tools.fs.writeFile(path.join(rootDirname_1, filepath), fileContent)];
                     case 4:
                         _h.sent();
                         // TODO: [💵] Check the file security
@@ -4113,7 +4134,7 @@
                             throw new EnvironmentMismatchError('Can not import file knowledge in non-file pipeline');
                             //          <- TODO: [🧠] What is the best error type here`
                         }
-                        filename_1 = node_path.join(rootDirname, knowledgeSourceContent).split('\\').join('/');
+                        filename_1 = path.join(rootDirname, knowledgeSourceContent).split('\\').join('/');
                         fileExtension = getFileExtension(filename_1);
                         mimeType = extensionToMimeType(fileExtension || '');
                         return [4 /*yield*/, isFileExisting(filename_1, tools.fs)];
@@ -6880,7 +6901,7 @@
             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;
@@ -6929,20 +6950,19 @@
             });
         }); });
         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*/];
                 }
             });
@@ -6956,22 +6976,23 @@
         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))];
@@ -7003,8 +7024,21 @@
                         pipelineExecutor = createPipelineExecutor(__assign({ pipeline: pipeline, tools: tools }, options));
                         executionTask = pipelineExecutor(inputParameters);
                         runningExecutionTasks.push(executionTask);
+                        return [4 /*yield*/, waitasecond.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*/];
                 }
             });
         }); });
@@ -7069,7 +7103,7 @@
             }); };
             // -----------
             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:
@@ -7138,11 +7172,11 @@
                             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();
@@ -7154,7 +7188,7 @@
             // -----------
             // 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:
@@ -7175,11 +7209,11 @@
                             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();
@@ -7191,7 +7225,7 @@
             // -----------
             // 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:
@@ -7211,11 +7245,11 @@
                             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();