@promptbook/azure-openai 0.94.0-2 → 0.94.0-4

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

@@ -0,0 +1,44 @@
+import type { AvailableModel } from '../../execution/AvailableModel';
+import type { LlmExecutionTools } from '../../execution/LlmExecutionTools';
+import type { Usage } from '../../execution/Usage';
+import type { string_markdown } from '../../types/typeAliases';
+import type { string_markdown_text } from '../../types/typeAliases';
+import type { string_title } from '../../types/typeAliases';
+import { computeOpenAiUsage } from '../openai/computeOpenAiUsage';
+import { OpenAiCompatibleExecutionTools } from '../openai/OpenAiCompatibleExecutionTools';
+import type { OllamaExecutionToolsOptions } from './OllamaExecutionToolsOptions';
+/**
+ * Execution Tools for calling Ollama API
+ *
+ * @public exported from `@promptbook/ollama`
+ */
+export declare class OllamaExecutionTools extends OpenAiCompatibleExecutionTools implements LlmExecutionTools {
+    constructor(ollamaOptions: OllamaExecutionToolsOptions);
+    get title(): string_title & string_markdown_text;
+    get description(): string_markdown;
+    /**
+     * List all available models (non dynamically)
+     *
+     * Note: Purpose of this is to provide more information about models than standard listing from API
+     */
+    protected get HARDCODED_MODELS(): ReadonlyArray<AvailableModel>;
+    /**
+     * Computes the usage of the Ollama API based on the response from Ollama
+     */
+    protected computeUsage(...args: Parameters<typeof computeOpenAiUsage>): Usage;
+    /**
+     * Default model for chat variant.
+     */
+    protected getDefaultChatModel(): AvailableModel;
+    /**
+     * Default model for completion variant.
+     */
+    protected getDefaultCompletionModel(): AvailableModel;
+    /**
+     * Default model for completion variant.
+     */
+    protected getDefaultEmbeddingModel(): AvailableModel;
+}
+/**
+ * TODO: [🛄] Some way how to re-wrap the errors from `OpenAiCompatibleExecutionTools`
+ */

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

@@ -4,7 +4,7 @@ import type { OpenAiExecutionToolsOptions } from '../openai/OpenAiExecutionTools
  *
  * @public exported from `@promptbook/ollama`
  */
-export declare const DEFAULT_OLLAMA_BASE_URL = "http://localhost:11434";
+export declare const DEFAULT_OLLAMA_BASE_URL = "http://localhost:11434/v1";
 /**
  * Options for `createOllamaExecutionTools`
  *

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

@@ -5,7 +5,7 @@ import type { OllamaExecutionToolsOptions } from './OllamaExecutionToolsOptions'
  *
  * @public exported from `@promptbook/ollama`
  */
