Address PR review feedback: Add type hints and parametrized tests

- Added type hints to all test functions and variables for better maintainability
- Added parametrized test to verify multiple watsonx models can be selected
- Imported pytest for parametrized testing functionality
- All tests continue to pass locally (6 passed)
- Addresses review suggestions from joaomdmoura

Co-Authored-By: João <joao@crewai.com>

docs/concepts/tools.mdx

@@ -32,7 +32,6 @@ The Enterprise Tools Repository includes:
 - **Customizability**: Provides the flexibility to develop custom tools or utilize existing ones, catering to the specific needs of agents.
 - **Error Handling**: Incorporates robust error handling mechanisms to ensure smooth operation.
 - **Caching Mechanism**: Features intelligent caching to optimize performance and reduce redundant operations.
-- **Asynchronous Support**: Handles both synchronous and asynchronous tools, enabling non-blocking operations.
 
 ## Using CrewAI Tools
 
@@ -178,62 +177,6 @@ class MyCustomTool(BaseTool):
         return "Tool's result"
 ```
 
-## Asynchronous Tool Support
-
-CrewAI supports asynchronous tools, allowing you to implement tools that perform non-blocking operations like network requests, file I/O, or other async operations without blocking the main execution thread.
-
-### Creating Async Tools
-
-You can create async tools in two ways:
-
-#### 1. Using the `tool` Decorator with Async Functions
-
-```python Code
-from crewai.tools import tool
-
-@tool("fetch_data_async")
-async def fetch_data_async(query: str) -> str:
-    """Asynchronously fetch data based on the query."""
-    # Simulate async operation
-    await asyncio.sleep(1)
-    return f"Data retrieved for {query}"
-```
-
-#### 2. Implementing Async Methods in Custom Tool Classes
-
-```python Code
-from crewai.tools import BaseTool
-
-class AsyncCustomTool(BaseTool):
-    name: str = "async_custom_tool"
-    description: str = "An asynchronous custom tool"
-    
-    async def _run(self, query: str = "") -> str:
-        """Asynchronously run the tool"""
-        # Your async implementation here
-        await asyncio.sleep(1)
-        return f"Processed {query} asynchronously"
-```
-
-### Using Async Tools
-
-Async tools work seamlessly in both standard Crew workflows and Flow-based workflows:
-
-```python Code
-# In standard Crew
-agent = Agent(role="researcher", tools=[async_custom_tool])
-
-# In Flow
-class MyFlow(Flow):
-    @start()
-    async def begin(self):
-        crew = Crew(agents=[agent])
-        result = await crew.kickoff_async()
-        return result
-```
-
-The CrewAI framework automatically handles the execution of both synchronous and asynchronous tools, so you don't need to worry about how to call them differently.
-
 ### Utilizing the `tool` Decorator
 
 ```python Code

docs/installation.mdx

@@ -22,7 +22,7 @@ Watch this video tutorial for a step-by-step demonstration of the installation p
 <Note>
   **Python Version Requirements**
 
-  CrewAI requires `Python >=3.10 and <3.14`. Here's how to check your version:
+  CrewAI requires `Python >=3.10 and <=3.13`. Here's how to check your version:
   ```bash
   python3 --version
   ```

src/crewai/cli/constants.py

@@ -237,6 +237,7 @@ MODELS = {
         "watsonx/meta-llama/llama-3-2-1b-instruct",
         "watsonx/meta-llama/llama-3-2-90b-vision-instruct",
         "watsonx/meta-llama/llama-3-405b-instruct",
+        "watsonx/meta-llama/llama-4-maverick-17b-128e-instruct-fp8",
         "watsonx/mistral/mistral-large",
         "watsonx/ibm/granite-3-8b-instruct",
     ],

src/crewai/tools/structured_tool.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import asyncio
-
 import inspect
 import textwrap
 from typing import Any, Callable, Optional, Union, get_type_hints
@@ -241,17 +239,7 @@ class CrewStructuredTool:
     ) -> Any:
         """Main method for tool execution."""
         parsed_args = self._parse_args(input)
-
-        if inspect.iscoroutinefunction(self.func):
-            result = asyncio.run(self.func(**parsed_args, **kwargs))
-            return result
-
-        result = self.func(**parsed_args, **kwargs)
-
-        if asyncio.iscoroutine(result):
-            return asyncio.run(result)
-
-        return result
+        return self.func(**parsed_args, **kwargs)
 
     @property
     def args(self) -> dict:

tests/cli/test_watsonx_model_support.py

