refactor charles_actor -> charles_app

app.py

@@ -51,7 +51,7 @@ def init_ray():
 #     charles_actor_proc = subprocess.Popen([sys.executable, "charles_actor.py"])
 #     while charles_actor_instance == None:
 #         try:
-#             charles_actor_instance = ray.get_actor("CharlesActor")
+#             charles_actor_instance = ray.get_actor("CharlesApp")
 #         except ValueError as e:
 #             time.sleep(0.1) # give the subprocess a chance to start
 #     return charles_actor_instance

charles_actor.py → charles_app.py

@@ -9,11 +9,11 @@ from respond_to_prompt_async import RespondToPromptAsync
 import asyncio
 import subprocess
 
-class CharlesActor:
+class CharlesApp:
     def __init__(self):
         self._needs_init = True
         self._charles_actor_debug_output = ""
-        self._environment_state:EnvironmentState = EnvironmentState(episode=0, step=0)  # Initialize as EnvironmentState
+        self._environment_state:EnvironmentState = EnvironmentState(episode=0, step=0)
         self._state = "Initializing"
         self._clip_transform = CLIPTransform()
         
@@ -246,52 +246,8 @@ async def main():
     if not ray.is_initialized():
         init_ray()
 
-    # charles_actor = CharlesActor.options(
-    #     name="CharlesActor", 
-    #     get_if_exists=True,
-    #     ).remote() 
-    # future = charles_actor.start.remote()
-    charles_actor = CharlesActor()
+    charles_actor = CharlesApp()
     await charles_actor.start()
-
-    last_step = -1
-    last_episode = -1
-    try:
-        while True:
-            ready, _ = ray.wait([future], timeout=0)
-            if ready:
-                # The start method has terminated. You can fetch the result (if any) with ray.get().
-                # If the method raised an exception, it will be re-raised here.
-                try:
-                    result = ray.get(future)
-                    print(f"The start method has terminated with result: {result}")
-                except Exception as e:
-                    print(f"The start method raised an exception: {e}")
-                break
-            else:
-                # The start method is still running. You can poll for debug information here.
-                await asyncio.sleep(1)
-                state = await charles_actor.get_state.remote()
-                env_state = await charles_actor.get_environment_state.remote()
-                if (env_state.episode != last_episode) or (env_state.step != last_step):
-                    last_episode = env_state.episode
-                    last_step = env_state.step
-                    print(f"Charles is in state: {state}")
-                    # if len(env_state.llm_preview):
-                    #     print (f"llm_preview: {env_state.llm_preview}")
-                    # if len(env_state.llm_responses):
-                    #     print (f"llm_responses: {env_state.llm_responses}")
-                    # if len(env_state.tts_raw_chunk_ids):
-                    #     for chunk_json in env_state.tts_raw_chunk_ids:
-                    #         chunk = json.loads(chunk_json)
-                    #         prompt = chunk['prompt']
-                    #         line = chunk['llm_sentence_id']
-                    #         chunk_id = chunk['chunk_count']
-                    #         print(f"Prompt: {prompt}, Line: {line}, Chunk: {chunk_id}")                            
-
-    except KeyboardInterrupt as e:
-        print("Script was manually terminated")
-        raise(e)
     
 
 if __name__ == "__main__":