@promptbook/ollama 0.102.0-5 → 0.102.0-6

package/esm/typings/src/scrapers/document-legacy/register-metadata.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Metadata of the scraper
  *

package/esm/typings/src/scrapers/markdown/register-constructor.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Registration of known scraper
  *

package/esm/typings/src/scrapers/markdown/register-metadata.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Metadata of the scraper
  *

package/esm/typings/src/scrapers/markitdown/register-constructor.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Registration of known scraper
  *

package/esm/typings/src/scrapers/markitdown/register-metadata.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Metadata of the scraper
  *

package/esm/typings/src/scrapers/pdf/register-constructor.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Registration of known scraper
  *

package/esm/typings/src/scrapers/pdf/register-metadata.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Metadata of the scraper
  *

package/esm/typings/src/scrapers/website/register-constructor.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Registration of known scraper
  *

package/esm/typings/src/scrapers/website/register-metadata.d.ts

@@ -1,4 +1,4 @@
-import type { Registration } from '../../utils/$Register';
+import type { Registration } from '../../utils/misc/$Register';
 /**
  * Metadata of the scraper
  *

package/esm/typings/src/scripting/javascript/postprocessing-functions.d.ts

@@ -1,22 +1,22 @@
 import spaceTrim from 'spacetrim';
 import { extractBlock } from '../../postprocessing/utils/extractBlock';
 import { prettifyMarkdown } from '../../utils/markdown/prettifyMarkdown';
+import { trimCodeBlock } from '../../utils/markdown/trimCodeBlock';
+import { trimEndOfCodeBlock } from '../../utils/markdown/trimEndOfCodeBlock';
 import { capitalize } from '../../utils/normalization/capitalize';
 import { decapitalize } from '../../utils/normalization/decapitalize';
 import { nameToUriPart } from '../../utils/normalization/nameToUriPart';
 import { nameToUriParts } from '../../utils/normalization/nameToUriParts';
 import { normalizeToKebabCase } from '../../utils/normalization/normalize-to-kebab-case';
+import { normalizeTo_camelCase } from '../../utils/normalization/normalizeTo_camelCase';
 import { normalizeTo_PascalCase } from '../../utils/normalization/normalizeTo_PascalCase';
 import { normalizeTo_SCREAMING_CASE } from '../../utils/normalization/normalizeTo_SCREAMING_CASE';
-import { normalizeTo_camelCase } from '../../utils/normalization/normalizeTo_camelCase';
 import { normalizeTo_snake_case } from '../../utils/normalization/normalizeTo_snake_case';
 import { normalizeWhitespaces } from '../../utils/normalization/normalizeWhitespaces';
 import { removeDiacritics } from '../../utils/normalization/removeDiacritics';
-import { removeEmojis } from '../../utils/removeEmojis';
-import { removeQuotes } from '../../utils/removeQuotes';
-import { trimCodeBlock } from '../../utils/trimCodeBlock';
-import { trimEndOfCodeBlock } from '../../utils/trimEndOfCodeBlock';
-import { unwrapResult } from '../../utils/unwrapResult';
+import { removeEmojis } from '../../utils/normalization/removeEmojis';
+import { removeQuotes } from '../../utils/normalization/removeQuotes';
+import { unwrapResult } from '../../utils/normalization/unwrapResult';
 /**
  * Collection of utility functions that can be used for post-processing model outputs.
  * These functions help transform, extract, or format the raw model responses.

package/esm/typings/src/utils/markdown/createMarkdownChart.d.ts

@@ -1,5 +1,5 @@
 import type { string_markdown } from '../../types/typeAliases';
-import type { FromtoItems } from '../FromtoItems';
+import type { FromtoItems } from '../misc/FromtoItems';
 /**
  * Options for `CreateMarkdownChartOptions`
  */

package/esm/typings/src/utils/markdown/humanizeAiText.d.ts

@@ -1,4 +1,4 @@
-import { string_markdown } from '../../types/typeAliases';
+import type { string_markdown } from '../../types/typeAliases';
 /**
  * Function `humanizeAiText` will remove traces of AI text generation artifacts
  *

package/esm/typings/src/utils/markdown/humanizeAiTextEllipsis.d.ts

@@ -1,4 +1,4 @@
-import { string_markdown } from '../../types/typeAliases';
+import type { string_markdown } from '../../types/typeAliases';
 /**
  * Change ellipsis character to three dots `…` -> `...`
  *

package/esm/typings/src/utils/markdown/humanizeAiTextEmdashed.d.ts

@@ -1,4 +1,4 @@
-import { string_markdown } from '../../types/typeAliases';
+import type { string_markdown } from '../../types/typeAliases';
 /**
  * Change em-dashes to regular dashes `—` -> `-`
  *

package/esm/typings/src/utils/markdown/humanizeAiTextQuotes.d.ts

@@ -1,4 +1,4 @@
-import { string_markdown } from '../../types/typeAliases';
+import type { string_markdown } from '../../types/typeAliases';
 /**
  * Change smart quotes to regular quotes
  *

package/esm/typings/src/utils/markdown/humanizeAiTextWhitespace.d.ts

@@ -1,4 +1,4 @@
-import { string_markdown } from '../../types/typeAliases';
+import type { string_markdown } from '../../types/typeAliases';
 /**
  * Change unprintable hard spaces to regular spaces
  *

package/esm/typings/src/utils/markdown/promptbookifyAiText.d.ts

@@ -1,4 +1,4 @@
-import { string_markdown } from '../../types/typeAliases';
+import type { string_markdown } from '../../types/typeAliases';
 /**
  * Function `promptbookifyAiText` will slightly modify the text so we know it was processed by Promptbook
  *

package/esm/typings/src/utils/{trimCodeBlock.d.ts → markdown/trimCodeBlock.d.ts}

@@ -5,6 +5,6 @@
  * Note: This is useful for post-processing of the result of the chat LLM model
  *       when the model wraps the result in the (markdown) code block.
  *
- * @public exported from `@promptbook/utils`
+ * @public exported from `@promptbook/markdown-utils`
  */
 export declare function trimCodeBlock(value: string): string;

