@promptbook/remote-server 0.85.0-8 → 0.85.0-9

package/esm/index.es.js

@@ -31,7 +31,7 @@ var BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-var PROMPTBOOK_ENGINE_VERSION = '0.85.0-7';
+var PROMPTBOOK_ENGINE_VERSION = '0.85.0-8';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -2009,18 +2009,16 @@ function assertsTaskSuccessful(executionResult) {
  */
 function createTask(options) {
     var taskType = options.taskType, taskProcessCallback = options.taskProcessCallback;
-    var taskId = "".concat(taskType.toLowerCase().substring(0, 4), "-").concat($randomToken(8 /* <- TODO: !!! To global config + Use Base58 to avoid simmilar char conflicts   */));
+    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);
@@ -2042,9 +2040,7 @@ 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];
@@ -6897,6 +6893,57 @@ function startRemoteServer(options) {
             .filter(function (part) { return part !== ''; })
             .join('/');
     var startupDate = new Date();
+    function getExecutionToolsFromIdentification(identification) {
+        return __awaiter(this, void 0, void 0, function () {
+            var isAnonymous, llm, llmToolsConfiguration, appId, userId, customOptions, fs, executables, tools;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (identification === null || identification === undefined) {
+                            throw new Error("Identification is not provided");
+                        }
+                        isAnonymous = identification.isAnonymous;
+                        if (isAnonymous === true && !isAnonymousModeAllowed) {
+                            throw new PipelineExecutionError("Anonymous mode is not allowed"); // <- TODO: [main] !!3 Test
+                        }
+                        if (isAnonymous === false && !isApplicationModeAllowed) {
+                            throw new PipelineExecutionError("Application mode is not allowed"); // <- TODO: [main] !!3 Test
+                        }
+                        if (!(isAnonymous === true)) return [3 /*break*/, 1];
+                        llmToolsConfiguration = identification.llmToolsConfiguration;
+                        llm = createLlmToolsFromConfiguration(llmToolsConfiguration, { isVerbose: isVerbose });
+                        return [3 /*break*/, 4];
+                    case 1:
+                        if (!(isAnonymous === false && createLlmExecutionTools !== null)) return [3 /*break*/, 3];
+                        appId = identification.appId, userId = identification.userId, customOptions = identification.customOptions;
+                        return [4 /*yield*/, createLlmExecutionTools({
+                                appId: appId,
+                                userId: userId,
+                                customOptions: customOptions,
+                            })];
+                    case 2:
+                        llm = _b.sent();
+                        return [3 /*break*/, 4];
+                    case 3: throw new PipelineExecutionError("You must provide either llmToolsConfiguration or non-anonymous mode must be propperly configured");
+                    case 4:
+                        fs = $provideFilesystemForNode();
+                        return [4 /*yield*/, $provideExecutablesForNode()];
+                    case 5:
+                        executables = _b.sent();
+                        _a = {
+                            llm: llm,
+                            fs: fs
+                        };
+                        return [4 /*yield*/, $provideScrapersForNode({ fs: fs, llm: llm, executables: executables })];
+                    case 6:
+                        tools = (_a.scrapers = _b.sent(),
+                            _a);
+                        return [2 /*return*/, tools];
+                }
+            });
+        });
+    }
     var app = express();
     app.use(express.json());
     app.use(function (request, response, next) {
@@ -6990,13 +7037,12 @@ function startRemoteServer(options) {
         });
     }); });
     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, error_1;
-        var _a;
+        var _a, inputParameters, identification, pipelineUrl, pipeline, tools, pipelineExecutor, executionTask, error_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    _b.trys.push([0, 6, , 7]);
-                    inputParameters = request.body.inputParameters;
+                    _b.trys.push([0, 4, , 5]);
+                    _a = request.body, inputParameters = _a.inputParameters, identification = _a.identification;
                     pipelineUrl = request.body.pipelineUrl || request.body.book;
                     return [4 /*yield*/, (collection === null || collection === void 0 ? void 0 : collection.getPipelineByUrl(pipelineUrl))];
                 case 1:
@@ -7005,43 +7051,27 @@ function startRemoteServer(options) {
                         response.status(404).send("Pipeline \"".concat(pipelineUrl, "\" not found"));
                         return [2 /*return*/];
                     }
-                    return [4 /*yield*/, createLlmExecutionTools({
-                            appId: '!!!!',
-                            userId: '!!!!',
-                            customOptions: {},
-                        })];
+                    return [4 /*yield*/, getExecutionToolsFromIdentification(identification)];
                 case 2:
-                    llm = _b.sent();
-                    fs = $provideFilesystemForNode();
-                    return [4 /*yield*/, $provideExecutablesForNode()];
-                case 3:
-                    executables = _b.sent();
-                    _a = {
-                        llm: llm,
-                        fs: fs
-                    };
-                    return [4 /*yield*/, $provideScrapersForNode({ fs: fs, llm: llm, executables: executables })];
-                case 4:
-                    tools = (_a.scrapers = _b.sent(),
-                        _a);
+                    tools = _b.sent();
                     pipelineExecutor = createPipelineExecutor(__assign({ pipeline: pipeline, tools: tools }, options));
                     executionTask = pipelineExecutor(inputParameters);
                     runningExecutionTasks.push(executionTask);
                     return [4 /*yield*/, forTime(10)];
