@promptbook/cli 0.92.0-20 → 0.92.0-22

package/esm/index.es.js

@@ -47,7 +47,7 @@ const BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.92.0-20';
+const PROMPTBOOK_ENGINE_VERSION = '0.92.0-22';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -346,6 +346,14 @@ const DEFAULT_IS_AUTO_INSTALLED = false;
  * @public exported from `@promptbook/core`
  */
 const DEFAULT_GET_PIPELINE_COLLECTION_FUNCTION_NAME = `getPipelineCollection`;
+/**
+ * Default rate limits (requests per minute)
+ *
+ * Note: Adjust based on the provider tier you are have
+ *
+ * @public exported from `@promptbook/core`
+ */
+const DEFAULT_RPM$1 = 60;
 /**
  * @@@
  *
@@ -1034,15 +1042,12 @@ function jsonParse(value) {
         }
         throw new Error(spaceTrim((block) => `
                     ${block(error.message)}
-            
+
                     The JSON text:
                     ${block(value)}
                 `));
     }
 }
-/**
- * TODO: !!!! Use in Promptbook.studio
- */
 
 /**
  * Convert identification to Promptbook token
@@ -5460,7 +5465,8 @@ const CsvFormatParser = {
     subvalueParsers: [
         {
             subvalueName: 'ROW',
-            async mapValues(value, outputParameterName, settings, mapCallback) {
+            async mapValues(options) {
+                const { value, outputParameterName, settings, mapCallback, onProgress } = options;
                 const csv = csvParse(value, settings);
                 if (csv.errors.length !== 0) {
                     throw new CsvFormatError(spaceTrim((block) => `
@@ -5476,21 +5482,29 @@ const CsvFormatParser = {
                                 ${block(value)}
                             `));
                 }
-                const mappedData = await Promise.all(csv.data.map(async (row, index) => {
+                const mappedData = [];
+                for (let index = 0; index < csv.data.length; index++) {
+                    const row = csv.data[index];
                     if (row[outputParameterName]) {
                         throw new CsvFormatError(`Can not overwrite existing column "${outputParameterName}" in CSV row`);
                     }
-                    return {
+                    const mappedRow = {
                         ...row,
                         [outputParameterName]: await mapCallback(row, index),
                     };
-                }));
+                    mappedData.push(mappedRow);
+                    if (onProgress) {
+                        // Note: Report the CSV with all rows mapped so far
+                        await onProgress(unparse(mappedData, { ...settings, ...MANDATORY_CSV_SETTINGS }));
+                    }
+                }
                 return unparse(mappedData, { ...settings, ...MANDATORY_CSV_SETTINGS });
             },
         },
         {
             subvalueName: 'CELL',
-            async mapValues(value, outputParameterName, settings, mapCallback) {
+            async mapValues(options) {
+                const { value, settings, mapCallback, onProgress } = options;
                 const csv = csvParse(value, settings);
                 if (csv.errors.length !== 0) {
                     throw new CsvFormatError(spaceTrim((block) => `
@@ -5577,7 +5591,8 @@ const TextFormatParser = {
     subvalueParsers: [
         {
             subvalueName: 'LINE',
-            async mapValues(value, outputParameterName, settings, mapCallback) {
+            async mapValues(options) {
+                const { value, mapCallback, onProgress } = options;
                 const lines = value.split('\n');
                 const mappedLines = await Promise.all(lines.map((lineContent, lineNumber) => 
                 // TODO: [🧠] Maybe option to skip empty line
@@ -6417,7 +6432,7 @@ async function executeAttempts(options) {
  * @private internal utility of `createPipelineExecutor`
  */
 async function executeFormatSubvalues(options) {
-    const { task, jokerParameterNames, parameters, priority, csvSettings, pipelineIdentification } = options;
+    const { task, jokerParameterNames, parameters, priority, csvSettings, onProgress, pipelineIdentification } = options;
     if (task.foreach === undefined) {
         return /* not await */ executeAttempts(options);
     }
@@ -6471,21 +6486,32 @@ async function executeFormatSubvalues(options) {
         formatSettings = csvSettings;
         // <- TODO: [🤹‍♂️] More universal, make simmilar pattern for other formats for example \n vs \r\n in text
     }
-    const resultString = await subvalueParser.mapValues(parameterValue, task.foreach.outputSubparameterName, formatSettings, async (subparameters, index) => {
-        let mappedParameters;
-        // TODO: [🤹‍♂️][🪂] Limit to N concurrent executions
-        // TODO: When done [🐚] Report progress also for each subvalue here
-        try {
-            mappedParameters = mapAvailableToExpectedParameters({
-                expectedParameters: Object.fromEntries(task.foreach.inputSubparameterNames.map((subparameterName) => [subparameterName, null])),
-                availableParameters: subparameters,
-            });
-        }
-        catch (error) {
-            if (!(error instanceof PipelineExecutionError)) {
-                throw error;
+    const resultString = await subvalueParser.mapValues({
+        value: parameterValue,
+        outputParameterName: task.foreach.outputSubparameterName,
+        settings: formatSettings,
+        onProgress(partialResultString) {
+            return onProgress(Object.freeze({
+                [task.resultingParameterName]: 
+                // <- Note: [👩‍👩‍👧] No need to detect parameter collision here because pipeline checks logic consistency during construction
+                partialResultString,
+            }));
+        },
+        async mapCallback(subparameters, index) {
+            let mappedParameters;
+            // TODO: [🤹‍♂️][🪂] Limit to N concurrent executions
+            // TODO: When done [🐚] Report progress also for each subvalue here
+            try {
+                mappedParameters = mapAvailableToExpectedParameters({
+                    expectedParameters: Object.fromEntries(task.foreach.inputSubparameterNames.map((subparameterName) => [subparameterName, null])),
+                    availableParameters: subparameters,
+                });
             }
-            throw new PipelineExecutionError(spaceTrim((block) => `
+            catch (error) {
+                if (!(error instanceof PipelineExecutionError)) {
+                    throw error;
+                }
+                throw new PipelineExecutionError(spaceTrim((block) => `
                         ${error.message}
 
                         This is error in FOREACH command
@@ -6494,23 +6520,24 @@ async function executeFormatSubvalues(options) {
                         ${block(pipelineIdentification)}
                         Subparameter index: ${index}
                     `));
-        }
-        const allSubparameters = {
-            ...parameters,
-            ...mappedParameters,
-        };
-        // Note: [👨‍👨‍👧] Now we can freeze `subparameters` because we are sure that all and only used parameters are defined and are not going to be changed
-        Object.freeze(allSubparameters);
-        const subresultString = await executeAttempts({
-            ...options,
-            priority: priority + index,
-            parameters: allSubparameters,
-            pipelineIdentification: spaceTrim((block) => `
+            }
+            const allSubparameters = {
+                ...parameters,
+                ...mappedParameters,
+            };
+            // Note: [👨‍👨‍👧] Now we can freeze `subparameters` because we are sure that all and only used parameters are defined and are not going to be changed
+            Object.freeze(allSubparameters);
+            const subresultString = await executeAttempts({
+                ...options,
+                priority: priority + index,
+                parameters: allSubparameters,
+                pipelineIdentification: spaceTrim((block) => `
                         ${block(pipelineIdentification)}
                         Subparameter index: ${index}
                     `),
-        });
-        return subresultString;
+            });
+            return subresultString;
+        },
     });
     return resultString;
 }
@@ -6684,11 +6711,6 @@ async function getReservedParametersForTask(options) {
 async function executeTask(options) {
     const { currentTask, preparedPipeline, parametersToPass, tools, onProgress, $executionReport, pipelineIdentification, maxExecutionAttempts, maxParallelCount, csvSettings, isVerbose, rootDirname, cacheDirname, intermediateFilesStrategy, isAutoInstalled, isNotPreparedWarningSupressed, } = options;
     const priority = preparedPipeline.tasks.length - preparedPipeline.tasks.indexOf(currentTask);
-    await onProgress({
-        outputParameters: {
-            [currentTask.resultingParameterName]: '', // <- TODO: [🧠] What is the best value here?
-        },
-    });
     // Note: Check consistency of used and dependent parameters which was also done in `validatePipeline`, but it’s good to doublecheck
     const usedParameterNames = extractParameterNamesFromTask(currentTask);
     const dependentParameterNames = new Set(currentTask.dependentParameterNames);
@@ -6763,6 +6785,7 @@ async function executeTask(options) {
         preparedPipeline,
         tools,
         $executionReport,
+        onProgress,
         pipelineIdentification,
         maxExecutionAttempts,
         maxParallelCount,
@@ -8892,6 +8915,43 @@ const ChatbotFormfactorDefinition = {
     },
 };
 
+/**
+ * Completion is formfactor that emulates completion models
+ *
+ * @public exported from `@promptbook/core`
+ */
+const CompletionFormfactorDefinition = {
+    name: 'COMPLETION',
+    description: `@@@`,
+    documentationUrl: `https://github.com/webgptorg/promptbook/discussions/@@`,
+    //                                                                     <- TODO: https://github.com/webgptorg/promptbook/discussions/new?category=concepts
+    //                                                                              "🔠 Completion Formfactor"
+    pipelineInterface: {
+        inputParameters: [
+            {
+                name: 'inputText',
+                description: `Input text to be completed`,
+                isInput: true,
+                isOutput: false,
+            },
+            {
+                name: 'instructions',
+                description: `Additional instructions for the model, for example the required length, empty by default`,
+                isInput: true,
+                isOutput: false,
+            },
+        ],
+        outputParameters: [
+            {
+                name: 'followingText',
+                description: `Text that follows the input text`,
+                isInput: false,
+                isOutput: true,
+            },
+        ],
+    },
+};
+
 /**
  * Generator is form of app that @@@
  *
@@ -9076,6 +9136,8 @@ const FORMFACTOR_DEFINITIONS = [
     MatcherFormfactorDefinition,
     GeneratorFormfactorDefinition,
     ImageGeneratorFormfactorDefinition,
+    CompletionFormfactorDefinition,
+    // <- [🛬] When making new formfactor, copy the _boilerplate and link it here
 ];
 /**
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -15818,7 +15880,7 @@ const OPENAI_MODELS = exportJson({
  */
 
 // Default rate limits (requests per minute) - adjust as needed based on Azure OpenAI tier
-const DEFAULT_RPM$1 = 60;
+const DEFAULT_RPM = 60;
 // <- TODO: !!! Put in some better place
 /**
  * Execution Tools for calling Azure OpenAI API.
@@ -15839,7 +15901,7 @@ class AzureOpenAiExecutionTools {
         this.client = null;
         // TODO: Allow configuring rate limits via options
         this.limiter = new Bottleneck({
-            minTime: 60000 / (this.options.maxRequestsPerMinute || DEFAULT_RPM$1),
+            minTime: 60000 / (this.options.maxRequestsPerMinute || DEFAULT_RPM),
         });
     }
     get title() {
@@ -16755,6 +16817,7 @@ const _OpenAiMetadataRegistration = $llmToolsMetadataRegister.register({
             className: 'OpenAiExecutionTools',
             options: {
                 apiKey: 'sk-',
+                maxRequestsPerMinute: DEFAULT_RPM$1,
             },
         };
     },
@@ -16868,9 +16931,6 @@ resultContent, rawResponse) {
  * TODO: [🤝] DRY Maybe some common abstraction between `computeOpenAiUsage` and `computeAnthropicClaudeUsage`
  */
 
-// Default rate limits (requests per minute) - adjust as needed based on OpenAI tier
-const DEFAULT_RPM = 60;
-// <- TODO: !!! Put in some better place
 /**
  * Execution Tools for calling OpenAI API
  *
@@ -16890,7 +16950,7 @@ class OpenAiExecutionTools {
         this.client = null;
         // TODO: Allow configuring rate limits via options
         this.limiter = new Bottleneck({
-            minTime: 60000 / (this.options.maxRequestsPerMinute || DEFAULT_RPM),
+            minTime: 60000 / (this.options.maxRequestsPerMinute || DEFAULT_RPM$1),
         });
     }
     get title() {
@@ -17240,6 +17300,7 @@ class OpenAiAssistantExecutionTools extends OpenAiExecutionTools {
     constructor(options) {
         super(options);
         this.assistantId = options.assistantId;
+        // TODO: !!!! Make limiter same as in OpenAiExecutionTools
     }
     get title() {
         return 'OpenAI Assistant';