@@ -0,0 +1,65 @@
+from typing import List
+from unittest.mock import patch
+import pytest
+
+from crewai.cli.constants import MODELS
+from crewai.cli.provider import select_model
+
+
+def test_watsonx_models_include_llama4_maverick() -> None:
+    """Test that the watsonx models list includes the Llama 4 Maverick model."""
+    watsonx_models: List[str] = MODELS.get("watson", [])
+    assert "watsonx/meta-llama/llama-4-maverick-17b-128e-instruct-fp8" in watsonx_models
+
+
+def test_select_model_watsonx_llama4_maverick() -> None:
+    """Test that the Llama 4 Maverick model can be selected for watsonx provider."""
+    provider = "watson"
+    provider_models = {}
+    
+    with patch("crewai.cli.provider.select_choice") as mock_select_choice:
+        mock_select_choice.return_value = "watsonx/meta-llama/llama-4-maverick-17b-128e-instruct-fp8"
+        
+        result = select_model(provider, provider_models)
+        
+        assert result == "watsonx/meta-llama/llama-4-maverick-17b-128e-instruct-fp8"
+        mock_select_choice.assert_called_once()
+        
+        call_args = mock_select_choice.call_args
+        available_models = call_args[0][1]
+        assert "watsonx/meta-llama/llama-4-maverick-17b-128e-instruct-fp8" in available_models
+
+
+def test_watsonx_model_list_ordering() -> None:
+    """Test that watsonx models are properly ordered."""
+    watsonx_models: List[str] = MODELS.get("watson", [])
+    
+    expected_models = [
+        "watsonx/meta-llama/llama-3-1-70b-instruct",
+        "watsonx/meta-llama/llama-3-1-8b-instruct",
+        "watsonx/meta-llama/llama-3-2-11b-vision-instruct",
+        "watsonx/meta-llama/llama-3-2-1b-instruct",
+        "watsonx/meta-llama/llama-3-2-90b-vision-instruct",
+        "watsonx/meta-llama/llama-3-405b-instruct",
+        "watsonx/meta-llama/llama-4-maverick-17b-128e-instruct-fp8",
+        "watsonx/mistral/mistral-large",
+        "watsonx/ibm/granite-3-8b-instruct",
+    ]
+    
+    assert watsonx_models == expected_models
+
+
+@pytest.mark.parametrize("model_name", [
+    "watsonx/meta-llama/llama-4-maverick-17b-128e-instruct-fp8",
+    "watsonx/mistral/mistral-large",
+    "watsonx/ibm/granite-3-8b-instruct",
+])
+def test_watsonx_model_selection_parametrized(model_name: str) -> None:
+    """Test that various watsonx models can be selected through CLI."""
+    provider = "watson"
+    provider_models = {}
+    
+    with patch("crewai.cli.provider.select_choice") as mock_select_choice:
+        mock_select_choice.return_value = model_name
+        result = select_model(provider, provider_models)
+        assert result == model_name

tests/tools/test_structured_tool.py

@@ -25,206 +25,122 @@ def schema_class():
     return TestSchema
 
 
-def test_initialization(basic_function, schema_class):
-    """Test basic initialization of CrewStructuredTool"""
-    tool = CrewStructuredTool(
-        name="test_tool",
-        description="Test tool description",
-        func=basic_function,
-        args_schema=schema_class,
-    )
+class InternalCrewStructuredTool:
+    def test_initialization(self, basic_function, schema_class):
+        """Test basic initialization of CrewStructuredTool"""
+        tool = CrewStructuredTool(
+            name="test_tool",
+            description="Test tool description",
+            func=basic_function,
+            args_schema=schema_class,
+        )
 
-    assert tool.name == "test_tool"
-    assert tool.description == "Test tool description"
-    assert tool.func == basic_function
-    assert tool.args_schema == schema_class
+        assert tool.name == "test_tool"
+        assert tool.description == "Test tool description"
+        assert tool.func == basic_function
+        assert tool.args_schema == schema_class
 
-def test_from_function(basic_function):
-    """Test creating tool from function"""
-    tool = CrewStructuredTool.from_function(
-        func=basic_function, name="test_tool", description="Test description"
-    )
+    def test_from_function(self, basic_function):
+        """Test creating tool from function"""
+        tool = CrewStructuredTool.from_function(
+            func=basic_function, name="test_tool", description="Test description"
+        )
 
-    assert tool.name == "test_tool"
-    assert tool.description == "Test description"
-    assert tool.func == basic_function
-    assert isinstance(tool.args_schema, type(BaseModel))
+        assert tool.name == "test_tool"
+        assert tool.description == "Test description"
+        assert tool.func == basic_function
+        assert isinstance(tool.args_schema, type(BaseModel))
 
