Update flare-ui/src/app/services/conversation-manager.service.ts

flare-ui/src/app/services/conversation-manager.service.ts

@@ -163,111 +163,99 @@ export class ConversationManagerService implements OnDestroy {
   }
     
   private setupSubscriptions(): void {
-    // Audio chunks from microphone
-    this.subscriptions.add(
-      this.audioService.audioChunk$.subscribe({
-        next: (chunk) => {
-          if (!this.isInterrupting && this.wsService.isConnected()) {
-            try {
-              this.wsService.sendAudioChunk(chunk.data);
-            } catch (error) {
-              console.error('Failed to send audio chunk:', error);
+      // Audio chunks from microphone
+      this.subscriptions.add(
+        this.audioService.audioChunk$.subscribe({
+          next: (chunk) => {
+            if (!this.isInterrupting && this.wsService.isConnected()) {
+              try {
+                this.wsService.sendAudioChunk(chunk.data);
+              } catch (error) {
+                console.error('Failed to send audio chunk:', error);
+              }
             }
+          },
+          error: (error) => {
+            console.error('Audio stream error:', error);
+            this.handleAudioError(error);
           }
-        },
-        error: (error) => {
-          console.error('Audio stream error:', error);
+        })
+      );
+      
+      // Audio stream errors
+      this.subscriptions.add(
+        this.audioService.error$.subscribe(error => {
           this.handleAudioError(error);
-        }
-      })
-    );
-    
-    // Audio stream errors
-    this.subscriptions.add(
-      this.audioService.error$.subscribe(error => {
-        this.handleAudioError(error);
-      })
-    );
-    
-    // WebSocket messages
-    this.subscriptions.add(
-      this.wsService.message$.subscribe({
-        next: (message) => {
-          this.handleMessage(message);
-        },
-        error: (error) => {
-          console.error('WebSocket message error:', error);
-          this.handleWebSocketError(error);
-        }
-      })
-    );
-    
-    // Subscribe to transcription updates
-    this.subscriptions.add(
-      this.wsService.transcription$.subscribe(result => {
-        console.log('📝 Transcription received:', result);
-        
-        // HER ZAMAN transcription'ı güncelle (final olsun olmasın)
-        this.transcriptionSubject.next(result.text);
-        
-        // Final ise mesaj olarak da ekle
-        if (result.is_final) {
-          const messages = this.messagesSubject.value;
-          const lastMessage = messages[messages.length - 1];
-          if (!lastMessage || lastMessage.role !== 'user' || lastMessage.text !== result.text) {
-            this.addMessage('user', result.text);
+        })
+      );
+      
+      // WebSocket messages
+      this.subscriptions.add(
+        this.wsService.message$.subscribe({
+          next: (message) => {
+            this.handleMessage(message);
+          },
+          error: (error) => {
+            console.error('WebSocket message error:', error);
+            this.handleWebSocketError(error);
           }
-          // Final olduktan sonra transcription'ı temizle
-          setTimeout(() => {
-            this.transcriptionSubject.next('');
-          }, 100);
-        }
-      })
-    );
-    
-    // State changes
-    this.subscriptions.add(
-      this.wsService.stateChange$.subscribe(change => {
-        this.currentStateSubject.next(change.to as ConversationState);
-        this.handleStateChange(change.from, change.to);
-      })
-    );
-    
-    // WebSocket errors
-    this.subscriptions.add(
-      this.wsService.error$.subscribe(error => {
-        console.error('WebSocket error:', error);
-        this.handleWebSocketError({ message: error });
-      })
-    );
+        })
+      );
+      
+      // Subscribe to transcription updates - SADECE FINAL RESULTS
+      this.subscriptions.add(
+        this.wsService.transcription$.subscribe(result => {
+          // SADECE final transcription'ları işle
+          if (result.is_final) {
+            console.log('📝 Final transcription received:', result);
+            const messages = this.messagesSubject.value;
+            const lastMessage = messages[messages.length - 1];
+            if (!lastMessage || lastMessage.role !== 'user' || lastMessage.text !== result.text) {
+              this.addMessage('user', result.text);
+            }
+          }
+        })
+      );
+      
+      // State changes
+      this.subscriptions.add(
+        this.wsService.stateChange$.subscribe(change => {
+          this.currentStateSubject.next(change.to as ConversationState);
+          this.handleStateChange(change.from, change.to);
+        })
+      );
+      
+      // WebSocket errors
+      this.subscriptions.add(
+        this.wsService.error$.subscribe(error => {
+          console.error('WebSocket error:', error);
+          this.handleWebSocketError({ message: error });
+        })
+      );
+      
+      // WebSocket connection state
+      this.subscriptions.add(
+        this.wsService.connection$.subscribe(connected => {
+          if (!connected && this.currentStateSubject.value !== 'idle') {
+            this.addSystemMessage('Connection lost. Attempting to reconnect...');
+          }
+        })
+      );
+    }
     
-    // WebSocket connection state
-    this.subscriptions.add(
-      this.wsService.connection$.subscribe(connected => {
-        if (!connected && this.currentStateSubject.value !== 'idle') {
-          this.addSystemMessage('Connection lost. Attempting to reconnect...');
-        }
-      })
-    );
-  }
-
   private handleMessage(message: any): void {
       try {
         switch (message.type) {
           case 'transcription':
-            // SADECE final transcription'ları mesaj olarak ekle
+            // SADECE final transcription'ları işle
             if (message['is_final']) {
-              // Eğer son mesaj aynı user mesajıysa ekleme (duplicate check)
               const messages = this.messagesSubject.value;
               const lastMessage = messages[messages.length - 1];
               if (!lastMessage || lastMessage.role !== 'user' || lastMessage.text !== message['text']) {
                 this.addMessage('user', message['text']);
               }
-              this.transcriptionSubject.next('');
-            } else {
-              // Interim transcription'ları accumulate et
-              this.transcriptionSubject.next(message['text']);
             }
+            // Interim transcription'ları artık işlemiyoruz
             break;
             
           case 'assistant_response':
@@ -324,7 +312,7 @@ export class ConversationManagerService implements OnDestroy {
           timestamp: new Date()
         });
       }
-  }
+    }
 
   private handleStateChange(from: string, to: string): void {
     console.log(`📊 State: ${from} → ${to}`);