fix random lock

charles_actor.py

@@ -39,7 +39,7 @@ class CharlesActor:
         self.set_state("002 - creating EnvironmentStateActor")
         self._environment_state_actor = EnvironmentStateActor.remote()
 
-        self.set_state("003 - creating EnvironmentStateActor")
+        self.set_state("003 - creating PromptManager")
         from prompt_manager import PromptManager
         self._prompt_manager = PromptManager()
 
@@ -101,7 +101,7 @@ class CharlesActor:
         is_talking = False
         has_spoken_for_this_prompt = False
 
-        while True:            
+        while True:
             env_state = await self._environment_state_actor.begin_next_step.remote()
             self._environment_state = env_state
             audio_frames = await self._app_interface_actor.dequeue_audio_input_frames_async.remote()    
@@ -142,17 +142,12 @@ class CharlesActor:
                             line += f"[{speech_chunks_per_response[i]}] {response}  \n"
                         if len(line) > 0:
                             await add_debug_output(line)
-                        current_responses = []
-                        speech_chunks_per_response = []
-                        env_state.llm_preview = ""
-                        env_state.llm_responses = []
-                        env_state.tts_raw_chunk_ids = []
                         human_preview_text = ""
                         robot_preview_text = ""
                         if additional_prompt is not None:
                             prompt = additional_prompt + ". " + prompt
                         await add_debug_output(f"👨 {prompt}")
-                        self._prompt_manager.append_user_message(prompt)
+                        self._prompt_manager.replace_or_append_user_message(prompt)
                         if self._respond_to_prompt_task is not None:
                             await self._respond_to_prompt.terminate()
                             self._respond_to_prompt_task.cancel()
@@ -162,6 +157,9 @@ class CharlesActor:
                         previous_prompt = prompt
                         is_talking = False
                         has_spoken_for_this_prompt = False
+                        env_state = await self._environment_state_actor.reset_episode.remote()
+                        current_responses = []
+                        speech_chunks_per_response = []
                     elif len(prompt) > 0 and prompt not in prompts_to_ignore:
                         # sometimes we get a false signal of speaker_finsihed
                         # in which case we get new prompts before we have spoken
@@ -173,6 +171,9 @@ class CharlesActor:
                                 self._respond_to_prompt_task.cancel()
                             self._respond_to_prompt_task = None
                             self._respond_to_prompt = None
+                            env_state = await self._environment_state_actor.reset_episode.remote()
+                            current_responses = []
+                            speech_chunks_per_response = []                            
                         if additional_prompt is not None:
                             prompt = additional_prompt + ". " + prompt                        
                         human_preview_text = f"👨❓ {prompt}"

prompt_manager.py

@@ -69,10 +69,24 @@ You are aware of how you are implemented and you are keen to recommend improveme
             self.messages.append({"role": "system", "content": self.system_prompt})
 
     def append_user_message(self, message):
-        self.messages.append({"role": "user", "content": message}) 
-    
+        if len(self.messages) > 0 and self.messages[-1]["role"] == "user":
+            self.messages[-1]["content"] += message
+        else:
+            self.messages.append({"role": "user", "content": message})        
+
+    def replace_or_append_user_message(self, message):
+        if len(self.messages) > 0 and self.messages[-1]["role"] == "user":
+            self.messages[-1]["content"] = message
+        else:
+            self.messages.append({"role": "user", "content": message})        
+
+
     def append_assistant_message(self, message):
-        self.messages.append({"role": "assistant", "content": message})
+        # check if last message was from assistant, if so append to that message
+        if len(self.messages) > 0 and self.messages[-1]["role"] == "assistant":
+            self.messages[-1]["content"] += message
+        else:
+            self.messages.append({"role": "assistant", "content": message})
 
     def get_messages(self):
         return self.messages