@promptbook/ollama 0.102.0-6 → 0.102.0-7

package/umd/index.umd.js

@@ -25,7 +25,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.102.0-6';
+    const PROMPTBOOK_ENGINE_VERSION = '0.102.0-7';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -1981,6 +1981,7 @@
      * @public exported from `@promptbook/openai`
      */
     class OpenAiCompatibleExecutionTools {
+        // Removed retriedUnsupportedParameters and attemptHistory instance fields
         /**
          * Creates OpenAI compatible Execution Tools.
          *
@@ -1992,14 +1993,6 @@
              * OpenAI API client.
              */
             this.client = null;
-            /**
-             * Tracks models and parameters that have already been retried to prevent infinite loops
-             */
-            this.retriedUnsupportedParameters = new Set();
-            /**
-             * Tracks the history of attempts for error reporting
-             */
-            this.attemptHistory = [];
             // TODO: Allow configuring rate limits via options
             this.limiter = new Bottleneck__default["default"]({
                 minTime: 60000 / (this.options.maxRequestsPerMinute || DEFAULT_MAX_REQUESTS_PER_MINUTE),
@@ -2061,12 +2054,16 @@
          * Calls OpenAI compatible API to use a chat model.
          */
         async callChatModel(prompt) {
-            return this.callChatModelWithRetry(prompt, prompt.modelRequirements);
+            // Deep clone prompt and modelRequirements to avoid mutation across calls
+            const clonedPrompt = JSON.parse(JSON.stringify(prompt));
+            // Use local Set for retried parameters to ensure independence and thread safety
+            const retriedUnsupportedParameters = new Set();
+            return this.callChatModelWithRetry(clonedPrompt, clonedPrompt.modelRequirements, [], retriedUnsupportedParameters);
         }
         /**
          * Internal method that handles parameter retry for chat model calls
          */
-        async callChatModelWithRetry(prompt, currentModelRequirements, attemptStack = []) {
+        async callChatModelWithRetry(prompt, currentModelRequirements, attemptStack = [], retriedUnsupportedParameters = new Set()) {
             var _a;
             if (this.options.isVerbose) {
                 console.info(`💬 ${this.title} callChatModel call`, { prompt, currentModelRequirements });
@@ -2176,10 +2173,12 @@
                     // If we have attemptStack, include it in the error message
                     if (attemptStack.length > 0) {
                         throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
-                            attemptStack.map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                            attemptStack
+                                .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
                                 (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
                                 `, Error: ${a.errorMessage}` +
-                                (a.stripped ? ' (stripped and retried)' : '')).join('\n') +
+                                (a.stripped ? ' (stripped and retried)' : ''))
+                                .join('\n') +
                             `\nFinal error: ${error.message}`);
                     }
                     throw error;
@@ -2194,7 +2193,7 @@
                 }
                 // Create a unique key for this model + parameter combination to prevent infinite loops
                 const retryKey = `${modelName}-${unsupportedParameter}`;
-                if (this.retriedUnsupportedParameters.has(retryKey)) {
+                if (retriedUnsupportedParameters.has(retryKey)) {
                     // Already retried this parameter, throw the error with attemptStack
                     attemptStack.push({
                         modelName,
@@ -2203,14 +2202,16 @@
                         stripped: true,
                     });
                     throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
-                        attemptStack.map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                        attemptStack
+                            .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
                             (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
                             `, Error: ${a.errorMessage}` +
-                            (a.stripped ? ' (stripped and retried)' : '')).join('\n') +
+                            (a.stripped ? ' (stripped and retried)' : ''))
+                            .join('\n') +
                         `\nFinal error: ${error.message}`);
                 }
                 // Mark this parameter as retried
-                this.retriedUnsupportedParameters.add(retryKey);
+                retriedUnsupportedParameters.add(retryKey);
                 // Log warning in verbose mode
                 if (this.options.isVerbose) {
                     console.warn(colors__default["default"].bgYellow('Warning'), `Removing unsupported parameter '${unsupportedParameter}' for model '${modelName}' and retrying request`);
@@ -2224,19 +2225,22 @@
                 });
                 // Remove the unsupported parameter and retry
                 const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callChatModelWithRetry(prompt, modifiedModelRequirements, attemptStack);
+                return this.callChatModelWithRetry(prompt, modifiedModelRequirements, attemptStack, retriedUnsupportedParameters);
             }
         }
         /**
          * Calls OpenAI API to use a complete model.
          */
         async callCompletionModel(prompt) {
-            return this.callCompletionModelWithRetry(prompt, prompt.modelRequirements);
+            // Deep clone prompt and modelRequirements to avoid mutation across calls
+            const clonedPrompt = JSON.parse(JSON.stringify(prompt));
+            const retriedUnsupportedParameters = new Set();
+            return this.callCompletionModelWithRetry(clonedPrompt, clonedPrompt.modelRequirements, [], retriedUnsupportedParameters);
         }
         /**
          * Internal method that handles parameter retry for completion model calls
          */