-export declare const createOllamaExecutionTools: ((ollamaOptions: OllamaExecutionToolsOptions) => LlmExecutionTools) & {
+export declare const createOllamaExecutionTools: ((options: OllamaExecutionToolsOptions) => LlmExecutionTools) & {
     packageName: string;
     className: string;
 };

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

@@ -0,0 +1,14 @@
+import type { AvailableModel } from '../../execution/AvailableModel';
+/**
+ * List of available models in Ollama library
+ *
+ * Note: Done at 2025-05-19
+ *
+ * @see https://ollama.com/library
+ * @public exported from `@promptbook/ollama`
+ */
+export declare const OLLAMA_MODELS: ReadonlyArray<AvailableModel>;
+/**
+ * TODO: [🚸] Not all models are compatible with JSON mode, add this information here and use it
+ * Note: [💞] Ignore a discrepancy between file name and entity name
+ */

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

@@ -0,0 +1,91 @@
+import OpenAI from 'openai';
+import type { AvailableModel } from '../../execution/AvailableModel';
+import type { LlmExecutionTools } from '../../execution/LlmExecutionTools';
+import type { ChatPromptResult } from '../../execution/PromptResult';
+import type { CompletionPromptResult } from '../../execution/PromptResult';
+import type { EmbeddingPromptResult } from '../../execution/PromptResult';
+import type { Usage } from '../../execution/Usage';
+import type { Prompt } from '../../types/Prompt';
+import type { string_markdown } from '../../types/typeAliases';
+import type { string_markdown_text } from '../../types/typeAliases';
+import type { string_model_name } from '../../types/typeAliases';
+import type { string_title } from '../../types/typeAliases';
+import { computeOpenAiUsage } from './computeOpenAiUsage';
+import type { OpenAiExecutionToolsOptions } from './OpenAiExecutionToolsOptions';
+/**
+ * Execution Tools for calling OpenAI API or other OpeenAI compatible provider
+ *
+ * @public exported from `@promptbook/openai`
+ */
+export declare abstract class OpenAiCompatibleExecutionTools implements LlmExecutionTools {
+    protected readonly options: OpenAiExecutionToolsOptions;
+    /**
+     * OpenAI API client.
+     */
+    private client;
+    /**
+     * Rate limiter instance
+     */
+    private limiter;
+    /**
+     * Creates OpenAI compatible Execution Tools.
+     *
+     * @param options which are relevant are directly passed to the OpenAI compatible client
+     */
+    constructor(options: OpenAiExecutionToolsOptions);
+    abstract get title(): string_title & string_markdown_text;
+    abstract get description(): string_markdown;
+    getClient(): Promise<OpenAI>;
+    /**
+     * Check the `options` passed to `constructor`
+     */
+    checkConfiguration(): Promise<void>;
+    /**
+     * List all available OpenAI compatible models that can be used
+     */
+    listModels(): Promise<ReadonlyArray<AvailableModel>>;
+    /**
+     * Calls OpenAI compatible API to use a chat model.
+     */
+    callChatModel(prompt: Pick<Prompt, 'content' | 'parameters' | 'modelRequirements' | 'format'>): Promise<ChatPromptResult>;
+    /**
+     * Calls OpenAI API to use a complete model.
+     */
+    callCompletionModel(prompt: Pick<Prompt, 'content' | 'parameters' | 'modelRequirements'>): Promise<CompletionPromptResult>;
+    /**
+     * Calls OpenAI compatible API to use a embedding model
+     */
+    callEmbeddingModel(prompt: Pick<Prompt, 'content' | 'parameters' | 'modelRequirements'>): Promise<EmbeddingPromptResult>;
+    /**
+     * Get the model that should be used as default
+     */
+    protected getDefaultModel(defaultModelName: string_model_name): AvailableModel;
+    /**
+     * List all available models (non dynamically)
+     *
+     * Note: Purpose of this is to provide more information about models than standard listing from API
+     */
+    protected abstract get HARDCODED_MODELS(): ReadonlyArray<AvailableModel>;
+    /**
+     * Computes the usage of the OpenAI API based on the response from OpenAI Compatible API
+     */
+    protected abstract computeUsage(...args: Parameters<typeof computeOpenAiUsage>): Usage;
+    /**
+     * Default model for chat variant.
+     */
+    protected abstract getDefaultChatModel(): AvailableModel;
+    /**
+     * Default model for completion variant.
+     */
+    protected abstract getDefaultCompletionModel(): AvailableModel;
+    /**
+     * Default model for completion variant.
+     */
+    protected abstract getDefaultEmbeddingModel(): AvailableModel;
+}
+/**
+ * TODO: [🛄] Some way how to re-wrap the errors from `OpenAiCompatibleExecutionTools`
+ * TODO: [🛄] Maybe make custom `OpenAiCompatibleError`
+ * TODO: [🧠][🈁] Maybe use `isDeterministic` from options
+ * TODO: [🧠][🌰] Allow to pass `title` for tracking purposes
+ */

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

@@ -1,79 +1,38 @@
-import OpenAI from 'openai';
 import type { AvailableModel } from '../../execution/AvailableModel';
 import type { LlmExecutionTools } from '../../execution/LlmExecutionTools';
-import type { ChatPromptResult } from '../../execution/PromptResult';
-import type { CompletionPromptResult } from '../../execution/PromptResult';
-import type { EmbeddingPromptResult } from '../../execution/PromptResult';
-import type { Prompt } from '../../types/Prompt';
 import type { string_markdown } from '../../types/typeAliases';
 import type { string_markdown_text } from '../../types/typeAliases';
 import type { string_title } from '../../types/typeAliases';
-import type { OpenAiExecutionToolsOptions } from './OpenAiExecutionToolsOptions';
+import { computeOpenAiUsage } from './computeOpenAiUsage';
+import { OpenAiCompatibleExecutionTools } from './OpenAiCompatibleExecutionTools';
 /**
  * Execution Tools for calling OpenAI API
  *
  * @public exported from `@promptbook/openai`
  */
-export declare class OpenAiExecutionTools implements LlmExecutionTools {
-    protected readonly options: OpenAiExecutionToolsOptions;
-    /**
-     * OpenAI API client.
-     */
-    private client;
-    /**
-     * Rate limiter instance
-     */
-    private limiter;
-    /**
-     * Creates OpenAI Execution Tools.
-     *
-     * @param options which are relevant are directly passed to the OpenAI client
-     */
-    constructor(options: OpenAiExecutionToolsOptions);
+export declare class OpenAiExecutionTools extends OpenAiCompatibleExecutionTools implements LlmExecutionTools {
     get title(): string_title & string_markdown_text;
     get description(): string_markdown;
-    getClient(): Promise<OpenAI>;
-    /**
-     * Check the `options` passed to `constructor`
-     */
-    checkConfiguration(): Promise<void>;
     /**
-     * List all available OpenAI models that can be used
-     */
-    listModels(): Promise<ReadonlyArray<AvailableModel>>;
-    /**
-     * Calls OpenAI API to use a chat model.
-     */
-    callChatModel(prompt: Pick<Prompt, 'content' | 'parameters' | 'modelRequirements' | 'format'>): Promise<ChatPromptResult>;
-    /**
-     * Calls OpenAI API to use a complete model.
-     */
-    callCompletionModel(prompt: Pick<Prompt, 'content' | 'parameters' | 'modelRequirements'>): Promise<CompletionPromptResult>;
-    /**
-     * Calls OpenAI API to use a embedding model
+     * List all available models (non dynamically)
+     *
+     * Note: Purpose of this is to provide more information about models than standard listing from API
      */
-    callEmbeddingModel(prompt: Pick<Prompt, 'content' | 'parameters' | 'modelRequirements'>): Promise<EmbeddingPromptResult>;
+    protected get HARDCODED_MODELS(): ReadonlyArray<AvailableModel>;
     /**
-     * Get the model that should be used as default
+     * Computes the usage of the OpenAI API based on the response from OpenAI
      */
-    private getDefaultModel;
+    protected computeUsage: typeof computeOpenAiUsage;
     /**
      * Default model for chat variant.
      */
-    private getDefaultChatModel;
+    protected getDefaultChatModel(): AvailableModel;
     /**
      * Default model for completion variant.
      */
-    private getDefaultCompletionModel;
+    protected getDefaultCompletionModel(): AvailableModel;
     /**
      * Default model for completion variant.
      */
-    private getDefaultEmbeddingModel;
+    protected getDefaultEmbeddingModel(): AvailableModel;
 }
-/**
- * TODO: [🧠][🧙‍♂️] Maybe there can be some wizzard for thoose who want to use just OpenAI
- * TODO: Maybe Create some common util for callChatModel and callCompletionModel
- * TODO: Maybe make custom OpenAiError
- * TODO: [🧠][🈁] Maybe use `isDeterministic` from options
- * TODO: [🧠][🌰] Allow to pass `title` for tracking purposes
- */

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/azure-openai",
-    "version": "0.94.0-2",
+    "version": "0.94.0-4",
     "description": "Promptbook: Run AI apps in plain human language across multiple models and platforms",
     "private": false,
     "sideEffects": false,
@@ -63,7 +63,7 @@
     "module": "./esm/index.es.js",
     "typings": "./esm/typings/src/_packages/azure-openai.index.d.ts",
     "peerDependencies": {
-        "@promptbook/core": "0.94.0-2"
+        "@promptbook/core": "0.94.0-4"
     },
     "dependencies": {
         "@azure/openai": "1.0.0-beta.12",

package/umd/index.umd.js

@@ -24,7 +24,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.94.0-2';
+    const PROMPTBOOK_ENGINE_VERSION = '0.94.0-4';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -1200,11 +1200,11 @@
     }
 
     /**
-     * Function computeUsage will create price per one token based on the string value found on openai page
+     * Create price per one token based on the string value found on openai page
      *
      * @private within the repository, used only as internal helper for `OPENAI_MODELS`
      */
-    function computeUsage(value) {
+    function pricing(value) {
         const [price, tokens] = value.split(' / ');
         return parseFloat(price.replace('$', '')) / parseFloat(tokens.replace('M tokens', '')) / 1000000;
     }
@@ -1240,8 +1240,8 @@
                 modelName: 'davinci-002',
                 modelDescription: 'Legacy completion model with strong performance on text generation tasks. Optimized for complex instructions and longer outputs.',
                 pricing: {
-                    prompt: computeUsage(`$2.00 / 1M tokens`),
-                    output: computeUsage(`$2.00 / 1M tokens`),
+                    prompt: pricing(`$2.00 / 1M tokens`),
+                    output: pricing(`$2.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1258,8 +1258,8 @@
                 modelName: 'gpt-3.5-turbo-16k',
                 modelDescription: 'GPT-3.5 Turbo with extended 16k token context length for handling longer conversations and documents.',
                 pricing: {
-                    prompt: computeUsage(`$3.00 / 1M tokens`),
-                    output: computeUsage(`$4.00 / 1M tokens`),
+                    prompt: pricing(`$3.00 / 1M tokens`),
+                    output: pricing(`$4.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1282,8 +1282,8 @@
                 modelName: 'gpt-4',
                 modelDescription: 'GPT-4 is a powerful language model with enhanced reasoning, instruction-following capabilities, and 8K context window. Optimized for complex tasks requiring deep understanding.',
                 pricing: {
-                    prompt: computeUsage(`$30.00 / 1M tokens`),
-                    output: computeUsage(`$60.00 / 1M tokens`),
+                    prompt: pricing(`$30.00 / 1M tokens`),
+                    output: pricing(`$60.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1294,8 +1294,8 @@
                 modelName: 'gpt-4-32k',
                 modelDescription: 'Extended context version of GPT-4 with a 32K token window for processing very long inputs and generating comprehensive responses for complex tasks.',
                 pricing: {
-                    prompt: computeUsage(`$60.00 / 1M tokens`),
-                    output: computeUsage(`$120.00 / 1M tokens`),
+                    prompt: pricing(`$60.00 / 1M tokens`),
+                    output: pricing(`$120.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1317,8 +1317,8 @@
                 modelName: 'gpt-4-turbo-2024-04-09',
                 modelDescription: 'Latest stable GPT-4 Turbo model from April 2024 with enhanced reasoning and context handling capabilities. Offers 128K context window and improved performance.',
                 pricing: {
-                    prompt: computeUsage(`$10.00 / 1M tokens`),
-                    output: computeUsage(`$30.00 / 1M tokens`),
+                    prompt: pricing(`$10.00 / 1M tokens`),
+                    output: pricing(`$30.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1329,8 +1329,8 @@
                 modelName: 'gpt-3.5-turbo-1106',
                 modelDescription: 'November 2023 version of GPT-3.5 Turbo with improved instruction following and a 16K token context window.',
                 pricing: {
-                    prompt: computeUsage(`$1.00 / 1M tokens`),
-                    output: computeUsage(`$2.00 / 1M tokens`),
+                    prompt: pricing(`$1.00 / 1M tokens`),
+                    output: pricing(`$2.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1341,8 +1341,8 @@
                 modelName: 'gpt-4-turbo',
                 modelDescription: 'More capable model than GPT-4 with improved instruction following, function calling and a 128K token context window for handling very large documents.',
                 pricing: {
-                    prompt: computeUsage(`$10.00 / 1M tokens`),
-                    output: computeUsage(`$30.00 / 1M tokens`),
+                    prompt: pricing(`$10.00 / 1M tokens`),
+                    output: pricing(`$30.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1353,8 +1353,8 @@
                 modelName: 'gpt-3.5-turbo-instruct-0914',
                 modelDescription: 'September 2023 version of GPT-3.5 Turbo optimized for completion-style instruction following with a 4K context window.',
                 pricing: {
-                    prompt: computeUsage(`$1.50  / 1M tokens`),
-                    output: computeUsage(`$2.00 / 1M tokens`), // <- For gpt-3.5-turbo-instruct
+                    prompt: pricing(`$1.50  / 1M tokens`),
+                    output: pricing(`$2.00 / 1M tokens`), // <- For gpt-3.5-turbo-instruct
                 },
             },
             /**/
@@ -1365,8 +1365,8 @@
                 modelName: 'gpt-3.5-turbo-instruct',
                 modelDescription: 'Optimized version of GPT-3.5 for completion-style API with good instruction following and a 4K token context window.',
                 pricing: {
-                    prompt: computeUsage(`$1.50  / 1M tokens`),
-                    output: computeUsage(`$2.00 / 1M tokens`),
+                    prompt: pricing(`$1.50  / 1M tokens`),
+                    output: pricing(`$2.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1383,8 +1383,8 @@
                 modelName: 'gpt-3.5-turbo',
                 modelDescription: 'Latest version of GPT-3.5 Turbo with improved performance and instruction following capabilities. Default 4K context window with options for 16K.',
                 pricing: {
-                    prompt: computeUsage(`$0.50 / 1M tokens`),
-                    output: computeUsage(`$1.50 / 1M tokens`),
+                    prompt: pricing(`$0.50 / 1M tokens`),
+                    output: pricing(`$1.50 / 1M tokens`),
                 },
             },
             /**/
@@ -1395,8 +1395,8 @@
                 modelName: 'gpt-3.5-turbo-0301',
                 modelDescription: 'March 2023 version of GPT-3.5 Turbo with a 4K token context window. Legacy model maintained for backward compatibility.',
                 pricing: {
-                    prompt: computeUsage(`$1.50 / 1M tokens`),
-                    output: computeUsage(`$2.00 / 1M tokens`),
+                    prompt: pricing(`$1.50 / 1M tokens`),
+                    output: pricing(`$2.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1407,8 +1407,8 @@
                 modelName: 'babbage-002',
                 modelDescription: 'Efficient legacy completion model with a good balance of performance and speed. Suitable for straightforward text generation tasks.',
                 pricing: {
-                    prompt: computeUsage(`$0.40 / 1M tokens`),
-                    output: computeUsage(`$0.40 / 1M tokens`),
+                    prompt: pricing(`$0.40 / 1M tokens`),
+                    output: pricing(`$0.40 / 1M tokens`),
                 },
             },
             /**/
@@ -1419,8 +1419,8 @@
                 modelName: 'gpt-4-1106-preview',
                 modelDescription: 'November 2023 preview version of GPT-4 Turbo with improved instruction following and a 128K token context window.',
                 pricing: {
-                    prompt: computeUsage(`$10.00 / 1M tokens`),
-                    output: computeUsage(`$30.00 / 1M tokens`),
+                    prompt: pricing(`$10.00 / 1M tokens`),
+                    output: pricing(`$30.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1431,8 +1431,8 @@
                 modelName: 'gpt-4-0125-preview',
                 modelDescription: 'January 2024 preview version of GPT-4 Turbo with improved reasoning capabilities and a 128K token context window.',
                 pricing: {
-                    prompt: computeUsage(`$10.00 / 1M tokens`),
-                    output: computeUsage(`$30.00 / 1M tokens`),
+                    prompt: pricing(`$10.00 / 1M tokens`),
+                    output: pricing(`$30.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1449,8 +1449,8 @@
                 modelName: 'gpt-3.5-turbo-0125',
                 modelDescription: 'January 2024 version of GPT-3.5 Turbo with improved reasoning capabilities and a 16K token context window.',
                 pricing: {
-                    prompt: computeUsage(`$0.50 / 1M tokens`),
-                    output: computeUsage(`$1.50  / 1M tokens`),
+                    prompt: pricing(`$0.50 / 1M tokens`),
+                    output: pricing(`$1.50  / 1M tokens`),
                 },
             },
             /**/
@@ -1461,8 +1461,8 @@
                 modelName: 'gpt-4-turbo-preview',
                 modelDescription: 'Preview version of GPT-4 Turbo that points to the latest model version. Features improved instruction following, 128K token context window and lower latency.',
                 pricing: {
-                    prompt: computeUsage(`$10.00 / 1M tokens`),
-                    output: computeUsage(`$30.00 / 1M tokens`),
+                    prompt: pricing(`$10.00 / 1M tokens`),
+                    output: pricing(`$30.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1473,7 +1473,7 @@
                 modelName: 'text-embedding-3-large',
                 modelDescription: "OpenAI's most capable text embedding model designed for high-quality embeddings for complex similarity tasks and information retrieval.",
                 pricing: {
-                    prompt: computeUsage(`$0.13 / 1M tokens`),
+                    prompt: pricing(`$0.13 / 1M tokens`),
                     // TODO: [🏏] Leverage the batch API @see https://platform.openai.com/docs/guides/batch
                     output: 0, // <- Note: [🆖] In Embedding models you dont pay for output
                 },
@@ -1486,7 +1486,7 @@
                 modelName: 'text-embedding-3-small',
                 modelDescription: 'Cost-effective embedding model with good performance for simpler tasks like text similarity and retrieval. Good balance of quality and efficiency.',
                 pricing: {
-                    prompt: computeUsage(`$0.02 / 1M tokens`),
+                    prompt: pricing(`$0.02 / 1M tokens`),
                     // TODO: [🏏] Leverage the batch API @see https://platform.openai.com/docs/guides/batch
                     output: 0, // <- Note: [🆖] In Embedding models you dont pay for output
                 },
@@ -1499,8 +1499,8 @@
                 modelName: 'gpt-3.5-turbo-0613',
                 modelDescription: 'June 2023 version of GPT-3.5 Turbo with function calling capabilities and a 4K token context window.',
                 pricing: {
-                    prompt: computeUsage(`$1.50 / 1M tokens`),
-                    output: computeUsage(`$2.00 / 1M tokens`),
+                    prompt: pricing(`$1.50 / 1M tokens`),
+                    output: pricing(`$2.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1511,7 +1511,7 @@
                 modelName: 'text-embedding-ada-002',
                 modelDescription: 'Legacy text embedding model suitable for text similarity and retrieval augmented generation use cases. Replaced by newer embedding-3 models.',
                 pricing: {
-                    prompt: computeUsage(`$0.1 / 1M tokens`),
+                    prompt: pricing(`$0.1 / 1M tokens`),
                     // TODO: [🏏] Leverage the batch API @see https://platform.openai.com/docs/guides/batch
                     output: 0, // <- Note: [🆖] In Embedding models you dont pay for output
                 },
@@ -1542,8 +1542,8 @@
                 modelName: 'gpt-4o-2024-05-13',
                 modelDescription: 'May 2024 version of GPT-4o with enhanced multimodal capabilities, improved reasoning, and optimized for vision, audio and chat at lower latencies.',
                 pricing: {
-                    prompt: computeUsage(`$5.00 / 1M tokens`),
-                    output: computeUsage(`$15.00 / 1M tokens`),
+                    prompt: pricing(`$5.00 / 1M tokens`),
+                    output: pricing(`$15.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1554,8 +1554,8 @@
                 modelName: 'gpt-4o',
                 modelDescription: "OpenAI's most advanced multimodal model optimized for performance, speed, and cost. Capable of vision, reasoning, and high quality text generation.",
                 pricing: {
-                    prompt: computeUsage(`$5.00 / 1M tokens`),
-                    output: computeUsage(`$15.00 / 1M tokens`),
+                    prompt: pricing(`$5.00 / 1M tokens`),
+                    output: pricing(`$15.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1566,8 +1566,8 @@
                 modelName: 'gpt-4o-mini',
                 modelDescription: 'Smaller, more cost-effective version of GPT-4o with good performance across text, vision, and audio tasks at reduced complexity.',
                 pricing: {
-                    prompt: computeUsage(`$0.15 / 1M tokens`),
-                    output: computeUsage(`$0.60 / 1M tokens`),
+                    prompt: pricing(`$0.15 / 1M tokens`),
+                    output: pricing(`$0.60 / 1M tokens`),
                 },
             },
             /**/
@@ -1578,8 +1578,8 @@
                 modelName: 'o1-preview',
                 modelDescription: 'Advanced reasoning model with exceptional performance on complex logical, mathematical, and analytical tasks. Built for deep reasoning and specialized professional tasks.',
                 pricing: {
-                    prompt: computeUsage(`$15.00 / 1M tokens`),
-                    output: computeUsage(`$60.00 / 1M tokens`),
+                    prompt: pricing(`$15.00 / 1M tokens`),
+                    output: pricing(`$60.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1591,8 +1591,8 @@
                 modelDescription: 'September 2024 version of O1 preview with specialized reasoning capabilities for complex tasks requiring precise analytical thinking.',
                 //             <- TODO: [💩] Some better system to organize these date suffixes and versions
                 pricing: {
-                    prompt: computeUsage(`$15.00 / 1M tokens`),
-                    output: computeUsage(`$60.00 / 1M tokens`),
+                    prompt: pricing(`$15.00 / 1M tokens`),
+                    output: pricing(`$60.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1603,8 +1603,8 @@
                 modelName: 'o1-mini',
                 modelDescription: 'Smaller, cost-effective version of the O1 model with good performance on reasoning tasks while maintaining efficiency for everyday analytical use.',
                 pricing: {
-                    prompt: computeUsage(`$3.00 / 1M tokens`),
-                    output: computeUsage(`$12.00 / 1M tokens`),
+                    prompt: pricing(`$3.00 / 1M tokens`),
+                    output: pricing(`$12.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1615,8 +1615,8 @@
                 modelName: 'o1',
                 modelDescription: "OpenAI's advanced reasoning model focused on logic and problem-solving. Designed for complex analytical tasks with rigorous step-by-step reasoning. 128K context window.",
                 pricing: {
-                    prompt: computeUsage(`$15.00 / 1M tokens`),
-                    output: computeUsage(`$60.00 / 1M tokens`),
+                    prompt: pricing(`$15.00 / 1M tokens`),
+                    output: pricing(`$60.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1627,8 +1627,8 @@
                 modelName: 'o3-mini',
                 modelDescription: 'Cost-effective reasoning model optimized for academic and scientific problem-solving. Efficient performance on STEM tasks with deep mathematical and scientific knowledge. 128K context window.',
                 pricing: {
-                    prompt: computeUsage(`$3.00 / 1M tokens`),
-                    output: computeUsage(`$12.00 / 1M tokens`),
+                    prompt: pricing(`$3.00 / 1M tokens`),
+                    output: pricing(`$12.00 / 1M tokens`),
                     // <- TODO: !! Unsure, check the pricing
                 },
             },
@@ -1640,8 +1640,8 @@
                 modelName: 'o1-mini-2024-09-12',
                 modelDescription: "September 2024 version of O1-mini with balanced reasoning capabilities and cost-efficiency. Good for analytical tasks that don't require the full O1 model.",
                 pricing: {
-                    prompt: computeUsage(`$3.00 / 1M tokens`),
-                    output: computeUsage(`$12.00 / 1M tokens`),
+                    prompt: pricing(`$3.00 / 1M tokens`),
+                    output: pricing(`$12.00 / 1M tokens`),
                 },
             },
             /**/
@@ -1652,8 +1652,8 @@
                 modelName: 'gpt-3.5-turbo-16k-0613',
                 modelDescription: 'June 2023 version of GPT-3.5 Turbo with extended 16k token context window for processing longer conversations and documents.',
                 pricing: {
-                    prompt: computeUsage(`$3.00 / 1M tokens`),
-                    output: computeUsage(`$4.00 / 1M tokens`),
+                    prompt: pricing(`$3.00 / 1M tokens`),
+                    output: pricing(`$4.00 / 1M tokens`),
                 },
             },
             /**/