@promptbook/cli 0.89.0-8 → 0.89.0-9

package/umd/index.umd.js

@@ -56,7 +56,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.89.0-8';
+    const PROMPTBOOK_ENGINE_VERSION = '0.89.0-9';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -929,53 +929,6 @@
         keepUnused(...sideEffectSubjects);
     }
 
-    /**
-     * Stores data in memory (HEAP)
-     *
-     * @public exported from `@promptbook/core`
-     */
-    class MemoryStorage {
-        constructor() {
-            this.storage = {};
-        }
-        /**
-         * Returns the number of key/value pairs currently present in the list associated with the object.
-         */
-        get length() {
-            return Object.keys(this.storage).length;
-        }
-        /**
-         * Empties the list associated with the object of all key/value pairs, if there are any.
-         */
-        clear() {
-            this.storage = {};
-        }
-        /**
-         * Returns the current value associated with the given key, or null if the given key does not exist in the list associated with the object.
-         */
-        getItem(key) {
-            return this.storage[key] || null;
-        }
-        /**
-         * Returns the name of the nth key in the list, or null if n is greater than or equal to the number of key/value pairs in the object.
-         */
-        key(index) {
-            return Object.keys(this.storage)[index] || null;
-        }
-        /**
-         * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.
-         */
-        setItem(key, value) {
-            this.storage[key] = value;
-        }
-        /**
-         * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.
-         */
-        removeItem(key) {
-            delete this.storage[key];
-        }
-    }
-
     /**
      * Just marks a place of place where should be something implemented
      * No side effects.
@@ -1910,6 +1863,53 @@
      * Note: [🟢] Code in this file should never be never released in packages that could be imported into browser environment
      */
 
+    /**
+     * Stores data in memory (HEAP)
+     *
+     * @public exported from `@promptbook/core`
+     */
+    class MemoryStorage {
+        constructor() {
+            this.storage = {};
+        }
+        /**
+         * Returns the number of key/value pairs currently present in the list associated with the object.
+         */
+        get length() {
+            return Object.keys(this.storage).length;
+        }
+        /**
+         * Empties the list associated with the object of all key/value pairs, if there are any.
+         */
+        clear() {
+            this.storage = {};
+        }
+        /**
+         * Returns the current value associated with the given key, or null if the given key does not exist in the list associated with the object.
+         */
+        getItem(key) {
+            return this.storage[key] || null;
+        }
+        /**
+         * Returns the name of the nth key in the list, or null if n is greater than or equal to the number of key/value pairs in the object.
+         */
+        key(index) {
+            return Object.keys(this.storage)[index] || null;
+        }
+        /**
+         * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.
+         */
+        setItem(key, value) {
+            this.storage[key] = value;
+        }
+        /**
+         * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.
+         */
+        removeItem(key) {
+            delete this.storage[key];
+        }
+    }
+
     /**
      * This error indicates problems parsing the format value
      *
@@ -2115,6 +2115,19 @@
         }
     }
 
+    /**
+     * Error thrown when a fetch request fails
+     *
+     * @public exported from `@promptbook/core`
+     */
+    class PromptbookFetchError extends Error {
+        constructor(message) {
+            super(message);
+            this.name = 'PromptbookFetchError';
+            Object.setPrototypeOf(this, PromptbookFetchError.prototype);
+        }
+    }
+
     /**
      * Index of all custom errors
      *
@@ -2153,6 +2166,7 @@
         URIError,
         AggregateError,
         AuthenticationError,
+        PromptbookFetchError,
         /*
       Note: Not widely supported
       > InternalError,
@@ -2651,21 +2665,15 @@
      */
 
     /**
-     * @@@
+     * Provides the path to the `.env` file
      *
-     * @@@ .env
+     * Note: `$` is used to indicate that this function is not a pure function - it uses filesystem to access .env file
      *
-     * It looks for environment variables:
-     * - `process.env.OPENAI_API_KEY`
-     * - `process.env.ANTHROPIC_CLAUDE_API_KEY`
-     * - ...
-     *
-     * @returns @@@
-     * @public exported from `@promptbook/node`
+     * @private within the repository - for CLI utils
      */
