@promptbook/cli 0.94.0-1 → 0.94.0-2

package/umd/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('colors'), require('commander'), require('spacetrim'), require('waitasecond'), require('prompts'), require('path'), require('fs/promises'), require('dotenv'), require('crypto-js/enc-hex'), require('crypto-js/sha256'), require('crypto'), require('socket.io-client'), require('rxjs'), require('child_process'), require('jszip'), require('prettier'), require('prettier/parser-html'), require('papaparse'), require('crypto-js'), require('mime-types'), require('glob-promise'), require('moment'), require('express'), require('express-openapi-validator'), require('http'), require('socket.io'), require('swagger-ui-express'), require('@anthropic-ai/sdk'), require('bottleneck'), require('@azure/openai'), require('node-fetch'), require('openai'), require('@mozilla/readability'), require('jsdom'), require('showdown')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'colors', 'commander', 'spacetrim', 'waitasecond', 'prompts', 'path', 'fs/promises', 'dotenv', 'crypto-js/enc-hex', 'crypto-js/sha256', 'crypto', 'socket.io-client', 'rxjs', 'child_process', 'jszip', 'prettier', 'prettier/parser-html', 'papaparse', 'crypto-js', 'mime-types', 'glob-promise', 'moment', 'express', 'express-openapi-validator', 'http', 'socket.io', 'swagger-ui-express', '@anthropic-ai/sdk', 'bottleneck', '@azure/openai', 'node-fetch', 'openai', '@mozilla/readability', 'jsdom', 'showdown'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-cli"] = {}, global.colors, global.commander, global.spaceTrim, global.waitasecond, global.prompts, global.path, global.promises, global.dotenv, global.hexEncoder, global.sha256, global.crypto, global.socket_ioClient, global.rxjs, global.child_process, global.JSZip, global.prettier, global.parserHtml, global.papaparse, global.cryptoJs, global.mimeTypes, global.glob, global.moment, global.express, global.OpenApiValidator, global.http, global.socket_io, global.swaggerUi, global.Anthropic, global.Bottleneck, global.openai, global.fetch$1, global.OpenAI, global.readability, global.jsdom, global.showdown));
-})(this, (function (exports, colors, commander, spaceTrim, waitasecond, prompts, path, promises, dotenv, hexEncoder, sha256, crypto, socket_ioClient, rxjs, child_process, JSZip, prettier, parserHtml, papaparse, cryptoJs, mimeTypes, glob, moment, express, OpenApiValidator, http, socket_io, swaggerUi, Anthropic, Bottleneck, openai, fetch$1, OpenAI, readability, jsdom, showdown) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('colors'), require('commander'), require('spacetrim'), require('waitasecond'), require('prompts'), require('path'), require('fs/promises'), require('dotenv'), require('crypto-js/enc-hex'), require('crypto-js/sha256'), require('crypto'), require('socket.io-client'), require('rxjs'), require('child_process'), require('jszip'), require('prettier'), require('prettier/parser-html'), require('papaparse'), require('crypto-js'), require('mime-types'), require('glob-promise'), require('moment'), require('express'), require('express-openapi-validator'), require('http'), require('socket.io'), require('swagger-ui-express'), require('@anthropic-ai/sdk'), require('bottleneck'), require('@azure/openai'), require('openai'), require('@mozilla/readability'), require('jsdom'), require('showdown')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'colors', 'commander', 'spacetrim', 'waitasecond', 'prompts', 'path', 'fs/promises', 'dotenv', 'crypto-js/enc-hex', 'crypto-js/sha256', 'crypto', 'socket.io-client', 'rxjs', 'child_process', 'jszip', 'prettier', 'prettier/parser-html', 'papaparse', 'crypto-js', 'mime-types', 'glob-promise', 'moment', 'express', 'express-openapi-validator', 'http', 'socket.io', 'swagger-ui-express', '@anthropic-ai/sdk', 'bottleneck', '@azure/openai', 'openai', '@mozilla/readability', 'jsdom', 'showdown'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-cli"] = {}, global.colors, global.commander, global.spaceTrim, global.waitasecond, global.prompts, global.path, global.promises, global.dotenv, global.hexEncoder, global.sha256, global.crypto, global.socket_ioClient, global.rxjs, global.child_process, global.JSZip, global.prettier, global.parserHtml, global.papaparse, global.cryptoJs, global.mimeTypes, global.glob, global.moment, global.express, global.OpenApiValidator, global.http, global.socket_io, global.swaggerUi, global.Anthropic, global.Bottleneck, global.openai, global.OpenAI, global.readability, global.jsdom, global.showdown));
+})(this, (function (exports, colors, commander, spaceTrim, waitasecond, prompts, path, promises, dotenv, hexEncoder, sha256, crypto, socket_ioClient, rxjs, child_process, JSZip, prettier, parserHtml, papaparse, cryptoJs, mimeTypes, glob, moment, express, OpenApiValidator, http, socket_io, swaggerUi, Anthropic, Bottleneck, openai, OpenAI, readability, jsdom, showdown) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -41,7 +41,6 @@
     var swaggerUi__default = /*#__PURE__*/_interopDefaultLegacy(swaggerUi);
     var Anthropic__default = /*#__PURE__*/_interopDefaultLegacy(Anthropic);
     var Bottleneck__default = /*#__PURE__*/_interopDefaultLegacy(Bottleneck);
-    var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch$1);
     var OpenAI__default = /*#__PURE__*/_interopDefaultLegacy(OpenAI);
 
     // ⚠️ WARNING: This code has been generated so that any manual changes will be overwritten
@@ -58,7 +57,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.94.0-1';
+    const PROMPTBOOK_ENGINE_VERSION = '0.94.0-2';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -17024,7 +17023,7 @@
                 packageName: '@promptbook/ollama',
                 className: 'OllamaExecutionTools',
                 options: {
-                    baseUrl: 'http://localhost:11434',
+                    baseURL: 'http://localhost:11434',
                     model: 'llama2',
                     maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
                 },
@@ -17037,7 +17036,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,
                     },
