DSPy: The framework for programming—not prompting—language models
Python
Fix unexpected parsing of Optional[str] fields when string has brackets or braces (#8805)
Santiago28a7f786f890
diff --git a/dspy/adapters/utils.py b/dspy/adapters/utils.pyindex db58f5f93..f38a77ee8 100644--- a/dspy/adapters/utils.py+++ b/dspy/adapters/utils.py@@ -163,6 +163,10 @@ def parse_value(value, annotation):if not isinstance(value, str):return TypeAdapter(annotation).validate_python(value)+ if origin in (Union, types.UnionType) and type(None) in get_args(annotation) and str in get_args(annotation):+ # Handle union annotations, e.g., `str | None`, `Optional[str]`, `Union[str, int, None]`, etc.+ return TypeAdapter(annotation).validate_python(value)+candidate = json_repair.loads(value) # json_repair.loads returns "" on failure.if candidate == "" and value != "":try:@@ -179,9 +183,6 @@ def parse_value(value, annotation):return TypeAdapter(annotation).validate_python(value)except Exception:raise e-- if origin in (Union, types.UnionType) and type(None) in get_args(annotation) and str in get_args(annotation):- return str(candidate)raisediff --git a/tests/adapters/test_adapter_utils.py b/tests/adapters/test_adapter_utils.pyindex 747f2db12..d39ddcf8c 100644--- a/tests/adapters/test_adapter_utils.py+++ b/tests/adapters/test_adapter_utils.py@@ -81,11 +81,17 @@ def test_parse_value_union():# Test Union with None (Optional)assert parse_value("test", Optional[str]) == "test"assert parse_value("test", str | None) == "test"+ assert parse_value("5", int | None) == 5assert parse_value(None, Optional[str]) is None+ assert parse_value("text with [placeholder]", Optional[str]) == "text with [placeholder]"+ assert parse_value("text with [placeholder]", str | None) == "text with [placeholder]"# Test Union fallback to strassert parse_value("fallback", Union[int, str, None]) == "fallback"+ assert parse_value(5, Union[int, str, None]) == 5assert parse_value("fallback", int | str | None) == "fallback"+ assert parse_value(5, int | str | None) == 5+ assert parse_value("text with [placeholder]", Union[int, str, None]) == "text with [placeholder]"def test_parse_value_json_repair():