cleanup method

gurleen-s · Apr 3, 2023 · 04c4343 · 04c4343
1 parent 8a5c980
commit 04c4343
Showing 1 changed file with 23 additions and 47 deletions.
diff --git a/scripts/main.py b/scripts/main.py
@@ -49,68 +49,44 @@ def print_assistant_thoughts(assistant_reply):
     global ai_name
     global cfg
     try:
-        # Parse and print Assistant response
         assistant_reply_json = fix_and_parse_json(assistant_reply)
 
         assistant_thoughts_reasoning = None
         assistant_thoughts_plan = None
         assistant_thoughts_speak = None
         assistant_thoughts_criticism = None
-        try:
-            assistant_thoughts = assistant_reply_json.get("thoughts")
-            if assistant_thoughts:
-                assistant_thoughts_text = assistant_thoughts.get("text")
-                assistant_thoughts_reasoning = assistant_thoughts.get("reasoning")
-                assistant_thoughts_plan = assistant_thoughts.get("plan")
-                assistant_thoughts_criticism = assistant_thoughts.get("criticism")
-                assistant_thoughts_speak = assistant_thoughts.get("speak")
-            else:
-                assistant_thoughts_text = None
-                assistant_thoughts_reasoning = None
-                assistant_thoughts_plan = None
-                assistant_thoughts_criticism = None
-                assistant_thoughts_speak = None
-        except Exception:
-            assistant_thoughts_text = "The AI's response was unreadable."
+        assistant_thoughts = assistant_reply_json.get("thoughts", {})
+        assistant_thoughts_text = assistant_thoughts.get("text")
+
+        if assistant_thoughts:
+            assistant_thoughts_reasoning = assistant_thoughts.get("reasoning")
+            assistant_thoughts_plan = assistant_thoughts.get("plan")
+            assistant_thoughts_criticism = assistant_thoughts.get("criticism")
+            assistant_thoughts_speak = assistant_thoughts.get("speak")
+
+        print_to_console(f"{ai_name.upper()} THOUGHTS:", Fore.YELLOW, assistant_thoughts_text)
+        print_to_console("REASONING:", Fore.YELLOW, assistant_thoughts_reasoning)
 
-        print_to_console(
-            f"{ai_name.upper()} THOUGHTS:",
-            Fore.YELLOW,
-            assistant_thoughts_text)
-        print_to_console(
-            "REASONING:",
-            Fore.YELLOW,
-            assistant_thoughts_reasoning)
         if assistant_thoughts_plan:
             print_to_console("PLAN:", Fore.YELLOW, "")
-            if assistant_thoughts_plan:
-                # If it's a list, join it into a string
-                if isinstance(assistant_thoughts_plan, list):
-                    assistant_thoughts_plan = "\n".join(assistant_thoughts_plan)
-                elif isinstance(assistant_thoughts_plan, dict):
-                    assistant_thoughts_plan = str(assistant_thoughts_plan)
-                    # Split the input_string using the newline character and dash
-
-                lines = assistant_thoughts_plan.split('\n')
-
-                # Iterate through the lines and print each one with a bullet
-                # point
-                for line in lines:
-                    # Remove any "-" characters from the start of the line
-                    line = line.lstrip("- ")
-                    print_to_console("- ", Fore.GREEN, line.strip())
-        print_to_console(
-            "CRITICISM:",
-            Fore.YELLOW,
-            assistant_thoughts_criticism)
+            if isinstance(assistant_thoughts_plan, list):
+                assistant_thoughts_plan = "\n".join(assistant_thoughts_plan)
+            elif isinstance(assistant_thoughts_plan, dict):
+                assistant_thoughts_plan = str(assistant_thoughts_plan)
+
+            lines = assistant_thoughts_plan.split('\n')
+            for line in lines:
+                line = line.lstrip("- ")
+                print_to_console("- ", Fore.GREEN, line.strip())
+
+        print_to_console("CRITICISM:", Fore.YELLOW, assistant_thoughts_criticism)
 
-        # Speak the assistant's thoughts
         if cfg.speak_mode and assistant_thoughts_speak:
             speak.say_text(assistant_thoughts_speak)
 
     except json.decoder.JSONDecodeError:
         print_to_console("Error: Invalid JSON\n", Fore.RED, assistant_reply)
-    # All other errors, return "Error: + error message"
+
     except Exception as e:
         call_stack = traceback.format_exc()
         print_to_console("Error: \n", Fore.RED, call_stack)