Merge branch 'main' into cursor/fix-miprov2-compile-seed-zero-88e7

Author: Zsanz3

dspy/adapters/types/tool.py

@@ -1,9 +1,11 @@
 import asyncio
 import inspect
+from decimal import Decimal
 from typing import TYPE_CHECKING, Any, Callable, Literal, Protocol, get_origin, get_type_hints
 
 import json_repair
 import pydantic
+import pydantic_core
 from jsonschema import ValidationError, validate
 from pydantic import BaseModel, TypeAdapter, create_model
 
@@ -111,7 +113,7 @@ def _parse_function(self, func: Callable, arg_desc: dict[str, str] | None = None
             else:
                 args[k] = _resolve_json_schema_reference(TypeAdapter(v).json_schema())
             if default_values[k] is not inspect.Parameter.empty:
-                args[k]["default"] = default_values[k]
+                args[k]["default"] = _to_json_default(default_values[k])
             if arg_desc and k in arg_desc:
                 args[k]["description"] = arg_desc[k]
 
@@ -520,6 +522,17 @@ def _normalize_tool_call_dict(data: dict[str, Any]) -> dict[str, Any]:
     }
 
 
+def _to_json_default(value: Any) -> Any:
+    """Convert a parameter default to its JSON form, e.g. an Enum member to its value."""
+    if isinstance(value, Decimal):
+        # A JSON number fits both float and Decimal arguments; pydantic would give a string.
+        return float(value)
+    try:
+        return pydantic_core.to_jsonable_python(value)
+    except Exception:
+        return value
+
+
 def _resolve_json_schema_reference(schema: dict) -> dict:
     """Recursively resolve json model schema, expanding all references."""
 

dspy/adapters/utils.py

@@ -240,6 +240,10 @@ def parse_value(value, annotation):
 def get_annotation_name(annotation):
     origin = get_origin(annotation)
     args = get_args(annotation)
+    if origin is types.UnionType:
+        # Render PEP 604 unions (e.g. `str | None`) the same way as `typing.Union`/`Optional` on Python < 3.14,
+        # matching Python 3.14+ where `get_origin(str | None)` already returns `typing.Union`.
+        origin = Union
     if origin is None:
         if annotation is Reasoning:
             # Keep backward compatibility with the old behavior in `dspy.ChainOfThought`, where reasoning

dspy/clients/model_metadata/provenance.json

@@ -1,6 +1,6 @@
 {
-  "source": "https://files.pythonhosted.org/packages/70/9a/36e3ea2ad9d79df1d9aa978dde42323321b339e42c71a0d0b9c9a5179dc7/litellm-1.104.2-cp310-abi3-macosx_10_12_x86_64.whl",
-  "version": "1.104.2",
-  "wheel_sha256": "0d43c16d93e7c47cf0a4028eeaa21f95ba677d0828d32be4af5363abdbcf109d",
-  "snapshot_sha256": "3cedaa2f5f2ae54424d9f8a10b89b7a7b12809922c97dd9c91609c2164b20fa4"
+  "source": "https://files.pythonhosted.org/packages/32/15/443c2c8b2bab8eef188d8bc5d41412761d943d397608b48eaec6fe5b4c12/litellm-1.105.0-cp310-abi3-macosx_10_12_x86_64.whl",
+  "version": "1.105.0",
+  "wheel_sha256": "300e2b6a2eed4c54a40a7753521611d3aa60599c068e200d9f41ac78ff2ca319",
+  "snapshot_sha256": "329113e5820834dc2a206500db9ec7861a17c74b86fe79601dec05478c06327e"
 }

dspy/clients/model_metadata/snapshot.json.gz

@@ -20,6 +20,11 @@
 # expansion at the `Prediction(**final_outputs, history=..., termination_reason=...)` call sites.
 _RESERVED_PREDICTION_KEYS = frozenset({"history", "termination_reason"})
 
+# Internal input field names ReActV2 injects into its inner Predict signature. A user
+# input with one of these names would be silently overwritten by `_make_react_signature`
+# and popped out of the caller's kwargs by `forward`/`aforward`, so it must be rejected.
+_RESERVED_INPUT_KEYS = frozenset({"history", "tools"})
+
 if TYPE_CHECKING:
     from dspy.signatures.signature import Signature
 
@@ -52,6 +57,14 @@ def __init__(self, signature: type[Signature], tools: list[Callable | Tool], max
                 "returned Prediction. Rename these output fields on your signature."
             )
 
+        reserved_inputs = _RESERVED_INPUT_KEYS.intersection(self.signature.input_fields)
+        if reserved_inputs:
+            names = ", ".join(f"`{name}`" for name in sorted(reserved_inputs))
+            raise ValueError(
+                f"Input field name(s) {names} are reserved by ReActV2 for its internal "
+                "conversation history and tool list. Rename these input fields on your signature."
+            )
+
         user_tools = [tool if isinstance(tool, Tool) else Tool(tool) for tool in tools]
         self.tools = {tool.name: tool for tool in user_tools}
         if "submit" in self.tools:

dspy/predict/react_v2.py