-def test_validate_function_signature(basic_function, schema_class):
-    """Test function signature validation"""
-    tool = CrewStructuredTool(
-        name="test_tool",
-        description="Test tool",
-        func=basic_function,
-        args_schema=schema_class,
-    )
+    def test_validate_function_signature(self, basic_function, schema_class):
+        """Test function signature validation"""
+        tool = CrewStructuredTool(
+            name="test_tool",
+            description="Test tool",
+            func=basic_function,
+            args_schema=schema_class,
+        )
 
-    # Should not raise any exceptions
-    tool._validate_function_signature()
+        # Should not raise any exceptions
+        tool._validate_function_signature()
 
-@pytest.mark.asyncio
-async def test_ainvoke(basic_function):
-    """Test asynchronous invocation"""
-    tool = CrewStructuredTool.from_function(func=basic_function, name="test_tool")
+    @pytest.mark.asyncio
+    async def test_ainvoke(self, basic_function):
+        """Test asynchronous invocation"""
+        tool = CrewStructuredTool.from_function(func=basic_function, name="test_tool")
 
-    result = await tool.ainvoke(input={"param1": "test"})
-    assert result == "test 0"
+        result = await tool.ainvoke(input={"param1": "test"})
+        assert result == "test 0"
 
-def test_parse_args_dict(basic_function):
-    """Test parsing dictionary arguments"""
-    tool = CrewStructuredTool.from_function(func=basic_function, name="test_tool")
+    def test_parse_args_dict(self, basic_function):
+        """Test parsing dictionary arguments"""
+        tool = CrewStructuredTool.from_function(func=basic_function, name="test_tool")
 
-    parsed = tool._parse_args({"param1": "test", "param2": 42})
-    assert parsed["param1"] == "test"
-    assert parsed["param2"] == 42
+        parsed = tool._parse_args({"param1": "test", "param2": 42})
+        assert parsed["param1"] == "test"
+        assert parsed["param2"] == 42
 
-def test_parse_args_string(basic_function):
-    """Test parsing string arguments"""
-    tool = CrewStructuredTool.from_function(func=basic_function, name="test_tool")
+    def test_parse_args_string(self, basic_function):
+        """Test parsing string arguments"""
+        tool = CrewStructuredTool.from_function(func=basic_function, name="test_tool")
 
-    parsed = tool._parse_args('{"param1": "test", "param2": 42}')
-    assert parsed["param1"] == "test"
-    assert parsed["param2"] == 42
+        parsed = tool._parse_args('{"param1": "test", "param2": 42}')
+        assert parsed["param1"] == "test"
+        assert parsed["param2"] == 42
 
-def test_complex_types():
-    """Test handling of complex parameter types"""
+    def test_complex_types(self):
+        """Test handling of complex parameter types"""
 
-    def complex_func(nested: dict, items: list) -> str:
-        """Process complex types."""
-        return f"Processed {len(items)} items with {len(nested)} nested keys"
+        def complex_func(nested: dict, items: list) -> str:
+            """Process complex types."""
+            return f"Processed {len(items)} items with {len(nested)} nested keys"
 
-    tool = CrewStructuredTool.from_function(
-        func=complex_func, name="test_tool", description="Test complex types"
-    )
-    result = tool.invoke({"nested": {"key": "value"}, "items": [1, 2, 3]})
-    assert result == "Processed 3 items with 1 nested keys"
+        tool = CrewStructuredTool.from_function(
+            func=complex_func, name="test_tool", description="Test complex types"
+        )
+        result = tool.invoke({"nested": {"key": "value"}, "items": [1, 2, 3]})
+        assert result == "Processed 3 items with 1 nested keys"
 
-def test_schema_inheritance():
-    """Test tool creation with inherited schema"""
+    def test_schema_inheritance(self):
+        """Test tool creation with inherited schema"""
 
-    def extended_func(base_param: str, extra_param: int) -> str:
-        """Test function with inherited schema."""
-        return f"{base_param} {extra_param}"
+        def extended_func(base_param: str, extra_param: int) -> str:
+            """Test function with inherited schema."""
+            return f"{base_param} {extra_param}"
 
-    class BaseSchema(BaseModel):
-        base_param: str
+        class BaseSchema(BaseModel):
+            base_param: str
 
-    class ExtendedSchema(BaseSchema):
-        extra_param: int
+        class ExtendedSchema(BaseSchema):
+            extra_param: int
 
-    tool = CrewStructuredTool.from_function(
-        func=extended_func, name="test_tool", args_schema=ExtendedSchema
-    )
+        tool = CrewStructuredTool.from_function(
+            func=extended_func, name="test_tool", args_schema=ExtendedSchema
+        )
 