package/esm/typings/src/utils/{trimEndOfCodeBlock.d.ts → markdown/trimEndOfCodeBlock.d.ts}

@@ -4,6 +4,6 @@
  * Note: This is useful for post-processing of the result of the completion LLM model
  *       if you want to start code block in the prompt but you don't want to end it in the result.
  *
- * @public exported from `@promptbook/utils`
+ * @public exported from `@promptbook/markdown-utils`
  */
 export declare function trimEndOfCodeBlock(value: string): string;

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

@@ -1,6 +1,6 @@
 import { type IDestroyable } from 'destroyable';
-import type { string_name } from '../types/typeAliases';
-import type { TODO_string } from './organization/TODO_string';
+import type { string_name } from '../../types/typeAliases';
+import type { TODO_string } from '../organization/TODO_string';
 /**
  * Represents an entity in a global registry.
  * Contains identifying information about the package and class.

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

@@ -1,4 +1,4 @@
-import type { string_date_iso8601 } from '../types/typeAliases';
+import type { string_date_iso8601 } from '../../types/typeAliases';
 /**
  * Simple wrapper `new Date().toISOString()`
  *

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

@@ -1,4 +1,4 @@
-import type { Arrayable } from '../types/Arrayable';
+import type { Arrayable } from '../../types/Arrayable';
 /**
  * Takes an item or an array of items and returns an array of items
  *

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-5`).
  *
  * @generated
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/ollama",
-    "version": "0.102.0-5",
+    "version": "0.102.0-6",
     "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-6"
     },
     "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-6';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -1996,6 +1996,10 @@
              * 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),
@@ -2062,7 +2066,7 @@
         /**
          * Internal method that handles parameter retry for chat model calls
          */
-        async callChatModelWithRetry(prompt, currentModelRequirements) {
+        async callChatModelWithRetry(prompt, currentModelRequirements, attemptStack = []) {
             var _a;
             if (this.options.isVerbose) {
                 console.info(`💬 ${this.title} callChatModel call`, { prompt, currentModelRequirements });
@@ -2169,6 +2173,15 @@
                 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
@@ -2182,11 +2195,19 @@
                 // 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;
+                    // 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);
@@ -2194,9 +2215,16 @@
                 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);
             }
         }
         /**
@@ -2208,7 +2236,7 @@
         /**
          * Internal method that handles parameter retry for completion model calls
          */
-        async callCompletionModelWithRetry(prompt, currentModelRequirements) {
+        async callCompletionModelWithRetry(prompt, currentModelRequirements, attemptStack = []) {
             var _a;
             if (this.options.isVerbose) {
                 console.info(`🖋 ${this.title} callCompletionModel call`, { prompt, currentModelRequirements });
@@ -2283,6 +2311,14 @@
                 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
@@ -2296,11 +2332,18 @@
                 // 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;
+                    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);
@@ -2308,9 +2351,15 @@
                 if (this.options.isVerbose) {
                     console.warn(colors__default["default"].bgYellow('Warning'), `Removing unsupported parameter '${unsupportedParameter}' for model '${modelName}' and retrying request`);
                 }
+                attemptStack.push({
+                    modelName,
+                    unsupportedParameter,
+                    errorMessage: error.message,
+                    stripped: true,
+                });
                 // Remove the unsupported parameter and retry
                 const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callCompletionModelWithRetry(prompt, modifiedModelRequirements);
+                return this.callCompletionModelWithRetry(prompt, modifiedModelRequirements, attemptStack);
             }
         }
         /**
@@ -2322,7 +2371,7 @@
         /**
          * Internal method that handles parameter retry for embedding model calls
          */
-        async callEmbeddingModelWithRetry(prompt, currentModelRequirements) {
+        async callEmbeddingModelWithRetry(prompt, currentModelRequirements, attemptStack = []) {
             if (this.options.isVerbose) {
                 console.info(`🖋 ${this.title} embedding call`, { prompt, currentModelRequirements });
             }
@@ -2386,6 +2435,14 @@
                 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
@@ -2399,11 +2456,18 @@
                 // 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;
+                    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);
@@ -2411,9 +2475,15 @@
                 if (this.options.isVerbose) {
                     console.warn(colors__default["default"].bgYellow('Warning'), `Removing unsupported parameter '${unsupportedParameter}' for model '${modelName}' and retrying request`);
                 }
+                attemptStack.push({
+                    modelName,
+                    unsupportedParameter,
+                    errorMessage: error.message,
+                    stripped: true,
+                });
                 // Remove the unsupported parameter and retry
                 const modifiedModelRequirements = removeUnsupportedModelRequirement(currentModelRequirements, unsupportedParameter);
-                return this.callEmbeddingModelWithRetry(prompt, modifiedModelRequirements);
+                return this.callEmbeddingModelWithRetry(prompt, modifiedModelRequirements, attemptStack);
             }
         }
         // <- Note: [🤖] callXxxModel