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

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/remote-server",
-    "version": "0.85.0-3",
+    "version": "0.85.0-4",
     "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-4"
     },
     "dependencies": {
         "colors": "1.4.0",

package/umd/index.umd.js

@@ -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-3';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -2006,7 +2006,7 @@
      */
     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);
@@ -2038,6 +2038,9 @@
                     isCrashedOnError: true,
                 })));
             },
+            get currentValue() {
+                return partialResultSubject.value;
+            },
         };
     }
     /**
@@ -6956,27 +6959,29 @@
         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, 5, , 6]);
                         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 = _b.sent();
+                        // <- TODO: !!!!!! NotFoundError
                         if (pipeline === undefined) {
                             response.status(404).send("Pipeline \"".concat(pipelineUrl, "\" not found"));
                             return [2 /*return*/];
@@ -7004,7 +7009,19 @@
                         executionTask = pipelineExecutor(inputParameters);
                         runningExecutionTasks.push(executionTask);
                         response.send(executionTask);
-                        return [2 /*return*/];
+                        // TODO: !!!!!! Remove this:
+                        executionTask.asObservable().subscribe(function (_) {
+                            console.log('!!!', _);
+                        });
+                        return [3 /*break*/, 6];
+                    case 5:
+                        error_1 = _b.sent();
+                        if (!(error_1 instanceof Error)) {
+                            throw error_1;
+                        }
+                        response.status(400).send({ error: serializeError(error_1) });
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         }); });
@@ -7069,7 +7086,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 +7155,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 +7171,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 +7192,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 +7208,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 +7228,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();