@promptbook/core 0.92.0-29 → 0.92.0-30

package/esm/typings/src/_packages/core.index.d.ts

@@ -35,7 +35,7 @@ import { DEFAULT_IS_VERBOSE } from '../config';
 import { SET_IS_VERBOSE } from '../config';
 import { DEFAULT_IS_AUTO_INSTALLED } from '../config';
 import { DEFAULT_GET_PIPELINE_COLLECTION_FUNCTION_NAME } from '../config';
-import { DEFAULT_RPM } from '../config';
+import { DEFAULT_MAX_REQUESTS_PER_MINUTE } from '../config';
 import { MODEL_TRUST_LEVELS } from '../constants';
 import { MODEL_ORDERS } from '../constants';
 import { ORDER_OF_PIPELINE_JSON } from '../constants';
@@ -182,7 +182,7 @@ export { DEFAULT_IS_VERBOSE };
 export { SET_IS_VERBOSE };
 export { DEFAULT_IS_AUTO_INSTALLED };
 export { DEFAULT_GET_PIPELINE_COLLECTION_FUNCTION_NAME };
-export { DEFAULT_RPM };
+export { DEFAULT_MAX_REQUESTS_PER_MINUTE };
 export { MODEL_TRUST_LEVELS };
 export { MODEL_ORDERS };
 export { ORDER_OF_PIPELINE_JSON };

package/esm/typings/src/config.d.ts

@@ -294,7 +294,7 @@ export declare const DEFAULT_GET_PIPELINE_COLLECTION_FUNCTION_NAME = "getPipelin
  *
  * @public exported from `@promptbook/core`
  */
-export declare const DEFAULT_RPM = 60;
+export declare const DEFAULT_MAX_REQUESTS_PER_MINUTE = 60;
 /**
  * Indicates whether pipeline logic validation is enabled. When true, the pipeline logic is checked for consistency.
  *

package/esm/typings/src/remote-server/openapi.d.ts

@@ -1,5 +1,5 @@
 /**
- * @private !!!! Decide how to expose this
+ * @private [🥺] Decide how to expose this
  */
 export declare const openapiJson: {
     openapi: string;

package/esm/typings/src/version.d.ts

@@ -15,7 +15,7 @@ export declare const BOOK_LANGUAGE_VERSION: string_semantic_version;
 export declare const PROMPTBOOK_ENGINE_VERSION: string_promptbook_version;
 /**
  * Represents the version string of the Promptbook engine.
- * It follows semantic versioning (e.g., `0.92.0-28`).
+ * It follows semantic versioning (e.g., `0.92.0-29`).
  *
  * @generated
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/core",
-    "version": "0.92.0-29",
+    "version": "0.92.0-30",
     "description": "It's time for a paradigm shift. The future of software in plain English, French or Latin",
     "private": false,
     "sideEffects": false,

package/umd/index.umd.js

@@ -27,7 +27,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.92.0-29';
+    const PROMPTBOOK_ENGINE_VERSION = '0.92.0-30';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -493,7 +493,7 @@
      *
      * @public exported from `@promptbook/core`
      */
-    const DEFAULT_RPM = 60;
+    const DEFAULT_MAX_REQUESTS_PER_MINUTE = 60;
     /**
      * Indicates whether pipeline logic validation is enabled. When true, the pipeline logic is checked for consistency.
      *
@@ -2918,13 +2918,10 @@
                         if (onProgress) {
                             // Note: Report the CSV with all rows mapped so far
                             /*
-                            !!!!
-                             // Report progress with updated value
-                                const progressData = mappedData.map((row, i) =>
-                                  i > index ? { ...row, [outputParameterName]: PENDING_VALUE_PLACEHOLDER } : row,
-                              );
-
-
+                            // TODO: [🛕] Report progress with all the rows including the pending ones
+                              const progressData = mappedData.map((row, i) =>
+                                i > index ? { ...row, [outputParameterName]: PENDING_VALUE_PLACEHOLDER } : row,
+                            );
                             */
                             await onProgress(papaparse.unparse(mappedData, { ...settings, ...MANDATORY_CSV_SETTINGS }));
                         }
