@cobrowser/chatgpt 0.7.48 → 0.7.50

package/dist/models/ChatGPTMessage.d.ts

@@ -1,17 +1,17 @@
-export declare enum ChatGPTRole {
+export declare enum ChatGptRole {
     USER = "user",
-    SYSTEM = "system",
-    ASSISTANT = "assistant"
+    ASSISTANT = "assistant",
+    SYSTEM = "system"
 }
-export interface ChatGPTRequestBody {
+export interface ChatGptRequestBody {
     model: string;
     response_format?: {
         type: string;
     };
-    messages: ChatGPTMessage[];
+    messages: ChatGptMessage[];
 }
-interface ChatGPTMessage {
-    role: ChatGPTRole;
+interface ChatGptMessage {
+    role: ChatGptRole;
     content: string;
 }
-export default ChatGPTMessage;
+export default ChatGptMessage;

package/dist/models/ChatGPTMessage.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChatGPTRole = void 0;
-var ChatGPTRole;
-(function (ChatGPTRole) {
-    ChatGPTRole["USER"] = "user";
-    ChatGPTRole["SYSTEM"] = "system";
-    ChatGPTRole["ASSISTANT"] = "assistant";
-})(ChatGPTRole = exports.ChatGPTRole || (exports.ChatGPTRole = {}));
+exports.ChatGptRole = void 0;
+var ChatGptRole;
+(function (ChatGptRole) {
+    ChatGptRole["USER"] = "user";
+    ChatGptRole["ASSISTANT"] = "assistant";
+    ChatGptRole["SYSTEM"] = "system";
+})(ChatGptRole = exports.ChatGptRole || (exports.ChatGptRole = {}));

package/dist/models/ChatGPTUsageTokens.d.ts

@@ -1,6 +1,6 @@
-interface ChatGPTUsageTokens {
+interface ChatGptUsageTokens {
     prompt_tokens: Number;
     completion_tokens: Number;
     total_tokens: Number;
 }
-export default ChatGPTUsageTokens;
+export default ChatGptUsageTokens;

package/dist/models/ChatGptResponse.d.ts

@@ -1,8 +1,8 @@
-import ChatGptUsageTokens from './ChatGptUsageTokens';
-interface ChatGptResponse {
-    firstChoice?: string;
-    usageTokens?: ChatGptUsageTokens;
+import ChatGPTUsageTokens from './ChatGPTUsageTokens';
+interface ChatGPTResponse {
+    data?: any;
+    usageTokens?: ChatGPTUsageTokens;
     threadId?: string;
-    requiredActions?: string;
+    requiredActions?: any;
 }
-export default ChatGptResponse;
+export default ChatGPTResponse;

package/dist/services/ResponseService/ResponseService.d.ts

@@ -8,6 +8,8 @@ interface ResponseServiceOptions {
     conversationId?: string;
 }
 export declare class ResponseService extends BaseService {
+    WAIT_TIME_FOR_CONVERSATION_BUSY: number;
+    MAX_ATTEMPTS_FOR_CONVERSATION_BUSY: number;
     promptId: string | undefined;
     conversationId: string | undefined;
     lastResponseId: string | undefined;

package/dist/services/ResponseService/ResponseService.js

@@ -19,6 +19,18 @@ const BaseService_1 = __importDefault(require("../BaseService/BaseService"));
 class ResponseService extends BaseService_1.default {
     constructor(apiKey, promptId, conversationId) {
         super(apiKey);
+        Object.defineProperty(this, "WAIT_TIME_FOR_CONVERSATION_BUSY", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 1500
+        });
+        Object.defineProperty(this, "MAX_ATTEMPTS_FOR_CONVERSATION_BUSY", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 6
+        });
         Object.defineProperty(this, "promptId", {
             enumerable: true,
             configurable: true,
@@ -58,7 +70,7 @@ class ResponseService extends BaseService_1.default {
      * @param runOptions
      */
     getReply(message, runOptions = {}) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.promptId) {
                 logger_1.default.error('Prompt ID is required for Response API');
@@ -115,9 +127,30 @@ class ResponseService extends BaseService_1.default {
                         id: this.promptId
                     };
                 }
-                const response = yield openai.responses.create(responseRequest);
+                /**
+                 * As OPENAI API is rate limited (only 1 message to respond at a time)
+                 * We need to handle the conversation busy error.
+                 * If the conversation is busy, wait for the WAIT_TIME_FOR_CONVERSATION_BUSY and try again.
+                 * If the conversation is busy after MAX_ATTEMPTS_FOR_CONVERSATION_BUSY attempts, throw an error.
+                 */
+                let response;
+                for (let attempt = 1; attempt <= this.MAX_ATTEMPTS_FOR_CONVERSATION_BUSY; attempt++) {
+                    try {
+                        response = yield openai.responses.create(responseRequest);
+                        break;
+                    }
+                    catch (error) {
+                        const errorMessage = (_d = (_c = (_b = error === null || error === void 0 ? void 0 : error.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : error === null || error === void 0 ? void 0 : error.message) !== null && _d !== void 0 ? _d : '';
+                        const isConversationBusy = (error === null || error === void 0 ? void 0 : error.status) === 400
+                            && errorMessage.includes('Another process is currently operating on this conversation');
+                        if (!isConversationBusy || attempt === this.MAX_ATTEMPTS_FOR_CONVERSATION_BUSY) {
+                            throw error;
+                        }
+                        yield new Promise((resolve) => setTimeout(resolve, this.WAIT_TIME_FOR_CONVERSATION_BUSY));
+                    }
+                }
                 this.lastResponseId = response.id;
-                if ((_b = response.conversation) === null || _b === void 0 ? void 0 : _b.id) {
+                if ((_e = response.conversation) === null || _e === void 0 ? void 0 : _e.id) {
                     this.conversationId = response.conversation.id;
                 }
                 else if (runOptions.conversationId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobrowser/chatgpt",
-  "version": "0.7.48",
+  "version": "0.7.50",
   "description": "chatgpt services to connect our projects with chatgpt api",
   "keywords": [
     "chatgpt",
@@ -21,11 +21,10 @@
     "precommit": "npm run lint && npm run test && npm run upgrade && npm run security"
   },
   "dependencies": {
-    "@cobrowser/logger": "^2.0.6",
-    "@cobrowser/xss-validation": "^2.0.1",
-    "axios": "^1.15.0",
-    "axios-mock-adapter": "^1.22.0",
-    "openai": "^6.3.0"
+    "@cobrowser/logger": "^2.0.7",
+    "@cobrowser/xss-validation": "^2.0.3",
+    "axios": "^1.16.0",
+    "openai": "^6.36.0"
   },
   "directories": {
     "dist": "dist"
@@ -41,5 +40,8 @@
   "bugs": {
     "url": "https://bitbucket.org/cobrowser/cb_utils/issues"
   },
-  "gitHead": "e91cfd6162da6c34d8f44002d5b5fe18b9a8f311"
+  "devDependencies": {
+    "axios-mock-adapter": "^2.1.0"
+  },
+  "gitHead": "c31dea8d5882f65809dda8f5b5aef14e5b9c2b3e"
 }