-        async callCompletionModelWithRetry(prompt, currentModelRequirements, attemptStack = []) {
+        async callCompletionModelWithRetry(prompt, currentModelRequirements, attemptStack = [], retriedUnsupportedParameters = new Set()) {
             var _a;
             if (this.options.isVerbose) {
                 console.info(`🖋 ${this.title} callCompletionModel call`, { prompt, currentModelRequirements });
@@ -2252,8 +2256,6 @@
                 model: modelName,
                 max_tokens: currentModelRequirements.maxTokens,
                 temperature: currentModelRequirements.temperature,
-                // <- TODO: [🈁] Use `seed` here AND/OR use is `isDeterministic` for entire execution tools
-                // <- Note: [🧆]
             };
             const rawPromptContent = templateParameters(content, { ...parameters, modelName });
             const rawRequest = {
@@ -2283,7 +2285,6 @@
                     throw new PipelineExecutionError(`No choises from ${this.title}`);
                 }
                 if (rawResponse.choices.length > 1) {
-                    // TODO: This should be maybe only warning
                     throw new PipelineExecutionError(`More than one choise from ${this.title}`);
                 }
                 const resultContent = rawResponse.choices[0].text;
@@ -2303,25 +2304,24 @@
                         rawPromptContent,
                         rawRequest,
                         rawResponse,
-                        // <- [🗯]
                     },
                 });
             }
             catch (error) {
                 assertsError(error);
-                // Check if this is an unsupported parameter error
                 if (!isUnsupportedParameterError(error)) {
                     if (attemptStack.length > 0) {
                         throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
-                            attemptStack.map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                            attemptStack
+                                .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
                                 (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
                                 `, Error: ${a.errorMessage}` +
-                                (a.stripped ? ' (stripped and retried)' : '')).join('\n') +
+                                (a.stripped ? ' (stripped and retried)' : ''))
+                                .join('\n') +
                             `\nFinal error: ${error.message}`);
                     }
                     throw error;
                 }
-                // Parse which parameter is unsupported
                 const unsupportedParameter = parseUnsupportedParameterError(error.message);
                 if (!unsupportedParameter) {
                     if (this.options.isVerbose) {
@@ -2329,9 +2329,8 @@
                     }
                     throw error;
                 }
-                // Create a unique key for this model + parameter combination to prevent infinite loops
                 const retryKey = `${modelName}-${unsupportedParameter}`;
-                if (this.retriedUnsupportedParameters.has(retryKey)) {
+                if (retriedUnsupportedParameters.has(retryKey)) {
                     attemptStack.push({
                         modelName,
                         unsupportedParameter,
@@ -2339,15 +2338,15 @@
                         stripped: true,
                     });
                     throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
-                        attemptStack.map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                        attemptStack
+                            .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
                             (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
                             `, Error: ${a.errorMessage}` +
-                            (a.stripped ? ' (stripped and retried)' : '')).join('\n') +
+                            (a.stripped ? ' (stripped and retried)' : ''))
+                            .join('\n') +
                         `\nFinal error: ${error.message}`);
                 }
-                // Mark this parameter as retried
-                this.retriedUnsupportedParameters.add(retryKey);
-                // Log warning in verbose mode
+                retriedUnsupportedParameters.add(retryKey);
                 if (this.options.isVerbose) {
                     console.warn(colors__default["default"].bgYellow('Warning'), `Removing unsupported parameter '${unsupportedParameter}' for model '${modelName}' and retrying request`);
                 }
@@ -2357,27 +2356,28 @@
                     errorMessage: error.message,
                     stripped: true,
                 });
-                // Remove the unsupported parameter and retry
                 const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callCompletionModelWithRetry(prompt, modifiedModelRequirements, attemptStack);
