@promptbook/core 0.52.0-18 → 0.52.0-19

package/README.md

@@ -555,8 +555,6 @@ _Note: LLMs work with tokens, not characters, but in Promptbooks we want to use
 ```markdown
 # ✨ Sample: Expectations
 
--   PROMPTBOOK URL https://promptbook.example.com/samples/postprocessing-2.ptbk.md@v1
--   PROMPTBOOK VERSION 1.0.0
 -   INPUT  PARAMETER {yourName} Name of the hero
 
 ## 💬 Question

package/esm/index.es.js

@@ -448,7 +448,7 @@ function union() {
 /**
  * The version of the Promptbook library
  */
-var PROMPTBOOK_VERSION = '0.52.0-17';
+var PROMPTBOOK_VERSION = '0.52.0-18';
 
 /**
  * Parses the template and returns the list of all parameter names
@@ -2526,7 +2526,7 @@ function createPromptbookExecutor(options) {
                                 title: currentTemplate.title,
                                 promptbookUrl: "".concat(promptbook.promptbookUrl
                                     ? promptbook.promptbookUrl
-                                    : 'anonymous' /* <- [🧠][🈴] How to deal with anonymous PROMPTBOOKs, do here some auto-url like SHA-256 based ad-hoc identifier? */, "#").concat(currentTemplate.name),
+                                    : 'anonymous' /* <- TODO: [🧠] How to deal with anonymous PROMPTBOOKs, do here some auto-url like SHA-256 based ad-hoc identifier? */, "#").concat(currentTemplate.name),
                                 parameters: parametersToPass,
                                 content: replaceParameters(currentTemplate.content, parametersToPass) /* <- [2] */,
                                 modelRequirements: currentTemplate.modelRequirements,
@@ -3243,6 +3243,12 @@ var SimplePromptbookLibrary = /** @class */ (function () {
                     throw new PromptbookReferenceError(spaceTrim("\n                        Promptbook with name \"".concat(promptbook.title, "\" does not have defined URL\n\n                        Note: Promptbooks without URLs are called anonymous promptbooks\n                              They can be used as standalone promptbooks, but they cannot be referenced by other promptbooks\n                              And also they cannot be used in the promptbook library\n\n                    ")));
                 }
                 validatePromptbookJson(promptbook);
+                // Note: [🦄]
+                if (this.library.has(promptbook.promptbookUrl) &&
+                    promptbookJsonToString(promptbook) !==
+                        promptbookJsonToString(this.library.get(promptbook.promptbookUrl))) {
+                    throw new PromptbookReferenceError(spaceTrim("\n                        Promptbook with URL \"".concat(promptbook.promptbookUrl, "\" is already in the library\n\n                        Note: Promptbooks with the same URL are not allowed\n                        Note: Automatically check whether the promptbooks are the same BUT they are DIFFERENT\n\n                    ")));
+                }
                 this.library.set(promptbook.promptbookUrl, promptbook);
             }
         }
@@ -3434,95 +3440,158 @@ function createPromptbookLibraryFromDirectory(path, options) {
     }
     var _a = options || {}, _b = _a.isRecursive, isRecursive = _b === void 0 ? true : _b, _c = _a.isVerbose, isVerbose = _c === void 0 ? false : _c;
     return createPromptbookLibraryFromPromise(function () { return __awaiter(_this, void 0, void 0, function () {
-        var justR_equire, fsPromises, readdir, readFile, dirents, fileNames, promptbooks, fileNames_1, fileNames_1_1, fileName, promptbookString, promptbook, e_1_1;
-        var e_1, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var fsPromises, readFile, fileNames, promptbooks, fileNames_1, fileNames_1_1, fileName, promptbook, promptbookString, _a, _b, e_1_1;
+        var e_1, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
-                    justR_equire = require;
-                    fsPromises = justR_equire(just('fs/promises') /* <- Note: [2] */);
-                    readdir = fsPromises.readdir;
+                    fsPromises = require(just('fs/promises') /* <- Note: [1] */);
                     readFile = fsPromises.readFile;
-                    return [4 /*yield*/, readdir(path, {
-                            withFileTypes: true /* Note: This is not working: recursive: isRecursive */,
-                        })];
+                    return [4 /*yield*/, listAllFiles(path, isRecursive)];
                 case 1:
-                    dirents = _b.sent();
-                    fileNames = dirents.filter(function (dirent) { return dirent.isFile(); }).map(function (_a) {
-                        var name = _a.name;
-                        return join(path, name);
-                    });
+                    fileNames = _d.sent();
                     if (isVerbose) {
-                        console.info('createPromptbookLibraryFromDirectory', { path: path, isRecursive: isRecursive, dirents: dirents, fileNames: fileNames });
+                        console.info('createPromptbookLibraryFromDirectory', { path: path, isRecursive: isRecursive, fileNames: fileNames });
                     }
                     promptbooks = [];
-                    _b.label = 2;
+                    _d.label = 2;
                 case 2:
-                    _b.trys.push([2, 8, 9, 10]);
+                    _d.trys.push([2, 11, 12, 13]);
                     fileNames_1 = __values(fileNames), fileNames_1_1 = fileNames_1.next();
-                    _b.label = 3;
+                    _d.label = 3;
                 case 3:
-                    if (!!fileNames_1_1.done) return [3 /*break*/, 7];
+                    if (!!fileNames_1_1.done) return [3 /*break*/, 10];
                     fileName = fileNames_1_1.value;
+                    promptbook = null;
                     if (!fileName.endsWith('.ptbk.md')) return [3 /*break*/, 5];
                     return [4 /*yield*/, readFile(fileName, 'utf8')];
                 case 4:
-                    promptbookString = (_b.sent());
+                    promptbookString = (_d.sent());
                     promptbook = promptbookStringToJson(promptbookString);
-                    if (!promptbook.promptbookUrl) {
-                        if (isVerbose) {
-                            console.info("Not loading ".concat(fileName, " - missing URL"));
-                        }
+                    return [3 /*break*/, 8];
+                case 5:
+                    if (!fileName.endsWith('.ptbk.json')) return [3 /*break*/, 7];
+                    if (isVerbose) {
+                        console.info("Loading ".concat(fileName));
                     }
-                    else {
-                        if (isVerbose) {
-                            console.info("Loading ".concat(fileName));
-                        }
-                        // TODO: !!!! Chack url uniqueness and collisions
-                        promptbooks.push(promptbook);
+                    _b = (_a = JSON).parse;
+                    return [4 /*yield*/, readFile(fileName, 'utf8')];
+                case 6:
+                    // TODO: Handle non-valid JSON files
+                    promptbook = _b.apply(_a, [_d.sent()]);
+                    return [3 /*break*/, 8];
+                case 7:
+                    if (isVerbose) {
+                        console.info("Skipping file ".concat(fileName));
                     }
-                    return [3 /*break*/, 6];
-                case 5:
-                    if (fileName.endsWith('.ptbk.json')) {
-                        if (isVerbose) {
-                            console.info("Loading ".concat(fileName));
+                    _d.label = 8;
+                case 8:
+                    // ---
+                    if (promptbook !== null) {
+                        if (!promptbook.promptbookUrl) {
+                            if (isVerbose) {
+                                console.info("Not loading ".concat(fileName, " - missing URL"));
+                            }
                         }
-                        // TODO: !!!! Implement JSON loading
-                        // TODO: !!!! Chack url uniqueness and collisions
-                    }
-                    else {
-                        if (isVerbose) {
-                            console.info("Skipping file ".concat(fileName));
+                        else {
+                            if (isVerbose) {
+                                console.info("Loading ".concat(fileName));
+                            }
+                            // Note: [🦄] Promptbook with same url uniqueness will be checked automatically in SimplePromptbookLibrary
+                            promptbooks.push(promptbook);
                         }
                     }
-                    _b.label = 6;
-                case 6:
+                    _d.label = 9;
+                case 9:
                     fileNames_1_1 = fileNames_1.next();
                     return [3 /*break*/, 3];
-                case 7: return [3 /*break*/, 10];
-                case 8:
-                    e_1_1 = _b.sent();
+                case 10: return [3 /*break*/, 13];
+                case 11:
+                    e_1_1 = _d.sent();
                     e_1 = { error: e_1_1 };
-                    return [3 /*break*/, 10];
-                case 9:
+                    return [3 /*break*/, 13];
+                case 12:
                     try {
-                        if (fileNames_1_1 && !fileNames_1_1.done && (_a = fileNames_1.return)) _a.call(fileNames_1);
+                        if (fileNames_1_1 && !fileNames_1_1.done && (_c = fileNames_1.return)) _c.call(fileNames_1);
                     }
                     finally { if (e_1) throw e_1.error; }
                     return [7 /*endfinally*/];
-                case 10: return [2 /*return*/, promptbooks];
+                case 13: return [2 /*return*/, promptbooks];
             }
         });
     }); });
 }
+/**
+ * Reads all files in the directory
+ *
+ * @param path
+ * @param isRecursive
+ * @returns List of all files in the directory
+ * @private internal function for `createPromptbookLibraryFromDirectory`
+ */
+function listAllFiles(path, isRecursive) {
+    return __awaiter(this, void 0, void 0, function () {
+        var fsPromises, readdir, dirents, fileNames, _a, _b, dirent, subPath, _c, _d, _e, _f, e_2_1;
+        var e_2, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    fsPromises = require(just('fs/promises') /* <- Note: [1] */);
+                    readdir = fsPromises.readdir;
+                    return [4 /*yield*/, readdir(path, {
+                            withFileTypes: true /* Note: This is not working: recursive: isRecursive */,
+                        })];
+                case 1:
+                    dirents = _h.sent();
+                    fileNames = dirents.filter(function (dirent) { return dirent.isFile(); }).map(function (_a) {
+                        var name = _a.name;
+                        return join(path, name);
+                    });
+                    if (!isRecursive) return [3 /*break*/, 9];
+                    _h.label = 2;
+                case 2:
+                    _h.trys.push([2, 7, 8, 9]);
+                    _a = __values(dirents.filter(function (dirent) { return dirent.isDirectory(); })), _b = _a.next();
+                    _h.label = 3;
+                case 3:
+                    if (!!_b.done) return [3 /*break*/, 6];
+                    dirent = _b.value;
+                    subPath = join(path, dirent.name);
+                    _d = (_c = fileNames.push).apply;
+                    _e = [fileNames];
+                    _f = [[]];
+                    return [4 /*yield*/, listAllFiles(subPath, isRecursive)];
+                case 4:
+                    _d.apply(_c, _e.concat([__spreadArray.apply(void 0, _f.concat([__read.apply(void 0, [(_h.sent())]), false]))]));
+                    _h.label = 5;
+                case 5:
+                    _b = _a.next();
+                    return [3 /*break*/, 3];
+                case 6: return [3 /*break*/, 9];
+                case 7:
+                    e_2_1 = _h.sent();
+                    e_2 = { error: e_2_1 };
+                    return [3 /*break*/, 9];
+                case 8:
+                    try {
+                        if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                    return [7 /*endfinally*/];
+                case 9: return [2 /*return*/, fileNames];
+            }
+        });
+    });
+}
 /***
- * Note: [1] Fixing the dynamic import issue in Webpack (! Not working !)
+ * TODO: [🧠] Maybe do not do hacks like [1] and just create package @promptbook/node
+ *       [🍓][🚯] maybe make `@promptbook/library` package
+ * TODO: Fix the dynamic import issue in Webpack (! Not working !)
  *     > ./node_modules/@promptbook/core/esm/index.es.js
  *     > Critical dependency: the request of a dependency is an expression
  *
- * Note: [2] Using require(just('fs/promises')) to allow
+ * Note: [1] Using require(just('fs/promises')) to allow
  *     the `@promptbook/core` work for both Node.js and browser environments
- * TODO: [🍓][🚯] !!! Add to README and samples + maybe make `@promptbook/library` package
  */
 
 /**