(improvement): Formats and Lints Code - Minor Changes
This commit is contained in:
@@ -29,4 +29,4 @@ __all__ = [
|
|||||||
"OneOfTypeParser",
|
"OneOfTypeParser",
|
||||||
"StringTypeParser",
|
"StringTypeParser",
|
||||||
"RefTypeParser",
|
"RefTypeParser",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -48,4 +48,4 @@ class ConstTypeParser(GenericTypeParser):
|
|||||||
)
|
)
|
||||||
return value
|
return value
|
||||||
|
|
||||||
return Annotated[type(const_value), AfterValidator(_validate_const_value)]
|
return Annotated[type(const_value), AfterValidator(_validate_const_value)]
|
||||||
|
|||||||
@@ -21,9 +21,7 @@ class EnumTypeParser(GenericTypeParser):
|
|||||||
if not isinstance(enum_values, list):
|
if not isinstance(enum_values, list):
|
||||||
raise ValueError(f"Enum type {name} must have 'enum' as a list of values.")
|
raise ValueError(f"Enum type {name} must have 'enum' as a list of values.")
|
||||||
|
|
||||||
if any(
|
if any(not isinstance(value, JSONSchemaNativeTypes) for value in enum_values):
|
||||||
not isinstance(value, JSONSchemaNativeTypes) for value in enum_values
|
|
||||||
):
|
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
f"Enum type {name} must have 'enum' values of allowed types: {JSONSchemaNativeTypes}."
|
f"Enum type {name} must have 'enum' values of allowed types: {JSONSchemaNativeTypes}."
|
||||||
)
|
)
|
||||||
@@ -32,9 +30,7 @@ class EnumTypeParser(GenericTypeParser):
|
|||||||
enum_type = Enum(name, {str(value).upper(): value for value in enum_values})
|
enum_type = Enum(name, {str(value).upper(): value for value in enum_values})
|
||||||
parsed_properties = self.mappings_properties_builder(properties, **kwargs)
|
parsed_properties = self.mappings_properties_builder(properties, **kwargs)
|
||||||
|
|
||||||
if (
|
if "default" in parsed_properties and parsed_properties["default"] is not None:
|
||||||
"default" in parsed_properties and parsed_properties["default"] is not None
|
|
||||||
):
|
|
||||||
parsed_properties["default"] = enum_type(parsed_properties["default"])
|
parsed_properties["default"] = enum_type(parsed_properties["default"])
|
||||||
|
|
||||||
return enum_type, parsed_properties
|
return enum_type, parsed_properties
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ JSONSchemaType = Literal[
|
|||||||
|
|
||||||
|
|
||||||
JSONSchemaNativeTypes: tuple[type, ...] = (
|
JSONSchemaNativeTypes: tuple[type, ...] = (
|
||||||
str,
|
str,
|
||||||
int,
|
int,
|
||||||
float,
|
float,
|
||||||
bool,
|
bool,
|
||||||
|
|||||||
@@ -99,4 +99,4 @@ class TestConstTypeParser(TestCase):
|
|||||||
self.assertIn(
|
self.assertIn(
|
||||||
"Const type invalid_country must have 'const' value of allowed types",
|
"Const type invalid_country must have 'const' value of allowed types",
|
||||||
str(context.exception),
|
str(context.exception),
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class TestEnumTypeParser(TestCase):
|
|||||||
|
|
||||||
def test_enum_type_parser_throws_invalid_enum_value(self):
|
def test_enum_type_parser_throws_invalid_enum_value(self):
|
||||||
parser = EnumTypeParser()
|
parser = EnumTypeParser()
|
||||||
|
|
||||||
schema = {
|
schema = {
|
||||||
"enum": ["value1", 42, dict()],
|
"enum": ["value1", 42, dict()],
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,4 +18,4 @@ class TestGenericTypeParser(TestCase):
|
|||||||
|
|
||||||
def test_get_impl_invalid_type(self):
|
def test_get_impl_invalid_type(self):
|
||||||
with self.assertRaises(ValueError):
|
with self.assertRaises(ValueError):
|
||||||
GenericTypeParser._get_impl({"type": "invalid_type"})
|
GenericTypeParser._get_impl({"type": "invalid_type"})
|
||||||
|
|||||||
Reference in New Issue
Block a user