@@ -9777,24 +9774,25 @@
      */
     function renderPromptbookMermaid(pipelineJson, options) {
         const { linkTask = () => null } = options || {};
-        const MERMAID_PREFIX = 'mermaid_';
-        const KNOWLEDGE_NAME = MERMAID_PREFIX + 'knowledge';
-        const RESERVED_NAME = MERMAID_PREFIX + 'reserved';
+        const MERMAID_PREFIX = 'pipeline_';
+        const MERMAID_KNOWLEDGE_NAME = MERMAID_PREFIX + 'knowledge';
+        const MERMAID_RESERVED_NAME = MERMAID_PREFIX + 'reserved';
+        const MERMAID_INPUT_NAME = MERMAID_PREFIX + 'input';
+        const MERMAID_OUTPUT_NAME = MERMAID_PREFIX + 'output';
         const parameterNameToTaskName = (parameterName) => {
             if (parameterName === 'knowledge') {
-                return KNOWLEDGE_NAME;
-                // <- TODO: !!!! Check that this works
+                return MERMAID_KNOWLEDGE_NAME;
             }
             else if (RESERVED_PARAMETER_NAMES.includes(parameterName)) {
-                return RESERVED_NAME;
+                return MERMAID_RESERVED_NAME;
             }
             const parameter = pipelineJson.parameters.find((parameter) => parameter.name === parameterName);
             if (!parameter) {
                 throw new UnexpectedError(`Could not find {${parameterName}}`);
-                // <- TODO: !!6 This causes problems when {knowledge} and other reserved parameters are used
+                // <- TODO: This causes problems when {knowledge} and other reserved parameters are used
             }
             if (parameter.isInput) {
-                return MERMAID_PREFIX + 'input';
+                return MERMAID_INPUT_NAME;
             }
             const task = pipelineJson.tasks.find((task) => task.resultingParameterName === parameterName);
             if (!task) {
@@ -9802,6 +9800,37 @@
             }
             return MERMAID_PREFIX + (task.name || normalizeTo_camelCase('task-' + titleToName(task.title)));
         };
+        const inputAndIntermediateParametersMermaid = pipelineJson.tasks
+            .flatMap(({ title, dependentParameterNames, resultingParameterName }) => [
+            `${parameterNameToTaskName(resultingParameterName)}("${title}")`,
+            ...dependentParameterNames.map((dependentParameterName) => `${parameterNameToTaskName(dependentParameterName)}--"{${dependentParameterName}}"-->${parameterNameToTaskName(resultingParameterName)}`),
+        ])
+            .join('\n');
+        const outputParametersMermaid = pipelineJson.parameters
+            .filter(({ isOutput }) => isOutput)
+            .map(({ name }) => `${parameterNameToTaskName(name)}--"{${name}}"-->${MERMAID_OUTPUT_NAME}`)
+            .join('\n');
+        const linksMermaid = pipelineJson.tasks
+            .map((task) => {
+            const link = linkTask(task);
+            if (link === null) {
+                return '';
+            }
+            const { href, title } = link;
+            const taskName = parameterNameToTaskName(task.resultingParameterName);
+            return `click ${taskName} href "${href}" "${title}";`;
+        })
+            .filter((line) => line !== '')
+            .join('\n');
+        const interactionPointsMermaid = Object.entries({
+            [MERMAID_INPUT_NAME]: 'Input',
+            [MERMAID_OUTPUT_NAME]: 'Output',
+            [MERMAID_RESERVED_NAME]: 'Other',
+            [MERMAID_KNOWLEDGE_NAME]: 'Knowledge',
+        })
+            .filter(([MERMAID_NAME]) => (inputAndIntermediateParametersMermaid + outputParametersMermaid).includes(MERMAID_NAME))
+            .map(([MERMAID_NAME, title]) => `${MERMAID_NAME}((${title})):::${MERMAID_NAME}`)
+            .join('\n');
         const promptbookMermaid = spaceTrim.spaceTrim((block) => `
 
             %% 🔮 Tip: Open this on GitHub or in the VSCode website to see the Mermaid graph visually
@@ -9809,39 +9838,27 @@
             flowchart LR
               subgraph "${pipelineJson.title}"
 
+                  %% Basic configuration
                   direction TB
 
-                  input((Input)):::input
-                  ${RESERVED_NAME}((Other)):::${RESERVED_NAME}
-                  ${KNOWLEDGE_NAME}((Knowledgebase)):::${KNOWLEDGE_NAME}
-                  ${block(pipelineJson.tasks
-        .flatMap(({ title, dependentParameterNames, resultingParameterName }) => [
-        `${parameterNameToTaskName(resultingParameterName)}("${title}")`,
-        ...dependentParameterNames.map((dependentParameterName) => `${parameterNameToTaskName(dependentParameterName)}--"{${dependentParameterName}}"-->${parameterNameToTaskName(resultingParameterName)}`),
-    ])
-        .join('\n'))}
+                  %% Interaction points from pipeline to outside
+                  ${block(interactionPointsMermaid)}
 
-                  ${block(pipelineJson.parameters
-        .filter(({ isOutput }) => isOutput)
-        .map(({ name }) => `${parameterNameToTaskName(name)}--"{${name}}"-->output`)
-        .join('\n'))}
-                  output((Output)):::output
+                  %% Input and intermediate parameters
+                  ${block(inputAndIntermediateParametersMermaid)}
 
-                  ${block(pipelineJson.tasks
-        .map((task) => {
-        const link = linkTask(task);
-        if (link === null) {
-            return '';
-        }
-        const { href, title } = link;
-        const taskName = parameterNameToTaskName(task.resultingParameterName);
-        return `click ${taskName} href "${href}" "${title}";`;
-    })
-        .filter((line) => line !== '')
-        .join('\n'))}
 
-                  classDef input color: grey;
-                  classDef output color: grey;
+                  %% Output parameters
+                  ${block(outputParametersMermaid)}
+
+                  %% Links
+                  ${block(linksMermaid)}
+
+                  %% Styles
+                  classDef ${MERMAID_INPUT_NAME} color: grey;
+                  classDef ${MERMAID_OUTPUT_NAME} color: grey;
+                  classDef ${MERMAID_RESERVED_NAME} color: grey;
+                  classDef ${MERMAID_KNOWLEDGE_NAME} color: grey;
 
               end;
 
@@ -11088,7 +11105,7 @@
                 className: 'OpenAiExecutionTools',
                 options: {
                     apiKey: 'sk-',
-                    maxRequestsPerMinute: DEFAULT_RPM,
+                    maxRequestsPerMinute: DEFAULT_MAX_REQUESTS_PER_MINUTE,
                 },
             };
         },
@@ -11671,10 +11688,10 @@
     exports.DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_DEPTH = DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_DEPTH;
     exports.DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_TOTAL = DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_TOTAL;
     exports.DEFAULT_MAX_PARALLEL_COUNT = DEFAULT_MAX_PARALLEL_COUNT;
+    exports.DEFAULT_MAX_REQUESTS_PER_MINUTE = DEFAULT_MAX_REQUESTS_PER_MINUTE;
     exports.DEFAULT_PIPELINE_COLLECTION_BASE_FILENAME = DEFAULT_PIPELINE_COLLECTION_BASE_FILENAME;
     exports.DEFAULT_PROMPT_TASK_TITLE = DEFAULT_PROMPT_TASK_TITLE;
     exports.DEFAULT_REMOTE_SERVER_URL = DEFAULT_REMOTE_SERVER_URL;
-    exports.DEFAULT_RPM = DEFAULT_RPM;
     exports.DEFAULT_SCRAPE_CACHE_DIRNAME = DEFAULT_SCRAPE_CACHE_DIRNAME;
     exports.DEFAULT_TASK_TITLE = DEFAULT_TASK_TITLE;
     exports.EXPECTATION_UNITS = EXPECTATION_UNITS;