@cobrowser/chatgpt 0.7.15 → 0.7.17

package/dist/models/ChatGptResponse.d.ts

@@ -3,5 +3,6 @@ interface ChatGptResponse {
     firstChoice?: string;
     usageTokens?: ChatGptUsageTokens;
     threadId?: string;
+    requiredActions?: string;
 }
 export default ChatGptResponse;

package/dist/services/AssistantService/AssistantService.d.ts

@@ -3,6 +3,7 @@ import BaseService from '../BaseService/BaseService';
 export declare class AssistantService extends BaseService {
     assistantId: string | undefined;
     threadId: string | undefined;
+    runId: string | undefined;
     constructor(apiKey?: string, assistantId?: string, threadId?: string);
     /**
      * Create new thread
@@ -15,5 +16,5 @@ export declare class AssistantService extends BaseService {
      *
      * @param message
      */
-    getReply(message: string): Promise<ChatGptResponse | undefined>;
+    getReply(message: string, instructions?: string, functionOutputs?: string): Promise<ChatGptResponse | undefined>;
 }

package/dist/services/AssistantService/AssistantService.js

@@ -31,6 +31,12 @@ class AssistantService extends BaseService_1.default {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "runId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.assistantId = assistantId;
         this.threadId = threadId;
     }
@@ -51,7 +57,7 @@ class AssistantService extends BaseService_1.default {
      *
      * @param message
      */
-    getReply(message) {
+    getReply(message, instructions, functionOutputs) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.assistantId || !this.threadId) {
@@ -60,15 +66,23 @@ class AssistantService extends BaseService_1.default {
             }
             const openai = new openai_1.default({ apiKey: this.openaiApiKey });
             let run;
-            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);
-            if (isRepeatedMessage) {
-                const runs = yield openai.beta.threads.runs.list(this.threadId, { order: "desc", limit: 1 });
-                run = runs.data[0];
+            if (functionOutputs && this.runId) {
+                run = yield openai.beta.threads.runs.submitToolOutputsAndPoll(this.threadId, this.runId, { tool_outputs: JSON.parse(functionOutputs) });
             }
             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 : '' });
+                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);
+                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 : '', additional_instructions: instructions });
+                }
+            }
+            if (run) {
+                this.runId = run.id;
             }
             while (['queued', 'in_progress', 'cancelling'].includes(run.status)) {
                 yield new Promise(resolve => setTimeout(resolve, 500));
@@ -87,6 +101,13 @@ class AssistantService extends BaseService_1.default {
                     };
                 }
             }
+            if (run.status === 'requires_action') {
+                return {
+                    requiredActions: JSON.stringify(run.required_action),
+                    threadId: run.thread_id,
+                    usageTokens: run.usage,
+                };
+            }
             return undefined;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobrowser/chatgpt",
-  "version": "0.7.15",
+  "version": "0.7.17",
   "description": "chatgpt services to connect our projects with chatgpt api",
   "keywords": [
     "chatgpt",
@@ -24,7 +24,7 @@
     "@cobrowser/logger": "^2.0.2",
     "axios": "^1.6.1",
     "axios-mock-adapter": "^1.22.0",
-    "openai": "^4.32.0"
+    "openai": "^4.52.7"
   },
   "directories": {
     "dist": "dist"
@@ -39,5 +39,5 @@
   "bugs": {
     "url": "https://bitbucket.org/cobrowser/cb_utils/issues"
   },
-  "gitHead": "271ee62b6ffcd6d670eb31abb882647830e0a691"
+  "gitHead": "cf1fbd8ba217c2b86386dfd59765308750e0e4f5"
 }