@cobrowser/chatgpt 0.7.31-beta.1 → 0.7.31-beta.3

package/dist/models/ChatGPTResponse.d.ts

@@ -1,6 +1,6 @@
 import ChatGPTUsageTokens from './ChatGPTUsageTokens';
 interface ChatGPTResponse {
-    data?: string;
+    data?: any;
     usageTokens?: ChatGPTUsageTokens;
     threadId?: string;
     requiredActions?: string;

package/dist/services/BaseService/BaseService.js

@@ -79,16 +79,22 @@ class BaseService {
             // Skip constructor, non-functions, and utility methods
             // But include service methods like getReply, getAssistant, etc.
             if (methodName === 'constructor' ||
+                methodName === 'suggest' ||
                 typeof method !== 'function' ||
-                (methodName.startsWith('get') && !methodName.startsWith('getReply') && !methodName.startsWith('getAssist')) ||
+                (methodName.startsWith('get') &&
+                    !methodName.startsWith('getReply') &&
+                    !methodName.startsWith('getAssist') &&
+                    !methodName.startsWith('getChatGPT')) ||
                 methodName.startsWith('handle') ||
                 methodName.includes('Sanitize') ||
                 methodName.includes('sanitize')) {
                 continue;
             }
             const originalMethod = method.bind(this);
+            console.log('ORIGINAL METHOD: ', originalMethod);
             // Replace the method with a sanitizing wrapper
             this[methodName] = (...args) => __awaiter(this, void 0, void 0, function* () {
+                console.log('WRAPPER args: ', args);
                 try {
                     const result = this.response(yield originalMethod(...args)), sanitizedResult = this.clean(result);
                     console.log('BASE SERVICE processAsyncMethods sanitizedResult: ', sanitizedResult);
@@ -116,7 +122,7 @@ class BaseService {
             catch (error) { }
         }
         const sanitized = xss_validation_1.XSSProtector.sanitize(value), encoded = xss_validation_1.XSSProtector.encode(sanitized);
-        console.log('BASE SERVICE clean sanitized sssss: ', sanitized);
+        console.log('BASE SERVICE clean sanitized aaaaa: ', sanitized);
         console.log('BASE SERVICE clean encoded: ', encoded);
         console.log('BASE SERVICE clean encoded data: ', encoded.result.data);
         logger_1.default.info({ value, sanitized, encoded }, ':: Sanitized Response ::');

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

@@ -2,6 +2,7 @@ import ChatGptMessage from '../../models/ChatGptMessage';
 import Item from '../../models/Item';
 import BaseService from '../BaseService/BaseService';
 import ChatGPTResponse from '../../models/ChatGPTResponse';
+import ChatGPTUsageTokens from 'src/models/ChatGPTUsageTokens';
 export declare class CopilotService extends BaseService {
     assistantId: string | undefined;
     threadId: string | undefined;
@@ -24,11 +25,18 @@ export declare class CopilotService extends BaseService {
      * @param conversation the whole chat conversation
      * @param items the items to recommend from
      */
-    recommend(conversation: ChatGptMessage[], items: Item[]): Promise<string | undefined>;
+    recommend(conversation: ChatGptMessage[], items: Item[]): Promise<{
+        data: string | undefined;
+        usageTokens: ChatGPTUsageTokens | undefined;
+    }>;
+    getChatGPTQuickReplies(conversation: string): Promise<{
+        data: string | undefined;
+        usageTokens: ChatGPTUsageTokens | undefined;
+    }>;
     /**
      * Get the reply of the assistant if the assistant_id is available
      *
      * @param message
      */
-    getAssistantReply(message: string): Promise<ChatGPTResponse | undefined>;
+    getAssistantReply(conversation: string): Promise<ChatGPTResponse | undefined>;
 }

package/dist/services/CopilotService/CopilotService.js

@@ -34,6 +34,7 @@ class CopilotService extends BaseService_1.default {
         });
         this.assistantId = assistantId;
         this.threadId = threadId;
+        console.log('API URL: ', apiUrl);
     }
     /**
      * a method to be used to suggest some quick replies for the agent based on the conversation
@@ -49,40 +50,17 @@ class CopilotService extends BaseService_1.default {
      */
     suggest(conversation) {
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('SUGGEST conversation: ', conversation);
             if (!(conversation === null || conversation === void 0 ? void 0 : conversation.length)) {
-                logger_1.default.error('conversation must be provided');
-                return Promise.reject(new Error('conversation must be provided'));
+                logger_1.default.error('Conversation must be provided');
+                return Promise.reject(new Error('Conversation must be provided'));
             }
             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'));
-                    }
-                    return yield this.getAssistantReply(lastCustomerMessage);
-                }
-                // main prompt used to instruct chatGPT to suggest some quick replies
-                const mainPrompt = `Propose some quick replies for the agent to be used on the following conversation
-          Your response must only contains a valid JSON array of strings like this:
-          ["Reply 1", "Reply 2", "Reply 3"]. the conversation is:-\n${conversation}`, 
-                // main prompt will be the whole conversation as string
-                mainPromptMessage = {
-                    role: ChatGptMessage_1.ChatGptRole.USER,
-                    content: mainPrompt,
-                }, 
-                // the body we need to send to the request
-                requestBody = {
-                    model: this.chatGptModel,
-                    messages: [mainPromptMessage],
-                }, response = yield this.request.post('', requestBody);
-                return {
-                    data: this.getResponseFirstChoice(response),
-                    usageTokens: this.getResponseUsageTokens(response),
-                };
+                // if (this.assistantId) {
+                //   return await this.getAssistantReply(conversation);
+                // }
+                console.log('NOT ASSISTANT');
+                return yield this.getChatGPTQuickReplies(conversation);
             }
             catch (e) {
                 this.handleErrors(e);
@@ -114,7 +92,10 @@ class CopilotService extends BaseService_1.default {
                     model: this.chatGptModel,
                     messages: [firstMessage, ...conversation],
                 }, response = yield this.request.post('', requestBody);
-                return this.getResponseFirstChoice(response);
+                return {
+                    data: this.getResponseFirstChoice(response),
+                    usageTokens: this.getResponseUsageTokens(response),
+                };
             }
             catch (e) {
                 this.handleErrors(e);
@@ -122,29 +103,58 @@ class CopilotService extends BaseService_1.default {
             }
         });
     }
