@promptbook/cli 0.59.0-27 → 0.59.0-29

package/esm/index.es.js

@@ -143,7 +143,7 @@ new Function("\n    try {\n        if (typeof WorkerGlobalScope !== 'undefined'
 /**
  * The version of the Promptbook library
  */
-var PROMPTBOOK_VERSION = '0.59.0-26';
+var PROMPTBOOK_VERSION = '0.59.0-28';
 
 /**
  * Initializes testing `hello` command for Promptbook CLI utilities
@@ -437,7 +437,7 @@ function validatePromptbook(promptbook) {
  *     >  ex port function validatePromptbook(promptbook: unknown): asserts promptbook is PromptbookJson {
  */
 
-var promptbookLibrary = [{title:"Prepare Knowledge from Markdown",promptbookUrl:"https://promptbook.studio/promptbook/prepare-knowledge-from-markdown.ptbk.md",promptbookVersion:"0.59.0-26",parameters:[{name:"content",description:"Markdown document content",isInput:true,isOutput:false},{name:"knowledge",description:"The knowledge JSON object",isInput:false,isOutput:true}],promptTemplates:[{name:"knowledge",title:"Knowledge",dependentParameterNames:["content"],executionType:"PROMPT_TEMPLATE",modelRequirements:{modelVariant:"CHAT",modelName:"claude-3-opus-20240229"},content:"You are experienced data researcher, extract the important knowledge from the document.\n\n# Rules\n\n-   Make pieces of information concise, clear, and easy to understand\n-   One piece of information should be approximately 1 paragraph\n-   Divide the paragraphs by markdown horizontal lines ---\n-   Omit irrelevant information\n-   Group redundant information\n-   Write just extracted information, nothing else\n\n# The document\n\nTake information from this document:\n\n> {content}",resultingParameterName:"knowledge"}],knowledge:[]}];
+var promptbookLibrary = [{title:"Prepare Knowledge from Markdown",promptbookUrl:"https://promptbook.studio/promptbook/prepare-knowledge-from-markdown.ptbk.md",promptbookVersion:"0.59.0-28",parameters:[{name:"content",description:"Markdown document content",isInput:true,isOutput:false},{name:"knowledge",description:"The knowledge JSON object",isInput:false,isOutput:true}],promptTemplates:[{name:"knowledge",title:"Knowledge",dependentParameterNames:["content"],executionType:"PROMPT_TEMPLATE",modelRequirements:{modelVariant:"CHAT",modelName:"claude-3-opus-20240229"},content:"You are experienced data researcher, extract the important knowledge from the document.\n\n# Rules\n\n-   Make pieces of information concise, clear, and easy to understand\n-   One piece of information should be approximately 1 paragraph\n-   Divide the paragraphs by markdown horizontal lines ---\n-   Omit irrelevant information\n-   Group redundant information\n-   Write just extracted information, nothing else\n\n# The document\n\nTake information from this document:\n\n> {content}",resultingParameterName:"knowledge"}],knowledge:[]}];
 
 /**
  * This error indicates errors during the execution of the promptbook
@@ -2003,7 +2003,9 @@ function prepareKnowledgeFromMarkdown(options) {
                 case 0:
                     content = options.content, llmTools = options.llmTools, _a = options.isVerbose, isVerbose = _a === void 0 ? false : _a;
                     library = createLibraryFromJson.apply(void 0, __spreadArray([], __read(promptbookLibrary), false));
-                    promptbook = library.getPromptbookByUrl('https://promptbook.studio/promptbook/prepare-knowledge-from-markdown.ptbk.md');
+                    return [4 /*yield*/, library.getPromptbookByUrl('https://promptbook.studio/promptbook/prepare-knowledge-from-markdown.ptbk.md')];
+                case 1:
+                    promptbook = _b.sent();
                     executor = createPromptbookExecutor({
                         promptbook: promptbook,
                         tools: {
@@ -2014,7 +2016,7 @@ function prepareKnowledgeFromMarkdown(options) {
                         },
                     });
                     return [4 /*yield*/, executor({ content: content })];
-                case 1:
+                case 2:
                     result = _b.sent();
                     assertsExecutionSuccessful(result);
                     outputParameters = result.outputParameters;
@@ -2053,7 +2055,7 @@ function prepareKnowledgeFromMarkdown(options) {
                                     }];
                             });
                         }); }))];
-                case 2:
+                case 3:
                     knowledge = _b.sent();
                     return [2 /*return*/, knowledge];
             }
