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

Maintain pydantic.v1 model compatibility while using pydantic v2 #393

Merged
merged 7 commits into from
Dec 13, 2024
Merged

Maintain pydantic.v1 model compatibility while using pydantic v2 #393

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c741462
We have pydantic V2 installed in our environemnt, but have been using
voidnologo Dec 12, 2024
93f63e9
update other plugins
voidnologo Dec 13, 2024
56c6fc8
test to verify functionality
voidnologo Dec 13, 2024
c230225
bump version
voidnologo Dec 13, 2024
baba9b2
update test
voidnologo Dec 13, 2024
29a7162
make test routes local to test
voidnologo Dec 13, 2024
932abce
ruff formatting
voidnologo Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions spectree/plugins/falcon_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from falcon import HTTP_400, HTTP_415, HTTPError
from falcon.routing.compiled import _FIELD_PATTERN as FALCON_FIELD_PATTERN

from spectree._pydantic import ValidationError
from spectree._pydantic import InternalValidationError, ValidationError
from spectree._types import ModelType
from spectree.plugins.base import BasePlugin, validate_response
from spectree.response import Response
Expand Down Expand Up @@ -211,7 +211,7 @@ def validate(
try:
self.request_validation(_req, query, json, form, headers, cookies)

except ValidationError as err:
except (InternalValidationError, ValidationError) as err:
req_validation_error = err
_resp.status = f"{validation_error_status} Validation Error"
_resp.media = err.errors()
Expand All @@ -235,7 +235,7 @@ def validate(
validation_model=resp.find_model(status),
response_payload=_resp.media,
)
except ValidationError as err:
except (InternalValidationError, ValidationError) as err:
resp_validation_error = err
_resp.status = HTTP_500
_resp.media = err.errors()
Expand Down Expand Up @@ -317,7 +317,7 @@ async def validate(
try:
await self.request_validation(_req, query, json, form, headers, cookies)

except ValidationError as err:
except (InternalValidationError, ValidationError) as err:
req_validation_error = err
_resp.status = f"{validation_error_status} Validation Error"
_resp.media = err.errors()
Expand Down Expand Up @@ -345,7 +345,7 @@ async def validate(
validation_model=resp.find_model(status) if resp else None,
response_payload=_resp.media,
)
except ValidationError as err:
except (InternalValidationError, ValidationError) as err:
resp_validation_error = err
_resp.status = HTTP_500
_resp.media = err.errors()
Expand Down
Loading