+                return this.callCompletionModelWithRetry(prompt, modifiedModelRequirements, attemptStack, retriedUnsupportedParameters);
             }
         }
         /**
          * Calls OpenAI compatible API to use a embedding model
          */
         async callEmbeddingModel(prompt) {
-            return this.callEmbeddingModelWithRetry(prompt, prompt.modelRequirements);
+            // Deep clone prompt and modelRequirements to avoid mutation across calls
+            const clonedPrompt = JSON.parse(JSON.stringify(prompt));
+            const retriedUnsupportedParameters = new Set();
+            return this.callEmbeddingModelWithRetry(clonedPrompt, clonedPrompt.modelRequirements, [], retriedUnsupportedParameters);
         }
         /**
          * Internal method that handles parameter retry for embedding model calls
          */
-        async callEmbeddingModelWithRetry(prompt, currentModelRequirements, attemptStack = []) {
+        async callEmbeddingModelWithRetry(prompt, currentModelRequirements, attemptStack = [], retriedUnsupportedParameters = new Set()) {
             if (this.options.isVerbose) {
                 console.info(`🖋 ${this.title} embedding call`, { prompt, currentModelRequirements });
             }
             const { content, parameters } = prompt;
             const client = await this.getClient();
-            // TODO: [☂] Use here more modelRequirements
             if (currentModelRequirements.modelVariant !== 'EMBEDDING') {
                 throw new PipelineExecutionError('Use embed only for EMBEDDING variant');
             }
@@ -2409,9 +2409,7 @@
                     throw new PipelineExecutionError(`Expected exactly 1 data item in response, got ${rawResponse.data.length}`);
                 }
                 const resultContent = rawResponse.data[0].embedding;
-                const usage = this.computeUsage(content || '', '', 
-                // <- Note: Embedding does not have result content
-                rawResponse);
+                const usage = this.computeUsage(content || '', '', rawResponse);
                 return exportJson({
                     name: 'promptResult',
                     message: `Result of \`OpenAiCompatibleExecutionTools.callEmbeddingModel\``,
@@ -2427,25 +2425,24 @@
                         rawPromptContent,
                         rawRequest,
                         rawResponse,
-                        // <- [🗯]
                     },
                 });
             }
             catch (error) {
                 assertsError(error);
-                // Check if this is an unsupported parameter error
                 if (!isUnsupportedParameterError(error)) {
                     if (attemptStack.length > 0) {
                         throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
-                            attemptStack.map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                            attemptStack
+                                .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
                                 (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
                                 `, Error: ${a.errorMessage}` +
-                                (a.stripped ? ' (stripped and retried)' : '')).join('\n') +
+                                (a.stripped ? ' (stripped and retried)' : ''))
+                                .join('\n') +
                             `\nFinal error: ${error.message}`);
                     }
                     throw error;
                 }
-                // Parse which parameter is unsupported
                 const unsupportedParameter = parseUnsupportedParameterError(error.message);
                 if (!unsupportedParameter) {
                     if (this.options.isVerbose) {
@@ -2453,9 +2450,8 @@
                     }
                     throw error;
                 }
-                // Create a unique key for this model + parameter combination to prevent infinite loops
                 const retryKey = `${modelName}-${unsupportedParameter}`;
-                if (this.retriedUnsupportedParameters.has(retryKey)) {
+                if (retriedUnsupportedParameters.has(retryKey)) {
                     attemptStack.push({
                         modelName,
                         unsupportedParameter,
@@ -2463,15 +2459,15 @@
                         stripped: true,
                     });
                     throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
-                        attemptStack.map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                        attemptStack
+                            .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
                             (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
                             `, Error: ${a.errorMessage}` +
-                            (a.stripped ? ' (stripped and retried)' : '')).join('\n') +
+                            (a.stripped ? ' (stripped and retried)' : ''))
+                            .join('\n') +
                         `\nFinal error: ${error.message}`);
                 }
-                // Mark this parameter as retried
-                this.retriedUnsupportedParameters.add(retryKey);
-                // Log warning in verbose mode
+                retriedUnsupportedParameters.add(retryKey);
                 if (this.options.isVerbose) {
                     console.warn(colors__default["default"].bgYellow('Warning'), `Removing unsupported parameter '${unsupportedParameter}' for model '${modelName}' and retrying request`);
                 }
@@ -2481,9 +2477,8 @@
                     errorMessage: error.message,
                     stripped: true,
                 });
-                // Remove the unsupported parameter and retry
                 const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callEmbeddingModelWithRetry(prompt, modifiedModelRequirements, attemptStack);
+                return this.callEmbeddingModelWithRetry(prompt, modifiedModelRequirements, attemptStack, retriedUnsupportedParameters);
             }
         }
         // <- Note: [🤖] callXxxModel