Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Support Pydantic 2 #1687

Closed
wants to merge 38 commits into from
Closed

Support Pydantic 2 #1687

wants to merge 38 commits into from

Conversation

mattt
Copy link
Contributor

@mattt mattt commented May 23, 2024

Alternative to #1625

@mattt mattt changed the base branch from main to async May 23, 2024 17:31
@mattt mattt marked this pull request as ready for review May 23, 2024 17:33
@technillogue
Copy link
Contributor

#1662

mattt added 26 commits June 1, 2024 16:48
@mattt @technillogue
Add Python tool cache directories to .gitignore
d629def 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Update VSCode settings to hide .venv
9aee41e 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Update pydantic and fastapi requirements
2b7df9b 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Define PYDANTIC_V2
ae86ce1 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Replace use of ErrorWrapper removed in pydantic v2
48896e9 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Update predictor model config and output types
5954373 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Pass string literal for extra value
5a78e65 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Set explicit None values for optional fields
f9a284c 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Mark output field as optional with explicit None value
81648b7 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Redefine custom types with Annotated for pydantic v2
f7ed318 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix test_make_encodeable_ignores_files
a101f60 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Import types from typing instead of accessing through namespace
aaffd4c 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Downgrade generated OpenAPI schema to 3.0
13c430e 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Set extra in model config
cfcec6e 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Set default description for enumerations
46a383f 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Actually, don't allow additional properties
0e63648 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix generated schema for webhook event filter
b4cad69 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fixup generated OpenAPI schema
a8735e0 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix deprecation warnings in ast_openapi_schema
00db473 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Ignore pydantic and fastapi deprecation warnings
6fed1cf 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix use of Annotated in custom types
f8a79e9 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Update expectations for test_gt_lt response JSON
f8839d8 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Work around isinstance checks on custom types defined by Annotations
dc201a8 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Flatten allOf for component schemas
1465b97 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix validation of weights_url
ae53a08 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix expectations for test_bad_int_input
a10b121 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
mattt added 9 commits June 1, 2024 16:51
@mattt @technillogue
Fixup test expectations
603a0c0 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Skip numpy tests for pydantic v2
17c70e6 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix test_make_encodeable_encodes_pydantic_models for pydantic v2
972996f 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Implement __get_pydantic_core_schema__ for URLFile
14dcbc8 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix deprecation warning for pydantic dict instance method
5d23302 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix deprecation warning for pydantic extra kwargs
dd0687e 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Use _is_iterator instead of converting to list for validation
69a6074 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Fix linter warnings
2e2eb5f 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
@mattt @technillogue
Rename WebSocketUrl -> WebhookUrl
c8fb560 
Signed-off-by: Mattt Zmuda <mattt@replicate.com>
technillogue
technillogue reviewed Jun 2, 2024
View reviewed changes
python/cog/schema.py
Comment on lines +55 to +59
WebhookUrl = Annotated[
Url, UrlConstraints(allowed_schemes=["http", "https"], max_length=65536)
]
else:
WebhookUrl = pydantic.AnyUrl
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the point of this exactly?

@technillogue
fix pydantic.Url not subclassing str
b0ba17c 
Signed-off-by: technillogue <technillogue@gmail.com>
@technillogue
if we get >2 redirects, retrying upload without streaming (#1711)
41d9b2c 
Signed-off-by: technillogue <technillogue@gmail.com>
This was referenced Jun 24, 2024
Closed
Closed
Closed
Closed
@mattt
Copy link
Contributor Author

mattt commented Aug 6, 2024

Starting a new PR targeting main instead of async.

@mattt mattt closed this Aug 6, 2024
@mattt mattt deleted the mattt/pydantic-v2 branch August 6, 2024 17:55
@mattt mattt mentioned this pull request Aug 6, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@technillogue technillogue technillogue left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mattt @technillogue