Enhance split words

Keep "Response200" as "response_200", but don't make "s3config" become
"s_3_config". :)

Author: ramnes

openapi_python_client/parser/properties/__init__.py

@@ -354,7 +354,7 @@ def build_union_property(
     sub_properties: List[Property] = []
     for i, sub_prop_data in enumerate(chain(data.anyOf, data.oneOf)):
         sub_prop, schemas = property_from_data(
-            name=f"{name}_type{i}",
+            name=f"{name}_type_{i}",
             required=required,
             data=sub_prop_data,
             schemas=schemas,

openapi_python_client/utils.py

@@ -12,8 +12,10 @@ 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-z]+)", value))
+    """Split a string on words and known delimiters"""
+    # We can't guess words if there is no capital letter
+    if any(c.isupper() for c in value):
+        value = " ".join(re.split("([A-Z]?[a-z]+)", value))
     return re.findall(rf"[^{delimiters}]+", value)
 
 

tests/test_utils.py

@@ -3,6 +3,22 @@
 from openapi_python_client import utils
 
 
+@pytest.mark.parametrize(
+    "before, after",
+    [
+        ("connectionID", ["connection", "ID"]),
+        ("connection_id", ["connection", "id"]),
+        ("connection-id", ["connection", "id"]),
+        ("Response200", ["Response", "200"]),
+        ("Response200Okay", ["Response", "200", "Okay"]),
+        ("S3Config", ["S3", "Config"]),
+        ("s3config", ["s3config"]),
+    ],
+)
+def test_split_words(before, after):
+    assert utils.split_words(before) == after
+
+
 def test_snake_case_uppercase_str():
     assert utils.snake_case("HTTP") == "http"
     assert utils.snake_case("HTTP RESPONSE") == "http_response"