@promptbook/core 0.44.0-9 → 0.45.0

package/esm/index.es.js

@@ -1,4 +1,4 @@
-import spaceTrim from 'spacetrim';
+import { spaceTrim } from 'spacetrim';
 import 'prettier';
 import 'prettier/parser-html';
 import 'moment';
@@ -1161,7 +1161,7 @@ function parsingMarkdownStructureToMarkdownStructure(parsingMarkdownStructure) {
 /**
  * The version of the Promptbook library
  */
-var PROMPTBOOK_VERSION = '0.44.0-8';
+var PROMPTBOOK_VERSION = '0.44.0';
 
 /**
  * Parses the given script and returns the list of all used variables that are not defined in the script
@@ -1986,6 +1986,7 @@ function createPromptbookExecutor(options) {
             return __awaiter(this, void 0, void 0, function () {
                 var name, title, priority, prompt, chatThread, completionResult, result, resultString, expectError, scriptExecutionErrors, maxAttempts, jokers, attempt, isJokerAttempt, joker, _a, _b, _c, _d, scriptTools, error_2, e_2_1, _e, _f, functionName, postprocessingError, _g, _h, scriptTools, error_3, e_3_1, e_4_1, error_4;
                 var e_2, _j, e_4, _k, e_3, _l, _m;
+                var _this = this;
                 return __generator(this, function (_o) {
                     switch (_o.label) {
                         case 0:
@@ -2055,6 +2056,67 @@ function createPromptbookExecutor(options) {
                                 content: replaceParameters(currentTemplate.content, parametersToPass) /* <- [2] */,
                                 modelRequirements: currentTemplate.modelRequirements,
                                 expectations: currentTemplate.expectations,
+                                postprocessing: (currentTemplate.postprocessing || []).map(function (functionName) { return function (result) { return __awaiter(_this, void 0, void 0, function () {
+                                    var errors, _a, _b, scriptTools, error_5, e_5_1;
+                                    var e_5, _c;
+                                    return __generator(this, function (_d) {
+                                        switch (_d.label) {
+                                            case 0:
+                                                errors = [];
+                                                _d.label = 1;
+                                            case 1:
+                                                _d.trys.push([1, 8, 9, 10]);
+                                                _a = __values(tools.script), _b = _a.next();
+                                                _d.label = 2;
+                                            case 2:
+                                                if (!!_b.done) return [3 /*break*/, 7];
+                                                scriptTools = _b.value;
+                                                _d.label = 3;
+                                            case 3:
+                                                _d.trys.push([3, 5, , 6]);
+                                                return [4 /*yield*/, scriptTools.execute({
+                                                        scriptLanguage: "javascript" /* <- TODO: Try it in each languages; In future allow postprocessing with arbitrary combination of languages to combine */,
+                                                        script: "".concat(functionName, "(result)"),
+                                                        parameters: {
+                                                            result: result || '',
+                                                            // Note: No ...parametersToPass, because working with result only
+                                                        },
+                                                    })];
+                                            case 4: return [2 /*return*/, _d.sent()];
+                                            case 5:
+                                                error_5 = _d.sent();
+                                                if (!(error_5 instanceof Error)) {
+                                                    throw error_5;
+                                                }
+                                                errors.push(error_5);
+                                                return [3 /*break*/, 6];
+                                            case 6:
+                                                _b = _a.next();
+                                                return [3 /*break*/, 2];
+                                            case 7: return [3 /*break*/, 10];
+                                            case 8:
+                                                e_5_1 = _d.sent();
+                                                e_5 = { error: e_5_1 };
+                                                return [3 /*break*/, 10];
+                                            case 9:
+                                                try {
+                                                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                                }
+                                                finally { if (e_5) throw e_5.error; }
+                                                return [7 /*endfinally*/];
+                                            case 10:
+                                                if (errors.length === 0) {
+                                                    throw new PromptbookExecutionError('Postprocessing in NaturalExecutionTools failed because no ScriptExecutionTools were provided');
+                                                }
+                                                else if (errors.length === 1) {
+                                                    throw errors[0];
+                                                }
+                                                else {
+                                                    throw new PromptbookExecutionError(spaceTrim(function (block) { return "\n                                                        Postprocessing in NaturalExecutionTools failed ".concat(errors.length, "x\n\n                                                        ").concat(block(errors.map(function (error) { return '- ' + error.message; }).join('\n\n')), "\n                                                      "); }));
+                                                }
+                                        }
+                                    });
+                                }); }; }),
                             };
                             _b = currentTemplate.modelRequirements.modelVariant;
                             switch (_b) {
@@ -2127,7 +2189,7 @@ function createPromptbookExecutor(options) {
                             finally { if (e_2) throw e_2.error; }
                             return [7 /*endfinally*/];
                         case 23:
-                            if (resultString) {
+                            if (resultString !== null) {
                                 return [3 /*break*/, 27];
                             }
                             if (scriptExecutionErrors.length === 1) {
@@ -2180,7 +2242,10 @@ function createPromptbookExecutor(options) {
                             return [4 /*yield*/, scriptTools.execute({
                                     scriptLanguage: "javascript" /* <- TODO: Try it in each languages; In future allow postprocessing with arbitrary combination of languages to combine */,
                                     script: "".concat(functionName, "(resultString)"),
-                                    parameters: __assign(__assign({}, parametersToPass), { resultString: resultString || '' }),
+                                    parameters: {
+                                        resultString: resultString || '',
+                                        // Note: No ...parametersToPass, because working with result only
+                                    },
                                 })];
                         case 33:
                             resultString = _o.sent();
@@ -2271,7 +2336,7 @@ function createPromptbookExecutor(options) {
                             return [7 /*endfinally*/];
                         case 47:
                             if (expectError !== null && attempt === maxAttempts - 1) {
-                                throw new PromptbookExecutionError(spaceTrim(function (block) { return "\n                              Natural execution failed ".concat(maxExecutionAttempts, "x\n\n                              Last error ").concat((expectError === null || expectError === void 0 ? void 0 : expectError.name) || '', ":\n                              ").concat(block((expectError === null || expectError === void 0 ? void 0 : expectError.message) || ''), "\n\n                              Last result:\n                              ").concat(resultString, "\n                          "); }));
+                                throw new PromptbookExecutionError(spaceTrim(function (block) { return "\n                              Natural execution failed ".concat(maxExecutionAttempts, "x\n\n                              ---\n                              Last error ").concat((expectError === null || expectError === void 0 ? void 0 : expectError.name) || '', ":\n                              ").concat(block((expectError === null || expectError === void 0 ? void 0 : expectError.message) || ''), "\n\n                              Last result:\n                              ").concat(resultString, "\n                              ---\n                          "); }));
                             }
                             _o.label = 48;
                         case 48:
@@ -2503,29 +2568,73 @@ var MockedEchoNaturalExecutionTools = /** @class */ (function () {
 /**
  * Gets the expectations and creates a fake text that meets the expectations
  *
+ * Note: You can provide postprocessing functions to modify the text before checking the expectations
+ *       The result will be the text BEFORE the postprocessing
+ *
  * @private internal util for MockedFackedNaturalExecutionTools
  */
-function $fakeTextToExpectations(expectations) {
-    var lorem = new LoremIpsum({
-        wordsPerSentence: { min: 5, max: 15 },
-        sentencesPerParagraph: { min: 5, max: 15 },
+function $fakeTextToExpectations(expectations, postprocessing) {
+    return __awaiter(this, void 0, void 0, function () {
+        var lorem, loremText, text, loopLimit, textToCheck, _a, _b, func, e_1_1;
+        var e_1, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    lorem = new LoremIpsum({
+                        wordsPerSentence: { min: 5, max: 15 },
+                        sentencesPerParagraph: { min: 5, max: 15 },
+                    });
+                    loremText = '';
+                    text = '';
+                    loopLimit = CHARACTER_LOOP_LIMIT;
+                    _d.label = 1;
+                case 1:
+                    if (!(loopLimit-- > 0)) return [3 /*break*/, 11];
+                    textToCheck = text;
+                    _d.label = 2;
+                case 2:
+                    _d.trys.push([2, 7, 8, 9]);
+                    _a = (e_1 = void 0, __values(postprocessing || [])), _b = _a.next();
+                    _d.label = 3;
+                case 3:
+                    if (!!_b.done) return [3 /*break*/, 6];
+                    func = _b.value;
+                    return [4 /*yield*/, func(textToCheck)];
+                case 4:
+                    textToCheck = _d.sent();
+                    _d.label = 5;
+                case 5:
+                    _b = _a.next();
+                    return [3 /*break*/, 3];
+                case 6: return [3 /*break*/, 9];
+                case 7:
+                    e_1_1 = _d.sent();
+                    e_1 = { error: e_1_1 };
+                    return [3 /*break*/, 9];
+                case 8:
+                    try {
+                        if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                    return [7 /*endfinally*/];
+                case 9:
+                    if (isPassingExpectations(expectations, textToCheck)) {
+                        return [2 /*return*/, text]; // <- Note: Returning the text because the postprocessing
+                    }
+                    if (loremText === '') {
+                        loremText = lorem.generateParagraphs(1) + '\n\n';
+                    }
+                    text += loremText.substring(0, 1);
+                    loremText = loremText.substring(1);
+                    _d.label = 10;
+                case 10: return [3 /*break*/, 1];
+                case 11: throw new Error(spaceTrim(function (block) { return "\n                Can not generate fake text to met the expectations\n\n                Loop limit reached\n                The expectations:\n                ".concat(block(JSON.stringify(expectations, null, 4)), "\n\n                The draft text:\n                ").concat(block(text), "\n\n            "); }));
+            }
+        });
     });
-    var loremText = '';
-    var text = '';
-    for (var loopLimit = CHARACTER_LOOP_LIMIT; loopLimit-- > 0;) {
-        if (isPassingExpectations(expectations, text)) {
-            return text;
-        }
-        if (loremText === '') {
-            loremText = lorem.generateParagraphs(1) + '\n\n';
-        }
-        text += loremText.substring(0, 1);
-        loremText = loremText.substring(1);
-    }
-    throw new Error(spaceTrim(function (block) { return "\n                Can not generate fake text to met the expectations\n\n                Loop limit reached\n                The expectations:\n                ".concat(block(JSON.stringify(expectations, null, 4)), "\n\n                The draft text:\n                ").concat(block(text), "\n\n            "); }));
 }
 /**
- * TODO: Implement better
+ * TODO: Implement better - create FakeLLM from this
  * TODO: [💝] Unite object for expecting amount and format - use here also a format
  */
 
@@ -2541,29 +2650,40 @@ var MockedFackedNaturalExecutionTools = /** @class */ (function () {
      */
     MockedFackedNaturalExecutionTools.prototype.gptChat = function (prompt) {
         return __awaiter(this, void 0, void 0, function () {
+            var content, result;
             return __generator(this, function (_a) {
-                if (this.options.isVerbose) {
-                    console.info('💬 Mocked faked call');
+                switch (_a.label) {
+                    case 0:
+                        if (this.options.isVerbose) {
+                            console.info('💬 Mocked faked prompt', prompt);
+                        }
+                        return [4 /*yield*/, $fakeTextToExpectations(prompt.expectations || {
+                                sentences: { min: 1, max: 1 },
+                            }, prompt.postprocessing)];
+                    case 1:
+                        content = _a.sent();
+                        result = {
+                            content: content,
+                            model: 'mocked-facked',
+                            timing: {
+                                start: getCurrentIsoDate(),
+                                complete: getCurrentIsoDate(),
+                            },
+                            usage: {
+                                price: 0,
+                                inputTokens: 0,
+                                outputTokens: 0,
+                            },
+                            rawResponse: {
+                                note: 'This is mocked echo',
+                            },
+                            // <- [🤹‍♂️]
+                        };
+                        if (this.options.isVerbose) {
+                            console.info('💬 Mocked faked result', result);
+                        }
+                        return [2 /*return*/, result];
                 }
-                return [2 /*return*/, {
-                        content: $fakeTextToExpectations(prompt.expectations || {
-                            sentences: { min: 1, max: 1 },
-                        }),
-                        model: 'mocked-facked',
-                        timing: {
-                            start: getCurrentIsoDate(),
-                            complete: getCurrentIsoDate(),
-                        },
-                        usage: {
-                            price: 0,
-                            inputTokens: 0,
-                            outputTokens: 0,
-                        },
-                        rawResponse: {
-                            note: 'This is mocked echo',
-                        },
-                        // <- [🤹‍♂️]
-                    }];
             });
         });
     };