-    async function $provideLlmToolsConfigurationFromEnv() {
+    async function $provideEnvFilepath() {
         if (!$isRunningInNode()) {
-            throw new EnvironmentMismatchError('Function `$provideLlmToolsFromEnv` works only in Node.js environment');
+            throw new EnvironmentMismatchError('Function `$provideEnvFilepath` works only in Node.js environment');
         }
         const envFilePatterns = [
             '.env',
@@ -2685,8 +2693,7 @@
                 const envFilename = path.join(rootDirname, pattern);
                 if (await isFileExisting(envFilename, $provideFilesystemForNode())) {
                     $setUsedEnvFilename(envFilename);
-                    dotenv__namespace.config({ path: envFilename });
-                    break up_to_root;
+                    return envFilename;
                 }
             }
             if (isRootPath(rootDirname)) {
@@ -2695,6 +2702,34 @@
             // Note: If the directory does not exist, try the parent directory
             rootDirname = path.join(rootDirname, '..');
         }
+        return null;
+    }
+    /**
+     * Note: [🟢] Code in this file should never be never released in packages that could be imported into browser environment
+     */
+
+    /**
+     * @@@
+     *
+     * @@@ .env
+     * Note: `$` is used to indicate that this function is not a pure function - it uses filesystem to access .env file
+     *
+     * It looks for environment variables:
+     * - `process.env.OPENAI_API_KEY`
+     * - `process.env.ANTHROPIC_CLAUDE_API_KEY`
+     * - ...
+     *
+     * @returns @@@
+     * @public exported from `@promptbook/node`
+     */
+    async function $provideLlmToolsConfigurationFromEnv() {
+        if (!$isRunningInNode()) {
+            throw new EnvironmentMismatchError('Function `$provideLlmToolsFromEnv` works only in Node.js environment');
+        }
+        const envFilepath = await $provideEnvFilepath();
+        if (envFilepath !== null) {
+            dotenv__namespace.config({ path: envFilepath });
+        }
         const llmToolsConfiguration = $llmToolsMetadataRegister
             .list()
             .map((metadata) => metadata.createConfigurationFromEnv(process.env))
@@ -2702,15 +2737,8 @@
         return llmToolsConfiguration;
     }
     /**
-     * TODO: [🧠][🪁] Maybe do allow to do auto-install if package not registered and not found
-     * TODO: Add Azure OpenAI
-     * TODO: [🧠][🍛]
-     * TODO: [🧠] Is there some meaningfull way how to test this util
      * Note: [🟢] Code in this file should never be never released in packages that could be imported into browser environment
-     * TODO: [👷‍♂️] @@@ Manual about construction of llmTools
-     * TODO: This should be maybe not under `_common` but under `utils`
-     * TODO: [🧠][⚛] Maybe pass env as argument
-     * TODO: [®] DRY Register logic */
+     */
 
     /**
      * Multiple LLM Execution Tools is a proxy server that uses multiple execution tools internally and exposes the executor interface externally.
@@ -2960,6 +2988,7 @@
      * Note: This function is not cached, every call creates new instance of `MultipleLlmExecutionTools`
      *
      * @@@ .env
+     * Note: `$` is used to indicate that this function is not a pure function - it uses filesystem to access .env file
      *
      * It looks for environment variables:
      * - `process.env.OPENAI_API_KEY`
@@ -3004,6 +3033,8 @@
     /**
      * Returns LLM tools for CLI
      *
+     * Note: `$` is used to indicate that this function is not a pure function - it uses filesystem to access .env file and also writes this .env file
+     *
      * @private within the repository - for CLI utils
      */
     async function $provideLlmToolsForWizzardOrCli(options) {
@@ -3015,6 +3046,8 @@
         let llmExecutionTools;
         if (strategy === 'REMOTE_SERVER') {
             const { remoteServerUrl = DEFAULT_REMOTE_SERVER_URL, loginPrompt } = options;
+            // TODO: !!!
+            // const envFilepath = await $provideEnvFilepath();
             const storage = new MemoryStorage(); // <- TODO: !!!!!! Save to `.promptbook` folder
             const key = `${remoteServerUrl}-identification`;
             let identification = await storage.getItem(key);
@@ -3051,6 +3084,39 @@
      * TODO: [®] DRY Register logic
      */
 
+    /**
+     * The built-in `fetch' function with a lightweight error handling wrapper as default fetch function used in Promptbook scrapers
+     *
+     * @public exported from `@promptbook/core`
+     */
+    const promptbookFetch = async (urlOrRequest, init) => {
+        try {
+            return await fetch(urlOrRequest, init);
+        }
+        catch (error) {
+            if (!(error instanceof Error)) {
+                throw error;
+            }
+            let url;
+            if (typeof urlOrRequest === 'string') {
+                url = urlOrRequest;
+            }
+            else if (urlOrRequest instanceof Request) {
+                url = urlOrRequest.url;
+            }
+            throw new PromptbookFetchError(spaceTrim__default["default"]((block) => `
+                    Can not fetch "${url}"
+
+                    Fetch error:
+                    ${block(error.message)}
+
+                `));
+        }
+    };
+    /**
+     * TODO: [🧠] Maybe rename because it is not used only for scrapers but also in `$getCompiledBook`
+     */
+
     /**
      * Checks if value is valid email
      *
@@ -3119,7 +3185,9 @@
                         },
                     ]);
                     const loginUrl = `${remoteServerUrl}/login`;
-                    const response = await fetch(loginUrl, {
+                    console.log('!!!', { loginUrl });
+                    // TODO: [🧠] Should we use normal `fetch` or `scraperFetch`
+                    const response = await promptbookFetch(loginUrl, {
                         method: 'POST',
                         headers: {
                             'Content-Type': 'application/json',
@@ -3138,6 +3206,12 @@
                         // text: await response.text(),
                     });
                     const { isSuccess, message, error, identification } = (await response.json());
+                    console.log('!!!', {
+                        isSuccess,
+                        message,
+                        error,
+                        identification,
+                    });
                     if (message) {
                         if (isSuccess) {
                             console.log(colors__default["default"].green(message));
@@ -6817,32 +6891,6 @@
         return mimeTypes.extension(value) || null;
     }
 
-    /**
-     * The built-in `fetch' function with a lightweight error handling wrapper as default fetch function used in Promptbook scrapers
-     *
-     * @private as default `fetch` function used in Promptbook scrapers
-     */
-    const scraperFetch = async (url, init) => {
-        try {
-            return await fetch(url, init);
-        }
-        catch (error) {
-            if (!(error instanceof Error)) {
-                throw error;
-            }
-            throw new KnowledgeScrapeError(spaceTrim__default["default"]((block) => `
-                    Can not fetch "${url}"
-
-                    Fetch error:
-                    ${block(error.message)}
-
-                `));
-        }
-    };
-    /**
-     * TODO: [🧠] Maybe rename because it is not used only for scrapers but also in `$getCompiledBook`
-     */
-
     /**
      * @@@
      *
@@ -6851,7 +6899,7 @@
     async function makeKnowledgeSourceHandler(knowledgeSource, tools, options) {
         // console.log('!! makeKnowledgeSourceHandler', knowledgeSource);
         var _a;
-        const { fetch = scraperFetch } = tools;
+        const { fetch = promptbookFetch } = tools;
         const { knowledgeSourceContent } = knowledgeSource;
         let { name } = knowledgeSource;
         const { rootDirname = null, 
@@ -12740,7 +12788,7 @@
             const tools = {
                 llm,
                 fs,
-                fetch: scraperFetch,
+                fetch: promptbookFetch,
                 scrapers: await $provideScrapersForNode({ fs, llm, executables }, prepareAndScrapeOptions),
                 script: [new JavascriptExecutionTools(cliOptions)],
             };