Use contentSchema keyword for JSON schema #6715
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Deploying with
|
| Latest commit: |
1380b8c
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://1a721c94.pydantic-docs2.pages.dev |
| Branch Preview URL: | https://json-content-schema.pydantic-docs2.pages.dev |
1 task
|
please review |
lig
approved these changes
Jul 17, 2023
pydantic/json_schema.py
Outdated
| @@ -1609,13 +1609,13 @@ def json_schema(self, schema: core_schema.JsonSchema) -> JsonSchemaValue: | |||
| Returns: | |||
| The generated JSON schema. | |||
| """ | |||
| content_core_schema = schema['schema'] if 'schema' in schema else core_schema.any_schema() | |||
There was a problem hiding this comment.
I would like the following code more but it will always call core_schema.any_schema()
Suggested change
| content_core_schema = schema['schema'] if 'schema' in schema else core_schema.any_schema() | |
| content_core_schema = schema.get('schema', core_schema.any_schema()) |
It would be nice to have a constant like core_schema.DEFAULT_SCHEMA that will hold this value and allow the above to be as efficient as if..in.
dmontagu
commented
Jul 19, 2023
pydantic/json_schema.py
Outdated
| @@ -1609,13 +1609,13 @@ def json_schema(self, schema: core_schema.JsonSchema) -> JsonSchemaValue: | |||
| Returns: | |||
| The generated JSON schema. | |||
| """ | |||
| content_core_schema = schema['schema'] if 'schema' in schema else core_schema.any_schema() | |||
There was a problem hiding this comment.
Suggested change
| content_core_schema = schema['schema'] if 'schema' in schema else core_schema.any_schema() | |
| content_core_schema = schema.get('schema') or core_schema.any_schema() |
I think this is the zero-overhead version of your suggestion, which works since all schemas must have a type key so schema.get('schema') will be falsy only if it is None (and having the value None is not meaningfully different from not being present)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #6663
Selected Reviewer: @lig