Bump pydantic version from 1.10.13 to >= 1.9.0, < 3 #2322
Conversation
| @@ -100,7 +100,7 @@ def parse_args(): | |||
| def create_error_response(status_code: HTTPStatus, | |||
| message: str) -> JSONResponse: | |||
| return JSONResponse(ErrorResponse(message=message, | |||
| type="invalid_request_error").dict(), | |||
| type="invalid_request_error").model_dump(), | |||
There was a problem hiding this comment.
I believe this is something that was added after 2.0, so won't work for pydantic>=1.9,<2. to fix this, you could instead do from pydantic.v1 import BaseModel and the rest of the file could remain as-is
There was a problem hiding this comment.
Since the ErrorResponse object is super simple (only has str or None values), we can just let this remain as dict(), as the outcome is the same, without needing any new methods?
There was a problem hiding this comment.
there is no dict() method in pydantic v2, per the migration guide. do you mean using the builtin dict function? that would also work here and would allow usage of v2's BaseModel instead of the pydantic.v1 compat class, which seems preferable 👍
There was a problem hiding this comment.
oh wow, pydantic v1 doesn't even have the v1 module. seems pretty strange to not do that for the last few v1 minor versions. anyway looks like dict(ErrorResponse(...)) is the only obvious/clean way to keep the code consistent for v1 & v2 installations. alternative would be to restrict the dependency to >=2,<3
There was a problem hiding this comment.
Another option, based on your original idea, I suggest you do:
try:
from pydantic.v1 import BaseModel, Field
except ImportError:
from pydantic import BaseModel, Field
That will work with both versions.
There was a problem hiding this comment.
+1 @kmcleste can you fix this?
|
bumping this! currently blocking our deployment of vllm, which has to integrate with other pydantic ecosystem packages looks like you need to format the code @kmcleste to pass checks, |
|
Bumping this as well, as we also need this to support Pydantic 2.x in our integrations. |
| @@ -100,7 +100,7 @@ def parse_args(): | |||
| def create_error_response(status_code: HTTPStatus, | |||
| message: str) -> JSONResponse: | |||
| return JSONResponse(ErrorResponse(message=message, | |||
| type="invalid_request_error").dict(), | |||
| type="invalid_request_error").model_dump(), | |||
There was a problem hiding this comment.
+1 @kmcleste can you fix this?
|
Thank you for your contribution. I will close this in favor of #2531 |
Updating pydantic version from 1.10.13 to >= 1.9.0, < 3. The version was originally pinned due to a dependency on the OpenAI python library. OpenAI has since updated their version requirements for pydantic. See OpenAI docs for the version change: pyproject.toml.
Pydantic V1 is no longer supported, and suggests migration to V2 (Migration Guide).