Fix BaseType annotation parsing #8318
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR adds defensive handling for non-class typing constructs in BaseType.extract_custom_type_from_annotation to avoid TypeError from issubclass.
- Imports
inspectand usesinspect.isclassinstead ofisinstance - Wraps
issubclassin atry/except TypeErrorto return early on invalid types
Comments suppressed due to low confidence (1)
dspy/adapters/types/base_type.py:56
- Add a unit test case for an annotation that triggers this
TypeErrorpath (e.g.,typing.Anyor aTypeAlias) to verify the guard behaves as expected.
return []
| # `issubclass` can raise `TypeError` if the argument is not actually | ||
| # a class (even if `inspect.isclass` thought otherwise). In these | ||
| # cases we just ignore the annotation. | ||
| return [] |
There was a problem hiding this comment.
Returning [] here will skip nested annotation parsing entirely when a TypeError is raised. Consider using pass instead so that downstream logic (e.g., handling get_origin and its args) can still detect custom types in generic constructs.
| return [] | |
| pass |
Copilot uses AI. Check for mistakes.
| # Direct match | ||
| if isinstance(annotation, type) and issubclass(annotation, cls): | ||
| return [annotation] | ||
| # Direct match. Some typing constructs (like `typing.Any`, `TypeAlias`, |
There was a problem hiding this comment.
[nitpick] Update the method docstring to mention this new defensive guard against invalid class-like annotations for clarity and maintainability.
Copilot uses AI. Check for mistakes.
Summary
BaseType.extract_custom_type_from_annotationTesting
ruff format dspy/adapters/types/base_type.pyruff check dspy/adapters/types/base_type.pypytest -q(fails: ModuleNotFoundError: No module named 'datamodel_code_generator')https://chatgpt.com/codex/tasks/task_e_683f2b47c75c8329b9ec5a7f441c7e2a