@cobrowser/chatgpt 0.7.40 → 0.7.41

package/dist/services/CopilotService/CopilotService.d.ts

@@ -33,5 +33,5 @@ export declare class CopilotService extends BaseService {
     getAssistantSuggestions(conversation: string): Promise<ChatGPTResponse | undefined>;
     private isAssistantIdFormat;
     private isPromptIdFormat;
-    getPromptSuggestions(message: string): Promise<ChatGPTResponse | undefined>;
+    getPromptSuggestions(conversation: string): Promise<ChatGPTResponse | undefined>;
 }

package/dist/services/CopilotService/CopilotService.js

@@ -80,7 +80,7 @@ class CopilotService extends BaseService_1.default {
                     if (yield this.isAssistantIdFormat(this.assistantId)) {
                         return yield this.getAssistantSuggestions(conversation);
                     }
-                    return yield this.getPromptSuggestions(lastCustomerMessage);
+                    return yield this.getPromptSuggestions(conversation);
                 }
                 return yield this.getChatCompletionSuggestions(conversation);
             }
@@ -216,18 +216,113 @@ class CopilotService extends BaseService_1.default {
     isPromptIdFormat(id) {
         return !!id && /^pmpt_[A-Za-z0-9]+$/.test(id);
     }
-    getPromptSuggestions(message) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    getPromptSuggestions(conversation) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         return __awaiter(this, void 0, void 0, function* () {
+            const conversationLines = conversation.split('\n').filter(line => line.trim());
+            const messages = [];
+            for (const line of conversationLines) {
+                if (line.includes('customer:')) {
+                    messages.push({
+                        role: 'user',
+                        content: line.replace(/^customer:\s*/, '').trim()
+                    });
+                }
+                else if (line.includes('agent:')) {
+                    messages.push({
+                        role: 'assistant',
+                        content: line.replace(/^agent:\s*/, '').trim()
+                    });
+                }
+            }
+            if (messages.length === 0) {
+                logger_1.default.error('No valid messages found in conversation');
+                return Promise.reject(new Error('No valid messages found in conversation'));
+            }
             const openai = new openai_1.default({ apiKey: this.openaiApiKey });
             let conversationId = this.conversationId;
+            let lastMessageIndex = -1;
             if (!conversationId) {
-                const conv = yield openai.conversations.create();
+                const conv = yield openai.conversations.create({
+                    metadata: {
+                        lastMessageIndex: '-1',
+                        conversationHistory: JSON.stringify([])
+                    }
+                });
                 conversationId = conv.id;
+                this.conversationId = conversationId;
+            }
+            else {
+                // Retrieve conversation to get metadata
+                try {
+                    const conv = yield openai.conversations.retrieve(conversationId);
+                    lastMessageIndex = parseInt(((_a = conv.metadata) === null || _a === void 0 ? void 0 : _a.lastMessageIndex) || '-1', 10);
+                }
+                catch (e) {
+                    logger_1.default.error('Failed to retrieve conversation metadata', e);
+                    lastMessageIndex = -1;
+                }
+            }
+            // Get new messages that haven't been sent yet
+            const newMessages = messages.slice(lastMessageIndex + 1);
+            if (newMessages.length === 0) {
+                // Retrieve the last response from the conversation
+                try {
+                    const convHistory = yield openai.conversations.retrieve(conversationId);
+                    const lastResponse = convHistory.last_response;
+                    if (lastResponse) {
+                        const output = lastResponse.output || [];
+                        const assistantMessages = output.filter((item) => item.type === 'message' && item.role === 'assistant');
+                        if (assistantMessages.length) {
+                            const text = assistantMessages.flatMap((m) => { var _a, _b; return ((_b = (_a = m.content) === null || _a === void 0 ? void 0 : _a.filter((c) => c.type === 'output_text')) === null || _b === void 0 ? void 0 : _b.map((c) => c.text)) || []; });
+                            return {
+                                data: [text[text.length - 1]],
+                                threadId: this.conversationId,
+                                usageTokens: undefined,
+                            };
+                        }
+                    }
+                }
+                catch (e) {
+                    logger_1.default.error('Failed to retrieve last response from conversation', e);
+                }
+                return Promise.reject(new Error('No new messages to process and no previous response found'));
+            }
+            const allPreviousMessages = messages.slice(0, lastMessageIndex + 1);
+            const contextMessages = [];
+            for (const msg of allPreviousMessages) {
+                const roleLabel = msg.role === 'user' ? 'customer' : 'agent';
+                contextMessages.push(`${roleLabel}: ${msg.content}`);
+            }
+            const lastUserMessage = newMessages.filter(m => m.role === 'user').pop();
+            if (!lastUserMessage) {
+                if (conversationId) {
+                    try {
+                        yield openai.conversations.update(conversationId, {
+                            metadata: {
+                                lastMessageIndex: (messages.length - 1).toString(),
+                                conversationHistory: JSON.stringify(messages)
+                            }
+                        });
+                    }
+                    catch (e) {
+                        logger_1.default.error('Failed to update conversation metadata', e);
+                    }
+                }
+                return Promise.reject(new Error('No new user messages to process'));
+            }
+            let inputWithContext = lastUserMessage.content;
+            if (contextMessages.length > 0 || newMessages.length > 1) {
+                const allNewMessages = [];
+                for (const msg of newMessages) {
+                    const roleLabel = msg.role === 'user' ? 'customer' : 'agent';
+                    allNewMessages.push(`${roleLabel}: ${msg.content}`);
+                }
+                const fullContext = [...contextMessages, ...allNewMessages].join('\n');
+                inputWithContext = fullContext;
             }
             const request = {
-                //model: this.chatGptModel || 'gpt-4o-mini',
-                input: message,
+                input: inputWithContext,
                 store: true,
                 conversation: { id: conversationId },
                 include: ['file_search_call.results'],
@@ -235,36 +330,49 @@ class CopilotService extends BaseService_1.default {
             if (this.assistantId && (yield this.isPromptIdFormat(this.assistantId))) {
                 request.prompt = { id: this.assistantId };
             }
-            const response = yield openai.responses.create(request);
-            response.output.forEach((item, index) => {
-            });
-            if ((_a = response.conversation) === null || _a === void 0 ? void 0 : _a.id) {
-                this.conversationId = response.conversation.id;
+            const lastResponse = yield openai.responses.create(request);
+            if ((_b = lastResponse.conversation) === null || _b === void 0 ? void 0 : _b.id) {
+                this.conversationId = lastResponse.conversation.id;
+                conversationId = this.conversationId;
+            }
+            if (conversationId) {
+                try {
+                    yield openai.conversations.update(conversationId, {
+                        metadata: {
+                            lastMessageIndex: (messages.length - 1).toString(),
+                            conversationHistory: JSON.stringify(messages)
+                        }
+                    });
+                }
+                catch (e) {
+                    logger_1.default.error('Failed to update conversation metadata', e);
+                }
+            }
+            if (!lastResponse) {
+                return Promise.reject(new Error('No response generated'));
             }
-            // Sometimes if the prompt needs a file search, the output will be an array of messages
-            // which includes multiple messages (some of them are not useful for the user, but the last one is)
-            const output = response.output || [];
+            const output = lastResponse.output || [];
             const assistantMessages = output.filter((item) => item.type === 'message' && item.role === 'assistant');
             if (assistantMessages.length) {
                 const text = assistantMessages.flatMap((m) => { var _a, _b; return ((_b = (_a = m.content) === null || _a === void 0 ? void 0 : _a.filter((c) => c.type === 'output_text')) === null || _b === void 0 ? void 0 : _b.map((c) => c.text)) || []; });
                 return {
-                    data: [text.pop()],
+                    data: [text[text.length - 1]],
                     threadId: this.conversationId,
                     usageTokens: {
-                        prompt_tokens: Number((_c = ((_b = response.usage) === null || _b === void 0 ? void 0 : _b.prompt_tokens)) !== null && _c !== void 0 ? _c : 0),
-                        completion_tokens: Number((_e = ((_d = response.usage) === null || _d === void 0 ? void 0 : _d.completion_tokens)) !== null && _e !== void 0 ? _e : 0),
-                        total_tokens: Number((_g = ((_f = response.usage) === null || _f === void 0 ? void 0 : _f.total_tokens)) !== null && _g !== void 0 ? _g : 0),
+                        prompt_tokens: Number((_d = ((_c = lastResponse.usage) === null || _c === void 0 ? void 0 : _c.prompt_tokens)) !== null && _d !== void 0 ? _d : 0),
+                        completion_tokens: Number((_f = ((_e = lastResponse.usage) === null || _e === void 0 ? void 0 : _e.completion_tokens)) !== null && _f !== void 0 ? _f : 0),
+                        total_tokens: Number((_h = ((_g = lastResponse.usage) === null || _g === void 0 ? void 0 : _g.total_tokens)) !== null && _h !== void 0 ? _h : 0),
                     },
                 };
             }
-            if (response.output_text) {
+            if (lastResponse.output_text) {
                 return {
-                    data: [response.output_text],
+                    data: [lastResponse.output_text],
                     threadId: this.conversationId,
                     usageTokens: {
-                        prompt_tokens: Number((_j = ((_h = response.usage) === null || _h === void 0 ? void 0 : _h.prompt_tokens)) !== null && _j !== void 0 ? _j : 0),
-                        completion_tokens: Number((_l = ((_k = response.usage) === null || _k === void 0 ? void 0 : _k.completion_tokens)) !== null && _l !== void 0 ? _l : 0),
-                        total_tokens: Number((_o = ((_m = response.usage) === null || _m === void 0 ? void 0 : _m.total_tokens)) !== null && _o !== void 0 ? _o : 0),
+                        prompt_tokens: Number((_k = ((_j = lastResponse.usage) === null || _j === void 0 ? void 0 : _j.prompt_tokens)) !== null && _k !== void 0 ? _k : 0),
+                        completion_tokens: Number((_m = ((_l = lastResponse.usage) === null || _l === void 0 ? void 0 : _l.completion_tokens)) !== null && _m !== void 0 ? _m : 0),
+                        total_tokens: Number((_p = ((_o = lastResponse.usage) === null || _o === void 0 ? void 0 : _o.total_tokens)) !== null && _p !== void 0 ? _p : 0),
                     },
                 };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobrowser/chatgpt",
-  "version": "0.7.40",
+  "version": "0.7.41",
   "description": "chatgpt services to connect our projects with chatgpt api",
   "keywords": [
     "chatgpt",
@@ -40,5 +40,5 @@
   "bugs": {
     "url": "https://bitbucket.org/cobrowser/cb_utils/issues"
   },
-  "gitHead": "16611610698982c71962d16bdf6508733b171847"
+  "gitHead": "901018b28b617c8e0363bfda1247a6c6b5a42ab0"
 }