@promptbook/openai 0.100.0-45 → 0.100.0-46

package/esm/typings/src/book-components/Chat/interfaces/ChatMessage.d.ts

@@ -1,30 +1,16 @@
-export type ChatMessage = UserChatMessage | PromptbookPersonaChatMessage;
-export interface UserChatMessage {
-    id: string;
-    date: Date;
-    from: 'USER';
-    content: string;
-    isComplete: boolean;
-    expectedAnswer?: string;
-    isVoiceCall?: boolean;
-}
-export interface PromptbookPersonaChatMessage {
+import type { string_markdown } from '../../../types/typeAliases';
+import type { string_name } from '../../../types/typeAliases';
+/**
+ * A message in the chat
+ *
+ * @public exported from `@promptbook/components`
+ */
+export type ChatMessage = {
     id: string;
     date: Date;
-    from: 'PROMPTBOOK_PERSONA';
-    avatar?: string | {
-        src: string;
-        width?: number;
-        height?: number;
-    };
-    content: string;
-    isComplete: boolean;
+    from: string_name;
+    content: string_markdown;
+    isComplete?: boolean;
     expectedAnswer?: string;
     isVoiceCall?: boolean;
-}
-export interface CompleteChatMessage {
-    isComplete: true;
-}
-/**
- * TODO: [🧠] ACRY Rename PROMPTBOOK_PERSONA + USER, Teacher, teacher to sth else
- */
+};

package/esm/typings/src/book-components/Chat/interfaces/ChatParticipant.d.ts

@@ -0,0 +1,12 @@
+import type { string_name } from '../../../types/typeAliases';
+import type { string_url_image } from '../../../types/typeAliases';
+/**
+ * A participant in the chat
+ *
+ * @public exported from `@promptbook/components`
+ */
+export type ChatParticipant = {
+    name: string_name;
+    avatarUrl?: string_url_image;
+    color: string;
+};

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

@@ -301,6 +301,13 @@ export declare const DEFAULT_GET_PIPELINE_COLLECTION_FUNCTION_NAME = "getPipelin
  * @public exported from `@promptbook/core`
  */
 export declare const DEFAULT_MAX_REQUESTS_PER_MINUTE = 60;
+/**
+ * API request timeout in milliseconds
+ * Can be overridden via API_REQUEST_TIMEOUT environment variable
+ *
+ * @public exported from `@promptbook/core`
+ */
+export declare const API_REQUEST_TIMEOUT: number;
 /**
  * URL of the Promptbook logo
  *

package/esm/typings/src/execution/ExecutionTask.d.ts

@@ -110,6 +110,14 @@ export type AbstractTask<TTaskResult extends AbstractTaskResult> = {
      * Gets a promise that resolves with the task result
      */
     asPromise(options?: {
+        /**
+         * Do the task throws on error
+         *
+         * - If `true` when error occurs the returned promise will rejects
+         * - If `false` the promise will resolve with object with all listed errors and warnings and partial result
+         *
+         * @default true
+         */
         readonly isCrashedOnError?: boolean;
     }): Promise<TTaskResult>;
     /**

package/esm/typings/src/llm-providers/openai/OpenAiCompatibleExecutionTools.d.ts

@@ -82,6 +82,14 @@ export declare abstract class OpenAiCompatibleExecutionTools implements LlmExecu
      * Default model for completion variant.
      */
     protected abstract getDefaultEmbeddingModel(): AvailableModel;
+    /**
+     * Makes a request with retry logic for network errors like ECONNRESET
+     */
+    private makeRequestWithRetry;
+    /**
+     * Determines if an error is retryable (network-related errors)
+     */
+    private isRetryableNetworkError;
 }
 /**
  * TODO: [🛄] Some way how to re-wrap the errors from `OpenAiCompatibleExecutionTools`

package/esm/typings/src/playground/permanent/error-handling-playground.d.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env ts-node
+export {};
+/**
+ * Note: [⚫] Code in this file should never be published in any package
+ */

package/esm/typings/src/utils/organization/preserve.d.ts

