refactor ffmpeg_converter_actor -> ffmpeg_converter

ffmpeg_converter_actor.py → ffmpeg_converter.py

@@ -3,7 +3,7 @@ import asyncio
 import ray
 from ray.util.queue import Queue
 
-class FFMpegConverterActor:
+class FFMpegConverter:
     def __init__(self, output_queue: Queue, buffer_size: int = 1920, output_format: str='s16le'):
         self.output_queue = output_queue
         self.buffer_size = buffer_size
@@ -24,7 +24,7 @@ class FFMpegConverterActor:
                 # If the pipe is broken, restart the process.
                 await self.start_process()
                 continue
-            # print(f"FFMpegConverterActor: read {len(chunk)} bytes")
+            # print(f"FFMpegConverter: read {len(chunk)} bytes")
             chunk_ref = ray.put(chunk)
             await self.output_queue.put_async(chunk_ref)       
 

respond_to_prompt_async.py

@@ -7,7 +7,7 @@ from chat_service import ChatService
 # from local_speaker_service import LocalSpeakerService
 from text_to_speech_service import TextToSpeechService
 from environment_state_actor import EnvironmentStateActor
-from ffmpeg_converter_actor import FFMpegConverterActor
+from ffmpeg_converter import FFMpegConverter
 from agent_response import AgentResponse
 import json
 
@@ -24,7 +24,7 @@ class RespondToPromptAsync:
         self.environment_state_actor = environment_state_actor
         self.sentence_queues = []
         self.sentence_tasks = []    
-        # self.ffmpeg_converter_actor = FFMpegConverterActor.remote(audio_output_queue)
+        # self.ffmpeg_converter = FFMpegConverter.remote(audio_output_queue)
 
     async def prompt_to_llm(self, prompt:str, messages:[str]):
         chat_service = ChatService()
@@ -69,9 +69,9 @@ class RespondToPromptAsync:
             chunk_count += 1
 
     async def speech_to_converter(self):
-        self.ffmpeg_converter_actor = FFMpegConverterActor(self.audio_output_queue)
-        await self.ffmpeg_converter_actor.start_process()
-        self.ffmpeg_converter_actor_task = asyncio.create_task(self.ffmpeg_converter_actor.run())
+        self.ffmpeg_converter = FFMpegConverter(self.audio_output_queue)
+        await self.ffmpeg_converter.start_process()
+        self.ffmpeg_converter_task = asyncio.create_task(self.ffmpeg_converter.run())
         
         while True:
             for i, task in enumerate(self.sentence_tasks):
@@ -83,7 +83,7 @@ class RespondToPromptAsync:
                     chunk_response = await queue.get()
                     audio_chunk_ref = chunk_response['tts_raw_chunk_ref']
                     audio_chunk = ray.get(audio_chunk_ref)
-                    await self.ffmpeg_converter_actor.push_chunk(audio_chunk)
+                    await self.ffmpeg_converter.push_chunk(audio_chunk)
                 break
 
             await asyncio.sleep(0.01) 
@@ -104,10 +104,10 @@ class RespondToPromptAsync:
             task.cancel()
 
         # Close FFmpeg converter actor
-        if self.ffmpeg_converter_actor_task:
-            self.ffmpeg_converter_actor_task.cancel()
-            await self.ffmpeg_converter_actor.close()
-        # ray.kill(self.ffmpeg_converter_actor)
+        if self.ffmpeg_converter_task:
+            self.ffmpeg_converter_task.cancel()
+            await self.ffmpeg_converter.close()
+        # ray.kill(self.ffmpeg_converter)
 
         # Flush all queues
         while not self.llm_sentence_queue.empty():