Fix mixed case properties & params (#972)

Also fixes some Ruff stuff, since it was getting in the way of debugging
e2e tests

---------

Co-authored-by: Dylan Anthony <[email protected]>

Author: dbanty

.changeset/allow_parameters_with_names_differing_only_by_case.md

@@ -0,0 +1,10 @@
+---
+default: patch
+---
+
+# Allow parameters with names differing only by case
+
+If you have two parameters to an endpoint named `mixedCase` and `mixed_case`, previously, this was a conflict and the endpoint would not be generated.
+Now, the generator will skip snake-casing the parameters and use the names as-is. Note that this means if neither of the parameters _was_ snake case, neither _will be_ in the generated code.
+
+Fixes #922 reported by @macmoritz & @benedikt-bartscher.

.changeset/fix_naming_conflicts_with_properties_in_models.md

@@ -0,0 +1,32 @@
+---
+default: patch
+---
+
+# Fix naming conflicts with properties in models with mixed casing
+
+If you had an object with two properties, where the names differed only by case, conflicting properties would be generated in the model, which then failed the linting step (when using default config). For example, this:
+
+```yaml
+type: "object"
+properties:
+  MixedCase:
+    type: "string"
+  mixedCase:
+    type: "string"
+```
+
+Would generate a class like this:
+
+```python
+class MyModel:
+    mixed_case: str
+    mixed_case: str
+```
+
+Now, neither of the properties will be forced into snake case, and the generated code will look like this:
+
+```python
+class MyModel:
+    MixedCase: str
+    mixedCase: str
+```

.changeset/for_custom_templates_changed_type_of_endpoint_parameters.md

@@ -0,0 +1,18 @@
+---
+default: major
+---
+
+# For custom templates, changed type of endpoint parameters
+
+**This does not affect projects that are not using `--custom-template-path`**
+
+The type of these properties on `Endpoint` has been changed from `Dict[str, Property]` to `List[Property]`:
+
+- `path_parameters`
+- `query_parameters`
+- `header_parameters`
+- `cookie_parameters`
+
+If your templates are very close to the default templates, you can probably just remove `.values()` anywhere it appears.
+
+The type of `iter_all_parameters()` is also different, you probably want `list_all_parameters()` instead.

.changeset/updated_generated_config_for_ruff_v02.md

@@ -0,0 +1,7 @@
+---
+default: major
+---
+
+# Updated generated config for Ruff v0.2
+
+This only affects projects using the `generate` command, not the `update` command. The `pyproject.toml` file generated which configures Ruff for linting and formatting has been updated to the 0.2 syntax, which means it will no longer work with Ruff 0.1.

.changeset/updated_naming_strategy_for_conflicting_properties.md

@@ -0,0 +1,8 @@
+---
+default: major
+---
+
+# Updated naming strategy for conflicting properties
+
+While fixing #922, some naming strategies were updated. These should mostly be backwards compatible, but there may be 
+some small differences in generated code. Make sure to check your diffs before pushing updates to consumers!

end_to_end_tests/baseline_openapi_3.0.json

@@ -1413,6 +1413,50 @@
         }
       }
     },
