refactor: Rebase on main, make Endpoint publicly-called methods public.

Author: dbanty

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

@@ -2,10 +2,14 @@
 
 import types
 
-from my_test_api_client.api.parameters import get_same_name_multiple_locations_param
+from my_test_api_client.api.parameters import get_same_name_multiple_locations_param, multiple_path_parameters
 
 
 class ParametersEndpoints:
     @classmethod
     def get_same_name_multiple_locations_param(cls) -> types.ModuleType:
         return get_same_name_multiple_locations_param
+
+    @classmethod
+    def multiple_path_parameters(cls) -> types.ModuleType:
+        return multiple_path_parameters

end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py

@@ -7,15 +7,15 @@
 
 
 def _get_kwargs(
-    param_4: str,
-    param_2: int,
-    param_1: str,
-    param_3: int,
+    param4: str,
+    param2: int,
+    param1: str,
+    param3: int,
     *,
     client: Client,
 ) -> Dict[str, Any]:
     url = "{}/multiple-path-parameters/{param4}/{param2}/{param1}/{param3}".format(
-        client.base_url, param4=param_4, param2=param_2, param1=param_1, param3=param_3
+        client.base_url, param4=param4, param2=param2, param1=param1, param3=param3
     )
 
     headers: Dict[str, Any] = client.get_headers()
@@ -29,7 +29,7 @@ def _get_kwargs(
     }
 
 
-def _build_response(*, response: httpx.Response) -> Response[None]:
+def _build_response(*, response: httpx.Response) -> Response[Any]:
     return Response(
         status_code=response.status_code,
         content=response.content,
@@ -39,18 +39,18 @@ def _build_response(*, response: httpx.Response) -> Response[None]:
 
 
 def sync_detailed(
-    param_4: str,
-    param_2: int,
-    param_1: str,
-    param_3: int,
+    param4: str,
+    param2: int,
+    param1: str,
+    param3: int,
     *,
     client: Client,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
-        param_4=param_4,
-        param_2=param_2,
-        param_1=param_1,
-        param_3=param_3,
+        param4=param4,
+        param2=param2,
+        param1=param1,
+        param3=param3,
         client=client,
     )
 
@@ -62,18 +62,18 @@ def sync_detailed(
 
 
 async def asyncio_detailed(
-    param_4: str,
-    param_2: int,
-    param_1: str,
-    param_3: int,
+    param4: str,
+    param2: int,
+    param1: str,
+    param3: int,
     *,
     client: Client,
-) -> Response[None]:
+) -> Response[Any]:
     kwargs = _get_kwargs(
-        param_4=param_4,
-        param_2=param_2,
-        param_1=param_1,
-        param_3=param_3,
+        param4=param4,
+        param2=param2,
+        param1=param1,
+        param3=param3,
         client=client,
     )
 

openapi_python_client/parser/openapi.py

@@ -50,11 +50,11 @@ def from_data(
                     data=operation, path=path, method=method, tag=tag, schemas=schemas, config=config
                 )
                 if not isinstance(endpoint, ParseError):
-                    endpoint, schemas = Endpoint._add_parameters(
+                    endpoint, schemas = Endpoint.add_parameters(
                         endpoint=endpoint, data=path_data, schemas=schemas, config=config
                     )
                 if not isinstance(endpoint, ParseError):
-                    endpoint = Endpoint._sort_parameters(endpoint=endpoint, path=path)
+                    endpoint = Endpoint.sort_parameters(endpoint=endpoint)
                 if isinstance(endpoint, ParseError):
                     endpoint.header = (
                         f"ERROR parsing {method.upper()} {path} within {tag}. Endpoint will not be generated."
@@ -242,7 +242,7 @@ def _add_responses(
         return endpoint, schemas
 
     @staticmethod
-    def _add_parameters(
+    def add_parameters(
         *, endpoint: "Endpoint", data: Union[oai.Operation, oai.PathItem], schemas: Schemas, config: Config
     ) -> Tuple[Union["Endpoint", ParseError], Schemas]:
         endpoint = deepcopy(endpoint)
@@ -300,18 +300,17 @@ def _add_parameters(
         return endpoint, schemas
 
     @staticmethod
-    def _sort_parameters(*, endpoint: "Endpoint", path: str) -> Union["Endpoint", ParseError]:
+    def sort_parameters(*, endpoint: "Endpoint") -> Union["Endpoint", ParseError]:
         endpoint = deepcopy(endpoint)
-        parameters_from_path = re.findall(_PATH_PARAM_REGEX, path)
+        parameters_from_path = re.findall(_PATH_PARAM_REGEX, endpoint.path)
         try:
             endpoint.path_parameters.sort(key=lambda p: parameters_from_path.index(p.name))
         except ValueError:
             pass  # We're going to catch the difference down below
         path_parameter_names = [p.name for p in endpoint.path_parameters]
         if parameters_from_path != path_parameter_names:
             return ParseError(
-                data=endpoint,
-                detail="Incorrect path templating (Path parameters do not match with path)",
+                detail=f"Incorrect path templating for {endpoint.path} (Path parameters do not match with path)",
             )
         return endpoint
 
@@ -336,7 +335,7 @@ def from_data(
             tag=tag,
         )
 
-        result, schemas = Endpoint._add_parameters(endpoint=endpoint, data=data, schemas=schemas, config=config)
+        result, schemas = Endpoint.add_parameters(endpoint=endpoint, data=data, schemas=schemas, config=config)
         if isinstance(result, ParseError):
             return result, schemas
         result, schemas = Endpoint._add_responses(endpoint=result, data=data.responses, schemas=schemas, config=config)