@promptbook/core 0.94.0-1 → 0.94.0-3

package/esm/typings/src/_packages/ollama.index.d.ts

@@ -1,8 +1,10 @@
 import { BOOK_LANGUAGE_VERSION, PROMPTBOOK_ENGINE_VERSION } from '../version';
 import { createOllamaExecutionTools } from '../llm-providers/ollama/createOllamaExecutionTools';
-import { OllamaExecutionTools } from '../llm-providers/ollama/OllamaExecutionTools';
+import { DEFAULT_OLLAMA_BASE_URL } from '../llm-providers/ollama/OllamaExecutionToolsOptions';
+import type { OllamaExecutionToolsOptions } from '../llm-providers/ollama/OllamaExecutionToolsOptions';
 import { _OllamaRegistration } from '../llm-providers/ollama/register-constructor';
 export { BOOK_LANGUAGE_VERSION, PROMPTBOOK_ENGINE_VERSION };
 export { createOllamaExecutionTools };
-export { OllamaExecutionTools };
+export { DEFAULT_OLLAMA_BASE_URL };
+export type { OllamaExecutionToolsOptions };
 export { _OllamaRegistration };

package/esm/typings/src/execution/AvailableModel.d.ts

@@ -1,4 +1,5 @@
 import type { ModelVariant } from '../types/ModelVariant';
+import type { number_usd } from '../types/typeAliases';
 import type { string_model_description } from '../types/typeAliases';
 import type { string_model_name } from '../types/typeAliases';
 import type { string_title } from '../types/typeAliases';
@@ -32,7 +33,14 @@ export type AvailableModel = {
      * @example "Model with 1 billion parameters and advanced reasoning capabilities"
      */
     readonly modelDescription?: string_model_description;
+    /**
+     * Pricing information for the model
+     */
+    readonly pricing?: {
+        readonly prompt: number_usd;
+        readonly output: number_usd;
+    };
 };
 /**
- * TODO: (not only [🕘]) Put pricing information here
+ * TODO: [🧠] Maybe rename to something else - like `ModelInformation` or `ModelMetadata`
  */

package/esm/typings/src/llm-providers/_common/filterModels.d.ts

@@ -4,12 +4,12 @@ import type { LlmExecutionTools } from '../../execution/LlmExecutionTools';
  * Creates a wrapper around LlmExecutionTools that only exposes models matching the filter function
  *
  * @param llmTools The original LLM execution tools to wrap
- * @param modelFilter Function that determines whether a model should be included
+ * @param predicate Function that determines whether a model should be included
  * @returns A new LlmExecutionTools instance with filtered models
  *
  * @public exported from `@promptbook/core`
  */
-export declare function filterModels<TLlmTools extends LlmExecutionTools>(llmTools: TLlmTools, modelFilter: (model: AvailableModel) => boolean): TLlmTools;
+export declare function filterModels<TLlmTools extends LlmExecutionTools>(llmTools: TLlmTools, predicate: (model: AvailableModel) => boolean): TLlmTools;
 /**
  * TODO: !!! [models] Test that this is working
  */

package/esm/typings/src/llm-providers/anthropic-claude/AnthropicClaudeExecutionToolsOptions.d.ts

