@cobrowser/chatgpt 0.7.36 → 0.7.37

package/dist/services/CopilotService/CopilotService.js

@@ -105,43 +105,87 @@ class CopilotService extends BaseService_1.default {
      * @param message
      */
     getAssistantSuggestions(conversation) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            // Here we get the last customer message as we dont need the whole conversation
-            // as we are doing with the other approach.
-            const conversationArray = conversation.split('\n'), lastCustomerMessage = conversationArray.reverse().find(e => e.includes('customer:'));
-            if (!lastCustomerMessage) {
-                logger_1.default.error('Last customer message not found');
-                return Promise.reject(new Error('Last customer message not found'));
+            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 run;
+            let thread;
             if (!this.threadId) {
-                const thread = yield openai.beta.threads.create();
+                thread = yield openai.beta.threads.create({
+                    metadata: {
+                        lastMessageIndex: '-1'
+                    }
+                });
                 this.threadId = thread.id;
             }
-            const lastThreadMessasges = yield openai.beta.threads.messages.list(this.threadId, { order: "desc", limit: 2 }), isRepeatedMessage = lastThreadMessasges.data.find(msg => msg.content[0].type === 'text' && msg.content[0].text.value === lastCustomerMessage);
-            // making sure that we're not saving repeated messages
-            if (isRepeatedMessage) {
-                const runs = yield openai.beta.threads.runs.list(this.threadId, { order: "desc", limit: 1 });
-                run = runs.data[0];
-            }
             else {
-                yield openai.beta.threads.messages.create(this.threadId, { role: "user", content: lastCustomerMessage });
-                run = yield openai.beta.threads.runs.create(this.threadId, { assistant_id: (_a = this.assistantId) !== null && _a !== void 0 ? _a : '' });
+                thread = yield openai.beta.threads.retrieve(this.threadId);
             }
-            while (['queued', 'in_progress', 'cancelling'].includes(run.status)) {
+            const lastMessageIndex = parseInt(((_a = thread.metadata) === null || _a === void 0 ? void 0 : _a.lastMessageIndex) || '-1', 10);
+            const newMessages = messages.slice(lastMessageIndex + 1);
+            if (newMessages.length === 0) {
+                // Retrieve the last assistant message from the thread
+                const { data } = yield openai.beta.threads.messages.list(this.threadId, { order: 'desc', limit: 10 });
+                const lastAssistantMessage = data.find(msg => msg.role === 'assistant');
+                if (lastAssistantMessage) {
+                    const messagesData = lastAssistantMessage.content.map((content) => content.type === 'text' ? content.text : '').filter(text => text);
+                    if (messagesData.length) {
+                        const answers = messagesData.map(message => message.value);
+                        return {
+                            data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, answers),
+                            threadId: this.threadId,
+                            usageTokens: undefined,
+                        };
+                    }
+                }
+                return Promise.reject(new Error('No previous assistant messages found'));
+            }
+            for (const message of newMessages) {
+                yield openai.beta.threads.messages.create(this.threadId, {
+                    role: message.role,
+                    content: message.content
+                });
+            }
+            yield openai.beta.threads.update(this.threadId, {
+                metadata: {
+                    lastMessageIndex: (messages.length - 1).toString()
+                }
+            });
+            const run = yield openai.beta.threads.runs.create(this.threadId, {
+                assistant_id: (_b = this.assistantId) !== null && _b !== void 0 ? _b : ''
+            });
+            let currentRun = run;
+            while (['queued', 'in_progress', 'cancelling'].includes(currentRun.status)) {
                 yield new Promise(resolve => setTimeout(resolve, 500));
-                run = yield openai.beta.threads.runs.retrieve(run.thread_id, run.id);
+                currentRun = yield openai.beta.threads.runs.retrieve(currentRun.thread_id, currentRun.id);
             }
-            if (run.status === 'completed') {
-                const { data } = yield openai.beta.threads.messages.list(run.thread_id, { order: 'desc', limit: 1 }), messages = data.flatMap((message) => message === null || message === void 0 ? void 0 : message.content.map((content) => ((content.type === 'text' && message.role === 'assistant') ? content.text : ''))), assistantMessages = messages.filter(message => typeof message === 'object' && 'value' in message && typeof message.value === 'string');
+            if (currentRun.status === 'completed') {
+                const { data } = yield openai.beta.threads.messages.list(currentRun.thread_id, { order: 'desc', limit: 1 }), messagesData = data.flatMap((message) => message === null || message === void 0 ? void 0 : message.content.map((content) => ((content.type === 'text' && message.role === 'assistant') ? content.text : ''))), assistantMessages = messagesData.filter(message => typeof message === 'object' && 'value' in message && typeof message.value === 'string');
                 if (assistantMessages.length) {
                     const answers = assistantMessages.map(message => message.value);
                     return {
                         data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, answers),
-                        threadId: run.thread_id,
-                        usageTokens: run.usage,
+                        threadId: currentRun.thread_id,
+                        usageTokens: currentRun.usage,
                     };
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobrowser/chatgpt",
-  "version": "0.7.36",
+  "version": "0.7.37",
   "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": "7a5961aa09cb038da19c5e23e25996158b2f1dfa"
+  "gitHead": "b72f8b0bd24f523172f83cb4bc833ad605684565"
 }