@promptbook/cli 0.86.5 → 0.86.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/cli",
-    "version": "0.86.5",
+    "version": "0.86.8",
     "description": "It's time for a paradigm shift. The future of software in plain English, French or Latin",
     "private": false,
     "sideEffects": false,

package/umd/index.umd.js

@@ -54,7 +54,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    var PROMPTBOOK_ENGINE_VERSION = '0.86.5';
+    var PROMPTBOOK_ENGINE_VERSION = '0.86.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
@@ -1516,9 +1516,11 @@
         FileCacheStorage.prototype.getFilenameForKey = function (key) {
             // TODO: [👬] DRY
             var name = titleToName(key);
+            var nameStart = name.split('-', 2)[0] || 'unnamed';
             var hash = sha256__default["default"](hexEncoder__default["default"].parse(name)).toString( /* hex */);
             //    <- TODO: [🥬] Encapsulate sha256 to some private utility function
-            return path.join.apply(void 0, __spreadArray(__spreadArray([this.options.rootFolderPath], __read(nameToSubfolderPath(hash /* <- TODO: [🎎] Maybe add some SHA256 prefix */)), false), ["".concat(name.substring(0, MAX_FILENAME_LENGTH), ".json")], false));
+            return path.join.apply(void 0, __spreadArray(__spreadArray([this.options.rootFolderPath,
+                nameStart], __read(nameToSubfolderPath(hash /* <- TODO: [🎎] Maybe add some SHA256 prefix */)), false), ["".concat(name.substring(0, MAX_FILENAME_LENGTH), ".json")], false));
         };
         /**
          * @@@ Returns the current value associated with the given key, or null if the given key does not exist in the list associated with the object.
@@ -1704,13 +1706,14 @@
                 return /* not await */ llmTools.listModels();
             } });
         var callCommonModel = function (prompt) { return __awaiter(_this, void 0, void 0, function () {
-            var key, cacheItem, _a, promptResult, _b;
+            var parameters, content, modelRequirements, key, cacheItem, _a, promptResult, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        parameters = prompt.parameters, content = prompt.content, modelRequirements = prompt.modelRequirements;
                         key = titleToName(prompt.title.substring(0, MAX_FILENAME_LENGTH - 10) +
                             '-' +
-                            sha256__default["default"](hexEncoder__default["default"].parse(JSON.stringify(prompt.parameters))).toString( /* hex */));
+                            sha256__default["default"](hexEncoder__default["default"].parse(JSON.stringify({ parameters: parameters, content: content, modelRequirements: modelRequirements }))).toString( /* hex */));
                         if (!!isCacheReloaded) return [3 /*break*/, 2];
                         return [4 /*yield*/, storage.getItem(key)];
                     case 1:
@@ -7597,7 +7600,9 @@
                                 return __generator(this, function (_a) {
                                     dependentParameterNames = task.dependentParameterNames;
                                     preparedContent = undefined;
-                                    if (knowledgePiecesCount > 0 && !dependentParameterNames.includes('knowledge')) {
+                                    if (task.taskType === 'PROMPT_TASK' &&
+                                        knowledgePiecesCount > 0 &&
+                                        !dependentParameterNames.includes('knowledge')) {
                                         preparedContent = spaceTrim.spaceTrim("\n                    {content}\n\n                    ## Knowledge\n\n                    {knowledge}\n                ");
                                         // <- TODO: [🧠][🧻] Cutomize shape/language/formatting of the addition to the prompt
                                         dependentParameterNames = __spreadArray(__spreadArray([], __read(dependentParameterNames), false), [
@@ -13027,31 +13032,31 @@
      */
     function $getCompiledBook(tools, pipelineSource, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var fs, fetch, filePathRaw, filePath, filePathCandidates, filePathCandidates_1, filePathCandidates_1_1, filePathCandidate, pipelineString, _a, pipelineJson, e_1_1, rootDirname, _loop_1, i, state_1, response_1, pipelineString, pipelineJson, pipelineJson;
+            var fs, fetch, filePathRaw, filePath, filePathCandidates, filePathCandidates_1, filePathCandidates_1_1, filePathCandidate, pipelineString, _a, pipelineJson, compiledFilePath, bookcBundle, data, e_1_1, rootDirname, _loop_1, i, state_1, response_1, pipelineString, pipelineJson, pipelineJson;
             var e_1, _b;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         fs = tools.fs, fetch = tools.fetch;
-                        if (!isValidFilePath(pipelineSource)) return [3 /*break*/, 10];
+                        if (!isValidFilePath(pipelineSource)) return [3 /*break*/, 12];
                         filePathRaw = pipelineSource;
                         filePath = null;
                         filePathCandidates = [filePathRaw, "".concat(filePathRaw, ".md"), "".concat(filePathRaw, ".book"), "".concat(filePathRaw, ".book")];
                         filePathCandidates = __spreadArray(__spreadArray([], __read(filePathCandidates), false), __read(filePathCandidates.map(function (path) { return path.split('\\').join('/'); })), false);
                         _c.label = 1;
                     case 1:
-                        _c.trys.push([1, 8, 9, 10]);
+                        _c.trys.push([1, 10, 11, 12]);
                         filePathCandidates_1 = __values(filePathCandidates), filePathCandidates_1_1 = filePathCandidates_1.next();
                         _c.label = 2;
                     case 2:
-                        if (!!filePathCandidates_1_1.done) return [3 /*break*/, 7];
+                        if (!!filePathCandidates_1_1.done) return [3 /*break*/, 9];
                         filePathCandidate = filePathCandidates_1_1.value;
                         return [4 /*yield*/, isFileExisting(filePathCandidate, fs)
                             // <- TODO: Also test that among the candidates the file is book not just any file
                         ];
                     case 3:
-                        if (!_c.sent()) return [3 /*break*/, 6];
+                        if (!_c.sent()) return [3 /*break*/, 8];
                         filePath = filePathCandidate;
                         _a = validatePipelineString;
                         return [4 /*yield*/, fs.readFile(filePath, 'utf-8')];
@@ -13060,23 +13065,32 @@
                         return [4 /*yield*/, compilePipeline(pipelineString, tools, __assign({ rootDirname: process.cwd() }, options))];
                     case 5:
                         pipelineJson = _c.sent();
-                        return [2 /*return*/, pipelineJson];
+                        compiledFilePath = filePath.replace('.book.md', '.book').replace('.book', '.bookc');
+                        bookcBundle = new JSZip__default["default"]();
+                        bookcBundle.file('index.book.json', JSON.stringify([pipelineJson]));
+                        return [4 /*yield*/, bookcBundle.generateAsync({ type: 'nodebuffer', streamFiles: true })];
                     case 6:
+                        data = _c.sent();
+                        return [4 /*yield*/, fs.writeFile(compiledFilePath, data)];
+                    case 7:
+                        _c.sent();
+                        return [2 /*return*/, pipelineJson];
+                    case 8:
                         filePathCandidates_1_1 = filePathCandidates_1.next();
                         return [3 /*break*/, 2];
-                    case 7: return [3 /*break*/, 10];
-                    case 8:
+                    case 9: return [3 /*break*/, 12];
+                    case 10:
                         e_1_1 = _c.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 10];
-                    case 9:
+                        return [3 /*break*/, 12];
+                    case 11:
                         try {
                             if (filePathCandidates_1_1 && !filePathCandidates_1_1.done && (_b = filePathCandidates_1.return)) _b.call(filePathCandidates_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 10:
-                        if (!isValidPipelineUrl(pipelineSource)) return [3 /*break*/, 14];
+                    case 12:
+                        if (!isValidPipelineUrl(pipelineSource)) return [3 /*break*/, 16];
                         rootDirname = process.cwd();
                         _loop_1 = function (i) {
                             var booksDirname, collection_1, pipeline;
@@ -13127,47 +13141,47 @@
                             });
                         };
                         i = 0;
-                        _c.label = 11;
-                    case 11:
-                        if (!(i < LOOP_LIMIT)) return [3 /*break*/, 14];
+                        _c.label = 13;
+                    case 13:
+                        if (!(i < LOOP_LIMIT)) return [3 /*break*/, 16];
                         return [5 /*yield**/, _loop_1(i)];
-                    case 12:
+                    case 14:
                         state_1 = _c.sent();
                         if (typeof state_1 === "object")
                             return [2 /*return*/, state_1.value];
                         switch (state_1) {
-                            case "break-up_to_root": return [3 /*break*/, 14];
+                            case "break-up_to_root": return [3 /*break*/, 16];
                         }
-                        _c.label = 13;
-                    case 13:
+                        _c.label = 15;
+                    case 15:
                         i++;
-                        return [3 /*break*/, 11];
-                    case 14:
-                        if (!isValidPipelineUrl(pipelineSource)) return [3 /*break*/, 18];
+                        return [3 /*break*/, 13];
+                    case 16:
+                        if (!isValidPipelineUrl(pipelineSource)) return [3 /*break*/, 20];
                         return [4 /*yield*/, fetch(pipelineSource)];
-                    case 15:
+                    case 17:
                         response_1 = _c.sent();
                         if (response_1.status >= 300) {
                             throw new NotFoundError(spaceTrim__default["default"](function (block) { return "\n                        Book not found on URL:\n                        ".concat(block(pipelineSource), "\n\n                        Request failed with status ").concat(block(response_1.status.toString()), " ").concat(block(response_1.statusText), "\n                    "); }));
                         }
                         return [4 /*yield*/, response_1.text()];
-                    case 16:
+                    case 18:
                         pipelineString = _c.sent();
                         // console.log({ pipelineString });
                         if (!isValidPipelineString(pipelineString)) {
                             throw new NotFoundError(spaceTrim__default["default"](function (block) { return "\n                        Book not found on URL:\n                        ".concat(block(pipelineSource), "\n\n                        Requested URL does not seem to contain a valid book\n                    "); }));
                         }
                         return [4 /*yield*/, compilePipeline(pipelineString, tools, __assign({ rootDirname: null }, options))];
-                    case 17:
+                    case 19:
                         pipelineJson = _c.sent();
                         return [2 /*return*/, pipelineJson];
-                    case 18:
-                        if (!isValidPipelineString(pipelineSource)) return [3 /*break*/, 20];
+                    case 20:
+                        if (!isValidPipelineString(pipelineSource)) return [3 /*break*/, 22];
                         return [4 /*yield*/, compilePipeline(pipelineSource, tools, __assign({ rootDirname: null }, options))];
-                    case 19:
+                    case 21:
                         pipelineJson = _c.sent();
                         return [2 /*return*/, pipelineJson];
-                    case 20: /* not else */ throw new NotFoundError(spaceTrim__default["default"](function (block) { return "\n                Book not found:\n                ".concat(block(pipelineSource), "\n\n                Pipelines can be loaded from:\n                1) As a file ./books/write-cv.book\n                2) As a URL https://promptbook.studio/hejny/write-cv.book found in ./books folder recursively\n                2) As a URL https://promptbook.studio/hejny/write-cv.book fetched from the internet\n                3) As a string\n\n\n            "); }));
+                    case 22: /* not else */ throw new NotFoundError(spaceTrim__default["default"](function (block) { return "\n                Book not found:\n                ".concat(block(pipelineSource), "\n\n                Pipelines can be loaded from:\n                1) As a file ./books/write-cv.book\n                2) As a URL https://promptbook.studio/hejny/write-cv.book found in ./books folder recursively\n                2) As a URL https://promptbook.studio/hejny/write-cv.book fetched from the internet\n                3) As a string\n\n\n            "); }));
                 }
             });
         });