@@ -2,7 +2,7 @@ import type { ClientOptions } from '@anthropic-ai/sdk';
 import type { CommonToolsOptions } from '../../execution/CommonToolsOptions';
 import type { RemoteClientOptions } from '../../remote-server/types/RemoteClientOptions';
 /**
- * Options for `AnthropicClaudeExecutionTools`
+ * Options for `createAnthropicClaudeExecutionTools` and `AnthropicClaudeExecutionTools`
  *
  * This extends Anthropic's `ClientOptions` with are directly passed to the Anthropic client.
  * @public exported from `@promptbook/anthropic-claude`

package/esm/typings/src/llm-providers/azure-openai/AzureOpenAiExecutionToolsOptions.d.ts

@@ -3,7 +3,7 @@ import type { string_name } from '../../types/typeAliases';
 import type { string_token } from '../../types/typeAliases';
 import type { string_user_id } from '../../types/typeAliases';
 /**
- * Options for `AzureOpenAiExecutionTools`
+ * Options for `createAzureOpenAiExecutionTools` and `AzureOpenAiExecutionTools`
  *
  * @see https://oai.azure.com/portal/
  * @public exported from `@promptbook/azure-openai`

package/esm/typings/src/llm-providers/deepseek/DeepseekExecutionToolsOptions.d.ts

@@ -1,7 +1,7 @@
 import type { createDeepSeek } from '@ai-sdk/deepseek';
 import type { VercelExecutionToolsOptions } from '../vercel/VercelExecutionToolsOptions';
 /**
- * Options for `DeepseekExecutionTools`
+ * Options for `createDeepseekExecutionTools`
  *
  * This combines options for Promptbook, Deepseek and Vercel together
  * @public exported from `@promptbook/deepseek`

package/esm/typings/src/llm-providers/google/GoogleExecutionToolsOptions.d.ts

@@ -1,7 +1,7 @@
 import type { createGoogleGenerativeAI } from '@ai-sdk/google';
 import type { VercelExecutionToolsOptions } from '../vercel/VercelExecutionToolsOptions';
 /**
- * Options for `GoogleExecutionTools`
+ * Options for `createGoogleExecutionTools`
  *
  * This combines options for Promptbook, Google and Vercel together
  * @public exported from `@promptbook/google`

package/esm/typings/src/llm-providers/ollama/OllamaExecutionToolsOptions.d.ts

@@ -1,12 +1,23 @@
-export interface OllamaExecutionToolsOptions {
-    /** Base URL of Ollama API, e.g., http://localhost:11434 */
-    baseUrl: string;
-    /** Model name to use for requests */
-    model: string;
-    /** Optional rate limit: max requests per minute */
-    maxRequestsPerMinute?: number;
-    /** Verbose logging */
-    isVerbose?: boolean;
-    /** Optional user identifier */
-    userId?: string;
-}
+import type { OpenAiExecutionToolsOptions } from '../openai/OpenAiExecutionToolsOptions';
+/**
+ * Default base URL for Ollama API
+ *
+ * @public exported from `@promptbook/ollama`
+ */
+export declare const DEFAULT_OLLAMA_BASE_URL = "http://localhost:11434";
+/**
+ * Options for `createOllamaExecutionTools`
+ *
+ * This combines options for Promptbook, Google and Vercel together
+ * @public exported from `@promptbook/ollama`
+ */
+export type OllamaExecutionToolsOptions = {
+    /**
+     * Base URL of Ollama API
+     *
+     * Note: Naming this `baseURL` not `baseUrl` to be consistent with OpenAI API
+     *
+     * @default `DEFAULT_OLLAMA_BASE_URL`
+     */
+    baseURL?: string;
+} & Omit<OpenAiExecutionToolsOptions, 'baseURL' | 'userId'>;

package/esm/typings/src/llm-providers/ollama/createOllamaExecutionTools.d.ts

@@ -1,11 +1,11 @@
-import { OllamaExecutionTools } from "./OllamaExecutionTools";
-import { OllamaExecutionToolsOptions } from "./OllamaExecutionToolsOptions";
+import type { LlmExecutionTools } from '../../execution/LlmExecutionTools';
+import type { OllamaExecutionToolsOptions } from './OllamaExecutionToolsOptions';
 /**
  * Execution Tools for calling Ollama API
  *
  * @public exported from `@promptbook/ollama`
  */
