@cobrowser/chatgpt 0.7.25 → 0.7.26

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

@@ -1,6 +1,6 @@
+import { AssistantResponseFormatOption } from 'openai/resources/beta/threads/threads';
 import ChatGptResponse from '../../models/ChatGptResponse';
 import BaseService from '../BaseService/BaseService';
-import { AssistantResponseFormatOption } from 'openai/resources/beta/threads/threads';
 export declare class AssistantService extends BaseService {
     assistantId: string | undefined;
     threadId: string | undefined;

package/dist/services/AssistantService/AssistantService.js

@@ -99,7 +99,7 @@ class AssistantService extends BaseService_1.default {
                 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');
                 if (assistantMessages.length) {
-                    let answer = assistantMessages.map(message => message.value).join('\n');
+                    let answer = assistantMessages.map(message => this.output(message.value, true)).join('\n');
                     return {
                         firstChoice: answer.replace(/【.*?】/g, ''),
                         threadId: run.thread_id,

package/dist/services/BaseService/BaseService.d.ts

@@ -35,6 +35,6 @@ declare class BaseService {
      *
      * @param data
      */
-    output(data: string | undefined): string | undefined;
+    output(data: any, shouldStringify?: boolean): any;
 }
 export default BaseService;

package/dist/services/BaseService/BaseService.js

@@ -105,14 +105,20 @@ class BaseService {
      *
      * @param data
      */
-    output(data) {
+    output(data, shouldStringify = false) {
         if (!data) {
             return;
         }
-        const parsed = JSON.parse(data), text = parsed.data[0].translation, sanitized = xss_validation_1.XSSProtector.sanitize(text), encoded = xss_validation_1.XSSProtector.encode(sanitized);
-        parsed.data[0].translation = encoded;
-        logger_1.default.info({ data, parsed, sanitized, encoded }, ':: Sanitized Response ::');
-        return JSON.stringify(parsed);
+        // Data could be plain string or JSON string. 
+        if (typeof data === 'string') {
+            try {
+                data = JSON.parse(data);
+            }
+            catch (error) { }
+        }
+        const sanitized = xss_validation_1.XSSProtector.sanitize(data), encoded = xss_validation_1.XSSProtector.encode(sanitized);
+        logger_1.default.info({ data, sanitized, encoded }, ':: Sanitized Response ::');
+        return shouldStringify ? JSON.stringify(encoded) : encoded;
     }
 }
 exports.default = BaseService;

package/dist/services/ChatService/ChatService.js

@@ -48,7 +48,7 @@ class ChatService extends BaseService_1.default {
             logger_1.default.info(`:: ChatService.ask :: ${JSON.stringify(requestBody)}`);
             try {
                 const response = yield this.request.post('', requestBody);
-                return this.getResponseFirstChoice(response);
+                return this.output(this.getResponseFirstChoice(response), true);
             }
             catch (e) {
                 this.handleErrors(e);

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

@@ -1,7 +1,7 @@
-import ChatGptResponse from '../../models/ChatGptResponse';
-import BaseService from '../BaseService/BaseService';
 import ChatGptMessage from '../../models/ChatGptMessage';
 import Item from '../../models/Item';
+import BaseService from '../BaseService/BaseService';
+import ChatGptResponse from '../../models/ChatGptResponse';
 export declare class CopilotService extends BaseService {
     assistantId: string | undefined;
     threadId: string | undefined;
@@ -24,7 +24,7 @@ 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<any>;
     /**
      * Get the reply of the assistant if the assistant_id is available
      *

package/dist/services/CopilotService/CopilotService.js

@@ -13,10 +13,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopilotService = void 0;
-const BaseService_1 = __importDefault(require("../BaseService/BaseService"));
-const logger_1 = __importDefault(require("../logger"));
 const ChatGptMessage_1 = require("../../models/ChatGptMessage");
+const logger_1 = __importDefault(require("../logger"));
 const openai_1 = __importDefault(require("openai"));
+const BaseService_1 = __importDefault(require("../BaseService/BaseService"));
 class CopilotService extends BaseService_1.default {
     constructor(apiKey, model, assistantId, threadId, apiUrl, maxNumberOfChoices) {
         super(apiKey, model, apiUrl, maxNumberOfChoices);
@@ -80,7 +80,7 @@ class CopilotService extends BaseService_1.default {
                     messages: [mainPromptMessage],
                 }, response = yield this.request.post('', requestBody);
                 return {
-                    firstChoice: this.getResponseFirstChoice(response),
+                    firstChoice: this.output(this.getResponseFirstChoice(response), true),
                     usageTokens: this.getResponseUsageTokens(response),
                 };
             }
@@ -114,7 +114,7 @@ class CopilotService extends BaseService_1.default {
                     model: this.chatGptModel,
                     messages: [firstMessage, ...conversation],
                 }, response = yield this.request.post('', requestBody);
-                return this.getResponseFirstChoice(response);
+                return this.output(this.getResponseFirstChoice(response), true);
             }
             catch (e) {
                 this.handleErrors(e);
@@ -158,7 +158,7 @@ class CopilotService extends BaseService_1.default {
                 if (assistantMessages.length) {
                     let answers = assistantMessages.map(message => message.value);
                     return {
-                        firstChoice: JSON.stringify(answers),
+                        firstChoice: this.output((answers), true),
                         threadId: run.thread_id,
                         usageTokens: run.usage,
                     };

package/dist/services/TranslationService/TranslationService.js

@@ -55,7 +55,7 @@ class TranslationService extends BaseService_1.default {
                 logger_1.default.info({ requestBody }, ':: TranslationServicee.translate :: Translating ::');
                 const response = yield this.request.post('', requestBody);
                 return {
-                    firstChoice: this.output(this.getResponseFirstChoice(response)),
+                    firstChoice: this.output(this.getResponseFirstChoice(response), true),
                     usageTokens: this.getResponseUsageTokens(response),
                 };
             }
@@ -94,7 +94,7 @@ class TranslationService extends BaseService_1.default {
                 logger_1.default.info({ requestBody }, ':: TranslationServicee.findTextLanguage :: Finding text language ::');
                 const response = yield this.request.post('', requestBody);
                 return {
-                    firstChoice: this.getResponseFirstChoice(response),
+                    firstChoice: this.output(this.getResponseFirstChoice(response), true),
                     usageTokens: this.getResponseUsageTokens(response),
                 };
             }
@@ -133,7 +133,7 @@ class TranslationService extends BaseService_1.default {
                 logger_1.default.info({ requestBody }, ':: TranslationServicee.findTextLanguageBasedOnFrequency :: Finding text language ::');
                 const response = yield this.request.post('', requestBody);
                 return {
-                    firstChoice: this.getResponseFirstChoice(response),
+                    firstChoice: this.output(this.getResponseFirstChoice(response), true),
                     usageTokens: this.getResponseUsageTokens(response),
                 };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cobrowser/chatgpt",
-  "version": "0.7.25",
+  "version": "0.7.26",
   "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": "57125454a3d76587d6c7a193ce382c98c14c978d"
+  "gitHead": "c2f7354d047df3043a1caa770b4ac509ca60bf32"
 }