@promptbook/node 0.86.30 → 0.88.0-1

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/node`
 
 - Promptbooks are [divided into several](#-packages) packages, all are published from [single monorepo](https://github.com/webgptorg/promptbook).
@@ -253,7 +257,7 @@ Or you can install them separately:
 -   ⭐ **[@promptbook/utils](https://www.npmjs.com/package/@promptbook/utils)** - Utility functions used in the library but also useful for individual use in preprocessing and postprocessing LLM inputs and outputs
 -   **[@promptbook/markdown-utils](https://www.npmjs.com/package/@promptbook/markdown-utils)** - Utility functions used for processing markdown
 -   _(Not finished)_ **[@promptbook/wizzard](https://www.npmjs.com/package/@promptbook/wizzard)** - Wizard for creating+running promptbooks in single line
--   **[@promptbook/execute-javascript](https://www.npmjs.com/package/@promptbook/execute-javascript)** - Execution tools for javascript inside promptbooks
+-   **[@promptbook/javascript](https://www.npmjs.com/package/@promptbook/javascript)** - Execution tools for javascript inside promptbooks
 -   **[@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
@@ -409,8 +413,6 @@ Promptbook project is under [BUSL 1.1 is an SPDX license](https://spdx.org/licen
 
 See [TODO.md](./TODO.md)
 
-
-
 ## 🤝 Partners
 
 <div style="display: flex; align-items: center; gap: 20px;">

package/esm/index.es.js

@@ -30,7 +30,7 @@ const BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.86.30';
+const PROMPTBOOK_ENGINE_VERSION = '0.88.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
@@ -2116,6 +2116,83 @@ function addUsage(...usageItems) {
     }, deepClone(ZERO_USAGE));
 }
 
+/**
+ * Parses the given script and returns the list of all used variables that are not defined in the script
+ *
+ * @param script from which to extract the variables
+ * @returns the list of variable names
+ * @throws {ParseError} if the script is invalid
+ * @public exported from `@promptbook/javascript`
+ */
+function extractVariablesFromJavascript(script) {
+    const variables = new Set();
+    const originalScript = script;
+    script = `(()=>{${script}})()`;
+    try {
+        for (let i = 0; i < LOOP_LIMIT; i++)
+            try {
+                eval(script); // <- TODO: Use `JavascriptExecutionTools.execute` here
+            }
+            catch (error) {
+                if (!(error instanceof ReferenceError)) {
+                    throw error;
+                }
+                /*
+                Note: Parsing the error
+                      🌟 Most devices:
+                      [PipelineUrlError: thing is not defined]
+
+                      🍏 iPhone`s Safari:
+                      [PipelineUrlError: Can't find variable: thing]
+                */
+                let variableName = undefined;
+                if (error.message.startsWith(`Can't`)) {
+                    // 🍏 Case
+                    variableName = error.message.split(' ').pop();
+                }
+                else {
+                    // 🌟 Case
+                    variableName = error.message.split(' ').shift();
+                }
+                if (variableName === undefined) {
+                    throw error;
+                }
+                if (script.includes(variableName + '(')) {
+                    script = `const ${variableName} = ()=>'';` + script;
+                }
+                else {
+                    variables.add(variableName);
+                    script = `const ${variableName} = '';` + script;
+                }
+            }
+    }
+    catch (error) {
+        if (!(error instanceof Error)) {
+            throw error;
+        }
+        throw new ParseError(spaceTrim$1((block) => `
+                    Can not extract variables from the script
+                    ${block(error.stack || error.message)}
+
+                    Found variables:
+                    ${Array.from(variables)
+            .map((variableName, i) => `${i + 1}) ${variableName}`)
+            .join('\n')}
+
+
+                    The script:
+
+                    \`\`\`javascript
+                    ${block(originalScript)}
+                    \`\`\`
+                `));
+    }
+    return variables;
+}
+/**
+ * TODO: [🔣] Support for multiple languages - python, java,...
+ */
+
 /**
  * Parses the task and returns the set of all used parameters
  *
@@ -2125,24 +2202,26 @@ function addUsage(...usageItems) {
  * @public exported from `@promptbook/core` <- Note: [👖] This utility is so tightly interconnected with the Promptbook that it is not exported as util but in core
  */
 function extractParameterNamesFromTask(task) {
-    const { title, description, /* [🙊] taskType,*/ content, preparedContent, jokerParameterNames, foreach } = task;
+    const { title, description, taskType, content, preparedContent, jokerParameterNames, foreach } = task;
     const parameterNames = new Set();
+    let contentParameters;
+    if (taskType !== 'SCRIPT_TASK') {
+        contentParameters = extractParameterNames(content);
+    }
+    else {
+        // TODO: What if script is not javascript?
+        // const { contentLanguage } = task;
+        // if (contentLanguage !== 'javascript') {
+        contentParameters = extractVariablesFromJavascript(content);
+    }
     for (const parameterName of [
         ...extractParameterNames(title),
         ...extractParameterNames(description || ''),
-        ...extractParameterNames(content),
+        ...contentParameters,
         ...extractParameterNames(preparedContent || ''),
     ]) {
         parameterNames.add(parameterName);
     }
-    /*/
-    // TODO: [🙊] Fix `extractVariablesFromScript` or delete
-    if (taskType === 'SCRIPT_TASK') {
-        for (const parameterName of extractVariablesFromScript(content)) {
-            parameterNames.add(parameterName);
-        }
-    }
-    /**/
     for (const jokerName of jokerParameterNames || []) {
         parameterNames.add(jokerName);
     }
@@ -9826,7 +9905,7 @@ function preserve(func) {
  * Warning: It is used for testing and mocking
  *          **NOT intended to use in the production** due to its unsafe nature, use `JavascriptExecutionTools` instead.
  *
- * @public exported from `@promptbook/execute-javascript`
+ * @public exported from `@promptbook/javascript`
  */
 class JavascriptEvalExecutionTools {
     constructor(options) {
@@ -9932,8 +10011,8 @@ class JavascriptEvalExecutionTools {
         // Note: Custom functions are exposed to the current scope as variables
         `const ${functionName} = customFunctions.${functionName};`)
             .join('\n');
-        script = templateParameters(script, parameters);
-        // <- Note: [🙊]
+        // script = templateParameters(script, parameters);
+        // <- TODO: [🧠][🥳] Should be this is one of two variants how to use parameters in script
         const statementToEvaluate = spaceTrim((block) => `
 
                 // Build-in functions:
@@ -10024,7 +10103,7 @@ class JavascriptEvalExecutionTools {
  * Placeholder for better implementation of JavascriptExecutionTools - some propper sandboxing
  *
  * @alias JavascriptExecutionTools
- * @public exported from `@promptbook/execute-javascript`
+ * @public exported from `@promptbook/javascript`
  */
 const JavascriptExecutionTools = JavascriptEvalExecutionTools;
 
@@ -10367,6 +10446,22 @@ async function createCollectionFromDirectory(rootPath, tools, options) {
  * TODO: Maybe move from `@promptbook/node` to `@promptbook/core` as we removes direct dependency on `fs`
  */
 
+/**
+ * Provides script execution tools
+ *
+ * @public exported from `@promptbook/node`
+ */
+async function $provideScriptingForNode(options) {
+    if (!$isRunningInNode()) {
+        throw new EnvironmentMismatchError('Function `$provideScriptingForNode` works only in Node.js environment');
+    }
+    // TODO: [🔱] Do here auto-installation
+    return [new JavascriptExecutionTools(options)];
+}
+/**
+ * Note: [🟢] Code in this file should never be never released in packages that could be imported into browser environment
+ */
+
 /**
  * Stringify the PipelineJson with proper formatting
  *
@@ -10485,5 +10580,5 @@ async function $execCommands({ commands, cwd, crashOnError, }) {
  * Note: [🟢] Code in this file should never be never released in packages that could be imported into browser environment
  */
 
-export { $execCommand, $execCommands, $provideExecutablesForNode, $provideExecutionToolsForNode, $provideFilesystemForNode, $provideLlmToolsConfigurationFromEnv, $provideLlmToolsFromEnv, $provideScrapersForNode, BOOK_LANGUAGE_VERSION, FileCacheStorage, PROMPTBOOK_ENGINE_VERSION, createCollectionFromDirectory };
+export { $execCommand, $execCommands, $provideExecutablesForNode, $provideExecutionToolsForNode, $provideFilesystemForNode, $provideLlmToolsConfigurationFromEnv, $provideLlmToolsFromEnv, $provideScrapersForNode, $provideScriptingForNode, BOOK_LANGUAGE_VERSION, FileCacheStorage, PROMPTBOOK_ENGINE_VERSION, createCollectionFromDirectory };
 //# sourceMappingURL=index.es.js.map