-export declare const createOllamaExecutionTools: ((options: OllamaExecutionToolsOptions) => OllamaExecutionTools) & {
+export declare const createOllamaExecutionTools: ((ollamaOptions: OllamaExecutionToolsOptions) => LlmExecutionTools) & {
     packageName: string;
     className: string;
 };

package/esm/typings/src/llm-providers/openai/OpenAiAssistantExecutionToolsOptions.d.ts

@@ -2,7 +2,7 @@ import type { ClientOptions } from 'openai';
 import type { string_token } from '../../types/typeAliases';
 import type { OpenAiExecutionToolsOptions } from './OpenAiExecutionToolsOptions';
 /**
- * Options for `OpenAiAssistantExecutionTools`
+ * Options for `createOpenAiAssistantExecutionTools` and `OpenAiAssistantExecutionTools`
  *
  * @public exported from `@promptbook/openai`
  */

package/esm/typings/src/llm-providers/openai/OpenAiExecutionTools.d.ts

@@ -40,7 +40,7 @@ export declare class OpenAiExecutionTools implements LlmExecutionTools {
     /**
      * List all available OpenAI models that can be used
      */
-    listModels(): ReadonlyArray<AvailableModel>;
+    listModels(): Promise<ReadonlyArray<AvailableModel>>;
     /**
      * Calls OpenAI API to use a chat model.
      */

package/esm/typings/src/llm-providers/openai/OpenAiExecutionToolsOptions.d.ts

@@ -1,7 +1,7 @@
 import type { ClientOptions } from 'openai';
 import type { CommonToolsOptions } from '../../execution/CommonToolsOptions';
 /**
- * Options for `OpenAiExecutionTools`
+ * Options for `createOpenAiExecutionTools` and `OpenAiExecutionTools`
  *
  * This extends OpenAI's `ClientOptions` with are directly passed to the OpenAI client.
  * Rest is used by the `OpenAiExecutionTools`.

package/esm/typings/src/llm-providers/openai/createOpenAiExecutionTools.d.ts

@@ -3,6 +3,8 @@ import type { OpenAiExecutionToolsOptions } from './OpenAiExecutionToolsOptions'
 /**
  * Execution Tools for calling OpenAI API
  *
+ * Note: This can be also used for other OpenAI compatible APIs, like Ollama
+ *
  * @public exported from `@promptbook/openai`
  */
 export declare const createOpenAiExecutionTools: ((options: OpenAiExecutionToolsOptions) => OpenAiExecutionTools) & {

package/esm/typings/src/llm-providers/openai/openai-models.d.ts

@@ -1,5 +1,4 @@
 import type { AvailableModel } from '../../execution/AvailableModel';
-import type { number_usd } from '../../types/typeAliases';
 /**
  * List of available OpenAI models with pricing
  *
@@ -9,12 +8,7 @@ import type { number_usd } from '../../types/typeAliases';
  * @see https://openai.com/api/pricing/
  * @public exported from `@promptbook/openai`
  */
-export declare const OPENAI_MODELS: ReadonlyArray<AvailableModel & {
-    pricing?: {
-        readonly prompt: number_usd;
-        readonly output: number_usd;
-    };
-}>;
+export declare const OPENAI_MODELS: ReadonlyArray<AvailableModel>;
 /**
  * Note: [🤖] Add models of new variant
  * TODO: [🧠] Some mechanism to propagate unsureness

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.94.0-0`).
+ * It follows semantic versioning (e.g., `0.94.0-2`).
  *
  * @generated
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/core",
-    "version": "0.94.0-1",
+    "version": "0.94.0-3",
     "description": "Promptbook: Run AI apps in plain human language across multiple models and platforms",
     "private": false,
     "sideEffects": false,

package/umd/index.umd.js

@@ -27,7 +27,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.94.0-1';
+    const PROMPTBOOK_ENGINE_VERSION = '0.94.0-3';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -10365,12 +10365,12 @@
      * Creates a wrapper around LlmExecutionTools that only exposes models matching the filter function
      *
      * @param llmTools The original LLM execution tools to wrap
-     * @param modelFilter Function that determines whether a model should be included
+     * @param predicate Function that determines whether a model should be included
      * @returns A new LlmExecutionTools instance with filtered models
      *
      * @public exported from `@promptbook/core`
      */
-    function filterModels(llmTools, modelFilter) {
+    function filterModels(llmTools, predicate) {
         const filteredTools = {
             // Keep all properties from the original llmTools
             ...llmTools,
@@ -10387,10 +10387,10 @@
                 const originalModels = await llmTools.listModels();
                 // Handle both synchronous and Promise return types
                 if (originalModels instanceof Promise) {
-                    return originalModels.then((models) => models.filter(modelFilter));
+                    return originalModels.then((models) => models.filter(predicate));
                 }
                 else {
-                    return originalModels.filter(modelFilter);
+                    return originalModels.filter(predicate);
                 }
             },
         };
@@ -11150,7 +11150,7 @@
                 packageName: '@promptbook/ollama',
                 className: 'OllamaExecutionTools',
                 options: {
-                    baseUrl: 'http://localhost:11434',
+                    baseURL: 'http://localhost:11434',
                     model: 'llama2',
                     maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
                 },
@@ -11163,7 +11163,7 @@
                     packageName: '@promptbook/ollama',
                     className: 'OllamaExecutionTools',
                     options: {
-                        baseUrl: env.OLLAMA_BASE_URL,
+                        baseURL: env.OLLAMA_BASE_URL,
                         model: env.OLLAMA_MODEL || 'llama2',
                         maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
                     },