fix(cases): treat numbers as words when processing cases

Author: dbanty

end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py

@@ -4,7 +4,7 @@
 
 from ...client import Client
 from ...models.test_inline_objects_json_body import TestInlineObjectsJsonBody
-from ...models.test_inline_objects_response200 import TestInlineObjectsResponse200
+from ...models.test_inline_objects_response_200 import TestInlineObjectsResponse200
 from ...types import Response
 
 

end_to_end_tests/golden-record/my_test_api_client/models/__init__.py

@@ -18,14 +18,14 @@
 )
 from .model_with_additional_properties_refed import ModelWithAdditionalPropertiesRefed
 from .model_with_any_json_properties import ModelWithAnyJsonProperties
-from .model_with_any_json_properties_additional_property_type0 import ModelWithAnyJsonPropertiesAdditionalPropertyType0
+from .model_with_any_json_properties_additional_property_type_0 import ModelWithAnyJsonPropertiesAdditionalPropertyType0
 from .model_with_primitive_additional_properties import ModelWithPrimitiveAdditionalProperties
 from .model_with_primitive_additional_properties_a_date_holder import ModelWithPrimitiveAdditionalPropertiesADateHolder
 from .model_with_property_ref import ModelWithPropertyRef
 from .model_with_union_property import ModelWithUnionProperty
 from .model_with_union_property_inlined import ModelWithUnionPropertyInlined
-from .model_with_union_property_inlined_fruit_type0 import ModelWithUnionPropertyInlinedFruitType0
-from .model_with_union_property_inlined_fruit_type1 import ModelWithUnionPropertyInlinedFruitType1
+from .model_with_union_property_inlined_fruit_type_0 import ModelWithUnionPropertyInlinedFruitType0
+from .model_with_union_property_inlined_fruit_type_1 import ModelWithUnionPropertyInlinedFruitType1
 from .test_inline_objects_json_body import TestInlineObjectsJsonBody
-from .test_inline_objects_response200 import TestInlineObjectsResponse200
+from .test_inline_objects_response_200 import TestInlineObjectsResponse200
 from .validation_error import ValidationError

end_to_end_tests/golden-record/my_test_api_client/models/a_model.py

@@ -186,20 +186,20 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
 
         def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.datetime]:
             try:
-                a_camel_date_time_type0: datetime.datetime
+                a_camel_date_time_type_0: datetime.datetime
                 if not isinstance(data, str):
                     raise TypeError()
-                a_camel_date_time_type0 = isoparse(data)
+                a_camel_date_time_type_0 = isoparse(data)
 
-                return a_camel_date_time_type0
+                return a_camel_date_time_type_0
             except:  # noqa: E722
                 pass
             if not isinstance(data, str):
                 raise TypeError()
-            a_camel_date_time_type1: datetime.date
-            a_camel_date_time_type1 = isoparse(data).date()
+            a_camel_date_time_type_1: datetime.date
+            a_camel_date_time_type_1 = isoparse(data).date()
 
-            return a_camel_date_time_type1
+            return a_camel_date_time_type_1
 
         a_camel_date_time = _parse_a_camel_date_time(d.pop("aCamelDateTime"))
 
@@ -209,20 +209,20 @@ def _parse_a_camel_date_time(data: object) -> Union[datetime.date, datetime.date
 
         def _parse_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty]:
             try:
-                one_of_models_type0: FreeFormModel
+                one_of_models_type_0: FreeFormModel
                 if not isinstance(data, dict):
                     raise TypeError()
-                one_of_models_type0 = FreeFormModel.from_dict(data)
+                one_of_models_type_0 = FreeFormModel.from_dict(data)
 
-                return one_of_models_type0
+                return one_of_models_type_0
             except:  # noqa: E722
                 pass
             if not isinstance(data, dict):
                 raise TypeError()
-            one_of_models_type1: ModelWithUnionProperty
-            one_of_models_type1 = ModelWithUnionProperty.from_dict(data)
+            one_of_models_type_1: ModelWithUnionProperty
+            one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)
 
