@promptbook/cli 0.94.0-0 → 0.94.0-1

package/README.md

@@ -114,8 +114,6 @@ Rest of the documentation is common for **entire promptbook ecosystem**:
 
 During the computer revolution, we have seen [multiple generations of computer languages](https://github.com/webgptorg/promptbook/discussions/180), from the physical rewiring of the vacuum tubes through low-level machine code to the high-level languages like Python or JavaScript. And now, we're on the edge of the **next revolution**!
 
-
-
 It's a revolution of writing software in **plain human language** that is understandable and executable by both humans and machines – and it's going to change everything!
 
 The incredible growth in power of microprocessors and the Moore's Law have been the driving force behind the ever-more powerful languages, and it's been an amazing journey! Similarly, the large language models (like GPT or Claude) are the next big thing in language technology, and they're set to transform the way we interact with computers.
@@ -301,8 +299,6 @@ Personas can have access to different knowledge, tools and actions. They can als
 
 -   [PERSONA](https://github.com/webgptorg/promptbook/blob/main/documents/commands/PERSONA.md)
 
-
-
 ### **3. How:** Knowledge, Instruments and Actions
 
 The resources used by the personas are used to do the work.
@@ -363,6 +359,7 @@ Or you can install them separately:
 -   **[@promptbook/vercel](https://www.npmjs.com/package/@promptbook/vercel)** - Adapter for Vercel functionalities
 -   **[@promptbook/google](https://www.npmjs.com/package/@promptbook/google)** - Integration with Google's Gemini API
 -   **[@promptbook/deepseek](https://www.npmjs.com/package/@promptbook/deepseek)** - Integration with [DeepSeek API](https://www.deepseek.com/)
+-   **[@promptbook/ollama](https://www.npmjs.com/package/@promptbook/ollama)** - Integration with [Ollama](https://ollama.com/) API
 -   **[@promptbook/azure-openai](https://www.npmjs.com/package/@promptbook/azure-openai)** - Execution tools for Azure OpenAI API
 
 -   **[@promptbook/fake-llm](https://www.npmjs.com/package/@promptbook/fake-llm)** - Mocked execution tools for testing the library and saving the tokens
@@ -401,8 +398,6 @@ The following glossary is used to clarify certain concepts:
 
 _Note: This section is not complete dictionary, more list of general AI / LLM terms that has connection with Promptbook_
 
-
-
 ### 💯 Core concepts
 
 -   [📚 Collection of pipelines](https://github.com/webgptorg/promptbook/discussions/65)

package/esm/index.es.js

@@ -28,6 +28,7 @@ import swaggerUi from 'swagger-ui-express';
 import Anthropic from '@anthropic-ai/sdk';
 import Bottleneck from 'bottleneck';
 import { OpenAIClient, AzureKeyCredential } from '@azure/openai';
+import fetch$1 from 'node-fetch';
 import OpenAI from 'openai';
 import { Readability } from '@mozilla/readability';
 import { JSDOM } from 'jsdom';
@@ -47,7 +48,7 @@ const BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.94.0-0';
+const PROMPTBOOK_ENGINE_VERSION = '0.94.0-1';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -6961,11 +6962,6 @@ async function executeTask(options) {
     const jokerParameterNames = currentTask.jokerParameterNames || [];
     const preparedContent = (currentTask.preparedContent || '{content}').split('{content}').join(currentTask.content);
     //    <- TODO: [🍵] Use here `templateParameters` to replace {websiteContent} with option to ignore missing parameters
-    await onProgress({
-        outputParameters: {
-            [currentTask.resultingParameterName]: '',
-        },
-    });
     const resultString = await executeFormatSubvalues({
         jokerParameterNames,
         priority,
@@ -7064,6 +7060,13 @@ async function executePipeline(options) {
      * Note: This is a flag to prevent `onProgress` call after the pipeline execution is finished
      */
     let isReturned = false;
+    // Note: Report all output parameters upfront as empty strings
+    if (onProgress) {
+        const emptyOutputParameters = Object.fromEntries(preparedPipeline.parameters.filter((param) => !param.isInput).map((param) => [param.name, '']));
+        onProgress({
+            outputParameters: emptyOutputParameters,
+        });
+    }
     // Note: Check that all input input parameters are defined
     for (const parameter of preparedPipeline.parameters.filter(({ isInput }) => isInput)) {
         if (inputParameters[parameter.name] === undefined) {
@@ -16989,6 +16992,157 @@ const _GoogleRegistration = $llmToolsRegister.register(createGoogleExecutionTool
  * 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 _OllamaMetadataRegistration = $llmToolsMetadataRegister.register({
+    title: 'Ollama',
+    packageName: '@promptbook/ollama',
+    className: 'OllamaExecutionTools',
+    envVariables: ['OLLAMA_BASE_URL', 'OLLAMA_MODEL'],
+    trustLevel: 'CLOSED_LOCAL',
+    order: MODEL_ORDERS.NORMAL,
+    getBoilerplateConfiguration() {
+        return {
+            title: 'Ollama',
+            packageName: '@promptbook/ollama',
+            className: 'OllamaExecutionTools',
+            options: {
+                baseUrl: 'http://localhost:11434',
+                model: 'llama2',
+                maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
+            },
+        };
+    },
+    createConfigurationFromEnv(env) {
+        if (typeof env.OLLAMA_BASE_URL === 'string') {
+            return {
+                title: 'Ollama (from env)',
+                packageName: '@promptbook/ollama',
+                className: 'OllamaExecutionTools',
+                options: {
+                    baseUrl: env.OLLAMA_BASE_URL,
+                    model: env.OLLAMA_MODEL || 'llama2',
+                    maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
+                },
+            };
+        }
+        return null;
+    },
+});
+/**
+ * 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({
+            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$1(`${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$1(`${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$1(`${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
  *
@@ -18947,5 +19101,5 @@ const _WebsiteScraperRegistration = $scrapersRegister.register(createWebsiteScra
  * Note: [💞] Ignore a discrepancy between file name and entity name
  */
 
-export { BOOK_LANGUAGE_VERSION, PROMPTBOOK_ENGINE_VERSION, _AnthropicClaudeMetadataRegistration, _AnthropicClaudeRegistration, _AzureOpenAiMetadataRegistration, _AzureOpenAiRegistration, _BoilerplateScraperMetadataRegistration, _BoilerplateScraperRegistration, _CLI, _DeepseekMetadataRegistration, _DeepseekRegistration, _DocumentScraperMetadataRegistration, _DocumentScraperRegistration, _GoogleMetadataRegistration, _GoogleRegistration, _LegacyDocumentScraperMetadataRegistration, _LegacyDocumentScraperRegistration, _MarkdownScraperMetadataRegistration, _MarkdownScraperRegistration, _MarkitdownScraperMetadataRegistration, _MarkitdownScraperRegistration, _OpenAiAssistantMetadataRegistration, _OpenAiAssistantRegistration, _OpenAiMetadataRegistration, _OpenAiRegistration, _PdfScraperMetadataRegistration, _PdfScraperRegistration, _WebsiteScraperMetadataRegistration, _WebsiteScraperRegistration };
+export { BOOK_LANGUAGE_VERSION, PROMPTBOOK_ENGINE_VERSION, _AnthropicClaudeMetadataRegistration, _AnthropicClaudeRegistration, _AzureOpenAiMetadataRegistration, _AzureOpenAiRegistration, _BoilerplateScraperMetadataRegistration, _BoilerplateScraperRegistration, _CLI, _DeepseekMetadataRegistration, _DeepseekRegistration, _DocumentScraperMetadataRegistration, _DocumentScraperRegistration, _GoogleMetadataRegistration, _GoogleRegistration, _LegacyDocumentScraperMetadataRegistration, _LegacyDocumentScraperRegistration, _MarkdownScraperMetadataRegistration, _MarkdownScraperRegistration, _MarkitdownScraperMetadataRegistration, _MarkitdownScraperRegistration, _OllamaMetadataRegistration, _OllamaRegistration, _OpenAiAssistantMetadataRegistration, _OpenAiAssistantRegistration, _OpenAiMetadataRegistration, _OpenAiRegistration, _PdfScraperMetadataRegistration, _PdfScraperRegistration, _WebsiteScraperMetadataRegistration, _WebsiteScraperRegistration };
 //# sourceMappingURL=index.es.js.map