-                case 5:
+                case 3:
                     _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 [3 /*break*/, 7];
-                case 6:
+                    return [3 /*break*/, 5];
+                case 4:
                     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*/];
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
             }
         });
     }); });
@@ -7058,55 +7088,9 @@ function startRemoteServer(options) {
         if (isVerbose) {
             console.info(colors.gray("Client connected"), socket.id);
         }
-        var getExecutionToolsFromIdentification = function (identification) { return __awaiter(_this, void 0, void 0, function () {
-            var isAnonymous, llm, llmToolsConfiguration, appId, userId, customOptions, fs, executables, tools;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        isAnonymous = identification.isAnonymous;
-                        if (isAnonymous === true && !isAnonymousModeAllowed) {
-                            throw new PipelineExecutionError("Anonymous mode is not allowed"); // <- TODO: [main] !!3 Test
-                        }
-                        if (isAnonymous === false && !isApplicationModeAllowed) {
-                            throw new PipelineExecutionError("Application mode is not allowed"); // <- TODO: [main] !!3 Test
-                        }
-                        if (!(isAnonymous === true)) return [3 /*break*/, 1];
-                        llmToolsConfiguration = identification.llmToolsConfiguration;
-                        llm = createLlmToolsFromConfiguration(llmToolsConfiguration, { isVerbose: isVerbose });
-                        return [3 /*break*/, 4];
-                    case 1:
-                        if (!(isAnonymous === false && createLlmExecutionTools !== null)) return [3 /*break*/, 3];
-                        appId = identification.appId, userId = identification.userId, customOptions = identification.customOptions;
-                        return [4 /*yield*/, createLlmExecutionTools({
-                                appId: appId,
-                                userId: userId,
-                                customOptions: customOptions,
-                            })];
-                    case 2:
-                        llm = _b.sent();
-                        return [3 /*break*/, 4];
-                    case 3: throw new PipelineExecutionError("You must provide either llmToolsConfiguration or non-anonymous mode must be propperly configured");
-                    case 4:
-                        fs = $provideFilesystemForNode();
-                        return [4 /*yield*/, $provideExecutablesForNode()];
-                    case 5:
-                        executables = _b.sent();
-                        _a = {
-                            llm: llm,
-                            fs: fs
-                        };
-                        return [4 /*yield*/, $provideScrapersForNode({ fs: fs, llm: llm, executables: executables })];
-                    case 6:
-                        tools = (_a.scrapers = _b.sent(),
-                            _a);
-                        return [2 /*return*/, tools];
-                }
-            });
-        }); };
         // -----------
         socket.on('prompt-request', function (request) { return __awaiter(_this, void 0, void 0, function () {
-            var identification, prompt, executionTools, llm, _a, promptResult, _b, error_2;
+            var identification, prompt, tools, llm, _a, promptResult, _b, error_2;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -7119,8 +7103,8 @@ function startRemoteServer(options) {
                         _c.trys.push([1, 13, 14, 15]);
                         return [4 /*yield*/, getExecutionToolsFromIdentification(identification)];
                     case 2:
-                        executionTools = _c.sent();
-                        llm = executionTools.llm;
+                        tools = _c.sent();
+                        llm = tools.llm;
                         _a = identification.isAnonymous === false &&
                             collection !== null;
                         if (!_a) return [3 /*break*/, 4];
@@ -7191,7 +7175,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_3;
+            var identification, tools, llm, models, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7204,8 +7188,8 @@ function startRemoteServer(options) {
                         _a.trys.push([1, 4, 5, 6]);
                         return [4 /*yield*/, getExecutionToolsFromIdentification(identification)];
                     case 2:
-                        executionTools = _a.sent();
-                        llm = executionTools.llm;
+                        tools = _a.sent();
+                        llm = tools.llm;
                         return [4 /*yield*/, llm.listModels()];
                     case 3:
                         models = _a.sent();
@@ -7228,7 +7212,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_4;
+            var identification, pipeline, tools, preparedPipeline, error_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -7241,8 +7225,8 @@ function startRemoteServer(options) {
                         _a.trys.push([1, 4, 5, 6]);
                         return [4 /*yield*/, getExecutionToolsFromIdentification(identification)];
                     case 2:
-                        executionTools = _a.sent();
-                        return [4 /*yield*/, preparePipeline(pipeline, executionTools, options)];
+                        tools = _a.sent();
+                        return [4 /*yield*/, preparePipeline(pipeline, tools, options)];
                     case 3:
                         preparedPipeline = _a.sent();
                         socket.emit('preparePipeline-response', { preparedPipeline: preparedPipeline } /* <- Note: [🤛] */);
@@ -7291,8 +7275,7 @@ function startRemoteServer(options) {
     };
 }
 /**
- * TODO: !!!!!!! CORS and security
- * TODO: !!!!!!! Allow to pass tokem here
+ * TODO: !! Add CORS and security - probbably via `helmet`
  * TODO: [👩🏾‍🤝‍🧑🏾] Allow to pass custom fetch function here - PromptbookFetch
  * TODO: Split this file into multiple functions - handler for each request
  * TODO: Maybe use `$exportJson`