-            return one_of_models_type1
+            return one_of_models_type_1
 
         one_of_models = _parse_one_of_models(d.pop("one_of_models"))
 
@@ -267,47 +267,47 @@ def _parse_nullable_one_of_models(data: object) -> Union[FreeFormModel, ModelWit
             if data is None:
                 return data
             try:
-                nullable_one_of_models_type0: FreeFormModel
+                nullable_one_of_models_type_0: FreeFormModel
                 if not isinstance(data, dict):
                     raise TypeError()
-                nullable_one_of_models_type0 = FreeFormModel.from_dict(data)
+                nullable_one_of_models_type_0 = FreeFormModel.from_dict(data)
 
-                return nullable_one_of_models_type0
+                return nullable_one_of_models_type_0
             except:  # noqa: E722
                 pass
             if not isinstance(data, dict):
                 raise TypeError()
-            nullable_one_of_models_type1: ModelWithUnionProperty
-            nullable_one_of_models_type1 = ModelWithUnionProperty.from_dict(data)
+            nullable_one_of_models_type_1: ModelWithUnionProperty
+            nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(data)
 
-            return nullable_one_of_models_type1
+            return nullable_one_of_models_type_1
 
         nullable_one_of_models = _parse_nullable_one_of_models(d.pop("nullable_one_of_models"))
 
         def _parse_not_required_one_of_models(data: object) -> Union[FreeFormModel, ModelWithUnionProperty, Unset]:
             if isinstance(data, Unset):
                 return data
             try:
-                not_required_one_of_models_type0: Union[Unset, FreeFormModel]
+                not_required_one_of_models_type_0: Union[Unset, FreeFormModel]
                 if not isinstance(data, dict):
                     raise TypeError()
-                not_required_one_of_models_type0 = UNSET
-                _not_required_one_of_models_type0 = data
-                if not isinstance(_not_required_one_of_models_type0, Unset):
-                    not_required_one_of_models_type0 = FreeFormModel.from_dict(_not_required_one_of_models_type0)
+                not_required_one_of_models_type_0 = UNSET
+                _not_required_one_of_models_type_0 = data
+                if not isinstance(_not_required_one_of_models_type_0, Unset):
+                    not_required_one_of_models_type_0 = FreeFormModel.from_dict(_not_required_one_of_models_type_0)
 
-                return not_required_one_of_models_type0
+                return not_required_one_of_models_type_0
             except:  # noqa: E722
                 pass
             if not isinstance(data, dict):
                 raise TypeError()
-            not_required_one_of_models_type1: Union[Unset, ModelWithUnionProperty]
-            not_required_one_of_models_type1 = UNSET
-            _not_required_one_of_models_type1 = data
-            if not isinstance(_not_required_one_of_models_type1, Unset):
-                not_required_one_of_models_type1 = ModelWithUnionProperty.from_dict(_not_required_one_of_models_type1)
+            not_required_one_of_models_type_1: Union[Unset, ModelWithUnionProperty]
+            not_required_one_of_models_type_1 = UNSET
+            _not_required_one_of_models_type_1 = data
+            if not isinstance(_not_required_one_of_models_type_1, Unset):
+                not_required_one_of_models_type_1 = ModelWithUnionProperty.from_dict(_not_required_one_of_models_type_1)
 
-            return not_required_one_of_models_type1
+            return not_required_one_of_models_type_1
 
         not_required_one_of_models = _parse_not_required_one_of_models(d.pop("not_required_one_of_models", UNSET))
 
@@ -319,31 +319,31 @@ def _parse_not_required_nullable_one_of_models(
             if isinstance(data, Unset):
                 return data
             try:
-                not_required_nullable_one_of_models_type0: Union[Unset, FreeFormModel]
+                not_required_nullable_one_of_models_type_0: Union[Unset, FreeFormModel]
                 if not isinstance(data, dict):
                     raise TypeError()
-                not_required_nullable_one_of_models_type0 = UNSET
-                _not_required_nullable_one_of_models_type0 = data
-                if not isinstance(_not_required_nullable_one_of_models_type0, Unset):
-                    not_required_nullable_one_of_models_type0 = FreeFormModel.from_dict(
-                        _not_required_nullable_one_of_models_type0
+                not_required_nullable_one_of_models_type_0 = UNSET
+                _not_required_nullable_one_of_models_type_0 = data
+                if not isinstance(_not_required_nullable_one_of_models_type_0, Unset):
+                    not_required_nullable_one_of_models_type_0 = FreeFormModel.from_dict(
+                        _not_required_nullable_one_of_models_type_0
                     )
 
-                return not_required_nullable_one_of_models_type0
+                return not_required_nullable_one_of_models_type_0
             except:  # noqa: E722
                 pass
             try:
-                not_required_nullable_one_of_models_type1: Union[Unset, ModelWithUnionProperty]
+                not_required_nullable_one_of_models_type_1: Union[Unset, ModelWithUnionProperty]
                 if not isinstance(data, dict):
                     raise TypeError()
-                not_required_nullable_one_of_models_type1 = UNSET
-                _not_required_nullable_one_of_models_type1 = data
-                if not isinstance(_not_required_nullable_one_of_models_type1, Unset):
-                    not_required_nullable_one_of_models_type1 = ModelWithUnionProperty.from_dict(
-                        _not_required_nullable_one_of_models_type1
+                not_required_nullable_one_of_models_type_1 = UNSET
+                _not_required_nullable_one_of_models_type_1 = data
+                if not isinstance(_not_required_nullable_one_of_models_type_1, Unset):
+                    not_required_nullable_one_of_models_type_1 = ModelWithUnionProperty.from_dict(
+                        _not_required_nullable_one_of_models_type_1
                     )
 
-                return not_required_nullable_one_of_models_type1
+                return not_required_nullable_one_of_models_type_1
             except:  # noqa: E722
                 pass
             return cast(Union[FreeFormModel, ModelWithUnionProperty, None, Unset, str], data)

end_to_end_tests/golden-record/my_test_api_client/models/model_with_any_json_properties.py

@@ -2,7 +2,7 @@
 
 import attr
 
-from ..models.model_with_any_json_properties_additional_property_type0 import (
+from ..models.model_with_any_json_properties_additional_property_type_0 import (
     ModelWithAnyJsonPropertiesAdditionalPropertyType0,
 )
 
@@ -46,21 +46,21 @@ def _parse_additional_property(
                 data: object,
             ) -> Union[List[str], ModelWithAnyJsonPropertiesAdditionalPropertyType0, bool, float, int, str]:
                 try:
-                    additional_property_type0: ModelWithAnyJsonPropertiesAdditionalPropertyType0
+                    additional_property_type_0: ModelWithAnyJsonPropertiesAdditionalPropertyType0
                     if not isinstance(data, dict):
                         raise TypeError()
-                    additional_property_type0 = ModelWithAnyJsonPropertiesAdditionalPropertyType0.from_dict(data)
+                    additional_property_type_0 = ModelWithAnyJsonPropertiesAdditionalPropertyType0.from_dict(data)
 
-                    return additional_property_type0
+                    return additional_property_type_0
                 except:  # noqa: E722
                     pass
                 try:
-                    additional_property_type1: List[str]
+                    additional_property_type_1: List[str]
                     if not isinstance(data, list):
                         raise TypeError()
-                    additional_property_type1 = cast(List[str], data)
+                    additional_property_type_1 = cast(List[str], data)
 
-                    return additional_property_type1
+                    return additional_property_type_1
                 except:  # noqa: E722
                     pass
                 return cast(

end_to_end_tests/golden-record/my_test_api_client/models/model_with_any_json_properties_additional_property_type0.py renamed to end_to_end_tests/golden-record/my_test_api_client/models/model_with_any_json_properties_additional_property_type_0.py

@@ -22,10 +22,10 @@ def to_dict(self) -> Dict[str, Any]:
     @classmethod
     def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
-        model_with_any_json_properties_additional_property_type0 = cls()
+        model_with_any_json_properties_additional_property_type_0 = cls()
 
-        model_with_any_json_properties_additional_property_type0.additional_properties = d
-        return model_with_any_json_properties_additional_property_type0
+        model_with_any_json_properties_additional_property_type_0.additional_properties = d
+        return model_with_any_json_properties_additional_property_type_0
 
     @property
     def additional_keys(self) -> List[str]:

end_to_end_tests/golden-record/my_test_api_client/models/model_with_union_property.py

@@ -44,26 +44,26 @@ def _parse_a_property(data: object) -> Union[AnEnum, AnIntEnum, Unset]:
             if isinstance(data, Unset):
                 return data
             try:
-                a_property_type0: Union[Unset, AnEnum]
+                a_property_type_0: Union[Unset, AnEnum]
                 if not isinstance(data, str):
                     raise TypeError()
-                a_property_type0 = UNSET
-                _a_property_type0 = data
-                if not isinstance(_a_property_type0, Unset):
-                    a_property_type0 = AnEnum(_a_property_type0)
+                a_property_type_0 = UNSET
+                _a_property_type_0 = data
+                if not isinstance(_a_property_type_0, Unset):
+                    a_property_type_0 = AnEnum(_a_property_type_0)
 
-                return a_property_type0
+                return a_property_type_0
             except:  # noqa: E722
                 pass
             if not isinstance(data, int):
                 raise TypeError()
-            a_property_type1: Union[Unset, AnIntEnum]
-            a_property_type1 = UNSET
-            _a_property_type1 = data
-            if not isinstance(_a_property_type1, Unset):
-                a_property_type1 = AnIntEnum(_a_property_type1)
+            a_property_type_1: Union[Unset, AnIntEnum]
+            a_property_type_1 = UNSET
+            _a_property_type_1 = data
+            if not isinstance(_a_property_type_1, Unset):
+                a_property_type_1 = AnIntEnum(_a_property_type_1)
 
-            return a_property_type1
+            return a_property_type_1
 
         a_property = _parse_a_property(d.pop("a_property", UNSET))
 

end_to_end_tests/golden-record/my_test_api_client/models/model_with_union_property_inlined.py

@@ -2,8 +2,8 @@
 
 import attr
 
-from ..models.model_with_union_property_inlined_fruit_type0 import ModelWithUnionPropertyInlinedFruitType0
-from ..models.model_with_union_property_inlined_fruit_type1 import ModelWithUnionPropertyInlinedFruitType1
+from ..models.model_with_union_property_inlined_fruit_type_0 import ModelWithUnionPropertyInlinedFruitType0
+from ..models.model_with_union_property_inlined_fruit_type_1 import ModelWithUnionPropertyInlinedFruitType1
 from ..types import UNSET, Unset
 
 T = TypeVar("T", bound="ModelWithUnionPropertyInlined")
@@ -46,26 +46,26 @@ def _parse_fruit(
             if isinstance(data, Unset):
                 return data
             try:
-                fruit_type0: Union[Unset, ModelWithUnionPropertyInlinedFruitType0]
+                fruit_type_0: Union[Unset, ModelWithUnionPropertyInlinedFruitType0]
                 if not isinstance(data, dict):
                     raise TypeError()
-                fruit_type0 = UNSET
-                _fruit_type0 = data
-                if not isinstance(_fruit_type0, Unset):
-                    fruit_type0 = ModelWithUnionPropertyInlinedFruitType0.from_dict(_fruit_type0)
+                fruit_type_0 = UNSET
+                _fruit_type_0 = data
+                if not isinstance(_fruit_type_0, Unset):
+                    fruit_type_0 = ModelWithUnionPropertyInlinedFruitType0.from_dict(_fruit_type_0)
 
-                return fruit_type0
+                return fruit_type_0
             except:  # noqa: E722
                 pass
             if not isinstance(data, dict):
                 raise TypeError()
-            fruit_type1: Union[Unset, ModelWithUnionPropertyInlinedFruitType1]
-            fruit_type1 = UNSET
-            _fruit_type1 = data
-            if not isinstance(_fruit_type1, Unset):
-                fruit_type1 = ModelWithUnionPropertyInlinedFruitType1.from_dict(_fruit_type1)
+            fruit_type_1: Union[Unset, ModelWithUnionPropertyInlinedFruitType1]
+            fruit_type_1 = UNSET
+            _fruit_type_1 = data
+            if not isinstance(_fruit_type_1, Unset):
+                fruit_type_1 = ModelWithUnionPropertyInlinedFruitType1.from_dict(_fruit_type_1)
 
-            return fruit_type1
+            return fruit_type_1
 
         fruit = _parse_fruit(d.pop("fruit", UNSET))
 

end_to_end_tests/golden-record/my_test_api_client/models/model_with_union_property_inlined_fruit_type0.py renamed to end_to_end_tests/golden-record/my_test_api_client/models/model_with_union_property_inlined_fruit_type_0.py

@@ -30,12 +30,12 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
         apples = d.pop("apples", UNSET)
 
-        model_with_union_property_inlined_fruit_type0 = cls(
+        model_with_union_property_inlined_fruit_type_0 = cls(
             apples=apples,
         )
 
-        model_with_union_property_inlined_fruit_type0.additional_properties = d
-        return model_with_union_property_inlined_fruit_type0
+        model_with_union_property_inlined_fruit_type_0.additional_properties = d
+        return model_with_union_property_inlined_fruit_type_0
 
     @property
     def additional_keys(self) -> List[str]:

end_to_end_tests/golden-record/my_test_api_client/models/model_with_union_property_inlined_fruit_type1.py renamed to end_to_end_tests/golden-record/my_test_api_client/models/model_with_union_property_inlined_fruit_type_1.py

@@ -30,12 +30,12 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
         bananas = d.pop("bananas", UNSET)
 
-        model_with_union_property_inlined_fruit_type1 = cls(
+        model_with_union_property_inlined_fruit_type_1 = cls(
             bananas=bananas,
         )
 
-        model_with_union_property_inlined_fruit_type1.additional_properties = d
-        return model_with_union_property_inlined_fruit_type1
+        model_with_union_property_inlined_fruit_type_1.additional_properties = d
+        return model_with_union_property_inlined_fruit_type_1
 
     @property
     def additional_keys(self) -> List[str]:

end_to_end_tests/golden-record/my_test_api_client/models/test_inline_objects_response200.py renamed to end_to_end_tests/golden-record/my_test_api_client/models/test_inline_objects_response_200.py

@@ -28,8 +28,8 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         d = src_dict.copy()
         a_property = d.pop("a_property", UNSET)
 
-        test_inline_objects_response200 = cls(
+        test_inline_objects_response_200 = cls(
             a_property=a_property,
         )
 
-        return test_inline_objects_response200
+        return test_inline_objects_response_200

openapi_python_client/utils.py

@@ -13,7 +13,7 @@ def sanitize(value: str) -> str:
 
 def split_words(value: str) -> List[str]:
     """ Split a string on non-capital letters and known delimiters """
-    value = " ".join(re.split("([A-Z]?[a-z0-9]+)", value))
+    value = " ".join(re.split("([A-Z]?[a-z]+)", value))
     return re.findall(rf"[^{delimiters}]+", value)
 
 

tests/test_utils.py

@@ -15,6 +15,11 @@ def test_snake_case_from_pascal_with_acronyms():
     assert utils.snake_case("S3Config") == "s3_config"
 
 
+def test_snake_case_from_pascal_with_numbers():
+    assert utils.snake_case("Response200") == "response_200"
+    assert utils.snake_case("Response200WithContent") == "response_200_with_content"
+
+
 def test_snake_case_from_pascal():
     assert utils.snake_case("HttpResponsePascalCase") == "http_response_pascal_case"