@promptbook/cli 0.76.0 → 0.77.0-3

package/README.md

@@ -23,6 +23,10 @@
 
 
 
+<blockquote style="color: #ff8811">
+    <b>⚠ Warning:</b> This is a pre-release version of the library. It is not yet ready for production use. Please look at <a href="https://www.npmjs.com/package/@promptbook/core?activeTab=versions">latest stable release</a>.
+</blockquote>
+
 ## 📦 Package `@promptbook/cli`
 
 - Promptbooks are [divided into several](#-packages) packages, all are published from [single monorepo](https://github.com/webgptorg/promptbook).
@@ -294,7 +298,7 @@ Or you can install them separately:
 -   **[@promptbook/openai](https://www.npmjs.com/package/@promptbook/openai)** - Execution tools for OpenAI API, wrapper around OpenAI SDK
 -   **[@promptbook/anthropic-claude](https://www.npmjs.com/package/@promptbook/anthropic-claude)** - Execution tools for Anthropic Claude API, wrapper around Anthropic Claude SDK 
 -   **[@promptbook/vercel](https://www.npmjs.com/package/@promptbook/vercel)** - Adapter for Vercel functionalities
--   **[@promptbook/gemini](https://www.npmjs.com/package/@promptbook/gemini)** - Integration with Google's Gemini API
+-   **[@promptbook/google](https://www.npmjs.com/package/@promptbook/google)** - Integration with Google's Gemini API
 -   **[@promptbook/azure-openai](https://www.npmjs.com/package/@promptbook/azure-openai)** - Execution tools for Azure OpenAI API
 -   **[@promptbook/langtail](https://www.npmjs.com/package/@promptbook/langtail)** - Execution tools for Langtail API, wrapper around Langtail SDK
 -   **[@promptbook/fake-llm](https://www.npmjs.com/package/@promptbook/fake-llm)** - Mocked execution tools for testing the library and saving the tokens

package/esm/index.es.js

@@ -37,7 +37,7 @@ var BOOK_LANGUAGE_VERSION = '1.0.0';
  *
  * @see https://github.com/webgptorg/promptbook
  */
-var PROMPTBOOK_ENGINE_VERSION = '0.75.10';
+var PROMPTBOOK_ENGINE_VERSION = '0.77.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
@@ -5645,7 +5645,7 @@ function preparePipeline(pipeline, tools, options) {
                     llmToolsWithUsage = countTotalUsage(llmTools);
                     currentPreparation = {
                         id: 1,
-                        // TODO: [🍥]> date: $currentDate(),
+                        // TODO: [🍥]> date: $getCurrentDate(),
                         promptbookVersion: PROMPTBOOK_ENGINE_VERSION,
                         usage: ZERO_USAGE,
                     };
@@ -10549,7 +10549,7 @@ var MemoryStorage = /** @class */ (function () {
  * @returns string_date branded type
  * @public exported from `@promptbook/utils`
  */
-function $currentDate() {
+function $getCurrentDate() {
     return new Date().toISOString();
 }
 
@@ -10624,7 +10624,7 @@ function cacheLlmTools(llmTools, options) {
                 // TODO: [🧠] !!!!! How to do timing in mixed cache / non-cache situation
                 // promptResult.timing: FromtoItems
                 return [4 /*yield*/, storage.setItem(key, {
-                        date: $currentDate(),
+                        date: $getCurrentDate(),
                         promptbookVersion: PROMPTBOOK_ENGINE_VERSION,
                         prompt: prompt,
                         promptResult: promptResult,
@@ -12198,15 +12198,6 @@ var RemoteLlmExecutionTools = /** @class */ (function () {
  * TODO: [🧠] Maybe remove `@promptbook/remote-client` and just use `@promptbook/core`
  */
 
-/**
- * Get current date in ISO 8601 format
- *
- * @private internal utility
- */
-function getCurrentIsoDate() {
-    return new Date().toISOString();
-}
-
 /**
  * Function computeUsage will create price per one token based on the string value found on openai page
  *
@@ -12481,7 +12472,7 @@ var AnthropicClaudeExecutionTools = /** @class */ (function () {
                             ],
                             // TODO: Is here some equivalent of user identification?> user: this.options.user,
                         };
-                        start = getCurrentIsoDate();
+                        start = $getCurrentDate();
                         if (this.options.isVerbose) {
                             console.info(colors.bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
                         }
@@ -12508,7 +12499,7 @@ var AnthropicClaudeExecutionTools = /** @class */ (function () {
                         }
                         resultContent = contentBlock.text;
                         // eslint-disable-next-line prefer-const
-                        complete = getCurrentIsoDate();
+                        complete = $getCurrentDate();
                         usage = computeAnthropicClaudeUsage(rawPromptContent || '', resultContent || '', rawResponse);
                         return [2 /*return*/, $asDeeplyFrozenSerializableJson('AnthropicClaudeExecutionTools ChatPromptResult', {
                                 content: resultContent,
@@ -12557,7 +12548,7 @@ var AnthropicClaudeExecutionTools = /** @class */ (function () {
             prompt: rawPromptContent,
             user: this.options.user,
         };
-        const start: string_date_iso8601 = getCurrentIsoDate();
+        const start: string_date_iso8601 = $getCurrentDate();
         let complete: string_date_iso8601;
 
         if (this.options.isVerbose) {
@@ -12586,7 +12577,7 @@ var AnthropicClaudeExecutionTools = /** @class */ (function () {
 
         const resultContent = rawResponse.choices[0].text;
         // eslint-disable-next-line prefer-const
-        complete = getCurrentIsoDate();
+        complete = $getCurrentDate();
         const usage = { price: 'UNKNOWN', inputTokens: 0, outputTokens: 0 /* <- TODO: [🐞] Compute usage * / } satisfies PromptResultUsage;
 
 
@@ -12648,7 +12639,7 @@ var AnthropicClaudeExecutionTools = /** @class */ (function () {
  */
 var createAnthropicClaudeExecutionTools = Object.assign(function (options) {
     if (options.isProxied) {
-        return new RemoteLlmExecutionTools(__assign(__assign({}, options), { userId: null, isAnonymous: true, llmToolsConfiguration: [
+        return new RemoteLlmExecutionTools(__assign(__assign({}, options), { isAnonymous: true, llmToolsConfiguration: [
                 {
                     title: 'Anthropic Claude (proxied)',
                     packageName: '@promptbook/anthropic-claude',
@@ -13257,7 +13248,7 @@ var AzureOpenAiExecutionTools = /** @class */ (function () {
                                 content: rawPromptContent,
                             },
                         ], false);
-                        start = getCurrentIsoDate();
+                        start = $getCurrentDate();
                         complete = void 0;
                         if (this.options.isVerbose) {
                             console.info(colors.bgWhite('messages'), JSON.stringify(messages, null, 4));
@@ -13286,7 +13277,7 @@ var AzureOpenAiExecutionTools = /** @class */ (function () {
                         }
                         resultContent = rawResponse.choices[0].message.content;
                         // eslint-disable-next-line prefer-const
-                        complete = getCurrentIsoDate();
+                        complete = $getCurrentDate();
                         usage = {
                             price: uncertainNumber() /* <- TODO: [🐞] Compute usage */,
                             input: __assign({ tokensCount: uncertainNumber((_b = rawResponse.usage) === null || _b === void 0 ? void 0 : _b.promptTokens) }, computeUsageCounts(prompt.content)),
@@ -13347,7 +13338,7 @@ var AzureOpenAiExecutionTools = /** @class */ (function () {
                             // <- TODO: [🈁] Use `seed` here AND/OR use is `isDeterministic` for entire execution tools
                             // <- Note: [🧆]
                         };
-                        start = getCurrentIsoDate();
+                        start = $getCurrentDate();
                         complete = void 0;
                         if (this.options.isVerbose) {
                             console.info(colors.bgWhite('content'), JSON.stringify(content, null, 4));
@@ -13379,7 +13370,7 @@ var AzureOpenAiExecutionTools = /** @class */ (function () {
                         }
                         resultContent = rawResponse.choices[0].text;
                         // eslint-disable-next-line prefer-const
-                        complete = getCurrentIsoDate();
+                        complete = $getCurrentDate();
                         usage = {
                             price: uncertainNumber() /* <- TODO: [🐞] Compute usage */,
                             input: __assign({ tokensCount: uncertainNumber((_b = rawResponse.usage) === null || _b === void 0 ? void 0 : _b.promptTokens) }, computeUsageCounts(prompt.content)),
@@ -13475,6 +13466,222 @@ var _AzureOpenAiRegistration = $llmToolsRegister.register(createAzureOpenAiExecu
  * 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/cli`
+ */
+var _GoogleMetadataRegistration = $llmToolsMetadataRegister.register({
+    title: 'Google Gemini',
+    packageName: '@promptbook/google',
+    className: 'GoogleExecutionTools',
+    getBoilerplateConfiguration: function () {
+        return {
+            title: 'Google Gemini (boilerplate)',
+            packageName: '@promptbook/google',
+            className: 'GoogleExecutionTools',
+            options: {
+                apiKey: 'sk-ant-api03-',
+                isProxied: true,
+                remoteUrl: DEFAULT_REMOTE_URL,
+                path: DEFAULT_REMOTE_URL_PATH,
+            },
+        };
+    },
+    createConfigurationFromEnv: function (env) {
+        // Note: Note using `process.env` BUT `env` to pass in the environment variables dynamically
+        if (typeof env.GOOGLE_GEMINI_API_KEY === 'string') {
+            return {
+                title: 'Google Gemini (from env)',
+                packageName: '@promptbook/google',
+                className: 'GoogleExecutionTools',
+                options: {
+                    apiKey: env.GOOGLE_GEMINI_API_KEY,
+                },
+            };
+        }
+        return null;
+    },
+});
+/**
+ * Note: [💞] Ignore a discrepancy between file name and entity name
+ */
+
+/**
+ * !!!!!!
+ *
+ * @public exported from `@promptbook/vercel`
+ */
+function createExecutionToolsFromVercelProvider(options) {
+    var vercelProvider = options.vercelProvider, availableModels = options.availableModels, userId = options.userId, _a = options.additionalChatSettings, additionalChatSettings = _a === void 0 ? {} : _a;
+    return {
+        title: '!!!',
+        description: "!!! (through Vercel)",
+        checkConfiguration: function () {
+            // TODO: !!!!!!
+            return Promise.resolve();
+        },
+        listModels: function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, availableModels];
+                });
+            });
+        },
+        callChatModel: function (prompt) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function () {
+                var content, parameters, modelRequirements, modelName, model, rawPromptContent, rawRequest, start, rawResponse, complete, usage;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            content = prompt.content, parameters = prompt.parameters, modelRequirements = prompt.modelRequirements;
+                            if (modelRequirements.modelVariant !== 'CHAT') {
+                                throw new PipelineExecutionError('Use callChatModel only for CHAT variant');
+                            }
+                            modelName = modelRequirements.modelName ||
+                                ((_a = availableModels.find(function (_a) {
+                                    var modelVariant = _a.modelVariant;
+                                    return modelVariant === 'CHAT';
+                                })) === null || _a === void 0 ? void 0 : _a.modelName);
+                            if (!modelName) {
+                                throw new PipelineExecutionError(spaceTrim$1("\n                        Can not determine which model to use.\n\n                        You need to provide at least one of:\n                        1) In `createExecutionToolsFromVercelProvider` options, provide `availableModels` with at least one model\n                        2) In `prompt.modelRequirements`, provide `modelName` with the name of the model to use\n                  \n                    "));
+                            }
+                            return [4 /*yield*/, vercelProvider.chat(modelName, __assign({ user: (userId === null || userId === void 0 ? void 0 : userId.toString()) || undefined }, additionalChatSettings))];
+                        case 1:
+                            model = _b.sent();
+                            rawPromptContent = replaceParameters(content, __assign(__assign({}, parameters), { modelName: modelName }));
+                            rawRequest = {
+                                // <- TODO: [☂]
+                                inputFormat: 'messages',
+                                mode: {
+                                    type: 'regular',
+                                    tools: [
+                                    /* !!!!!! */
+                                    ],
+                                },
+                                prompt: __spreadArray(__spreadArray([], __read((modelRequirements.systemMessage === undefined
+                                    ? []
+                                    : [
+                                        {
+                                            role: 'system',
+                                            content: modelRequirements.systemMessage,
+                                        },
+                                    ])), false), [
+                                    {
+                                        role: 'user',
+                                        content: [
+                                            {
+                                                type: 'text',
+                                                text: rawPromptContent,
+                                            },
+                                        ],
+                                    },
+                                ], false),
+                            };
+                            start = $getCurrentDate();
+                            if (options.isVerbose) {
+                                console.info(colors.bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
+                            }
+                            return [4 /*yield*/, model.doGenerate(rawRequest)];
+                        case 2:
+                            rawResponse = _b.sent();
+                            /*
+                            TODO: !!!!!! Handle errors
+                            .catch((error) => {
+                                if (options.isVerbose) {
+                                    console.info(colors.bgRed('error'), error);
+                                }
+                                throw error;
+                            });
+                            */
+                            if (options.isVerbose) {
+                                console.info(colors.bgWhite('rawResponse'), JSON.stringify(rawResponse, null, 4));
+                            }
+                            if (rawResponse.text === undefined) {
+                                throw new PipelineExecutionError('No response message');
+                            }
+                            complete = $getCurrentDate();
+                            usage = UNCERTAIN_USAGE;
+                            return [2 /*return*/, $asDeeplyFrozenSerializableJson('createExecutionToolsFromVercelProvider ChatPromptResult', {
+                                    content: rawResponse.text,
+                                    modelName: modelName,
+                                    timing: {
+                                        start: start,
+                                        complete: complete,
+                                    },
+                                    usage: usage,
+                                    rawPromptContent: rawPromptContent,
+                                    rawRequest: rawRequest,
+                                    rawResponse: {
+                                    /* TODO: !!!!!! UnexpectedError: createExecutionToolsFromVercelProvider ChatPromptResult.rawResponse.response.timestamp is Date */
+                                    },
+                                    // <- [🗯]
+                                })];
+                    }
+                });
+            });
+        },
+    };
+}
+
+/**
+ * Execution Tools for calling Google Gemini API.
+ *
+ * @public exported from `@promptbook/google`
+ */
+var createGoogleExecutionTools = Object.assign(function (options) {
+    // Note: [🔘] There is a compatibility when using import from '@ai-sdk/google'
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    var createGoogleGenerativeAI = require('@ai-sdk/google').createGoogleGenerativeAI;
+    var googleGeminiVercelProvider = createGoogleGenerativeAI(__assign({}, options));
+    return createExecutionToolsFromVercelProvider(__assign({ vercelProvider: googleGeminiVercelProvider, availableModels: [
+            // TODO: !!!!!! Maybe list models in same way as in other providers
+            'gemini-1.5-flash',
+            'gemini-1.5-flash-latest',
+            'gemini-1.5-flash-001',
+            'gemini-1.5-flash-002',
+            'gemini-1.5-flash-exp-0827',
+            'gemini-1.5-flash-8b',
+            'gemini-1.5-flash-8b-latest',
+            'gemini-1.5-flash-8b-exp-0924',
+            'gemini-1.5-flash-8b-exp-0827',
+            'gemini-1.5-pro-latest',
+            'gemini-1.5-pro',
+            'gemini-1.5-pro-001',
+            'gemini-1.5-pro-002',
+            'gemini-1.5-pro-exp-0827',
+            'gemini-1.0-pro',
+        ].map(function (modelName) { return ({ modelName: modelName, modelVariant: 'CHAT' }); }) }, options));
+}, {
+    packageName: '@promptbook/google',
+    className: 'GoogleExecutionTools',
+});
+/**
+ * TODO: [🧠][main] !!!! Make anonymous this with all LLM providers
+ * TODO: [🧠][🧱][main] !!!! Maybe change all `new GoogleExecutionTools` -> `createGoogleExecutionTools` in manual
+ * TODO: [🧠] Maybe auto-detect usage in browser and determine default value of `isProxied`
+ * 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
+ *
+ * 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/google`
+ * @public exported from `@promptbook/cli`
+ */
+var _GoogleRegistration = $llmToolsRegister.register(createGoogleExecutionTools);
+/**
+ * TODO: [🎶] Naming "constructor" vs "creator" vs "factory"
+ * Note: [💞] Ignore a discrepancy between file name and entity name
+ */
+
 /**
  * Registration of LLM provider metadata
  *
@@ -13747,7 +13954,7 @@ var OpenAiExecutionTools = /** @class */ (function () {
                                     content: rawPromptContent,
                                 },
                             ], false), user: (_a = this.options.userId) === null || _a === void 0 ? void 0 : _a.toString() });
-                        start = getCurrentIsoDate();
+                        start = $getCurrentDate();
                         if (this.options.isVerbose) {
                             console.info(colors.bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
                         }
@@ -13771,7 +13978,7 @@ var OpenAiExecutionTools = /** @class */ (function () {
                         }
                         resultContent = rawResponse.choices[0].message.content;
                         // eslint-disable-next-line prefer-const
-                        complete = getCurrentIsoDate();
+                        complete = $getCurrentDate();
                         usage = computeOpenAiUsage(content || '', resultContent || '', rawResponse);
                         if (resultContent === null) {
                             throw new PipelineExecutionError('No response message from OpenAI');
@@ -13826,7 +14033,7 @@ var OpenAiExecutionTools = /** @class */ (function () {
                         };
                         rawPromptContent = replaceParameters(content, __assign(__assign({}, parameters), { modelName: modelName }));
                         rawRequest = __assign(__assign({}, modelSettings), { prompt: rawPromptContent, user: (_a = this.options.userId) === null || _a === void 0 ? void 0 : _a.toString() });
-                        start = getCurrentIsoDate();
+                        start = $getCurrentDate();
                         if (this.options.isVerbose) {
                             console.info(colors.bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
                         }
@@ -13850,7 +14057,7 @@ var OpenAiExecutionTools = /** @class */ (function () {
                         }
                         resultContent = rawResponse.choices[0].text;
                         // eslint-disable-next-line prefer-const
-                        complete = getCurrentIsoDate();
+                        complete = $getCurrentDate();
                         usage = computeOpenAiUsage(content || '', resultContent || '', rawResponse);
                         return [2 /*return*/, $asDeeplyFrozenSerializableJson('OpenAiExecutionTools CompletionPromptResult', {
                                 content: resultContent,
@@ -13896,7 +14103,7 @@ var OpenAiExecutionTools = /** @class */ (function () {
                             input: rawPromptContent,
                             model: modelName,
                         };
-                        start = getCurrentIsoDate();
+                        start = $getCurrentDate();
                         if (this.options.isVerbose) {
                             console.info(colors.bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
                         }
@@ -13916,7 +14123,7 @@ var OpenAiExecutionTools = /** @class */ (function () {
                         }
                         resultContent = rawResponse.data[0].embedding;
                         // eslint-disable-next-line prefer-const
-                        complete = getCurrentIsoDate();
+                        complete = $getCurrentDate();
                         usage = computeOpenAiUsage(content || '', '', 
                         // <- Note: Embedding does not have result content
                         rawResponse);
@@ -14069,7 +14276,7 @@ var OpenAiAssistantExecutionTools = /** @class */ (function (_super) {
                             },
                             // <- TODO: Add user identification here> user: this.options.user,
                         };
-                        start = getCurrentIsoDate();
+                        start = $getCurrentDate();
                         if (this.options.isVerbose) {
                             console.info(colors.bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
                         }
@@ -14120,7 +14327,7 @@ var OpenAiAssistantExecutionTools = /** @class */ (function (_super) {
                         resultContent = (_c = rawResponse[0].content[0]) === null || _c === void 0 ? void 0 : _c.text.value;
                         //                                                     <- TODO: [🧠] There are also annotations, maybe use them
                         // eslint-disable-next-line prefer-const
-                        complete = getCurrentIsoDate();
+                        complete = $getCurrentDate();
                         usage = UNCERTAIN_USAGE;
                         // <- TODO: [🥘] Compute real usage for assistant
                         //       ?> const usage = computeOpenAiUsage(content, resultContent || '', rawResponse);
@@ -15378,5 +15585,5 @@ var _WebsiteScraperRegistration = $scrapersRegister.register(createWebsiteScrape
  * Note: [💞] Ignore a discrepancy between file name and entity name
  */
 
-export { BOOK_LANGUAGE_VERSION, PROMPTBOOK_ENGINE_VERSION, _AnthropicClaudeMetadataRegistration, _AnthropicClaudeRegistration, _AzureOpenAiMetadataRegistration, _AzureOpenAiRegistration, _CLI, _DocumentScraperMetadataRegistration, _DocumentScraperRegistration, _LegacyDocumentScraperMetadataRegistration, _LegacyDocumentScraperRegistration, _MarkdownScraperMetadataRegistration, _MarkdownScraperRegistration, _OpenAiAssistantMetadataRegistration, _OpenAiAssistantRegistration, _OpenAiMetadataRegistration, _OpenAiRegistration, _PdfScraperMetadataRegistration, _PdfScraperRegistration, _WebsiteScraperMetadataRegistration, _WebsiteScraperRegistration };
+export { BOOK_LANGUAGE_VERSION, PROMPTBOOK_ENGINE_VERSION, _AnthropicClaudeMetadataRegistration, _AnthropicClaudeRegistration, _AzureOpenAiMetadataRegistration, _AzureOpenAiRegistration, _CLI, _DocumentScraperMetadataRegistration, _DocumentScraperRegistration, _GoogleMetadataRegistration, _GoogleRegistration, _LegacyDocumentScraperMetadataRegistration, _LegacyDocumentScraperRegistration, _MarkdownScraperMetadataRegistration, _MarkdownScraperRegistration, _OpenAiAssistantMetadataRegistration, _OpenAiAssistantRegistration, _OpenAiMetadataRegistration, _OpenAiRegistration, _PdfScraperMetadataRegistration, _PdfScraperRegistration, _WebsiteScraperMetadataRegistration, _WebsiteScraperRegistration };
 //# sourceMappingURL=index.es.js.map