Merge branch 'main' into devin/1740154466-add-o3-mini-context-window

Co-Authored-By: Joe Moura <joao@crewai.com>

src/crewai/cli/constants.py

@@ -216,43 +216,10 @@ MODELS = {
         "watsonx/ibm/granite-3-8b-instruct",
     ],
     "bedrock": [
-        "bedrock/us.amazon.nova-pro-v1:0",
-        "bedrock/us.amazon.nova-micro-v1:0",
-        "bedrock/us.amazon.nova-lite-v1:0",
-        "bedrock/us.anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "bedrock/us.anthropic.claude-3-5-haiku-20241022-v1:0",
-        "bedrock/us.anthropic.claude-3-5-sonnet-20241022-v2:0",
-        "bedrock/us.anthropic.claude-3-7-sonnet-20250219-v1:0",
-        "bedrock/us.anthropic.claude-3-sonnet-20240229-v1:0",
-        "bedrock/us.anthropic.claude-3-opus-20240229-v1:0",
-        "bedrock/us.anthropic.claude-3-haiku-20240307-v1:0",
-        "bedrock/us.meta.llama3-2-11b-instruct-v1:0",
-        "bedrock/us.meta.llama3-2-3b-instruct-v1:0",
-        "bedrock/us.meta.llama3-2-90b-instruct-v1:0",
-        "bedrock/us.meta.llama3-2-1b-instruct-v1:0",
-        "bedrock/us.meta.llama3-1-8b-instruct-v1:0",
-        "bedrock/us.meta.llama3-1-70b-instruct-v1:0",
-        "bedrock/us.meta.llama3-3-70b-instruct-v1:0",
-        "bedrock/us.meta.llama3-1-405b-instruct-v1:0",
-        "bedrock/eu.anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "bedrock/eu.anthropic.claude-3-sonnet-20240229-v1:0",
-        "bedrock/eu.anthropic.claude-3-haiku-20240307-v1:0",
-        "bedrock/eu.meta.llama3-2-3b-instruct-v1:0",
-        "bedrock/eu.meta.llama3-2-1b-instruct-v1:0",
-        "bedrock/apac.anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "bedrock/apac.anthropic.claude-3-5-sonnet-20241022-v2:0",
-        "bedrock/apac.anthropic.claude-3-sonnet-20240229-v1:0",
-        "bedrock/apac.anthropic.claude-3-haiku-20240307-v1:0",
-        "bedrock/amazon.nova-pro-v1:0",
-        "bedrock/amazon.nova-micro-v1:0",
-        "bedrock/amazon.nova-lite-v1:0",
         "bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0",
-        "bedrock/anthropic.claude-3-5-haiku-20241022-v1:0",
-        "bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0",
-        "bedrock/anthropic.claude-3-7-sonnet-20250219-v1:0",
         "bedrock/anthropic.claude-3-sonnet-20240229-v1:0",
-        "bedrock/anthropic.claude-3-opus-20240229-v1:0",
         "bedrock/anthropic.claude-3-haiku-20240307-v1:0",
+        "bedrock/anthropic.claude-3-opus-20240229-v1:0",
         "bedrock/anthropic.claude-v2:1",
         "bedrock/anthropic.claude-v2",
         "bedrock/anthropic.claude-instant-v1",
@@ -267,6 +234,8 @@ MODELS = {
         "bedrock/ai21.j2-mid-v1",
         "bedrock/ai21.j2-ultra-v1",
         "bedrock/ai21.jamba-instruct-v1:0",
+        "bedrock/meta.llama2-13b-chat-v1",
+        "bedrock/meta.llama2-70b-chat-v1",
         "bedrock/mistral.mistral-7b-instruct-v0:2",
         "bedrock/mistral.mixtral-8x7b-instruct-v0:1",
     ],

src/crewai/task.py

@@ -19,8 +19,6 @@ from typing import (
     Tuple,
     Type,
     Union,
-    get_args,
-    get_origin,
 )
 
 from pydantic import (
@@ -174,29 +172,15 @@ class Task(BaseModel):
         """
         if v is not None:
             sig = inspect.signature(v)
-            positional_args = [
-                param
-                for param in sig.parameters.values()
-                if param.default is inspect.Parameter.empty
-            ]
-            if len(positional_args) != 1:
+            if len(sig.parameters) != 1:
                 raise ValueError("Guardrail function must accept exactly one parameter")
 
             # Check return annotation if present, but don't require it
             return_annotation = sig.return_annotation
             if return_annotation != inspect.Signature.empty:
-
-                return_annotation_args = get_args(return_annotation)
                 if not (
-                    get_origin(return_annotation) is tuple
-                    and len(return_annotation_args) == 2
-                    and return_annotation_args[0] is bool
-                    and (
-                        return_annotation_args[1] is Any
-                        or return_annotation_args[1] is str
-                        or return_annotation_args[1] is TaskOutput
-                        or return_annotation_args[1] == Union[str, TaskOutput]
-                    )
+                    return_annotation == Tuple[bool, Any]
+                    or str(return_annotation) == "Tuple[bool, Any]"
                 ):
                     raise ValueError(
                         "If return type is annotated, it must be Tuple[bool, Any]"
@@ -451,9 +435,9 @@ class Task(BaseModel):
                 content = (
                     json_output
                     if json_output
-                    else (
-                        pydantic_output.model_dump_json() if pydantic_output else result
-                    )
+                    else pydantic_output.model_dump_json()
+                    if pydantic_output
+                    else result
                 )
                 self._save_file(content)
             crewai_event_bus.emit(self, TaskCompletedEvent(output=task_output))

tests/task_test.py

@@ -1283,109 +1283,3 @@ def test_interpolate_valid_types():
     assert parsed["optional"] is None
     assert parsed["nested"]["flag"] is True
     assert parsed["nested"]["empty"] is None
-
-
-def test_guardrail_with_new_style_annotations():
-    """Test that guardrails with new-style type annotations work correctly."""
-
-    # Define a guardrail with new-style annotation
-    def guardrail(result: TaskOutput) -> tuple[bool, str]:
-        return (True, result.raw.upper())
-
-    agent = MagicMock()
-    agent.role = "test_agent"
-    agent.execute_task.return_value = "test result"
-    agent.crew = None
-
-    task = Task(description="Test task", expected_output="Output", guardrail=guardrail)
-
-    result = task.execute_sync(agent=agent)
-    assert isinstance(result, TaskOutput)
-    assert result.raw == "TEST RESULT"
-
-
-def test_guardrail_with_specific_return_type():
-    """Test that guardrails with specific return types work correctly."""
-
-    # Define a guardrail with specific return type
-    def guardrail(result: TaskOutput) -> tuple[bool, TaskOutput]:
-        if "error" in result.raw.lower():
-            return (False, "Contains error")
-        return (True, result)
-
-    agent = MagicMock()
-    agent.role = "test_agent"
-    agent.execute_task.return_value = "success result"
-    agent.crew = None
-
-    task = Task(description="Test task", expected_output="Output", guardrail=guardrail)
-
-    result = task.execute_sync(agent=agent)
-    assert isinstance(result, TaskOutput)
-    assert result.raw == "success result"
-
-
-def test_guardrail_with_positional_and_default_args():
-    """Test that guardrails with positional and default arguments work correctly."""
-
-    # Define a guardrail with a positional argument and a default argument
-    def guardrail(result: TaskOutput, optional_arg=None) -> tuple[bool, str]:
-        return (True, result.raw.upper())
-
-    agent = MagicMock()
-    agent.role = "test_agent"
-    agent.execute_task.return_value = "test result"
-    agent.crew = None
-
-    # This should now work with the updated validator
-    task = Task(description="Test task", expected_output="Output", guardrail=guardrail)
-
-    result = task.execute_sync(agent=agent)
-    assert isinstance(result, TaskOutput)
-    assert result.raw == "TEST RESULT"
-
-
-def test_guardrail_with_multiple_positional_args():
-    """Test that guardrails with multiple positional arguments are rejected."""
-
-    # Define a guardrail with multiple positional arguments
-    def guardrail(result: TaskOutput, another_required_arg) -> tuple[bool, str]:
-        return (True, result.raw.upper())
-
-    agent = MagicMock()
-    agent.role = "test_agent"
-    agent.execute_task.return_value = "test result"
-    agent.crew = None
-
-    # This should raise a ValueError because guardrail must accept exactly one positional parameter
-    with pytest.raises(ValueError) as excinfo:
-        Task(description="Test task", expected_output="Output", guardrail=guardrail)
-
-    assert "Guardrail function must accept exactly one parameter" in str(excinfo.value)
-
-
-def test_guardrail_with_positional_and_default_args():
-    """Validate that the guardrail function has the correct signature and behavior.
-
-    While type hints provide static checking, this validator ensures runtime safety by:
-    1. Verifying the function accepts exactly one required parameter (the TaskOutput)
-       (additional parameters with default values are allowed)
-    2. Checking return type annotations match Tuple[bool, Any] or tuple[bool, Any] if present
-    3. Providing clear, immediate error messages for debugging
-    """
-
-    # Define a guardrail with a positional argument and a default argument
-    def guardrail(result: TaskOutput, optional_arg=None) -> tuple[bool, str]:
-        return (True, result.raw.upper())
-
-    agent = MagicMock()
-    agent.role = "test_agent"
-    agent.execute_task.return_value = "test result"
-    agent.crew = None
-
-    # This should now work with the updated validator
-    task = Task(description="Test task", expected_output="Output", guardrail=guardrail)
-
-    result = task.execute_sync(agent=agent)
-    assert isinstance(result, TaskOutput)
-    assert result.raw == "TEST RESULT"