@@ -17050,203 +17049,6 @@
      * Note: [💞] Ignore a discrepancy between file name and entity name
      */
 
-    /**
-     * Execution Tools for calling a local Ollama model via HTTP API
-     *
-     * @public exported from `@promptbook/ollama`
-     */
-    class OllamaExecutionTools {
-        constructor(options) {
-            this.options = options;
-            this.limiter = new Bottleneck__default["default"]({
-                minTime: 60000 / (options.maxRequestsPerMinute || DEFAULT_MAX_REQUESTS_PER_MINUTE),
-            });
-        }
-        get title() {
-            return 'Ollama';
-        }
-        get description() {
-            return 'Local Ollama LLM via HTTP';
-        }
-        async checkConfiguration() {
-            const res = await fetch__default["default"](`${this.options.baseUrl}/models`);
-            if (!res.ok)
-                throw new UnexpectedError(`Failed to reach Ollama API at ${this.options.baseUrl}`);
-        }
-        async listModels() {
-            const res = await fetch__default["default"](`${this.options.baseUrl}/models`);
-            if (!res.ok)
-                throw new UnexpectedError(`Error listing Ollama models: ${res.statusText}`);
-            const data = (await res.json());
-            return data.map((m) => ({ modelName: m.name, modelVariant: 'CHAT' }));
-        }
-        async callChatModel(prompt) {
-            const { content, parameters, modelRequirements } = prompt;
-            if (modelRequirements.modelVariant !== 'CHAT') {
-                throw new PipelineExecutionError('Use callChatModel only for CHAT variant');
-            }
-            const modelName = modelRequirements.modelName || this.options.model;
-            const body = {
-                model: modelName,
-                messages: [
-                    ...(modelRequirements.systemMessage
-                        ? [{ role: 'system', content: modelRequirements.systemMessage }]
-                        : []),
-                    { role: 'user', content: content },
-                ],
-                parameters: parameters,
-            };
-            const start = $getCurrentDate();
-            const res = await this.limiter.schedule(() => fetch__default["default"](`${this.options.baseUrl}/chat/completions`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify(body),
-            }));
-            if (!res.ok)
-                throw new PipelineExecutionError(`Ollama API error: ${res.statusText}`);
-            const json = await res.json();
-            const complete = $getCurrentDate();
-            if (!json.choices || !json.choices[0]) {
-                throw new PipelineExecutionError('No choices from Ollama');
-            }
-            const resultContent = json.choices[0].message.content;
-            const usage = { price: { value: 0, isUncertain: true }, input: {}, output: {} }; /* <- !!! */
-            return exportJson({
-                name: 'promptResult',
-                message: 'Result of Ollama',
-                order: [],
-                value: {
-                    content: resultContent,
-                    modelName,
-                    timing: { start, complete },
-                    usage,
-                    rawPromptContent: content,
-                    rawRequest: body,
-                    rawResponse: json,
-                },
-            });
-        }
-    }
-
-    /**
-     * Execution Tools for calling Ollama API
-     *
-     * @public exported from `@promptbook/ollama`
-     */
-    const createOllamaExecutionTools = Object.assign((options) => new OllamaExecutionTools(options), {
-        packageName: '@promptbook/ollama',
-        className: 'OllamaExecutionTools',
-    });
-
-    /**
-     * Registration of LLM provider
-     *
-     * Warning: This is not useful for the end user, it is just a side effect of the mechanism that handles all available LLM tools
-     *
-     * @public exported from `@promptbook/ollama`
-     * @public exported from `@promptbook/wizzard`
-     * @public exported from `@promptbook/cli`
-     */
-    const _OllamaRegistration = $llmToolsRegister.register(createOllamaExecutionTools);
-    /**
-     * TODO: [🎶] Naming "constructor" vs "creator" vs "factory"
-     * Note: [💞] Ignore a discrepancy between file name and entity name
-     */
-
-    /**
-     * Registration of LLM provider metadata
-     *
-     * Warning: This is not useful for the end user, it is just a side effect of the mechanism that handles all available LLM tools
-     *
-     * @public exported from `@promptbook/core`
-     * @public exported from `@promptbook/wizzard`
-     * @public exported from `@promptbook/cli`
-     */
-    const _OpenAiMetadataRegistration = $llmToolsMetadataRegister.register({
-        title: 'Open AI',
-        packageName: '@promptbook/openai',
-        className: 'OpenAiExecutionTools',
-        envVariables: ['OPENAI_API_KEY'],
-        trustLevel: 'CLOSED',
-        order: MODEL_ORDERS.TOP_TIER,
-        getBoilerplateConfiguration() {
-            return {
-                title: 'Open AI',
-                packageName: '@promptbook/openai',
-                className: 'OpenAiExecutionTools',
-                options: {
-                    apiKey: 'sk-',
-                    maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
-                },
-            };
-        },
-        createConfigurationFromEnv(env) {
-            // Note: Note using `process.env` BUT `env` to pass in the environment variables dynamically
-            if (typeof env.OPENAI_API_KEY === 'string') {
-                return {
-                    title: 'Open AI (from env)',
-                    packageName: '@promptbook/openai',
-                    className: 'OpenAiExecutionTools',
-                    options: {
-                        apiKey: env.OPENAI_API_KEY,
-                    },
-                };
-            }
-            return null;
-        },
-    });
-    /**
-     * Registration of the OpenAI Assistant metadata
-     *
-     * Note: [🏐] Configurations registrations are done in the metadata registration section, but the constructor registration is handled separately.
-     *
-     * @public exported from `@promptbook/core`
-     * @public exported from `@promptbook/wizzard`
-     * @public exported from `@promptbook/cli`
-     */
-    const _OpenAiAssistantMetadataRegistration = $llmToolsMetadataRegister.register({
-        title: 'Open AI Assistant',
-        packageName: '@promptbook/openai',
-        className: 'OpenAiAssistantExecutionTools',
-        envVariables: null,
-        //            <- TODO: ['OPENAI_API_KEY', 'OPENAI_ASSISTANT_ID']
-        trustLevel: 'CLOSED',
-        order: MODEL_ORDERS.NORMAL,
-        getBoilerplateConfiguration() {
-            return {
-                title: 'Open AI Assistant',
-                packageName: '@promptbook/openai',
-                className: 'OpenAiAssistantExecutionTools',
-                options: {
-                    apiKey: 'sk-',
-                    assistantId: 'asst_',
-                    maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
-                },
-            };
-        },
-        createConfigurationFromEnv(env) {
-            return null;
-            /*
-            if (typeof env.OPENAI_API_KEY === 'string' || typeof env.OPENAI_XXX === 'string') {
-                return {
-                    title: 'Open AI Assistant (from env)',
-                    packageName: '@promptbook/openai',
-                    className: 'OpenAiAssistantExecutionTools',
-                    options: {
-                        apiKey: env.OPENAI_API_KEY!,
-                        assistantId: env.OPENAI_XXX!
-                    },
-                };
-            }
-
-            return null;
-            */
-        },
-    });
-    /**
-     * Note: [💞] Ignore a discrepancy between file name and entity name
-     */
-
     /**
      * Computes the usage of the OpenAI API based on the response from OpenAI
      *
@@ -17359,7 +17161,7 @@
         /**
          * List all available OpenAI models that can be used
          */
