Start enumeration at 1

Author: tjb346

README.md

@@ -182,7 +182,7 @@ If this option results in conflicts, you will need to manually override class na
 
 Even with `use_path_prefixes_for_title_model_names` set to `true`, duplicate model class names can occur. By default, when duplicates are encountered they will be skipped.
 
-Setting `enumerate_duplicate_model_names` to `true` in your config file will result in a number being added to duplicate names starting with 2. For instance, if `MyModelName` already exists, then the next time a model with that name is encountered, it will be named `MyModelName2`, then `MyModelName3` and so on.
+Setting `enumerate_duplicate_model_names` to `true` in your config file will result in a number being added to duplicate names starting with 1. For instance, if there are multiple occurances in the schema of `MyModelName`, the initial occurance will remain `MyModelName` and subsequent occurances will be named `MyModelName1`, `MyModelName2` and so on.
 
 ### http_timeout
 

openapi_python_client/parser/properties/model_property.py

@@ -75,7 +75,7 @@ def build(
                 class_string = title
         class_info = Class.from_string(string=class_string, config=config)
         if config.enumerate_duplicate_model_names:
-            suffix = 2
+            suffix = 1
             while class_info.name in schemas.classes_by_name:
                 class_info = Class.from_string(string=class_string + str(suffix), config=config)
                 suffix += 1

tests/test_parser/test_properties/test_model_property.py

@@ -166,19 +166,27 @@ def test_happy_path(self, model_property_factory, string_property_factory, date_
         )
 
     @pytest.mark.parametrize(
-        "existing_names, new_name, enumerate_duplicate_model_names, expected",
+        "existing_names, new_name, enumerate_duplicate_model_names, should_raise, expected",
         ids=(
             "name without duplicate suffix",
             "name with duplicate suffix",
             "name with duplicate suffix and matching existing name",
         ),
         argvalues=(
-            (["OtherModel"], "OtherModel", None, 'Attempted to generate duplicate models with name "OtherModel"'),
-            (["OtherModel"], "OtherModel", True, "OtherModel2"),
-            (["OtherModel", "OtherModel2"], "OtherModel", True, "OtherModel3"),
+            (["OtherModel"], "OtherModel", None, True, 'Attempted to generate duplicate models with name "OtherModel"'),
+            (["OtherModel"], "OtherModel", True, False, "OtherModel1"),
+            (["OtherModel", "OtherModel1"], "OtherModel", True, False, "OtherModel2"),
         ),
     )
-    def test_model_name_conflict(self, existing_names: str, new_name: str, enumerate_duplicate_model_names: Optional[str], expected: str, config):
+    def test_model_name_conflict(
+        self,
+        existing_names: str,
+        new_name: str,
+        enumerate_duplicate_model_names: Optional[str],
+        should_raise: bool,
+        expected: str,
+        config,
+    ):
         from openapi_python_client.parser.properties import ModelProperty
 
         data = oai.Schema.model_construct()
@@ -195,11 +203,12 @@ def test_model_name_conflict(self, existing_names: str, new_name: str, enumerate
             process_properties=True,
         )
 
-        assert isinstance(result, (PropertyError, ModelProperty))
-        if isinstance(result, PropertyError):
+        if should_raise:
+            assert isinstance(result, PropertyError)
             assert new_schemas == schemas
-            assert result == PropertyError(detail=expected, data=data)
-        else: # ModelProperty
+            assert result.detail == expected
+        else:
+            assert isinstance(result, ModelProperty)
             assert result.class_info.name in new_schemas.classes_by_name
             assert result.class_info.name == expected