-    result = tool.invoke({"base_param": "test", "extra_param": 42})
-    assert result == "test 42"
+        result = tool.invoke({"base_param": "test", "extra_param": 42})
+        assert result == "test 42"
 
-def test_default_values_in_schema():
-    """Test handling of default values in schema"""
+    def test_default_values_in_schema(self):
+        """Test handling of default values in schema"""
 
-    def default_func(
-        required_param: str,
-        optional_param: str = "default",
-        nullable_param: Optional[int] = None,
-    ) -> str:
-        """Test function with default values."""
-        return f"{required_param} {optional_param} {nullable_param}"
+        def default_func(
+            required_param: str,
+            optional_param: str = "default",
+            nullable_param: Optional[int] = None,
+        ) -> str:
+            """Test function with default values."""
+            return f"{required_param} {optional_param} {nullable_param}"
 
-    tool = CrewStructuredTool.from_function(
-        func=default_func, name="test_tool", description="Test defaults"
-    )
+        tool = CrewStructuredTool.from_function(
+            func=default_func, name="test_tool", description="Test defaults"
+        )
 
-    # Test with minimal parameters
-    result = tool.invoke({"required_param": "test"})
-    assert result == "test default None"
+        # Test with minimal parameters
+        result = tool.invoke({"required_param": "test"})
+        assert result == "test default None"
 
-    # Test with all parameters
-    result = tool.invoke(
-        {"required_param": "test", "optional_param": "custom", "nullable_param": 42}
-    )
-    assert result == "test custom 42"
-
-@pytest.fixture
-def custom_tool_decorator():
-    from crewai.tools import tool
-
-    @tool("custom_tool", result_as_answer=True)
-    async def custom_tool():
-        """This is a tool that does something"""
-        return "Hello World from Custom Tool"
-
-    return custom_tool
-
-@pytest.fixture
-def custom_tool():
-    from crewai.tools import BaseTool
-
-    class CustomTool(BaseTool):
-        name: str = "my_tool"
-        description: str = "This is a tool that does something"
-        result_as_answer: bool = True
-
-        async def _run(self):
-            return "Hello World from Custom Tool"
-
-    return CustomTool()
-
-def build_simple_crew(tool):
-    from crewai import Agent, Task, Crew
-
-    agent1 = Agent(role="Simple role", goal="Simple goal", backstory="Simple backstory", tools=[tool])
-
-    say_hi_task = Task(
-        description="Use the custom tool result as answer.", agent=agent1, expected_output="Use the tool result"
-    )
-
-    crew = Crew(agents=[agent1], tasks=[say_hi_task])
-    return crew
-
-@pytest.mark.vcr(filter_headers=["authorization"])
-def test_async_tool_using_within_isolated_crew(custom_tool):
-    crew = build_simple_crew(custom_tool)
-    result = crew.kickoff()
-
-    assert result.raw == "Hello World from Custom Tool"
-
-@pytest.mark.vcr(filter_headers=["authorization"])
-def test_async_tool_using_decorator_within_isolated_crew(custom_tool_decorator):
-    crew = build_simple_crew(custom_tool_decorator)
-    result = crew.kickoff()
-
-    assert result.raw == "Hello World from Custom Tool"
-
-@pytest.mark.vcr(filter_headers=["authorization"])
-def test_async_tool_within_flow(custom_tool):
-    from crewai.flow.flow import Flow
-
-    class StructuredExampleFlow(Flow):
-        from crewai.flow.flow import start
-
-        @start()
-        async def start(self):
-            crew = build_simple_crew(custom_tool)
-            result = await crew.kickoff_async()
-            return result
-
-    flow = StructuredExampleFlow()
-    result = flow.kickoff()
-    assert result.raw == "Hello World from Custom Tool"
-
-
-@pytest.mark.vcr(filter_headers=["authorization"])
-def test_async_tool_using_decorator_within_flow(custom_tool_decorator):
-    from crewai.flow.flow import Flow
-
-    class StructuredExampleFlow(Flow):
-        from crewai.flow.flow import start
-        @start()
-        async def start(self):
-            crew = build_simple_crew(custom_tool_decorator)
-            result = await crew.kickoff_async()
-            return result
-
-    flow = StructuredExampleFlow()
-    result = flow.kickoff()
-    assert result.raw == "Hello World from Custom Tool"
+        # Test with all parameters
+        result = tool.invoke(
+            {"required_param": "test", "optional_param": "custom", "nullable_param": 42}
+        )
+        assert result == "test custom 42"