@cobrowser/chatgpt 0.7.42 → 0.7.44

package/dist/services/CopilotService/CopilotService.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _CopilotService_instances, _CopilotService_processSuggestions;
+var _CopilotService_instances, _CopilotService_processSuggestions, _CopilotService_prepareAssistantResponseAnswer;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopilotService = void 0;
 const ChatGPTMessage_1 = require("../../models/ChatGPTMessage");
@@ -77,23 +77,15 @@ class CopilotService extends BaseService_1.default {
             }
             try {
                 if (this.assistantId) {
-                    // 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');
-                    const 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'));
-                    }
                     // Route based on id shape: asst_* => Assistant API, prompt_* => Responses API
                     if (yield this.isAssistantIdFormat(this.assistantId)) {
-                        logger_1.default.info(':: CopilotServicee.suggest :: Fetching suggestion through Assistant API ::');
+                        logger_1.default.info(':: CopilotServicee.suggest :: Fetching suggestions through Assistant API ::');
                         return yield this.getAssistantSuggestions(conversation, suggestionLanguage);
                     }
-                    logger_1.default.info(':: CopilotServicee.suggest :: Fetching suggestion through Responses API ::');
+                    logger_1.default.info(':: CopilotServicee.suggest :: Fetching suggestions through Responses API ::');
                     return yield this.getPromptSuggestions(conversation, suggestionLanguage);
                 }
-                logger_1.default.info(':: CopilotServicee.suggest :: Fetching suggestion through Chat Completion API ::');
+                logger_1.default.info(':: CopilotServicee.suggest :: Fetching suggestions through Chat Completion API ::');
                 return yield this.getChatCompletionSuggestions(conversation, suggestionLanguage);
             }
             catch (e) {
@@ -150,10 +142,11 @@ class CopilotService extends BaseService_1.default {
                         content: line.replace(/^customer:\s*/, '').trim()
                     });
                 }
-                else if (line.includes('agent:')) {
+                else if (line.includes('agent:') || line.includes('chatbot:')) {
+                    const isAgent = line.includes('agent:'), content = isAgent ? line.replace(/^agent:\s*/, '') : line.replace(/^chatbot:\s*/, '');
                     messages.push({
                         role: 'assistant',
-                        content: line.replace(/^agent:\s*/, '').trim()
+                        content: content.trim()
                     });
                 }
             }
@@ -184,8 +177,11 @@ class CopilotService extends BaseService_1.default {
                     const messagesData = lastAssistantMessage.content.map((content) => content.type === 'text' ? content.text : '').filter(text => text);
                     if (messagesData.length) {
                         const answers = messagesData.map(message => message.value);
+                        logger_1.default.info({
+                            answers
+                        }, ':: CopilotServicee.getAssistantSuggestions :: Raw Suggestions ::');
                         return {
-                            data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, answers),
+                            data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_prepareAssistantResponseAnswer).call(this, answers)),
                             threadId: this.threadId,
                             usageTokens: undefined,
                         };
@@ -217,8 +213,11 @@ class CopilotService extends BaseService_1.default {
                 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);
+                    logger_1.default.info({
+                        answers
+                    }, ':: CopilotServicee.getAssistantSuggestions :: Raw Suggestions ::');
                     return {
-                        data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, answers),
+                        data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_prepareAssistantResponseAnswer).call(this, answers)),
                         threadId: currentRun.thread_id,
                         usageTokens: currentRun.usage,
                     };
