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

Jsonschema keywords module rename fix #132

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Jsonschema keywords module rename fix #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions openapi_schema_validator/_validators.py → openapi_schema_validator/_keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
from typing import Mapping
from typing import Union

from jsonschema._keywords import allOf as _allOf
from jsonschema._keywords import anyOf as _anyOf
from jsonschema._keywords import oneOf as _oneOf
from jsonschema._utils import extras_msg
from jsonschema._utils import find_additional_properties
from jsonschema._validators import allOf as _allOf
from jsonschema._validators import anyOf as _anyOf
from jsonschema._validators import oneOf as _oneOf
from jsonschema.exceptions import FormatError
from jsonschema.exceptions import ValidationError
from jsonschema.protocols import Validator
Expand Down
94 changes: 47 additions & 47 deletions openapi_schema_validator/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,59 @@
from typing import Any
from typing import Type

from jsonschema import _legacy_validators
from jsonschema import _validators
from jsonschema import _keywords
from jsonschema import _legacy_keywords
from jsonschema.validators import Draft202012Validator
from jsonschema.validators import create
from jsonschema.validators import extend
from jsonschema_specifications import REGISTRY as SPECIFICATIONS

from openapi_schema_validator import _format as oas_format
from openapi_schema_validator import _keywords as oas_keywords
from openapi_schema_validator import _types as oas_types
from openapi_schema_validator import _validators as oas_validators
from openapi_schema_validator._types import oas31_type_checker

OAS30Validator = create(
meta_schema=SPECIFICATIONS.contents(
"http://json-schema.org/draft-04/schema#",
),
validators={
"multipleOf": _validators.multipleOf,
"multipleOf": _keywords.multipleOf,
# exclusiveMaximum supported inside maximum_draft3_draft4
"maximum": _legacy_validators.maximum_draft3_draft4,
"maximum": _legacy_keywords.maximum_draft3_draft4,
# exclusiveMinimum supported inside minimum_draft3_draft4
"minimum": _legacy_validators.minimum_draft3_draft4,
"maxLength": _validators.maxLength,
"minLength": _validators.minLength,
"pattern": _validators.pattern,
"maxItems": _validators.maxItems,
"minItems": _validators.minItems,
"uniqueItems": _validators.uniqueItems,
"maxProperties": _validators.maxProperties,
"minProperties": _validators.minProperties,
"enum": _validators.enum,
"minimum": _legacy_keywords.minimum_draft3_draft4,
"maxLength": _keywords.maxLength,
"minLength": _keywords.minLength,
"pattern": _keywords.pattern,
"maxItems": _keywords.maxItems,
"minItems": _keywords.minItems,
"uniqueItems": _keywords.uniqueItems,
"maxProperties": _keywords.maxProperties,
"minProperties": _keywords.minProperties,
"enum": _keywords.enum,
# adjusted to OAS
"type": oas_validators.type,
"allOf": oas_validators.allOf,
"oneOf": oas_validators.oneOf,
"anyOf": oas_validators.anyOf,
"not": _validators.not_,
"items": oas_validators.items,
"properties": _validators.properties,
"required": oas_validators.required,
"additionalProperties": oas_validators.additionalProperties,
"type": oas_keywords.type,
"allOf": oas_keywords.allOf,
"oneOf": oas_keywords.oneOf,
"anyOf": oas_keywords.anyOf,
"not": _keywords.not_,
"items": oas_keywords.items,
"properties": _keywords.properties,
"required": oas_keywords.required,
"additionalProperties": oas_keywords.additionalProperties,
# TODO: adjust description
"format": oas_validators.format,
"format": oas_keywords.format,
# TODO: adjust default
"$ref": _validators.ref,
"$ref": _keywords.ref,
# fixed OAS fields
"discriminator": oas_validators.not_implemented,
"readOnly": oas_validators.readOnly,
"writeOnly": oas_validators.writeOnly,
"xml": oas_validators.not_implemented,
"externalDocs": oas_validators.not_implemented,
"example": oas_validators.not_implemented,
"deprecated": oas_validators.not_implemented,
"discriminator": oas_keywords.not_implemented,
"readOnly": oas_keywords.readOnly,
"writeOnly": oas_keywords.writeOnly,
"xml": oas_keywords.not_implemented,
"externalDocs": oas_keywords.not_implemented,
"example": oas_keywords.not_implemented,
"deprecated": oas_keywords.not_implemented,
},
type_checker=oas_types.oas30_type_checker,
format_checker=oas_format.oas30_format_checker,
Expand All @@ -67,33 +67,33 @@
OAS30ReadValidator = extend(
OAS30Validator,
validators={
"required": oas_validators.read_required,
"readOnly": oas_validators.not_implemented,
"writeOnly": oas_validators.writeOnly,
"required": oas_keywords.read_required,
"readOnly": oas_keywords.not_implemented,
"writeOnly": oas_keywords.writeOnly,
},
)
OAS30WriteValidator = extend(
OAS30Validator,
validators={
"required": oas_validators.write_required,
"readOnly": oas_validators.readOnly,
"writeOnly": oas_validators.not_implemented,
"required": oas_keywords.write_required,
"readOnly": oas_keywords.readOnly,
"writeOnly": oas_keywords.not_implemented,
},
)

OAS31Validator = extend(
Draft202012Validator,
{
# adjusted to OAS
"allOf": oas_validators.allOf,
"oneOf": oas_validators.oneOf,
"anyOf": oas_validators.anyOf,
"description": oas_validators.not_implemented,
"allOf": oas_keywords.allOf,
"oneOf": oas_keywords.oneOf,
"anyOf": oas_keywords.anyOf,
"description": oas_keywords.not_implemented,
# fixed OAS fields
"discriminator": oas_validators.not_implemented,
"xml": oas_validators.not_implemented,
"externalDocs": oas_validators.not_implemented,
"example": oas_validators.not_implemented,
"discriminator": oas_keywords.not_implemented,
"xml": oas_keywords.not_implemented,
"externalDocs": oas_keywords.not_implemented,
"example": oas_keywords.not_implemented,
},
type_checker=oas31_type_checker,
format_checker=oas_format.oas31_format_checker,
Expand Down
8 changes: 4 additions & 4 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ include = [

[tool.poetry.dependencies]
python = "^3.8.0"
jsonschema = "^4.18.0"
jsonschema = "^4.19.1"
rfc3339-validator = "*" # requred by jsonschema for date-time checker
jsonschema-specifications = "^2023.5.2"

Expand Down
Loading