@promptbook/markdown-utils 0.92.0-32 → 0.92.0-34

package/esm/index.es.js

@@ -25,7 +25,7 @@ const BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.92.0-32';
+const PROMPTBOOK_ENGINE_VERSION = '0.92.0-34';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -2200,6 +2200,7 @@ function assertsTaskSuccessful(executionResult) {
  */
 function createTask(options) {
     const { taskType, taskProcessCallback } = options;
+    let { title } = options;
     // TODO: [🐙] DRY
     const taskId = `${taskType.toLowerCase().substring(0, 4)}-${$randomToken(8 /* <- TODO: To global config + Use Base58 to avoid simmilar char conflicts   */)}`;
     let status = 'RUNNING';
@@ -2211,6 +2212,10 @@ function createTask(options) {
     const partialResultSubject = new Subject();
     // <- Note: Not using `BehaviorSubject` because on error we can't access the last value
     const finalResultPromise = /* not await */ taskProcessCallback((newOngoingResult) => {
+        if (newOngoingResult.title) {
+            title = newOngoingResult.title;
+        }
+        updatedAt = new Date();
         Object.assign(currentValue, newOngoingResult);
         // <- TODO: assign deep
         partialResultSubject.next(newOngoingResult);
@@ -2256,17 +2261,24 @@ function createTask(options) {
     return {
         taskType,
         taskId,
+        get promptbookVersion() {
+            return PROMPTBOOK_ENGINE_VERSION;
+        },
+        get title() {
+            return title;
+            // <- Note: [1] Theese must be getters to allow changing the value in the future
+        },
         get status() {
             return status;
-            // <- Note: [1] Theese must be getters to allow changing the value in the future
+            // <- Note: [1] --||--
         },
         get createdAt() {
             return createdAt;
-            // <- Note: [1]
+            // <- Note: [1] --||--
         },
         get updatedAt() {
             return updatedAt;
-            // <- Note: [1]
+            // <- Note: [1] --||--
         },
         asPromise,
         asObservable() {
@@ -2274,15 +2286,15 @@ function createTask(options) {
         },
         get errors() {
             return errors;
-            // <- Note: [1]
+            // <- Note: [1] --||--
         },
         get warnings() {
             return warnings;
-            // <- Note: [1]
+            // <- Note: [1] --||--
         },
         get currentValue() {
             return currentValue;
-            // <- Note: [1]
+            // <- Note: [1] --||--
         },
     };
 }
@@ -2447,12 +2459,14 @@ function countUsage(llmTools) {
     const spending = new Subject();
     const proxyTools = {
         get title() {
-            // TODO: [🧠] Maybe put here some suffix
-            return llmTools.title;
+            return `${llmTools.title} (+usage)`;
+            // <- TODO: [🧈] Maybe standartize the suffix when wrapping `LlmExecutionTools` up
+            // <- TODO: [🧈][🧠] Does it make sence to suffix "(+usage)"?
         },
         get description() {
-            // TODO: [🧠] Maybe put here some suffix
-            return llmTools.description;
+            return `${llmTools.description} (+usage)`;
+            // <- TODO: [🧈] Maybe standartize the suffix when wrapping `LlmExecutionTools` up
+            // <- TODO: [🧈][🧠] Does it make sence to suffix "(+usage)"?
         },
         checkConfiguration() {
             return /* not await */ llmTools.checkConfiguration();
@@ -2523,7 +2537,14 @@ class MultipleLlmExecutionTools {
         return 'Multiple LLM Providers';
     }
     get description() {
-        return this.llmExecutionTools.map(({ title }, index) => `${index + 1}) \`${title}\``).join('\n');
+        const innerModelsTitlesAndDescriptions = this.llmExecutionTools
+            .map(({ title, description }, index) => `${index + 1}) \`${title}\`\n${description}`)
+            .join('\n\n');
+        return spaceTrim((block) => `
+                Multiple LLM Providers:
+
+                ${block(innerModelsTitlesAndDescriptions)}
+            `);
     }
     /**
      * Check the configuration of all execution tools
@@ -5297,6 +5318,7 @@ function knowledgePiecesToString(knowledgePieces) {
  */
 async function getKnowledgeForTask(options) {
     const { tools, preparedPipeline, task, parameters } = options;
+    console.log('!!! getKnowledgeForTask', options);
     const firstKnowlegePiece = preparedPipeline.knowledgePieces[0];
     const firstKnowlegeIndex = firstKnowlegePiece === null || firstKnowlegePiece === void 0 ? void 0 : firstKnowlegePiece.index[0];
     // <- TODO: Do not use just first knowledge piece and first index to determine embedding model, use also keyword search
@@ -5335,7 +5357,7 @@ async function getKnowledgeForTask(options) {
         });
         const knowledgePiecesSorted = knowledgePiecesWithRelevance.sort((a, b) => a.relevance - b.relevance);
         const knowledgePiecesLimited = knowledgePiecesSorted.slice(0, 5);
-        console.log('!!! Embedding', {
+        console.log('!!! `getKnowledgeForTask` Embedding', {
             task,
             taskEmbeddingPrompt,
             taskEmbeddingResult,
@@ -5371,6 +5393,7 @@ async function getKnowledgeForTask(options) {
  */
 async function getReservedParametersForTask(options) {
     const { tools, preparedPipeline, task, parameters, pipelineIdentification } = options;
+    console.log('!!! getReservedParametersForTask', options);
     const context = await getContextForTask(); // <- [🏍]
     const knowledge = await getKnowledgeForTask({ tools, preparedPipeline, task, parameters });
     const examples = await getExamplesForTask();
@@ -5407,6 +5430,7 @@ 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;
+    console.log('!!! executeTask', options);
     const priority = preparedPipeline.tasks.length - preparedPipeline.tasks.indexOf(currentTask);
     // Note: Check consistency of used and dependent parameters which was also done in `validatePipeline`, but it’s good to doublecheck
     const usedParameterNames = extractParameterNamesFromTask(currentTask);
@@ -5430,14 +5454,15 @@ async function executeTask(options) {
 
                 `));
     }
+    const reservedParameters = await getReservedParametersForTask({
+        tools,
+        preparedPipeline,
+        task: currentTask,
+        pipelineIdentification,
+        parameters: parametersToPass,
+    });
     const definedParameters = Object.freeze({
-        ...(await getReservedParametersForTask({
-            tools,
-            preparedPipeline,
-            task: currentTask,
-            pipelineIdentification,
-            parameters: parametersToPass,
-        })),
+        ...reservedParameters,
         ...parametersToPass,
     });
     const definedParameterNames = new Set(Object.keys(definedParameters));
@@ -5884,6 +5909,7 @@ function createPipelineExecutor(options) {
     };
     const pipelineExecutor = (inputParameters) => createTask({
         taskType: 'EXECUTION',
+        title: pipeline.title,
         taskProcessCallback(updateOngoingResult) {
             return pipelineExecutorWithCallback(inputParameters, async (newOngoingResult) => {
                 updateOngoingResult(newOngoingResult);
@@ -6014,6 +6040,12 @@ class MarkdownScraper {
                 }
                 // ---
                 if (!llmTools.callEmbeddingModel) {
+                    console.log('!!! No callEmbeddingModel function provided', {
+                        'llmTools.title': llmTools.title,
+                        'llmTools.description': llmTools.description,
+                        'llmTools.callEmbeddingModel': llmTools.callEmbeddingModel,
+                        llmTools,
+                    });
                     // TODO: [🟥] Detect browser / node and make it colorfull
                     console.error('No callEmbeddingModel function provided');
                 }