refactor(llamabot/components/tools.py)🔧: Refactor write_and_execute_code to add detailed error handling and return code with result

- Add try-except blocks to catch and return specific syntax, name, import, and execution errors during parsing, compilation, and execution phases.
- Return a dictionary containing both the executed code and the function result instead of just the result.
- Update tests to assert the returned dictionary structure with 'code' and 'result' keys.

Author: ericmjl

llamabot/components/tools.py

@@ -632,45 +632,43 @@ def filter_employees(min_age, department):
         """
 
         # Parse the code to extract the function name
-        # try:
-        tree = ast.parse(placeholder_function)
-        function_name = None
-        for node in ast.walk(tree):
-            if isinstance(node, ast.FunctionDef):
-                function_name = node.name
-                break
+        try:
+            tree = ast.parse(placeholder_function)
+            function_name = None
+            for node in ast.walk(tree):
+                if isinstance(node, ast.FunctionDef):
+                    function_name = node.name
+                    break
+
+            if function_name is None:
+                return "Code validation error: No function definition found in the code"
+
+        except SyntaxError as e:
+            return f"Syntax error in the provided code: {str(e)}"
+        except Exception as e:
+            return f"Unexpected error parsing function name: {str(e)}"
+
+        try:
+            ns = globals_dict
+            compiled = compile(placeholder_function, "<llm>", "exec")
+            exec(compiled, globals_dict, ns)
+        except SyntaxError as e:
+            return f"Syntax error during compilation: {str(e)}"
+        except NameError as e:
+            return f"Name error during execution: {str(e)}"
+        except ImportError as e:
+            return f"Import error during execution: {str(e)}"
+        except Exception as e:
+            return f"Error during code execution: {str(e)}"
 
-        if function_name is None:
-            raise ValueError("No function definition found in the code")
-
-        # except SyntaxError as e:
-        #     return f"Syntax error in the provided code: {str(e)}"
-        # except ValueError as e:
-        #     return f"Code validation error: {str(e)}"
-        # except Exception as e:
-        #     return f"Unexpected error parsing function name: {str(e)}"
-
-        # try:
-        ns = globals_dict
-        compiled = compile(placeholder_function, "<llm>", "exec")
-        exec(compiled, globals_dict, ns)
-        # except SyntaxError as e:
-        #     return f"Syntax error during compilation: {str(e)}"
-        # except NameError as e:
-        #     return f"Name error during execution: {str(e)}"
-        # except ImportError as e:
-        #     return f"Import error during execution: {str(e)}"
-        # except Exception as e:
-        #     return f"Error during code execution: {str(e)}"
-
-        # try:
-        result = ns[function_name](**keyword_args)
-        return {"code": placeholder_function, "result": result}
-        # except KeyError:
-        #     return f"Function '{function_name}' not found in compiled namespace"
-        # except TypeError as e:
-        #     return f"Type error calling function '{function_name}': {str(e)}"
-        # except Exception as e:
-        #     return f"Error executing function '{function_name}': {str(e)}"
+        try:
+            result = ns[function_name](**keyword_args)
+            return {"code": placeholder_function, "result": result}
+        except KeyError:
+            return f"Function '{function_name}' not found in compiled namespace"
+        except TypeError as e:
+            return f"Type error calling function '{function_name}': {str(e)}"
+        except Exception as e:
+            return f"Error executing function '{function_name}': {str(e)}"
 
     return write_and_execute_code_wrapper

tests/bot/test_toolbot.py

@@ -47,7 +47,8 @@ def test_function():
     wrapper = write_and_execute_code(globals_dict)
     result = wrapper(valid_code, {})
 
-    assert result == "Hello, World!"
+    assert result["result"] == "Hello, World!"
+    assert result["code"] == valid_code
 
 
 def test_write_and_execute_code_accesses_globals():
@@ -63,7 +64,8 @@ def test_function():
     wrapper = write_and_execute_code(globals_dict)
     result = wrapper(code_with_global, {})
 
-    assert result == 3
+    assert result["result"] == 3
+    assert result["code"] == code_with_global
 
 
 def test_toolbot_initialization():