@cobrowser/chatgpt 0.7.5 → 0.7.7

package/dist/models/ChatGptResponse.d.ts

@@ -2,5 +2,6 @@ import ChatGptUsageTokens from './ChatGptUsageTokens';
 interface ChatGptResponse {
     firstChoice?: string;
     usageTokens?: ChatGptUsageTokens;
+    threadId?: string;
 }
 export default ChatGptResponse;

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

@@ -4,7 +4,8 @@ import ChatGptMessage from '../../models/ChatGptMessage';
 import Item from '../../models/Item';
 export declare class CopilotService extends BaseService {
     assistantId: string | undefined;
-    constructor(apiKey?: string, model?: string, assistantId?: string, apiUrl?: string, maxNumberOfChoices?: number);
+    threadId: string | undefined;
+    constructor(apiKey?: string, model?: string, assistantId?: string, threadId?: string, apiUrl?: string, maxNumberOfChoices?: number);
     /**
      * a method to be used to suggest some quick replies for the agent based on the conversation
      *  will be added as a single string in the format
@@ -29,5 +30,5 @@ export declare class CopilotService extends BaseService {
      *
      * @param message
      */
-    getAssistantReply(message: string): Promise<string | undefined>;
+    getAssistantReply(message: string): Promise<ChatGptResponse | undefined>;
 }

package/dist/services/CopilotService/CopilotService.js

@@ -18,7 +18,7 @@ const logger_1 = __importDefault(require("../logger"));
 const ChatGptMessage_1 = require("../../models/ChatGptMessage");
 const openai_1 = __importDefault(require("openai"));
 class CopilotService extends BaseService_1.default {
-    constructor(apiKey, model, assistantId, apiUrl, maxNumberOfChoices) {
+    constructor(apiKey, model, assistantId, threadId, apiUrl, maxNumberOfChoices) {
         super(apiKey, model, apiUrl, maxNumberOfChoices);
         Object.defineProperty(this, "assistantId", {
             enumerable: true,
@@ -26,7 +26,14 @@ class CopilotService extends BaseService_1.default {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "threadId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.assistantId = assistantId;
+        this.threadId = threadId;
     }
     /**
      * a method to be used to suggest some quick replies for the agent based on the conversation
@@ -56,10 +63,7 @@ class CopilotService extends BaseService_1.default {
                         logger_1.default.error('last customer message not found');
                         return Promise.reject(new Error('last customer message not found'));
                     }
-                    const assistantReply = yield this.getAssistantReply(lastCustomerMessage);
-                    return {
-                        firstChoice: assistantReply
-                    };
+                    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
@@ -126,23 +130,40 @@ class CopilotService extends BaseService_1.default {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const openai = new openai_1.default({ apiKey: this.openaiApiKey });
-            let reply = undefined;
-            const thread = yield openai.beta.threads.create();
-            yield openai.beta.threads.messages.create(thread.id, { role: "user", content: message });
-            let run = yield openai.beta.threads.runs.create(thread.id, { assistant_id: (_a = this.assistantId) !== null && _a !== void 0 ? _a : '' });
+            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);
+            // 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 });
+                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)) {
                 yield new Promise(resolve => setTimeout(resolve, 500));
                 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);
+                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 assistantMessage = messages.find(message => typeof message === 'object' && 'value' in message && typeof message.value === 'string');
-                if (assistantMessage) {
-                    reply = assistantMessage.value;
+                const assistantMessages = messages.filter(message => typeof message === 'object' && 'value' in message && typeof message.value === 'string');
+                if (assistantMessages.length) {
+                    let answers = assistantMessages.map(message => message.value).join('\n');
+                    return {
+                        firstChoice: answers,
+                        threadId: run.thread_id,
+                        usageTokens: run.usage,
+                    };
                 }
             }
-            return reply;
+            return undefined;
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobrowser/chatgpt",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "chatgpt services to connect our projects with chatgpt api",
   "keywords": [
     "chatgpt",
@@ -39,5 +39,5 @@
   "bugs": {
     "url": "https://bitbucket.org/cobrowser/cb_utils/issues"
   },
-  "gitHead": "5a4bff51323eed4e0c17a865e7783d8dfc0323e1"
+  "gitHead": "2f235befbe0be80629be10c8a34d197ca189f512"
 }