@@ -5,7 +5,7 @@
 import pytest
 from pydantic import BaseModel
 
-from dspy.adapters.utils import parse_value
+from dspy.adapters.utils import get_annotation_name, parse_value
 
 
 class Profile(BaseModel):
@@ -115,3 +115,18 @@ def test_parse_value_json_repair():
     malformed = "not json or literal"
     with pytest.raises(Exception):
         parse_value(malformed, dict)
+
+
+@pytest.mark.parametrize(
+    "pep604_annotation,typing_annotation,expected",
+    [
+        (str | None, Optional[str], "Union[str, NoneType]"),  # noqa: UP045
+        (int | str, Union[int, str], "Union[int, str]"),
+        (int | str | None, Union[int, str, None], "Union[int, str, NoneType]"),
+        (list[str] | None, Optional[list[str]], "Union[list[str], NoneType]"),  # noqa: UP045
+        (dict[str, int | None], dict[str, Optional[int]], "dict[str, Union[int, NoneType]]"),  # noqa: UP045
+    ],
+)
+def test_get_annotation_name_pep604_union_matches_typing_union(pep604_annotation, typing_annotation, expected):
+    assert get_annotation_name(typing_annotation) == expected
+    assert get_annotation_name(pep604_annotation) == expected

tests/adapters/test_adapter_utils.py

@@ -3050,3 +3050,15 @@ class OptionalSyntaxSignature(dspy.Signature):
     with dspy.context(lm=DummyLM(responses), adapter=dspy.ChatAdapter()):
         with pytest.raises(AdapterParseError):
             dspy.Predict(OptionalSyntaxSignature)(question="anything")
+
+
+def test_chat_adapter_formats_pep604_union_like_typing_union():
+    class QA(dspy.Signature):
+        question: str = dspy.InputField()
+        answer: int | None = dspy.OutputField()
+
+    messages = dspy.ChatAdapter().format(QA, [], {"question": "How many?"})
+
+    assert "1. `answer` (Union[int, NoneType])" in messages[0]["content"]
+    assert "must be formatted as a valid Python Union[int, NoneType]" in messages[-1]["content"]
+    assert "UnionType" not in messages[0]["content"] + messages[-1]["content"]

tests/adapters/test_chat_adapter.py

@@ -146,6 +146,42 @@ def test_tool_from_function():
     assert tool.args["y"]["default"] == "hello"
 
 
+def test_tool_defaults_are_json_serializable():
+    import datetime
+    import enum
+    import json
+    from decimal import Decimal
+
+    class Unit(enum.Enum):
+        CELSIUS = "celsius"
+        FAHRENHEIT = "fahrenheit"
+
+    def forecast(
+        city: str,
+        unit: Unit = Unit.CELSIUS,
+        start: datetime.date = datetime.date(2026, 1, 2),
+        price: Decimal = Decimal("1.5"),
+        factor: float = Decimal("0.1"),
+    ) -> str:
+        return city
+
+    tool = Tool(forecast)
+    assert tool.args["unit"]["default"] == "celsius"
+    assert tool.args["start"]["default"] == "2026-01-02"
+    assert tool.args["price"]["default"] == 1.5
+    assert tool.args["factor"]["default"] == 0.1
+    assert tool(city="x", price=tool.args["price"]["default"], factor=tool.args["factor"]["default"]) == "x"
+    json.dumps(tool.format_as_litellm_function_call())
+
+
+def test_tool_defaults_without_json_form_are_kept():
+    def scale(data: bytes = b"\xff") -> str:
+        return "ok"
+
+    tool = Tool(scale)
+    assert tool.args["data"]["default"] == b"\xff"
+
+
 def test_format_as_litellm_function_call_excludes_defaulted_args_from_required():
     # `x` has no default and must be required; `y` has a default and must be optional.
     tool = Tool(dummy_function)

tests/adapters/test_tool.py

@@ -1,4 +1,3 @@
-import sys
 from unittest import mock
 
 import pydantic
@@ -454,7 +453,7 @@ class QA(dspy.Signature):
     assert messages[0]["role"] == "system"
     assert messages[1]["role"] == "user"
 
-    union_type_repr = "Union[str, NoneType]" if sys.version_info >= (3, 14) else "UnionType[str, NoneType]"
+    union_type_repr = "Union[str, NoneType]"
 
     expected_system = (
         "Your input fields are:\n"

tests/adapters/test_xml_adapter.py

@@ -362,6 +362,12 @@ def test_react_v2_rejects_reserved_output_field_names(reserved):
         dspy.ReActV2(f"question -> answer, {reserved}: str", tools=[])
 
 
+@pytest.mark.parametrize("reserved", ["history", "tools"])
+def test_react_v2_rejects_reserved_input_field_names(reserved):
+    with pytest.raises(ValueError, match=reserved):
+        dspy.ReActV2(f"{reserved}: str -> answer: str", tools=[])
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("use_async", [False, True])
 @pytest.mark.parametrize("break_reason", ["max_iters", "empty_tool_calls", "parse_error", "context_window_exceeded"])