diff --git a/jambo/parser/__init__.py b/jambo/parser/__init__.py index 44b4424..0de9f00 100644 --- a/jambo/parser/__init__.py +++ b/jambo/parser/__init__.py @@ -29,4 +29,4 @@ __all__ = [ "OneOfTypeParser", "StringTypeParser", "RefTypeParser", -] \ No newline at end of file +] diff --git a/jambo/parser/const_type_parser.py b/jambo/parser/const_type_parser.py index 1e4ce84..da55bc0 100644 --- a/jambo/parser/const_type_parser.py +++ b/jambo/parser/const_type_parser.py @@ -48,4 +48,4 @@ class ConstTypeParser(GenericTypeParser): ) return value - return Annotated[type(const_value), AfterValidator(_validate_const_value)] \ No newline at end of file + return Annotated[type(const_value), AfterValidator(_validate_const_value)] diff --git a/jambo/parser/enum_type_parser.py b/jambo/parser/enum_type_parser.py index 5ea9e67..42f4d6f 100644 --- a/jambo/parser/enum_type_parser.py +++ b/jambo/parser/enum_type_parser.py @@ -21,9 +21,7 @@ class EnumTypeParser(GenericTypeParser): if not isinstance(enum_values, list): raise ValueError(f"Enum type {name} must have 'enum' as a list of values.") - if any( - not isinstance(value, JSONSchemaNativeTypes) for value in enum_values - ): + if any(not isinstance(value, JSONSchemaNativeTypes) for value in enum_values): raise ValueError( 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}) parsed_properties = self.mappings_properties_builder(properties, **kwargs) - if ( - "default" in parsed_properties and parsed_properties["default"] is not None - ): + if "default" in parsed_properties and parsed_properties["default"] is not None: parsed_properties["default"] = enum_type(parsed_properties["default"]) return enum_type, parsed_properties diff --git a/jambo/types/json_schema_type.py b/jambo/types/json_schema_type.py index 6f61837..d99d791 100644 --- a/jambo/types/json_schema_type.py +++ b/jambo/types/json_schema_type.py @@ -9,7 +9,7 @@ JSONSchemaType = Literal[ JSONSchemaNativeTypes: tuple[type, ...] = ( - str, + str, int, float, bool, diff --git a/tests/parser/test_const_type_parser.py b/tests/parser/test_const_type_parser.py index 5a8c9c1..bd7dcc5 100644 --- a/tests/parser/test_const_type_parser.py +++ b/tests/parser/test_const_type_parser.py @@ -99,4 +99,4 @@ class TestConstTypeParser(TestCase): self.assertIn( "Const type invalid_country must have 'const' value of allowed types", str(context.exception), - ) \ No newline at end of file + ) diff --git a/tests/parser/test_enum_type_parser.py b/tests/parser/test_enum_type_parser.py index 0f830e0..aad95a4 100644 --- a/tests/parser/test_enum_type_parser.py +++ b/tests/parser/test_enum_type_parser.py @@ -81,7 +81,7 @@ class TestEnumTypeParser(TestCase): def test_enum_type_parser_throws_invalid_enum_value(self): parser = EnumTypeParser() - + schema = { "enum": ["value1", 42, dict()], } diff --git a/tests/parser/test_type_parser.py b/tests/parser/test_type_parser.py index 195297b..4722de8 100644 --- a/tests/parser/test_type_parser.py +++ b/tests/parser/test_type_parser.py @@ -18,4 +18,4 @@ class TestGenericTypeParser(TestCase): def test_get_impl_invalid_type(self): with self.assertRaises(ValueError): - GenericTypeParser._get_impl({"type": "invalid_type"}) \ No newline at end of file + GenericTypeParser._get_impl({"type": "invalid_type"})