+    getChatGPTQuickReplies(conversation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // main prompt used to instruct chatGPT to suggest some quick replies
+            const mainPrompt = `Propose some quick replies for the agent to be used on the following conversation
+    Your response must only contains a valid JSON array of strings like this:
+    ["Reply 1", "Reply 2", "Reply 3"]. the conversation is:-\n${conversation}`, 
+            // main prompt will be the whole conversation as string
+            mainPromptMessage = {
+                role: ChatGptMessage_1.ChatGptRole.USER,
+                content: mainPrompt,
+            }, 
+            // the body we need to send to the request
+            requestBody = {
+                model: this.chatGptModel,
+                messages: [mainPromptMessage],
+            }, response = yield this.request.post('', requestBody);
+            return {
+                data: this.getResponseFirstChoice(response),
+                usageTokens: this.getResponseUsageTokens(response),
+            };
+        });
+    }
     /**
      * Get the reply of the assistant if the assistant_id is available
      *
      * @param message
      */
-    getAssistantReply(message) {
+    getAssistantReply(conversation) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            console.log('getAssistantReply conversation: ', conversation);
+            // 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 openai = new openai_1.default({ apiKey: this.openaiApiKey });
             let run;
             if (!this.threadId) {
                 const thread = yield openai.beta.threads.create();
                 this.threadId = thread.id;
             }
-            const lastThreadMessasges = yield openai.beta.threads.messages.list(this.threadId, { order: "desc", limit: 2 });
-            const isRepeatedMessage = lastThreadMessasges.data.find(msg => msg.content[0].type === 'text' && msg.content[0].text.value === message);
+            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: message });
+                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 : '' });
             }
             while (['queued', 'in_progress', 'cancelling'].includes(run.status)) {
@@ -152,13 +162,13 @@ class CopilotService extends BaseService_1.default {
                 run = yield openai.beta.threads.runs.retrieve(run.thread_id, run.id);
             }
             if (run.status === 'completed') {
-                const { data } = yield openai.beta.threads.messages.list(run.thread_id, { order: 'desc', limit: 1 });
-                const messages = data.flatMap((message) => message === null || message === void 0 ? void 0 : message.content.map((content) => ((content.type === 'text' && message.role === 'assistant') ? content.text : '')));
-                const assistantMessages = messages.filter(message => typeof message === 'object' && 'value' in message && typeof message.value === 'string');
+                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');
+                console.log('GET ASSISTANT REPLY assistantMessages: ', assistantMessages);
                 if (assistantMessages.length) {
                     let answers = assistantMessages.map(message => message.value);
+                    console.log('GET ASSISTANT REPLY answers: ', answers);
                     return {
-                        data: JSON.stringify(answers),
+                        data: answers,
                         threadId: run.thread_id,
                         usageTokens: run.usage,
                     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobrowser/chatgpt",
-  "version": "0.7.31-beta.1",
+  "version": "0.7.31-beta.3",
   "description": "chatgpt services to connect our projects with chatgpt api",
   "keywords": [
     "chatgpt",
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@cobrowser/logger": "^2.0.2",
+    "@cobrowser/xss-validation": "^2.0.1",
     "axios": "^1.6.1",
     "axios-mock-adapter": "^1.22.0",
     "openai": "^4.86.2"
@@ -39,5 +40,5 @@
   "bugs": {
     "url": "https://bitbucket.org/cobrowser/cb_utils/issues"
   },
-  "gitHead": "4f4def1cb16e7e16058f1a50902551b1b1d35d47"
+  "gitHead": "58607b0a20bf3de92b53069515252eecf2fe2fc9"
 }