@promptbook/ollama 0.102.0-5 → 0.102.0-7

package/esm/typings/src/utils/misc/debounce.d.ts

@@ -0,0 +1,5 @@
+import type { TODO_any } from '../organization/TODO_any';
+/**
+ * @public exported from `@promptbook/utils`
+ */
+export declare function debounce<T extends (...args: TODO_any[]) => void>(fn: T, delay: number): (...args: Parameters<T>) => void;

package/esm/typings/src/utils/{emojis.d.ts → misc/emojis.d.ts}

@@ -1,4 +1,4 @@
-import type { string_char_emoji } from '../types/typeAliasEmoji';
+import type { string_char_emoji } from '../../types/typeAliasEmoji';
 /**
  * All possible emoji chars like "🍆", "🍡", "🍤"...
  * Note: this will be needed to update annually - now updated at 2022-01-19

package/esm/typings/src/utils/misc/injectCssModuleIntoShadowRoot.d.ts

@@ -0,0 +1,20 @@
+import type { string_css_class } from '../../types/typeAliases';
+export type InjectCssModuleIntoShadowRootOptions = {
+    /**
+     * The shadow root where the styles should be injected
+     */
+    shadowRoot: ShadowRoot;
+    /**
+     * The imported CSS module styles object
+     */
+    styles: Record<string_css_class, string_css_class>;
+};
+/**
+ * Inject the CSS module rules (derived from imported `styles`) into the provided shadow root.
+ * This allows CSS modules (which are normally emitted into the document head) to be
+ * available inside the component's shadow DOM.
+ *
+ * @public exported from `@promptbook/components`
+ *         <- TODO: [🧠] Make `@promptbook/components-utils`
+ */
+export declare function injectCssModuleIntoShadowRoot(options: InjectCssModuleIntoShadowRootOptions): void;

package/esm/typings/src/version.d.ts