@@ -236,8 +235,7 @@ class CopilotService extends BaseService_1.default {
     getPromptSuggestions(conversation, suggestionLanguage) {
         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 = [];
+            const conversationLines = conversation.split('\n').filter(line => line.trim()), messages = [];
             for (const line of conversationLines) {
                 if (line.includes('customer:')) {
                     messages.push({
@@ -245,10 +243,11 @@ class CopilotService extends BaseService_1.default {
                         content: line.replace(/^customer:\s*/, '').trim()
                     });
                 }
-                else if (line.includes('agent:')) {
+                else if (line.includes('agent:') || line.includes('chatbot:')) {
+                    const isAgent = line.includes('agent:'), content = isAgent ? line.replace(/^agent:\s*/, '') : line.replace(/^chatbot:\s*/, '');
                     messages.push({
                         role: 'assistant',
-                        content: line.replace(/^agent:\s*/, '').trim()
+                        content: content.trim()
                     });
                 }
             }
@@ -257,8 +256,7 @@ class CopilotService extends BaseService_1.default {
                 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;
+            let conversationId = this.conversationId, lastMessageIndex = -1;
             if (!conversationId) {
                 const conv = yield openai.conversations.create({
                     metadata: {
@@ -293,7 +291,7 @@ class CopilotService extends BaseService_1.default {
                         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]],
+                                data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_prepareAssistantResponseAnswer).call(this, text)),
                                 threadId: this.conversationId,
                                 usageTokens: undefined,
                             };
@@ -312,23 +310,20 @@ class CopilotService extends BaseService_1.default {
                 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);
-                    }
+            if (!lastUserMessage && 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;
+            let inputWithContext = lastUserMessage === null || lastUserMessage === void 0 ? void 0 : lastUserMessage.content;
             if (contextMessages.length > 0 || newMessages.length > 1) {
                 const allNewMessages = [];
                 for (const msg of newMessages) {
@@ -338,12 +333,19 @@ class CopilotService extends BaseService_1.default {
                 const fullContext = [...contextMessages, ...allNewMessages].join('\n');
                 inputWithContext = fullContext;
             }
-            const request = Object.assign({ input: inputWithContext, store: true, conversation: { id: conversationId }, include: ['file_search_call.results'] }, (suggestionLanguage ? {
-                instructions: `IMPORTANT: You must respond in ${suggestionLanguage} language only. 
-          Regardless of the language used in the conversation, your response must be in ${suggestionLanguage}.`
-            } : {}));
+            const request = {
+                input: inputWithContext,
+                store: true,
+                conversation: { id: conversationId },
+                include: ['file_search_call.results'],
+            };
             if (this.assistantId && (yield this.isPromptIdFormat(this.assistantId))) {
-                request.prompt = { id: this.assistantId };
+                request.prompt = {
+                    id: this.assistantId,
+                    variables: {
+                        language: suggestionLanguage,
+                    }
+                };
             }
             const lastResponse = yield openai.responses.create(request);
             if ((_b = lastResponse.conversation) === null || _b === void 0 ? void 0 : _b.id) {
@@ -371,7 +373,7 @@ class CopilotService extends BaseService_1.default {
             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]],
+                    data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_prepareAssistantResponseAnswer).call(this, text)),
                     threadId: this.conversationId,
                     usageTokens: {
                         prompt_tokens: Number((_d = ((_c = lastResponse.usage) === null || _c === void 0 ? void 0 : _c.prompt_tokens)) !== null && _d !== void 0 ? _d : 0),
@@ -382,7 +384,7 @@ class CopilotService extends BaseService_1.default {
             }
             if (lastResponse.output_text) {
                 return {
-                    data: [lastResponse.output_text],
+                    data: __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_processSuggestions).call(this, __classPrivateFieldGet(this, _CopilotService_instances, "m", _CopilotService_prepareAssistantResponseAnswer).call(this, lastResponse.output_text)),
                     threadId: this.conversationId,
                     usageTokens: {
                         prompt_tokens: Number((_k = ((_j = lastResponse.usage) === null || _j === void 0 ? void 0 : _j.prompt_tokens)) !== null && _k !== void 0 ? _k : 0),
@@ -400,4 +402,21 @@ _CopilotService_instances = new WeakSet(), _CopilotService_processSuggestions =
     suggestions = suggestions ? suggestions : [];
     suggestions = suggestions.filter(suggestion => !!suggestion.trim());
     return suggestions;
+}, _CopilotService_prepareAssistantResponseAnswer = function _CopilotService_prepareAssistantResponseAnswer(data) {
+    if (!data) {
+        return [];
+    }
+    if (Array.isArray(data) &&
+        data.length === 1 &&
+        typeof data[0] === 'string') {
+        try {
+            // when data is [ '["suggestion1", "suggestion2"]' ]
+            return JSON.parse(data[0]);
+        }
+        catch (e) {
+            logger_1.default.error('Failed to parse stringified array, returning the data as is...');
+        }
+    }
+    // return data as is if format is different or try-catch threw an error
+    return data;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobrowser/chatgpt",
-  "version": "0.7.42",
+  "version": "0.7.44",
   "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": "2d994b9a9cf3c441e1b0fcc3ade49cfd36c913e3"
+  "gitHead": "573059b245f281c1bf93e38937b666e725f58019"
 }