@promptbook/core 0.92.0-32 → 0.92.0-34

package/esm/index.es.js

@@ -27,7 +27,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
@@ -2368,6 +2368,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';
@@ -2379,6 +2380,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);
@@ -2424,17 +2429,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() {
@@ -2442,15 +2454,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] --||--
         },
     };
 }
@@ -3192,7 +3204,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
@@ -4546,6 +4565,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
@@ -4584,7 +4604,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,
@@ -4620,6 +4640,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();
@@ -4656,6 +4677,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);
@@ -4679,14 +4701,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));
@@ -5133,6 +5156,7 @@ function createPipelineExecutor(options) {
     };
     const pipelineExecutor = (inputParameters) => createTask({
         taskType: 'EXECUTION',
+        title: pipeline.title,
         taskProcessCallback(updateOngoingResult) {
             return pipelineExecutorWithCallback(inputParameters, async (newOngoingResult) => {
                 updateOngoingResult(newOngoingResult);
@@ -5184,12 +5208,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();
@@ -10334,8 +10360,13 @@ function filterModels(llmTools, modelFilter) {
     const filteredTools = {
         // Keep all properties from the original llmTools
         ...llmTools,
+        get title() {
+            return `${llmTools.title} (filtered)`;
+            // <- TODO: [🧈] Maybe standartize the suffix when wrapping `LlmExecutionTools` up
+        },
         get description() {
             return `${llmTools.description} (filtered)`;
+            // <- TODO: [🧈] Maybe standartize the suffix when wrapping `LlmExecutionTools` up
         },
         // Override listModels to filter the models
         async listModels() {
@@ -10696,12 +10727,14 @@ function cacheLlmTools(llmTools, options = {}) {
         ...llmTools,
         // <- Note: [🥫]
         get title() {
-            // TODO: [🧠] Maybe put here some suffix
-            return llmTools.title;
+            return `${llmTools.title} (cached)`;
+            // <- TODO: [🧈] Maybe standartize the suffix when wrapping `LlmExecutionTools` up
+            // <- TODO: [🧈][🧠] Does it make sence to suffix "(cached)"?
         },
         get description() {
-            // TODO: [🧠] Maybe put here some suffix
-            return llmTools.description;
+            return `${llmTools.description} (cached)`;
+            // <- TODO: [🧈] Maybe standartize the suffix when wrapping `LlmExecutionTools` up
+            // <- TODO: [🧈][🧠] Does it make sence to suffix "(cached)"?
         },
         listModels() {
             // TODO: [🧠] Should be model listing also cached?
@@ -10864,6 +10897,7 @@ const _AnthropicClaudeMetadataRegistration = $llmToolsMetadataRegister.register(
                 apiKey: 'sk-ant-api03-',
                 isProxied: true,
                 remoteServerUrl: DEFAULT_REMOTE_SERVER_URL,
+                maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
             },
         };
     },
@@ -10899,7 +10933,7 @@ const _AzureOpenAiMetadataRegistration = $llmToolsMetadataRegister.register({
     title: 'Azure Open AI',
     packageName: '@promptbook/azure-openai',
     className: 'AzureOpenAiExecutionTools',
-    envVariables: ['AZUREOPENAI_RESOURCE_NAME', 'AZUREOPENAI_DEPLOYMENT_NAME', 'AZUREOPENAI_API_KEY'],
+    envVariables: ['AZUREOPENAI_API_KEY', 'AZUREOPENAI_RESOURCE_NAME', 'AZUREOPENAI_DEPLOYMENT_NAME'],
     trustLevel: 'CLOSED_BUSINESS',
     order: MODEL_ORDERS.NORMAL,
     getBoilerplateConfiguration() {
@@ -10909,6 +10943,9 @@ const _AzureOpenAiMetadataRegistration = $llmToolsMetadataRegister.register({
             className: 'AzureOpenAiExecutionTools',
             options: {
                 apiKey: 'sk-',
+                resourceName: 'my-resource-name',
+                deploymentName: 'my-deployment-name',
+                maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
             },
         };
     },
@@ -10922,15 +10959,15 @@ const _AzureOpenAiMetadataRegistration = $llmToolsMetadataRegister.register({
                 packageName: '@promptbook/azure-openai',
                 className: 'AzureOpenAiExecutionTools',
                 options: {
+                    apiKey: env.AZUREOPENAI_API_KEY,
                     resourceName: env.AZUREOPENAI_RESOURCE_NAME,
                     deploymentName: env.AZUREOPENAI_DEPLOYMENT_NAME,
-                    apiKey: env.AZUREOPENAI_API_KEY,
                 },
             };
         }
-        else if (typeof env.AZUREOPENAI_RESOURCE_NAME === 'string' ||
-            typeof env.AZUREOPENAI_DEPLOYMENT_NAME === 'string' ||
-            typeof env.AZUREOPENAI_API_KEY === 'string') {
+        else if (typeof env.AZUREOPENAI_API_KEY === 'string' ||
+            typeof env.AZUREOPENAI_RESOURCE_NAME === 'string' ||
+            typeof env.AZUREOPENAI_DEPLOYMENT_NAME === 'string') {
             return null;
             /*
             Note: [🗨] Partial configuration is handled more gracefully elsewhere
@@ -11143,6 +11180,7 @@ const _OpenAiAssistantMetadataRegistration = $llmToolsMetadataRegister.register(
             options: {
                 apiKey: 'sk-',
                 assistantId: 'asst_',
+                maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
             },
         };
     },