Updated tests

Author: tara-natarajan

end_to_end_tests/golden-record/my_test_api_client/client.py

@@ -3,6 +3,7 @@
 
 import httpx
 from attrs import define, evolve, field
+import urllib.parse
 
 
 @define
@@ -266,3 +267,25 @@ async def __aenter__(self) -> "AuthenticatedClient":
     async def __aexit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for underlying httpx.AsyncClient (see httpx docs)"""
         await self.get_async_httpx_client().__aexit__(*args, **kwargs)
+
+def replace_client_path(client: Client, base_path: str) -> Client:
+    """Override a client's base URL with a new path. Does not update scheme, host, or other URL parts."""
+    parsed = urllib.parse.urlparse(client.base_url)
+    # _replace is not private, it's part of the NamedTuple API but prefixed _ to avoid conflicts
+    updated_url = parsed._replace(path=base_path)
+    return client.with_base_url(updated_url.geturl())
+
+
+def v3_stable_client(client: Client) -> Client:
+    """Override a client's base URL with a v2 stable path."""
+    return replace_client_path(client, "api/v3-draft")
+
+
+def v3_alpha_client(client: Client) -> Client:
+    """Override a client's base URL with a v2-alpha path."""
+    return replace_client_path(client, "api/v3-alpha")
+
+
+def v3_beta_client(client: Client) -> Client:
+    """Override a client's base URL with a v2-beta path."""
+    return replace_client_path(client, "api/v3-beta")

end_to_end_tests/literal-enums-golden-record/my_enum_api_client/client.py

@@ -3,6 +3,7 @@
 
 import httpx
 from attrs import define, evolve, field
+import urllib.parse
 
 
 @define
@@ -266,3 +267,10 @@ async def __aenter__(self) -> "AuthenticatedClient":
     async def __aexit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for underlying httpx.AsyncClient (see httpx docs)"""
         await self.get_async_httpx_client().__aexit__(*args, **kwargs)
+
+
+def replace_client_path(client: Client, base_path: str) -> Client:
+    """Override a client's base URL with a new path. Does not update scheme, host, or other URL parts."""
+    parsed = urllib.parse.urlparse(client.base_url)
+    # _replace is not private, it's part of the NamedTuple API but prefixed _ to avoid conflicts
+    updated_url = parsed._replace(path=base_path)

end_to_end_tests/test-3-1-golden-record/test_3_1_features_client/client.py

@@ -3,7 +3,7 @@
 
 import httpx
 from attrs import define, evolve, field
-
+import urllib.parse
 
 @define
 class Client:
@@ -266,3 +266,25 @@ async def __aenter__(self) -> "AuthenticatedClient":
     async def __aexit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for underlying httpx.AsyncClient (see httpx docs)"""
         await self.get_async_httpx_client().__aexit__(*args, **kwargs)
+
+def replace_client_path(client: Client, base_path: str) -> Client:
+    """Override a client's base URL with a new path. Does not update scheme, host, or other URL parts."""
+    parsed = urllib.parse.urlparse(client.base_url)
+    # _replace is not private, it's part of the NamedTuple API but prefixed _ to avoid conflicts
+    updated_url = parsed._replace(path=base_path)
+    return client.with_base_url(updated_url.geturl())
+
+
+def v3_stable_client(client: Client) -> Client:
+    """Override a client's base URL with a v2 stable path."""
+    return replace_client_path(client, "api/v3-draft")
+
+
+def v3_alpha_client(client: Client) -> Client:
+    """Override a client's base URL with a v2-alpha path."""
+    return replace_client_path(client, "api/v3-alpha")
+
+
+def v3_beta_client(client: Client) -> Client:
+    """Override a client's base URL with a v2-beta path."""
+    return replace_client_path(client, "api/v3-beta")

integration-tests/integration_tests/client.py

@@ -1,4 +1,5 @@
 import ssl
+import urllib.parse
 from typing import Any, Optional, Union
 
 import httpx
@@ -266,3 +267,26 @@ async def __aenter__(self) -> "AuthenticatedClient":
     async def __aexit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for underlying httpx.AsyncClient (see httpx docs)"""
         await self.get_async_httpx_client().__aexit__(*args, **kwargs)
+
+
+def replace_client_path(client: Client, base_path: str) -> Client:
+    """Override a client's base URL with a new path. Does not update scheme, host, or other URL parts."""
+    parsed = urllib.parse.urlparse(client.base_url)
+    # _replace is not private, it's part of the NamedTuple API but prefixed _ to avoid conflicts
+    updated_url = parsed._replace(path=base_path)
+    return client.with_base_url(updated_url.geturl())
+
+
+def v3_stable_client(client: Client) -> Client:
+    """Override a client's base URL with a v2 stable path."""
+    return replace_client_path(client, "api/v3-draft")
+
+
+def v3_alpha_client(client: Client) -> Client:
+    """Override a client's base URL with a v2-alpha path."""
+    return replace_client_path(client, "api/v3-alpha")
+
+
+def v3_beta_client(client: Client) -> Client:
+    """Override a client's base URL with a v2-beta path."""
+    return replace_client_path(client, "api/v3-beta")

openapi_python_client/templates/client.py.jinja

@@ -212,4 +212,3 @@ def v3_alpha_client(client: Client) -> Client:
 def v3_beta_client(client: Client) -> Client:
     """Override a client's base URL with a v2-beta path."""
     return replace_client_path(client, "api/v3-beta")
-

tests/tmp/test_load_from_path_absolute_e0/example.yml

@@ -0,0 +1,7 @@
+class_overrides:
+  Class1: {class_name: ExampleClass, module_name: example_module}
+  Class2: {class_name: DifferentClass, module_name: different_module}
+field_prefix: blah
+package_name_override: package_name
+package_version_override: package_version
+project_name_override: project-name

tests/tmp/test_load_from_path_absolute_e1/example.json

@@ -0,0 +1 @@
+{"field_prefix": "blah", "class_overrides": {"Class1": {"class_name": "ExampleClass", "module_name": "example_module"}, "Class2": {"class_name": "DifferentClass", "module_name": "different_module"}}, "project_name_override": "project-name", "package_name_override": "package_name", "package_version_override": "package_version"}

tests/tmp/test_load_from_path_absolute_e2/example.yaml

@@ -0,0 +1,7 @@
+class_overrides:
+  Class1: {class_name: ExampleClass, module_name: example_module}
+  Class2: {class_name: DifferentClass, module_name: different_module}
+field_prefix: blah
+package_name_override: package_name
+package_version_override: package_version
+project_name_override: project-name

tests/tmp/test_load_from_path_absolute_e3/example.json

@@ -0,0 +1,16 @@
+{
+	"field_prefix": "blah",
+	"class_overrides": {
+		"Class1": {
+			"class_name": "ExampleClass",
+			"module_name": "example_module"
+		},
+		"Class2": {
+			"class_name": "DifferentClass",
+			"module_name": "different_module"
+		}
+	},
+	"project_name_override": "project-name",
+	"package_name_override": "package_name",
+	"package_version_override": "package_version"
+}

tests/tmp/test_load_from_path_absolute_ecurrent

@@ -0,0 +1 @@
+/Users/tara.natarajan/openapi-python-client/tests/tmp/test_load_from_path_absolute_e3