@@ -0,0 +1,21 @@
+import type { really_any } from './really_any';
+/**
+ * Does nothing, but preserves the function in the bundle
+ * Compiler is tricked into thinking the function is used
+ *
+ * @param value any function to preserve
+ * @returns nothing
+ * @private within the repository
+ */
+export declare function $preserve(...value: Array<really_any>): void;
+/**
+ * DO NOT USE THIS FUNCTION
+ * Only purpose of this function is to trick the compiler and javascript engine
+ * that `_preserved` array can be used in the future and should not be garbage collected
+ *
+ * @private internal for `preserve`
+ */
+export declare function __DO_NOT_USE_getPreserved(): Array<really_any>;
+/**
+ * Note: [💞] Ignore a discrepancy between file name and entity name
+ */

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.100.0-44`).
+ * It follows semantic versioning (e.g., `0.100.0-45`).
  *
  * @generated
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/openai",
-    "version": "0.100.0-45",
+    "version": "0.100.0-46",
     "description": "Promptbook: Run AI apps in plain human language across multiple models and platforms",
     "private": false,
     "sideEffects": false,
@@ -102,7 +102,7 @@
     "module": "./esm/index.es.js",
     "typings": "./esm/typings/src/_packages/openai.index.d.ts",
     "peerDependencies": {
-        "@promptbook/core": "0.100.0-45"
+        "@promptbook/core": "0.100.0-46"
     },
     "dependencies": {
         "bottleneck": "^2.19.5",

package/umd/index.umd.js

@@ -25,7 +25,7 @@
      * @generated
      * @see https://github.com/webgptorg/promptbook
      */
-    const PROMPTBOOK_ENGINE_VERSION = '0.100.0-45';
+    const PROMPTBOOK_ENGINE_VERSION = '0.100.0-46';
     /**
      * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
      * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -316,6 +316,13 @@
      * @public exported from `@promptbook/core`
      */
     const DEFAULT_MAX_REQUESTS_PER_MINUTE = 60;
+    /**
+     * API request timeout in milliseconds
+     * Can be overridden via API_REQUEST_TIMEOUT environment variable
+     *
+     * @public exported from `@promptbook/core`
+     */
+    const API_REQUEST_TIMEOUT = parseInt(process.env.API_REQUEST_TIMEOUT || '90000');
     /**
      * Note: [💞] Ignore a discrepancy between file name and entity name
      * TODO: [🧠][🧜‍♂️] Maybe join remoteServerUrl and path into single value
@@ -1959,7 +1966,18 @@
                 const openAiOptions = { ...this.options };
                 delete openAiOptions.isVerbose;
                 delete openAiOptions.userId;
-                this.client = new OpenAI__default["default"](openAiOptions);
+                // Enhanced configuration for better ECONNRESET handling
+                const enhancedOptions = {
+                    ...openAiOptions,
+                    timeout: API_REQUEST_TIMEOUT,
+                    maxRetries: CONNECTION_RETRIES_LIMIT,
+                    defaultHeaders: {
+                        Connection: 'keep-alive',
+                        'Keep-Alive': 'timeout=30, max=100',
+                        ...openAiOptions.defaultHeaders,
+                    },
+                };
+                this.client = new OpenAI__default["default"](enhancedOptions);
             }
             return this.client;
         }
@@ -2047,7 +2065,7 @@
                 console.info(colors__default["default"].bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
             }
             const rawResponse = await this.limiter
-                .schedule(() => client.chat.completions.create(rawRequest))
+                .schedule(() => this.makeRequestWithRetry(() => client.chat.completions.create(rawRequest)))
                 .catch((error) => {
                 assertsError(error);
                 if (this.options.isVerbose) {
@@ -2123,7 +2141,7 @@
                 console.info(colors__default["default"].bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
             }
             const rawResponse = await this.limiter
-                .schedule(() => client.completions.create(rawRequest))
+                .schedule(() => this.makeRequestWithRetry(() => client.completions.create(rawRequest)))
                 .catch((error) => {
                 assertsError(error);
                 if (this.options.isVerbose) {
@@ -2187,7 +2205,7 @@
                 console.info(colors__default["default"].bgWhite('rawRequest'), JSON.stringify(rawRequest, null, 4));
             }
             const rawResponse = await this.limiter
-                .schedule(() => client.embeddings.create(rawRequest))
+                .schedule(() => this.makeRequestWithRetry(() => client.embeddings.create(rawRequest)))
                 .catch((error) => {
                 assertsError(error);
                 if (this.options.isVerbose) {
@@ -2245,6 +2263,76 @@
             }
             return model;
         }
+        // <- Note: [🤖] getDefaultXxxModel
+        /**
+         * Makes a request with retry logic for network errors like ECONNRESET
+         */
+        async makeRequestWithRetry(requestFn) {
+            let lastError;
+            for (let attempt = 1; attempt <= CONNECTION_RETRIES_LIMIT; attempt++) {
+                try {
+                    return await requestFn();
+                }
+                catch (error) {
+                    assertsError(error);
+                    lastError = error;
+                    // Check if this is a retryable network error
+                    const isRetryableError = this.isRetryableNetworkError(error);
+                    if (!isRetryableError || attempt === CONNECTION_RETRIES_LIMIT) {
+                        if (this.options.isVerbose) {
+                            console.info(colors__default["default"].bgRed('Final error after retries'), `Attempt ${attempt}/${CONNECTION_RETRIES_LIMIT}:`, error);
+                        }
+                        throw error;
+                    }
+                    // Calculate exponential backoff delay
+                    const baseDelay = 1000; // 1 second
+                    const backoffDelay = baseDelay * Math.pow(2, attempt - 1);
+                    const jitterDelay = Math.random() * 500; // Add some randomness
+                    const totalDelay = backoffDelay + jitterDelay;
+                    if (this.options.isVerbose) {
+                        console.info(colors__default["default"].bgYellow('Retrying request'), `Attempt ${attempt}/${CONNECTION_RETRIES_LIMIT}, waiting ${Math.round(totalDelay)}ms:`, error.message);
+                    }
+                    // Wait before retrying
+                    await new Promise((resolve) => setTimeout(resolve, totalDelay));
+                }
+            }
+            throw lastError;
+        }
+        /**
+         * Determines if an error is retryable (network-related errors)
+         */
+        isRetryableNetworkError(error) {
+            const errorMessage = error.message.toLowerCase();
+            const errorCode = error.code;
+            // Network connection errors that should be retried
+            const retryableErrors = [
+                'econnreset',
+                'enotfound',
+                'econnrefused',
+                'etimedout',
+                'socket hang up',
+                'network error',
+                'fetch failed',
+                'connection reset',
+                'connection refused',
+                'timeout',
+            ];
+            // Check error message
+            if (retryableErrors.some((retryableError) => errorMessage.includes(retryableError))) {
+                return true;
+            }
+            // Check error code
+            if (errorCode && retryableErrors.includes(errorCode.toLowerCase())) {
+                return true;
+            }
+            // Check for specific HTTP status codes that are retryable
+            const errorWithStatus = error;
+            const httpStatus = errorWithStatus.status || errorWithStatus.statusCode;
+            if (httpStatus && [429, 500, 502, 503, 504].includes(httpStatus)) {
+                return true;
+            }
+            return false;
+        }
     }
     /**
      * TODO: [🛄] Some way how to re-wrap the errors from `OpenAiCompatibleExecutionTools`