From 14035a98c3b4c3b07adf6497f097e3669ad7b18e Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Tue, 13 May 2025 17:57:49 +0000
Subject: [PATCH] Address PR feedback: Add error handling and edge case tests

Co-Authored-By: Joe Moura <joao@crewai.com>
---
 src/crewai/tools/base_tool.py       | 25 ++++++---
 tests/tools/test_json_edge_cases.py | 85 +++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 8 deletions(-)
 create mode 100644 tests/tools/test_json_edge_cases.py

diff --git a/src/crewai/tools/base_tool.py b/src/crewai/tools/base_tool.py
index a86aec44e..baa6b3c7b 100644
--- a/src/crewai/tools/base_tool.py
+++ b/src/crewai/tools/base_tool.py
@@ -136,15 +136,24 @@ class BaseTool(BaseModel, ABC):
 
     def _generate_description(self):
         import json
-        args_schema = {
-            name: {
-                "description": field.description,
-                "type": BaseTool._get_arg_annotations(field.annotation),
-            }
-            for name, field in self.args_schema.model_fields.items()
-        }
+        import logging
 
-        self.description = f"Tool Name: {self.name}\nTool Arguments: {json.dumps(args_schema)}\nTool Description: {self.description}"
+        logger = logging.getLogger(__name__)
+        
+        try:
+            args_schema = {
+                name: {
+                    "description": field.description,
+                    "type": BaseTool._get_arg_annotations(field.annotation),
+                }
+                for name, field in self.args_schema.model_fields.items()
+            }
+            args_json = json.dumps(args_schema)
+        except Exception as e:
+            logger.warning(f"Failed to serialize args schema: {e}")
+            args_json = str(args_schema)
+            
+        self.description = f"Tool Name: {self.name}\nTool Arguments: {args_json}\nTool Description: {self.description}"
 
     @staticmethod
     def _get_arg_annotations(annotation: type[Any] | None) -> str:
diff --git a/tests/tools/test_json_edge_cases.py b/tests/tools/test_json_edge_cases.py
new file mode 100644
index 000000000..da575fa74
--- /dev/null
+++ b/tests/tools/test_json_edge_cases.py
@@ -0,0 +1,85 @@
+import json
+from unittest.mock import MagicMock
+
+import pytest
+from pydantic import BaseModel, Field
+
+from crewai.tools import BaseTool
+from crewai.tools.tool_usage import ToolUsage
+
+
+class TestComplexInput(BaseModel):
+    special_chars: str = Field(
+        ..., description="Parameter with special characters: \"'\\{}[]"
+    )
+    nested_dict: dict = Field(
+        ..., description="A nested dictionary parameter"
+    )
+    unicode_text: str = Field(
+        ..., description="Text with unicode characters: 你好, こんにちは, مرحبا"
+    )
+
+
+class TestComplexTool(BaseTool):
+    name: str = "Complex JSON Tool"
+    description: str = "A tool for testing complex JSON formatting"
+    args_schema: type[BaseModel] = TestComplexInput
+
+    def _run(self, special_chars: str, nested_dict: dict, unicode_text: str) -> str:
+        return f"Processed complex input successfully"
+
+
+def test_complex_json_formatting():
+    """Test that complex JSON with special characters and nested structures is formatted correctly."""
+    tool = TestComplexTool()
+    
+    assert "Tool Arguments:" in tool.description
+    
+    description_parts = tool.description.split("Tool Arguments: ")
+    json_str = description_parts[1].split("\nTool Description:")[0]
+    
+    parsed_json = json.loads(json_str)
+    
+    assert "special_chars" in parsed_json
+    assert "nested_dict" in parsed_json
+    assert "unicode_text" in parsed_json
+    
+    assert "\"'\\{}[]" in parsed_json["special_chars"]["description"]
+    
+    assert "你好" in parsed_json["unicode_text"]["description"]
+    assert "こんにちは" in parsed_json["unicode_text"]["description"]
+    assert "مرحبا" in parsed_json["unicode_text"]["description"]
+
+
+def test_complex_tool_usage_render():
+    """Test that complex tool usage renders with proper JSON formatting."""
+    tool = TestComplexTool()
+
+    tool_usage = ToolUsage(
+        tools_handler=MagicMock(),
+        tools=[tool],
+        original_tools=[tool],
+        tools_description="Tool for testing complex JSON formatting",
+        tools_names="test_complex_tool",
+        task=MagicMock(),
+        function_calling_llm=MagicMock(),
+        agent=MagicMock(),
+        action=MagicMock(),
+    )
+
+    rendered = tool_usage._render()
+    
+    rendered_parts = rendered.split("Tool Arguments: ")
+    if len(rendered_parts) > 1:
+        json_str = rendered_parts[1].split("\nTool Description:")[0]
+        
+        try:
+            parsed_json = json.loads(json_str)
+            assert True  # If we get here, JSON parsing succeeded
+            
+            assert "special_chars" in parsed_json
+            assert "nested_dict" in parsed_json
+            assert "unicode_text" in parsed_json
+            
+        except json.JSONDecodeError:
+            assert False, "The rendered tool arguments are not valid JSON"