@sinequa/assistant 3.8.4 → 3.8.6

package/fesm2020/sinequa-assistant-chat.mjs

@@ -1476,6 +1476,8 @@ class WebSocketChatService extends ChatService {
         this._debugMessages = [];
         this.signalRService = inject(SignalRWebService);
         this.authenticationService = inject(AuthenticationService);
+        this.jsonMethodWebService = inject(JsonMethodPluginService);
+        this.restUrl = "SinequaAssistantREST";
     }
     /**
      * Initialize the assistant process.
@@ -1742,65 +1744,48 @@ class WebSocketChatService extends ChatService {
             return;
         }
         const data = {
+            action: "SavedChatList",
             instanceId: this.chatInstanceId,
             debug: this.assistantConfig$.value.defaultValues.debug
         };
-        this.connection.on('SavedChatList', (res) => {
-            this.savedChats$.next(res.savedChats); // emits the result to the savedChats$ subject
-        });
-        // Invoke the method SavedChatList
-        this.connection.invoke('SavedChatList', data)
-            .catch(error => {
-            console.error('Error invoking SavedChatList:', error);
-            return Promise.resolve();
+        this.jsonMethodWebService.get(this.restUrl, data).subscribe(res => this.savedChats$.next(res.savedChats), error => {
+            console.error('Error occurred while calling the SavedChatList API:', error.error.errorMessage);
+            this.notificationsService.error('Error occurred while calling the SavedChatList API:', error.error.errorMessage);
         });
     }
-    getSavedChat(id) {
-        const savedChatSubject$ = new Subject();
+    addSavedChat(messages) {
         const data = {
+            action: "SavedChatAdd",
             instanceId: this.chatInstanceId,
-            savedChatId: id,
+            savedChatId: this.chatId,
+            history: messages,
             debug: this.assistantConfig$.value.defaultValues.debug
         };
-        this.connection.on('SavedChatGet', (res) => {
-            savedChatSubject$.next(res.savedChat);
-            savedChatSubject$.complete();
-        });
-        // Invoke the method SavedChatGet
-        this.connection.invoke('SavedChatGet', data)
-            .catch(error => {
-            console.error('Error invoking SavedChatGet:', error);
-            savedChatSubject$.error(new Error(error));
-            return Promise.resolve(); // Return a resolved promise to handle the error and prevent unhandled promise rejection when no further error handling exists downstream
-        });
-        return savedChatSubject$.asObservable();
+        return this.jsonMethodWebService.post(this.restUrl, data).pipe(map(res => res.savedChat), tap((savedChat) => {
+            this.setSavedChatId(savedChat.id); // Persist the savedChatId
+            this.generateAuditEvent('saved-chat.add', {}, savedChat.id); // Generate audit event
+        }), catchError((error) => {
+            console.error('Error occurred while calling the SavedChatAdd API:', error.error.errorMessage);
+            this.notificationsService.error('Error occurred while calling the SavedChatAdd API:', error.error.errorMessage);
+            return throwError(() => error);
+        }));
     }
-    addSavedChat(messages) {
-        const addSavedChatSubject$ = new Subject();
+    getSavedChat(id) {
         const data = {
+            action: "SavedChatGet",
             instanceId: this.chatInstanceId,
-            savedChatId: this.chatId,
-            history: messages,
+            savedChatId: id,
             debug: this.assistantConfig$.value.defaultValues.debug
         };
-        this.connection.on('SavedChatAdd', (res) => {
-            this.setSavedChatId(res.savedChat.id); // Persist the savedChatId
-            this.generateAuditEvent('saved-chat.add', {}, res.savedChat.id); // Generate audit event
-            addSavedChatSubject$.next(res.savedChat);
-            addSavedChatSubject$.complete();
-        });
-        // Invoke the method SavedChatAdd
-        this.connection.invoke('SavedChatAdd', data)
-            .catch(error => {
-            console.error('Error invoking SavedChatAdd:', error);
-            addSavedChatSubject$.error(new Error(error));
-            return Promise.resolve(); // Return a resolved promise to handle the error and prevent unhandled promise rejection when no further error handling exists downstream
-        });
-        return addSavedChatSubject$.asObservable();
+        return this.jsonMethodWebService.get(this.restUrl, data).pipe(map(res => res.savedChat), catchError((error) => {
+            console.error('Error occurred while calling the SavedChatGet API:', error.error.errorMessage);
+            this.notificationsService.error('Error occurred while calling the SavedChatGet API:', error.error.errorMessage);
+            return throwError(() => error);
+        }));
     }
     updateSavedChat(id, name, messages) {
-        const updateSavedChatSubject$ = new Subject();
         const data = {
+            action: "SavedChatUpdate",
             instanceId: this.chatInstanceId,
             savedChatId: id,
             debug: this.assistantConfig$.value.defaultValues.debug
@@ -1809,38 +1794,24 @@ class WebSocketChatService extends ChatService {
             data["title"] = name;
         if (messages)
             data["history"] = messages;
-        this.connection.on('SavedChatUpdate', (res) => {
-            updateSavedChatSubject$.next(res.savedChat);
-            updateSavedChatSubject$.complete();
-        });
-        // Invoke the method SavedChatUpdate
-        this.connection.invoke('SavedChatUpdate', data)
-            .catch(error => {
-            console.error('Error invoking SavedChatUpdate:', error);
-            updateSavedChatSubject$.error(new Error(error));
-            return Promise.resolve(); // Return a resolved promise to handle the error and prevent unhandled promise rejection when no further error handling exists downstream
-        });
-        return updateSavedChatSubject$.asObservable();
+        return this.jsonMethodWebService.post(this.restUrl, data).pipe(map(res => res.savedChat), catchError((error) => {
+            console.error('Error occurred while calling the SavedChatUpdate API:', error.error.errorMessage);
+            this.notificationsService.error('Error occurred while calling the SavedChatUpdate API:', error.error.errorMessage);
+            return throwError(() => error);
+        }));
     }
     deleteSavedChat(ids) {
-        const deleteSavedChatSubject$ = new Subject();
         const data = {
+            action: "SavedChatDelete",
             instanceId: this.chatInstanceId,
-            SavedChatIds: ids,
+            savedChatIds: ids,
             debug: this.assistantConfig$.value.defaultValues.debug
         };
-        this.connection.on('SavedChatDelete', (res) => {
-            deleteSavedChatSubject$.next(res.deleteCount);
-            deleteSavedChatSubject$.complete();
-        });
-        // Invoke the method SavedChatDelete
-        this.connection.invoke('SavedChatDelete', data)
-            .catch(error => {
-            console.error('Error invoking SavedChatDelete:', error);
-            deleteSavedChatSubject$.error(new Error(error));
-            return Promise.resolve(); // Return a resolved promise to handle the error and prevent unhandled promise rejection when no further error handling exists downstream
-        });
-        return deleteSavedChatSubject$.asObservable();
+        return this.jsonMethodWebService.post(this.restUrl, data).pipe(map(res => res.deletedCount), catchError((error) => {
+            console.error('Error occurred while calling the SavedChatDelete API:', error.error.errorMessage);
+            this.notificationsService.error('Error occurred while calling the SavedChatDelete API:', error.error.errorMessage);
+            return throwError(() => error);
+        }));
     }
     /**
      * Initialize out-of-the-box handlers