test: more robust arg parsing

Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

resource_secretary/agents/secretary.py

@@ -168,11 +168,7 @@ async def deliberate(
             obs = "OBSERVATIONS:\n"
             for call in calls:
                 p_name, f_name, args_str = call
-                args = {}
-                arg_pairs = re.findall(r'(\w+)\s*=\s*["\']?([^"\',]+)["\']?', args_str)
-                for k, v in arg_pairs:
-                    args[k] = utils.from_string_arg(v)
-
+                args = utils.parse_args_string(args_str)
                 result = self.execute_call(p_name, f_name, args)
 
                 # Results are usually json, but not always

resource_secretary/utils/text.py

@@ -16,6 +16,26 @@ def format_calls(calls_block):
         return calls
 
 
+import ast
+import re
+
+
+def parse_args_string(args_str):
+    flattened = args_str.replace("\n", " ").replace("\r", " ")
+    flattened = re.sub(r"\s+", " ", flattened).strip()
+    try:
+        tree = ast.parse(f"f({flattened})")
+
+        kwargs = {}
+        for kw in tree.body[0].value.keywords:
+            kwargs[kw.arg] = ast.literal_eval(kw.value)
+
+        return kwargs
+    except SyntaxError as e:
+        print(f"Syntax error in agent output: {e}")
+        return {}
+
+
 def ensure_command(command):
     """
     Ensure the command if provided as string is split into list.