-        listModels() {
+        async listModels() {
             /*
             Note: Dynamic lising of the models
             const models = await this.openai.models.list({});
@@ -17367,7 +17169,26 @@
             console.log({ models });
             console.log(models.data);
             */
-            return OPENAI_MODELS;
+            const client = await this.getClient();
+            const rawModelsList = await client.models.list();
+            const availableModels = rawModelsList.data
+                .sort((a, b) => (a.created > b.created ? 1 : -1))
+                .map((modelFromApi) => {
+                // TODO: !!!! What about other model compatibilities?
+                const modelFromList = OPENAI_MODELS.find(({ modelName }) => modelName === modelFromApi.id ||
+                    modelName.startsWith(modelFromApi.id) ||
+                    modelFromApi.id.startsWith(modelName));
+                if (modelFromList !== undefined) {
+                    return modelFromList;
+                }
+                return {
+                    modelVariant: 'CHAT',
+                    modelTitle: modelFromApi.id,
+                    modelName: modelFromApi.id,
+                    modelDescription: '',
+                };
+            });
+            return availableModels;
         }
         /**
          * Calls OpenAI API to use a chat model.
@@ -17647,6 +17468,163 @@
      * TODO: [🧠][🌰] Allow to pass `title` for tracking purposes
      */
 
+    /**
+     * Execution Tools for calling OpenAI API
+     *
+     * Note: This can be also used for other OpenAI compatible APIs, like Ollama
+     *
+     * @public exported from `@promptbook/openai`
+     */
+    const createOpenAiExecutionTools = Object.assign((options) => {
+        // TODO: [🧠][main] !!4 If browser, auto add `dangerouslyAllowBrowser`
+        if (($isRunningInBrowser() || $isRunningInWebWorker()) && !options.dangerouslyAllowBrowser) {
+            options = { ...options, dangerouslyAllowBrowser: true };
+        }
+        return new OpenAiExecutionTools(options);
+    }, {
+        packageName: '@promptbook/openai',
+        className: 'OpenAiExecutionTools',
+    });
+    /**
+     * TODO: [🦺] Is there some way how to put `packageName` and `className` on top and function definition on bottom?
+     * TODO: [🎶] Naming "constructor" vs "creator" vs "factory"
+     */
+
+    /**
+     * Default base URL for Ollama API
+     *
+     * @public exported from `@promptbook/ollama`
+     */
+    const DEFAULT_OLLAMA_BASE_URL = 'http://localhost:11434'; // <- TODO: !!!! What is the correct base URL? /v1?
+
+    /**
+     * Execution Tools for calling Ollama API
+     *
+     * @public exported from `@promptbook/ollama`
+     */
+    const createOllamaExecutionTools = Object.assign((ollamaOptions) => {
+        const openAiCompatibleOptions = {
+            baseURL: DEFAULT_OLLAMA_BASE_URL,
+            ...ollamaOptions,
+            userId: 'ollama',
+        };
+        // TODO: !!!! Listing the models - do it dynamically in OpenAiExecutionTools
+        // TODO: !!!! Do not allow to create Assistant from OpenAi compatible tools
+        return createOpenAiExecutionTools(openAiCompatibleOptions);
+    }, {
+        packageName: '@promptbook/ollama',
+        className: 'OllamaExecutionTools',
+    });
+
+    /**
+     * Registration of LLM provider
+     *
+     * Warning: This is not useful for the end user, it is just a side effect of the mechanism that handles all available LLM tools
+     *
+     * @public exported from `@promptbook/ollama`
+     * @public exported from `@promptbook/wizzard`
+     * @public exported from `@promptbook/cli`
+     */
+    const _OllamaRegistration = $llmToolsRegister.register(createOllamaExecutionTools);
+    /**
+     * TODO: [🎶] Naming "constructor" vs "creator" vs "factory"
+     * Note: [💞] Ignore a discrepancy between file name and entity name
+     */
+
+    /**
+     * Registration of LLM provider metadata
+     *
+     * Warning: This is not useful for the end user, it is just a side effect of the mechanism that handles all available LLM tools
+     *
+     * @public exported from `@promptbook/core`
+     * @public exported from `@promptbook/wizzard`
+     * @public exported from `@promptbook/cli`
+     */
+    const _OpenAiMetadataRegistration = $llmToolsMetadataRegister.register({
+        title: 'Open AI',
+        packageName: '@promptbook/openai',
+        className: 'OpenAiExecutionTools',
+        envVariables: ['OPENAI_API_KEY'],
+        trustLevel: 'CLOSED',
+        order: MODEL_ORDERS.TOP_TIER,
+        getBoilerplateConfiguration() {
+            return {
+                title: 'Open AI',
+                packageName: '@promptbook/openai',
+                className: 'OpenAiExecutionTools',
+                options: {
+                    apiKey: 'sk-',
+                    maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
+                },
+            };
+        },
+        createConfigurationFromEnv(env) {
+            // Note: Note using `process.env` BUT `env` to pass in the environment variables dynamically
+            if (typeof env.OPENAI_API_KEY === 'string') {
+                return {
+                    title: 'Open AI (from env)',
+                    packageName: '@promptbook/openai',
+                    className: 'OpenAiExecutionTools',
+                    options: {
+                        apiKey: env.OPENAI_API_KEY,
+                    },
+                };
+            }
+            return null;
+        },
+    });
+    /**
+     * Registration of the OpenAI Assistant metadata
+     *
+     * Note: [🏐] Configurations registrations are done in the metadata registration section, but the constructor registration is handled separately.
+     *
+     * @public exported from `@promptbook/core`
+     * @public exported from `@promptbook/wizzard`
+     * @public exported from `@promptbook/cli`
+     */
+    const _OpenAiAssistantMetadataRegistration = $llmToolsMetadataRegister.register({
+        title: 'Open AI Assistant',
+        packageName: '@promptbook/openai',
+        className: 'OpenAiAssistantExecutionTools',
+        envVariables: null,
+        //            <- TODO: ['OPENAI_API_KEY', 'OPENAI_ASSISTANT_ID']
+        trustLevel: 'CLOSED',
+        order: MODEL_ORDERS.NORMAL,
+        getBoilerplateConfiguration() {
+            return {
+                title: 'Open AI Assistant',
+                packageName: '@promptbook/openai',
+                className: 'OpenAiAssistantExecutionTools',
+                options: {
+                    apiKey: 'sk-',
+                    assistantId: 'asst_',
+                    maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
+                },
+            };
+        },
+        createConfigurationFromEnv(env) {
+            return null;
+            /*
+            if (typeof env.OPENAI_API_KEY === 'string' || typeof env.OPENAI_XXX === 'string') {
+                return {
+                    title: 'Open AI Assistant (from env)',
+                    packageName: '@promptbook/openai',
+                    className: 'OpenAiAssistantExecutionTools',
+                    options: {
+                        apiKey: env.OPENAI_API_KEY!,
+                        assistantId: env.OPENAI_XXX!
+                    },
+                };
+            }
+
+            return null;
+            */
+        },
+    });
+    /**
+     * Note: [💞] Ignore a discrepancy between file name and entity name
+     */
+
     /**
      * Execution Tools for calling OpenAI API Assistants
      *
@@ -17834,26 +17812,6 @@
      * TODO: [🎶] Naming "constructor" vs "creator" vs "factory"
      */
 
-    /**
-     * Execution Tools for calling OpenAI API
-     *
-     * @public exported from `@promptbook/openai`
-     */
-    const createOpenAiExecutionTools = Object.assign((options) => {
-        // TODO: [🧠][main] !!4 If browser, auto add `dangerouslyAllowBrowser`
-        if (($isRunningInBrowser() || $isRunningInWebWorker()) && !options.dangerouslyAllowBrowser) {
-            options = { ...options, dangerouslyAllowBrowser: true };
-        }
-        return new OpenAiExecutionTools(options);
-    }, {
-        packageName: '@promptbook/openai',
-        className: 'OpenAiExecutionTools',
-    });
-    /**
-     * TODO: [🦺] Is there some way how to put `packageName` and `className` on top and function definition on bottom?
-     * TODO: [🎶] Naming "constructor" vs "creator" vs "factory"
-     */
-
     /**
      * Registration of LLM provider
      *