@@ -3134,7 +3136,7 @@ function promptbookStringToJson(promptbookString, options) {
                         if (templateModelRequirements.modelVariant === undefined) {
                             templateModelRequirements.modelVariant = 'CHAT';
                         }
-                        promptbookJson.promptTemplates.push({
+                        var template = {
                             name: titleToName(section.title),
                             title: section.title,
                             description: description_1,
@@ -3148,7 +3150,12 @@ function promptbookStringToJson(promptbookString, options) {
                             contentLanguage: executionType === 'SCRIPT' ? language : undefined,
                             content: content,
                             resultingParameterName: resultingParameterName,
-                        });
+                        };
+                        if (executionType !== 'PROMPT_TEMPLATE') {
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            delete template.modelRequirements;
+                        }
+                        promptbookJson.promptTemplates.push(template);
                     };
                     try {
                         for (_a = __values(markdownStructure.sections), _b = _a.next(); !_b.done; _b = _a.next()) {
@@ -3312,14 +3319,11 @@ function createLibraryFromDirectory(path, options) {
                             switch (_b.label) {
                                 case 0:
                                     if (isVerbose) {
-                                        console.info("Creating promptbook library from path ".concat(path));
+                                        console.info("Creating promptbook library from path ".concat(path.split('\\').join('/')));
                                     }
                                     return [4 /*yield*/, listAllFiles(path, isRecursive)];
                                 case 1:
                                     fileNames = _b.sent();
-                                    if (isVerbose) {
-                                        console.info('createLibraryFromDirectory', { path: path, isRecursive: isRecursive, fileNames: fileNames });
-                                    }
                                     promptbooks = [];
                                     _loop_1 = function (fileName) {
                                         var promptbook, promptbookString, _c, _d, error_1, wrappedErrorMessage;
@@ -3339,7 +3343,7 @@ function createLibraryFromDirectory(path, options) {
                                                 case 3:
                                                     if (!fileName.endsWith('.ptbk.json')) return [3 /*break*/, 5];
                                                     if (isVerbose) {
-                                                        console.info("Loading ".concat(fileName));
+                                                        console.info("Loading ".concat(fileName.split('\\').join('/')));
                                                     }
                                                     _d = (_c = JSON).parse;
                                                     return [4 /*yield*/, readFile(fileName, 'utf8')];
@@ -3349,7 +3353,7 @@ function createLibraryFromDirectory(path, options) {
                                                     return [3 /*break*/, 6];
                                                 case 5:
                                                     if (isVerbose) {
-                                                        console.info("Skipping file ".concat(fileName));
+                                                        console.info("Skipping file ".concat(fileName.split('\\').join('/')));
                                                     }
                                                     _e.label = 6;
                                                 case 6:
@@ -3357,12 +3361,12 @@ function createLibraryFromDirectory(path, options) {
                                                     if (promptbook !== null) {
                                                         if (!promptbook.promptbookUrl) {
                                                             if (isVerbose) {
-                                                                console.info("Not loading ".concat(fileName, " - missing URL"));
+                                                                console.info("Not loading ".concat(fileName.split('\\').join('/'), " - missing URL"));
                                                             }
                                                         }
                                                         else {
                                                             if (isVerbose) {
-                                                                console.info("Loading ".concat(fileName));
+                                                                console.info("Loading ".concat(fileName.split('\\').join('/')));
                                                             }
                                                             if (!isCrashOnError) {
                                                                 // Note: Validate promptbook to check if it is logically correct to not crash on invalid promptbooks
@@ -3528,9 +3532,10 @@ function initializeMake(program) {
     helloCommand.option('-f, --format <format>', spaceTrim("\n            Output format of builded library \"javascript\", \"typescript\" or \"json\"\n\n            Note: You can use multiple formats separated by comma\n        "), 'javascript' /* <- Note: [🏳‍🌈] */);
     helloCommand.option('--no-validation', "Do not validate logic of promptbooks in library", true);
     helloCommand.option('--validation', "Types of validations separated by comma (options \"logic\",\"imports\")", 'logic,imports');
+    helloCommand.option('--verbose', "Is verbose", false);
     // TODO: !!! Auto-detect AI api keys + explicit api keys as argv
     helloCommand.action(function (path, _a) {
-        var projectName = _a.projectName, format = _a.format, validation = _a.validation;
+        var projectName = _a.projectName, format = _a.format, validation = _a.validation, verbose = _a.verbose;
         return __awaiter(_this, void 0, void 0, function () {
             var formats, validations, library, validations_1, validations_1_1, validation_1, _b, _c, promptbookUrl, promptbook, e_1_1, e_2_1, libraryJson, libraryJsonString, saveFile;
             var e_2, _d, e_1, _e;
@@ -3538,7 +3543,7 @@ function initializeMake(program) {
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
-                        console.info('!!!', { projectName: projectName, path: path, format: format, validation: validation });
+                        console.info('!!!', { projectName: projectName, path: path, format: format, validation: validation, verbose: verbose });
                         formats = (format || '')
                             .split(',')
                             .map(function (_) { return _.trim(); })
@@ -3548,7 +3553,7 @@ function initializeMake(program) {
                             .map(function (_) { return _.trim(); })
                             .filter(function (_) { return _ !== ''; });
                         return [4 /*yield*/, createLibraryFromDirectory(path, {
-                                isVerbose: true,
+                                isVerbose: verbose,
                                 isRecursive: true,
                             })];
                     case 1:
@@ -3577,6 +3582,9 @@ function initializeMake(program) {
                         promptbook = _f.sent();
                         if (validation_1 === 'logic') {
                             validatePromptbook(promptbook);
+                            if (verbose) {
+                                console.info(colors.cyan("Validated logic of ".concat(promptbook.promptbookUrl)));
+                            }
                         }
                         _f.label = 8;
                     case 8:
@@ -3620,7 +3628,8 @@ function initializeMake(program) {
                                         return [4 /*yield*/, writeFile(filePath, content, 'utf-8')];
                                     case 1:
                                         _a.sent();
-                                        console.info(colors.green("Maked ".concat(filePath)));
+                                        // Note: Log despite of verbose mode
+                                        console.info(colors.green("Maked ".concat(filePath.split('\\').join('/'))));
                                         return [2 /*return*/];
                                 }
                             });
@@ -3631,19 +3640,18 @@ function initializeMake(program) {
                         _f.sent();
                         _f.label = 19;
                     case 19:
-                        if (formats.includes('javascript')) {
-                            // TODO: !!!!;
-                            // TODO: !!! DRY javascript and typescript
-                            formats.push('javascript');
-                        }
-                        if (!formats.includes('typescript')) return [3 /*break*/, 21];
-                        // TODO: !!!!!!!! Javascript json
-                        return [4 /*yield*/, saveFile('ts', spaceTrim("\n                        import { createLibraryFromJson } from '@promptbook/core';\n                        import type { PromptbookLibrary, SimplePromptbookLibrary } from '@promptbook/types';\n\n                        /**\n                         * Promptbook library for ".concat(projectName, "\n                         *\n                         * @private internal cache for `getPromptbookLibrary`\n                         */\n                        let promptbookLibrary: null | SimplePromptbookLibrary = null;\n\n\n                        /**\n                         *  Get promptbook library for ").concat(projectName, "\n                         *\n                         *  @returns {PromptbookLibrary} Library of promptbooks for ").concat(projectName, "\n                         *  @generated by `@promptbook/cli`\n                         */\n                        export function getPromptbookLibrary(): PromptbookLibrary{\n                            if(promptbookLibrary===null){\n                                promptbookLibrary = createLibraryFromJson(").concat(libraryJsonString.substring(1, libraryJsonString.length - 1), ");\n                            }\n\n                            return promptbookLibrary;\n                        }\n                    ") + '\n'))];
+                        if (!formats.includes('javascript')) return [3 /*break*/, 21];
+                        return [4 /*yield*/, saveFile('js', spaceTrim("\n                        import { createLibraryFromJson } from '@promptbook/core';\n\n                        /**\n                         * Promptbook library for ".concat(projectName, "\n                         *\n                         * @private internal cache for `getPromptbookLibrary`\n                         */\n                        let promptbookLibrary = null;\n\n\n                        /**\n                         *  Get promptbook library for ").concat(projectName, "\n                         *\n                         *  @returns {PromptbookLibrary} Library of promptbooks for ").concat(projectName, "\n                         *  @generated by `@promptbook/cli`\n                         */\n                        export function getPromptbookLibrary(){\n                            if(promptbookLibrary===null){\n                                promptbookLibrary = createLibraryFromJson(").concat(libraryJsonString.substring(1, libraryJsonString.length - 1), ");\n                            }\n\n                            return promptbookLibrary;\n                        }\n                    ") + '\n'))];
                     case 20:
-                        // TODO: !!!!!!!! Javascript json
                         _f.sent();
                         _f.label = 21;
                     case 21:
+                        if (!formats.includes('typescript')) return [3 /*break*/, 23];
+                        return [4 /*yield*/, saveFile('ts', spaceTrim("\n                        import { createLibraryFromJson } from '@promptbook/core';\n                        import type { PromptbookLibrary } from '@promptbook/types';\n\n                        /**\n                         * Promptbook library for ".concat(projectName, "\n                         *\n                         * @private internal cache for `getPromptbookLibrary`\n                         */\n                        let promptbookLibrary: null | PromptbookLibrary = null;\n\n\n                        /**\n                         *  Get promptbook library for ").concat(projectName, "\n                         *\n                         *  @returns {PromptbookLibrary} Library of promptbooks for ").concat(projectName, "\n                         *  @generated by `@promptbook/cli`\n                         */\n                        export function getPromptbookLibrary(): PromptbookLibrary{\n                            if(promptbookLibrary===null){\n                                promptbookLibrary = createLibraryFromJson(").concat(libraryJsonString.substring(1, libraryJsonString.length - 1), ");\n                            }\n\n                            return promptbookLibrary;\n                        }\n                    ") + '\n'))];
+                    case 22:
+                        _f.sent();
+                        _f.label = 23;
+                    case 23:
                         process.exit(0);
                         return [2 /*return*/];
                 }