lint

Author: eli-bl

openapi_python_client/parser/properties/merge_properties.py

@@ -1,4 +1,3 @@
-
 from collections.abc import Callable
 from typing import Any
 
@@ -15,9 +14,9 @@
 
 def merge_properties(prop1: PropertyProtocol, prop2: PropertyProtocol) -> PropertyProtocol:
     """Attempt to create a new property that incorporates the behavior of both.
-    
+
     This is used when merging schemas with allOf, when two schemas define a property with the same name.
-    
+
     OpenAPI defines allOf in terms of validation behavior: the input must pass the validation rules
     defined in all of the listed schemas. Our task here is slightly more difficult, since we must end
     up with a single Property object that will be used to generate a single class property in the
@@ -37,10 +36,10 @@ def merge_properties(prop1: PropertyProtocol, prop2: PropertyProtocol) -> Proper
 
     if prop1.__class__ == prop2.__class__:
         return _merge_same_type(prop1, prop2)
-    
+
     if isinstance(prop1, AnyProperty) or isinstance(prop2, AnyProperty):
         return _merge_with_any(prop1, prop2)
-    
+
     if _is_numeric(prop1) and _is_numeric(prop2):
         return _merge_numeric(prop1, prop2)
 
@@ -78,13 +77,11 @@ def _merge_string(prop1: StringProperty, prop2: StringProperty) -> StringPropert
     # it would just mean the value must match both of the patterns to be valid. But we have no way to
     # represent this in our internal model currently.
     pattern: str | None | ValueError = _combine_values(
-        prop1.pattern,
-        prop2.pattern,
-        lambda a, b: ValueError("specified two different regex patterns")
+        prop1.pattern, prop2.pattern, lambda a, b: ValueError("specified two different regex patterns")
     )
     if isinstance(pattern, ValueError):
         raise pattern
-    
+
     return _merge_common_attributes(evolve(prop1, max_length=max_length, pattern=pattern), prop2)
 
 
@@ -98,7 +95,7 @@ def _merge_numeric(prop1: PropertyProtocol, prop2: PropertyProtocol) -> IntPrope
         if isinstance(result.default, float) and not result.default.is_integer():
             raise ValueError(f"default value {result.default} is not valid for an integer property")
     return result
-    
+
 
 def _merge_with_any(prop1: PropertyProtocol, prop2: PropertyProtocol) -> PropertyProtocol:
     # AnyProperty implies no validation rules for a value, so merging it with any other type just means
@@ -123,17 +120,16 @@ def _merge_with_enum(prop1: PropertyProtocol, prop2: PropertyProtocol) -> EnumPr
     # If enum values were specified for just one of the properties, use those.
     enum_prop = prop1 if isinstance(prop1, EnumProperty) else prop2
     non_enum_prop = prop2 if isinstance(prop1, EnumProperty) else prop1
-    if (
-        (isinstance(non_enum_prop, IntProperty) and enum_prop.value_type is int) or
-        (isinstance(non_enum_prop, StringProperty) and enum_prop.value_type is str)
+    if (isinstance(non_enum_prop, IntProperty) and enum_prop.value_type is int) or (
+        isinstance(non_enum_prop, StringProperty) and enum_prop.value_type is str
     ):
         return _merge_common_attributes(enum_prop, prop1, prop2)
     raise ValueError("defined with two incompatible types")
 
 
 def _merge_common_attributes(base: PropertyProtocol, *extend_with: PropertyProtocol) -> PropertyProtocol:
     """Create a new instance based on base, overriding basic attributes with values from extend_with, in order.
-    
+
     For "default", "description", and "example", a non-None value overrides any value from a previously
     specified property. The behavior is similar to using the spread operator with dictionaries, except
     that None means "not specified".
@@ -146,10 +142,10 @@ def _merge_common_attributes(base: PropertyProtocol, *extend_with: PropertyProto
         current = evolve(
             current,
             required=current.required or override.required,
-            default = override.default or current.default,
-            description = override.description or current.description,
-            example = override.example or current.example,
-    )
+            default=override.default or current.default,
+            description=override.description or current.description,
+            example=override.example or current.example,
+        )
     return current
 
 

tests/conftest.py

@@ -68,7 +68,7 @@ def _factory(**kwargs):
     return _factory
 
 
-def _simple_factory(cls: type, default_kwargs: Union[dict, Callable[[dict], dict], None]=None):
+def _simple_factory(cls: type, default_kwargs: Union[dict, Callable[[dict], dict], None] = None):
     def _factory(**kwargs):
         kwargs = _common_kwargs(kwargs)
         defaults = default_kwargs
@@ -90,11 +90,14 @@ def enum_property_factory() -> Callable[..., EnumProperty]:
     """
     from openapi_python_client.parser.properties import Class
 
-    return _simple_factory(EnumProperty, lambda kwargs: {
-        "class_info": Class(name=kwargs["name"], module_name=kwargs["name"]),
-        "values": {},
-        "value_type": str,
-    })
+    return _simple_factory(
+        EnumProperty,
+        lambda kwargs: {
+            "class_info": Class(name=kwargs["name"], module_name=kwargs["name"]),
+            "values": {},
+            "value_type": str,
+        },
+    )
 
 
 @pytest.fixture
@@ -215,9 +218,9 @@ def union_property_factory(date_time_property_factory, string_property_factory)
     You can pass the same params into this as the UnionProperty constructor to override defaults.
     """
 
-    return _simple_factory(UnionProperty, {
-        "inner_properties": [date_time_property_factory(), string_property_factory()]
-    })
+    return _simple_factory(
+        UnionProperty, {"inner_properties": [date_time_property_factory(), string_property_factory()]}
+    )
 
 
 @pytest.fixture

tests/test_parser/test_properties/test_merge_properties.py

@@ -1,4 +1,3 @@
-
 import pytest
 from attr import evolve
 
@@ -73,9 +72,7 @@ def test_merge_int_with_float(int_property_factory, float_property_factory):
     assert merge_properties(int_prop, float_prop) == (
         evolve(int_prop, default=float_prop.default, description=float_prop.description)
     )
-    assert merge_properties(float_prop, int_prop) == (
-        evolve(int_prop, default=float_prop.default)
-    )
+    assert merge_properties(float_prop, int_prop) == (evolve(int_prop, default=float_prop.default))
 
     float_prop_with_non_int_default = evolve(float_prop, default=2.5)
     with pytest.raises(ValueError) as excinfo:
@@ -151,7 +148,7 @@ def test_merge_string_with_string_enum(string_property_factory, enum_property_fa
         required=True,
         default=string_prop.default,
         description=string_prop.description,
-        example=string_prop.example
+        example=string_prop.example,
     )
 
 
@@ -168,11 +165,7 @@ def test_merge_int_with_int_enum(int_property_factory, enum_property_factory):
 
     assert merge_properties(int_prop, enum_prop) == evolve(enum_prop, required=True)
     assert merge_properties(enum_prop, int_prop) == evolve(
-        enum_prop,
-        required=True,
-        default=int_prop.default,
-        description=int_prop.description,
-        example=int_prop.example
+        enum_prop, required=True, default=int_prop.default, description=int_prop.description, example=int_prop.example
     )