@@ -15,7 +15,7 @@ export declare const BOOK_LANGUAGE_VERSION: string_semantic_version;
 export declare const PROMPTBOOK_ENGINE_VERSION: string_promptbook_version;
 /**
  * Represents the version string of the Promptbook engine.
- * It follows semantic versioning (e.g., `0.102.0-4`).
+ * It follows semantic versioning (e.g., `0.102.0-6`).
  *
  * @generated
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/ollama",
-    "version": "0.102.0-5",
+    "version": "0.102.0-7",
     "description": "Promptbook: Run AI apps in plain human language across multiple models and platforms",
     "private": false,
     "sideEffects": false,
@@ -94,7 +94,7 @@
     "module": "./esm/index.es.js",
     "typings": "./esm/typings/src/_packages/ollama.index.d.ts",
     "peerDependencies": {
-        "@promptbook/core": "0.102.0-5"
+        "@promptbook/core": "0.102.0-7"
     },
     "dependencies": {
         "bottleneck": "^2.19.5",

package/umd/index.umd.js

@@ -25,7 +25,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.102.0-5';
+    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,10 +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();
             // TODO: Allow configuring rate limits via options
             this.limiter = new Bottleneck__default["default"]({
                 minTime: 60000 / (this.options.maxRequestsPerMinute || DEFAULT_MAX_REQUESTS_PER_MINUTE),
@@ -2057,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) {
+        async callChatModelWithRetry(prompt, currentModelRequirements, attemptStack = [], retriedUnsupportedParameters = new Set()) {
             var _a;
             if (this.options.isVerbose) {
                 console.info(`💬 ${this.title} callChatModel call`, { prompt, currentModelRequirements });
@@ -2169,6 +2170,17 @@
                 assertsError(error);
                 // Check if this is an unsupported parameter error
                 if (!isUnsupportedParameterError(error)) {
+                    // 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}` +
+                                (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
+                                `, Error: ${a.errorMessage}` +
+                                (a.stripped ? ' (stripped and retried)' : ''))
+                                .join('\n') +
+                            `\nFinal error: ${error.message}`);
+                    }
                     throw error;
                 }
                 // Parse which parameter is unsupported
@@ -2181,34 +2193,54 @@
                 }
                 // Create a unique key for this model + parameter combination to prevent infinite loops
                 const retryKey = `${modelName}-${unsupportedParameter}`;
-                if (this.retriedUnsupportedParameters.has(retryKey)) {
-                    // Already retried this parameter, throw the error
-                    if (this.options.isVerbose) {
-                        console.warn(colors__default["default"].bgRed('Error'), `Parameter '${unsupportedParameter}' for model '${modelName}' already retried once, throwing error:`, error.message);
-                    }
-                    throw error;
+                if (retriedUnsupportedParameters.has(retryKey)) {
+                    // Already retried this parameter, throw the error with attemptStack
+                    attemptStack.push({
+                        modelName,
+                        unsupportedParameter,
+                        errorMessage: error.message,
+                        stripped: true,
+                    });
+                    throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
+                        attemptStack
+                            .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                            (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
+                            `, Error: ${a.errorMessage}` +
+                            (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`);
                 }
+                // Add to attemptStack
+                attemptStack.push({
+                    modelName,
+                    unsupportedParameter,
+                    errorMessage: error.message,
+                    stripped: true,
+                });
                 // Remove the unsupported parameter and retry
                 const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callChatModelWithRetry(prompt, modifiedModelRequirements);
+                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) {
+        async callCompletionModelWithRetry(prompt, currentModelRequirements, attemptStack = [], retriedUnsupportedParameters = new Set()) {
             var _a;
             if (this.options.isVerbose) {
                 console.info(`🖋 ${this.title} callCompletionModel call`, { prompt, currentModelRequirements });
@@ -2224,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 = {
@@ -2255,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;
@@ -2275,17 +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}` +
+                                (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
+                                `, Error: ${a.errorMessage}` +
+                                (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) {
@@ -2293,42 +2329,55 @@
                     }
                     throw error;
                 }
-                // Create a unique key for this model + parameter combination to prevent infinite loops
                 const retryKey = `${modelName}-${unsupportedParameter}`;
-                if (this.retriedUnsupportedParameters.has(retryKey)) {
-                    // Already retried this parameter, throw the error
-                    if (this.options.isVerbose) {
-                        console.warn(colors__default["default"].bgRed('Error'), `Parameter '${unsupportedParameter}' for model '${modelName}' already retried once, throwing error:`, error.message);
-                    }
-                    throw error;
+                if (retriedUnsupportedParameters.has(retryKey)) {
+                    attemptStack.push({
+                        modelName,
+                        unsupportedParameter,
+                        errorMessage: error.message,
+                        stripped: true,
+                    });
+                    throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
+                        attemptStack
+                            .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                            (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
+                            `, Error: ${a.errorMessage}` +
+                            (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`);
                 }
-                // Remove the unsupported parameter and retry
+                attemptStack.push({
+                    modelName,
+                    unsupportedParameter,
+                    errorMessage: error.message,
+                    stripped: true,
+                });
                 const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callCompletionModelWithRetry(prompt, modifiedModelRequirements);
+                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) {
+        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');
             }
@@ -2360,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\``,
@@ -2378,17 +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}` +
+                                (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
+                                `, Error: ${a.errorMessage}` +
+                                (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) {
@@ -2396,24 +2450,35 @@
                     }
                     throw error;
                 }
-                // Create a unique key for this model + parameter combination to prevent infinite loops
                 const retryKey = `${modelName}-${unsupportedParameter}`;
-                if (this.retriedUnsupportedParameters.has(retryKey)) {
-                    // Already retried this parameter, throw the error
-                    if (this.options.isVerbose) {
-                        console.warn(colors__default["default"].bgRed('Error'), `Parameter '${unsupportedParameter}' for model '${modelName}' already retried once, throwing error:`, error.message);
-                    }
-                    throw error;
+                if (retriedUnsupportedParameters.has(retryKey)) {
+                    attemptStack.push({
+                        modelName,
+                        unsupportedParameter,
+                        errorMessage: error.message,
+                        stripped: true,
+                    });
+                    throw new PipelineExecutionError(`All attempts failed. Attempt history:\n` +
+                        attemptStack
+                            .map((a, i) => `  ${i + 1}. Model: ${a.modelName}` +
+                            (a.unsupportedParameter ? `, Stripped: ${a.unsupportedParameter}` : '') +
+                            `, Error: ${a.errorMessage}` +
+                            (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`);
                 }
-                // Remove the unsupported parameter and retry
+                attemptStack.push({
+                    modelName,
+                    unsupportedParameter,
+                    errorMessage: error.message,
+                    stripped: true,
+                });
                 const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callEmbeddingModelWithRetry(prompt, modifiedModelRequirements);
+                return this.callEmbeddingModelWithRetry(prompt, modifiedModelRequirements, attemptStack, retriedUnsupportedParameters);
             }
         }
         // <- Note: [🤖] callXxxModel