+    "/naming/mixed-case": {
+      "get": {
+        "tags": ["naming"],
+        "operationId": "mixed_case",
+        "parameters": [
+          {
+            "name": "mixed_case",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "mixedCase",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+            "200": {
+              "description": "Successful response",
+              "content": {
+                "application/json": {
+                  "schema": {
+                    "type": "object",
+                    "properties": {
+                      "mixed_case": {
+                        "type": "string"
+                      },
+                      "mixedCase": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+        }
+      }
+    },
     "/parameter-references/{path_param}": {
       "get": {
         "tags": [

end_to_end_tests/baseline_openapi_3.1.yaml

@@ -1407,6 +1407,50 @@ info:
       }
     }
   },
+  "/naming/mixed-case": {
+    "get": {
+      "tags": [ "naming" ],
+      "operationId": "mixed_case",
+      "parameters": [
+        {
+          "name": "mixed_case",
+          "in": "query",
+          "required": true,
+          "schema": {
+            "type": "string"
+          }
+        },
+        {
+          "name": "mixedCase",
+          "in": "query",
+          "required": true,
+          "schema": {
+            "type": "string"
+          }
+        }
+      ],
+      "responses": {
+        "200": {
+          "description": "Successful response",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "mixed_case": {
+                    "type": "string"
+                  },
+                  "mixedCase": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
   "/parameter-references/{path_param}": {
     "get": {
       "tags": [

end_to_end_tests/custom-templates-golden-record/my_test_api_client/api/naming/__init__.py

@@ -2,10 +2,14 @@
 
 import types
 
-from . import post_naming_property_conflict_with_import
+from . import mixed_case, post_naming_property_conflict_with_import
 
 
 class NamingEndpoints:
     @classmethod
     def post_naming_property_conflict_with_import(cls) -> types.ModuleType:
         return post_naming_property_conflict_with_import
+
+    @classmethod
+    def mixed_case(cls) -> types.ModuleType:
+        return mixed_case

end_to_end_tests/golden-record/my_test_api_client/api/naming/mixed_case.py

@@ -0,0 +1,169 @@
+from http import HTTPStatus
+from typing import Any, Dict, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import AuthenticatedClient, Client
+from ...models.mixed_case_response_200 import MixedCaseResponse200
+from ...types import UNSET, Response
+
+
+def _get_kwargs(
+    *,
+    mixed_case: str,
+    mixedCase: str,
+) -> Dict[str, Any]:
+    params: Dict[str, Any] = {}
+
+    params["mixed_case"] = mixed_case
+
+    params["mixedCase"] = mixedCase
+
+    params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
+
+    _kwargs: Dict[str, Any] = {
+        "method": "get",
+        "url": "/naming/mixed-case",
+        "params": params,
+    }
+
+    return _kwargs
+
+
+def _parse_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Optional[MixedCaseResponse200]:
+    if response.status_code == HTTPStatus.OK:
+        response_200 = MixedCaseResponse200.from_dict(response.json())
+
+        return response_200
+    if client.raise_on_unexpected_status:
+        raise errors.UnexpectedStatus(response.status_code, response.content)
+    else:
+        return None
+
+
+def _build_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Response[MixedCaseResponse200]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    *,
+    client: Union[AuthenticatedClient, Client],
+    mixed_case: str,
+    mixedCase: str,
+) -> Response[MixedCaseResponse200]:
+    """
+    Args:
+        mixed_case (str):
+        mixedCase (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[MixedCaseResponse200]
+    """
+
+    kwargs = _get_kwargs(
+        mixed_case=mixed_case,
+        mixedCase=mixedCase,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    *,
+    client: Union[AuthenticatedClient, Client],
+    mixed_case: str,
+    mixedCase: str,
+) -> Optional[MixedCaseResponse200]:
+    """
+    Args:
+        mixed_case (str):
+        mixedCase (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        MixedCaseResponse200
+    """
+
+    return sync_detailed(
+        client=client,
+        mixed_case=mixed_case,
+        mixedCase=mixedCase,
+    ).parsed
+
+
+async def asyncio_detailed(
+    *,
+    client: Union[AuthenticatedClient, Client],
+    mixed_case: str,
+    mixedCase: str,
+) -> Response[MixedCaseResponse200]:
+    """
+    Args:
+        mixed_case (str):
+        mixedCase (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[MixedCaseResponse200]
+    """
+
+    kwargs = _get_kwargs(
+        mixed_case=mixed_case,
+        mixedCase=mixedCase,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    *,
+    client: Union[AuthenticatedClient, Client],
+    mixed_case: str,
+    mixedCase: str,
+) -> Optional[MixedCaseResponse200]:
+    """
+    Args:
+        mixed_case (str):
+        mixedCase (str):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        MixedCaseResponse200
+    """
+
+    return (
+        await asyncio_detailed(
+            client=client,
+            mixed_case=mixed_case,
+            mixedCase=mixedCase,
+        )
+    ).parsed

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

@@ -40,6 +40,7 @@
 from .http_validation_error import HTTPValidationError
 from .import_ import Import
 from .json_like_body import JsonLikeBody
+from .mixed_case_response_200 import MixedCaseResponse200
 from .model_from_all_of import ModelFromAllOf
 from .model_name import ModelName
 from .model_reference_with_periods import ModelReferenceWithPeriods
@@ -116,6 +117,7 @@
     "HTTPValidationError",
     "Import",
     "JsonLikeBody",
+    "MixedCaseResponse200",
     "ModelFromAllOf",
     "ModelName",
     "ModelReferenceWithPeriods",