-
Notifications
You must be signed in to change notification settings - Fork 171
implement union type support for streaming actions #813
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -269,7 +269,22 @@ async def async_action_function(state: State, **kwargs) -> State: | |
| return decorator | ||
|
|
||
|
|
||
| PartialType = Union[Type[pydantic.BaseModel], Type[dict]] | ||
| # 'object' broadens the annotation to accept union forms (Model1 | Model2 / Union[...]) | ||
| # which the type system cannot express more narrowly; _is_valid_stream_type enforces the real constraint. | ||
| PartialType = Union[Type[pydantic.BaseModel], Type[dict], object] | ||
|
|
||
|
|
||
| def _is_valid_stream_type(t: object) -> bool: | ||
| if t is dict or (isinstance(t, type) and issubclass(t, pydantic.BaseModel)): | ||
| return True | ||
| if typing.get_origin(t) is Union: | ||
| return all(_is_valid_stream_type(arg) for arg in typing.get_args(t)) | ||
| # Python 3.10+ `X | Y` syntax produces types.UnionType | ||
| _UnionType = getattr(types, "UnionType", None) | ||
| if _UnionType is not None and isinstance(t, _UnionType): | ||
| return all(_is_valid_stream_type(arg) for arg in t.__args__) | ||
| return False | ||
|
|
||
|
|
||
| PydanticStreamingActionFunctionSync = Callable[ | ||
| ..., Generator[Tuple[Union[pydantic.BaseModel, dict], Optional[pydantic.BaseModel]], None, None] | ||
|
|
@@ -290,15 +305,19 @@ async def async_action_function(state: State, **kwargs) -> State: | |
|
|
||
| def _validate_and_extract_signature_types_streaming( | ||
| fn: PydanticStreamingActionFunction, | ||
| stream_type: Optional[Union[Type[pydantic.BaseModel], Type[dict]]], | ||
| stream_type: Optional[PartialType], | ||
| state_input_type: Optional[Type[pydantic.BaseModel]] = None, | ||
| state_output_type: Optional[Type[pydantic.BaseModel]] = None, | ||
| ) -> Tuple[ | ||
| Type[pydantic.BaseModel], Type[pydantic.BaseModel], Union[Type[dict], Type[pydantic.BaseModel]] | ||
| Type[pydantic.BaseModel], Type[pydantic.BaseModel], PartialType | ||
| ]: | ||
| if stream_type is None: | ||
| # TODO -- derive from the signature | ||
| raise ValueError(f"stream_type is required for function: {fn.__qualname__}") | ||
| if not _is_valid_stream_type(stream_type): | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This looks like the key behavior change in the PR, so I think we should add negative-path coverage for it as well. Right now the new tests show that valid unions are accepted, but they don’t pin the rejection behavior for invalid cases like |
||
| raise ValueError( | ||
| f"stream_type must be a Pydantic BaseModel subclass, dict, or a union of those. Got: {stream_type!r}" | ||
| ) | ||
| if state_input_type is None: | ||
| # TODO -- derive from the signature | ||
| raise ValueError(f"state_input_type is required for function: {fn.__qualname__}") | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This fixes the usability issue, but it also broadens the public type hint a lot. Is that tradeoff intentional? We’re now depending on runtime validation for the real constraint, so static tooling no longer gets much help from the signature.