openapi-python-client 0.18.0__tar.gz → 0.19.1__tar.gz

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/.gitignore

@@ -4,6 +4,7 @@ build/
 dist/
 *.egg-info/
 .pytest_cache/
+.ruff_cache
 
 # macOS
 .DS_Store

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: openapi-python-client
-Version: 0.18.0
+Version: 0.19.1
 Summary: Generate modern Python clients from OpenAPI
 Project-URL: repository, https://github.com/openapi-generators/openapi-python-client
 Author-email: Dylan Anthony <contact@dylananthony.com>
@@ -26,9 +26,9 @@ Requires-Dist: jinja2<4.0.0,>=3.0.0
 Requires-Dist: pydantic<3.0.0,>=2.1.1
 Requires-Dist: python-dateutil<3.0.0,>=2.8.1
 Requires-Dist: pyyaml<7.0,>=6.0
-Requires-Dist: ruff<0.3,>=0.2
+Requires-Dist: ruff<0.4,>=0.2
 Requires-Dist: shellingham<2.0.0,>=1.3.2
-Requires-Dist: typer<0.10,>0.6
+Requires-Dist: typer<0.12,>0.6
 Requires-Dist: typing-extensions<5.0.0,>=4.8.0
 Description-Content-Type: text/markdown
 
@@ -190,6 +190,16 @@ If this option results in conflicts, you will need to manually override class na
 
 By default, the timeout for retrieving the schema file via HTTP is 5 seconds. In case there is an error when retrieving the schema, you might try and increase this setting to a higher value.
 
+### content_type_overrides
+
+Normally, `openapi-python-client` will skip any bodies or responses that it doesn't recognize the content type for.
+This config tells the generator to treat a given content type like another.
+
+```yaml
+content_type_overrides:
+  application/zip: application/octet-stream
+```
+
 [changelog.md]: CHANGELOG.md
 [poetry]: https://python-poetry.org/
 [PDM]: https://pdm-project.org/latest/

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/README.md

@@ -156,6 +156,16 @@ If this option results in conflicts, you will need to manually override class na
 
 By default, the timeout for retrieving the schema file via HTTP is 5 seconds. In case there is an error when retrieving the schema, you might try and increase this setting to a higher value.
 
+### content_type_overrides
+
+Normally, `openapi-python-client` will skip any bodies or responses that it doesn't recognize the content type for.
+This config tells the generator to treat a given content type like another.
+
+```yaml
+content_type_overrides:
+  application/zip: application/octet-stream
+```
+
 [changelog.md]: CHANGELOG.md
 [poetry]: https://python-poetry.org/
 [PDM]: https://pdm-project.org/latest/

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/__init__.py

@@ -1,4 +1,4 @@
-""" Generate modern Python clients from OpenAPI """
+"""Generate modern Python clients from OpenAPI"""
 
 import json
 import mimetypes

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/config.py

@@ -35,6 +35,7 @@ class ConfigFile(BaseModel):
     """
 
     class_overrides: Optional[Dict[str, ClassOverride]] = None
+    content_type_overrides: Optional[Dict[str, str]] = None
     project_name_override: Optional[str] = None
     package_name_override: Optional[str] = None
     package_version_override: Optional[str] = None
@@ -70,6 +71,7 @@ class Config:
     http_timeout: int
     document_source: Union[Path, str]
     file_encoding: str
+    content_type_overrides: Dict[str, str]
 
     @staticmethod
     def from_sources(
@@ -91,6 +93,7 @@ class Config:
         config = Config(
             meta_type=meta_type,
             class_overrides=config_file.class_overrides or {},
+            content_type_overrides=config_file.content_type_overrides or {},
             project_name_override=config_file.project_name_override,
             package_name_override=config_file.package_name_override,
             package_version_override=config_file.package_version_override,

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/parser/__init__.py

@@ -1,4 +1,4 @@
-""" Classes representing the data in the OpenAPI schema """
+"""Classes representing the data in the OpenAPI schema"""
 
 __all__ = ["GeneratorData", "import_string_from_class"]
 

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/parser/bodies.py

@@ -56,7 +56,7 @@ def body_from_data(
     prefix_type_names = len(body_content) > 1
 
     for content_type, media_type in body_content.items():
-        simplified_content_type = get_content_type(content_type)
+        simplified_content_type = get_content_type(content_type, config)
         if simplified_content_type is None:
             bodies.append(
                 ParseError(

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/parser/openapi.py

@@ -26,7 +26,7 @@ from .properties import (
 from .properties.schemas import parameter_from_reference
 from .responses import Response, response_from_data
 
-_PATH_PARAM_REGEX = re.compile("{([a-zA-Z_][a-zA-Z0-9_]*)}")
+_PATH_PARAM_REGEX = re.compile("{([a-zA-Z_-][a-zA-Z0-9_-]*)}")
 
 
 def import_string_from_class(class_: Class, prefix: str = "") -> str:
@@ -114,8 +114,7 @@ class RequestBodyParser(Protocol):
 
     def __call__(
         self, *, body: oai.RequestBody, schemas: Schemas, parent_name: str, config: Config
-    ) -> Tuple[Union[Property, PropertyError, None], Schemas]:
-        ...  # pragma: no cover
+    ) -> Tuple[Union[Property, PropertyError, None], Schemas]: ...  # pragma: no cover
 
 
 @dataclass
@@ -380,6 +379,8 @@ class Endpoint:
             return ParseError(
                 detail=f"Incorrect path templating for {endpoint.path} (Path parameters do not match with path)",
             )
+        for parameter in endpoint.path_parameters:
+            endpoint.path = endpoint.path.replace(f"{{{parameter.name}}}", f"{{{parameter.python_name}}}")
         return endpoint
 
     @staticmethod

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/parser/properties/const.py

@@ -78,8 +78,7 @@ class ConstProperty(PropertyProtocol):
 
     @staticmethod
     @overload
-    def _convert_value(value: Any) -> Value:
-        ...  # pragma: no cover
+    def _convert_value(value: Any) -> Value: ...  # pragma: no cover
 
     @staticmethod
     def _convert_value(value: Any) -> Value | None:

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/parser/properties/string.py

@@ -61,8 +61,7 @@ class StringProperty(PropertyProtocol):
 
     @classmethod
     @overload
-    def convert_value(cls, value: Any) -> Value:
-        ...  # pragma: no cover
+    def convert_value(cls, value: Any) -> Value: ...  # pragma: no cover
 
     @classmethod
     def convert_value(cls, value: Any) -> Value | None:

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/parser/responses.py

@@ -37,8 +37,8 @@ class Response:
     data: Union[oai.Response, oai.Reference]  # Original data which created this response, useful for custom templates
 
 
-def _source_by_content_type(content_type: str) -> Optional[_ResponseSource]:
-    parsed_content_type = utils.get_content_type(content_type)
+def _source_by_content_type(content_type: str, config: Config) -> Optional[_ResponseSource]:
+    parsed_content_type = utils.get_content_type(content_type, config)
     if parsed_content_type is None:
         return None
 
@@ -114,7 +114,7 @@ def response_from_data(
         )
 
     for content_type, media_type in content.items():
-        source = _source_by_content_type(content_type)
+        source = _source_by_content_type(content_type, config)
         if source is not None:
             schema_data = media_type.media_type_schema
             break

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/templates/client.py.jinja

@@ -37,13 +37,13 @@ class Client:
     """
 {% macro attributes() %}
     raise_on_unexpected_status: bool = field(default=False, kw_only=True)
-    _base_url: str
-    _cookies: Dict[str, str] = field(factory=dict, kw_only=True)
-    _headers: Dict[str, str] = field(factory=dict, kw_only=True)
-    _timeout: Optional[httpx.Timeout] = field(default=None, kw_only=True)
-    _verify_ssl: Union[str, bool, ssl.SSLContext] = field(default=True, kw_only=True)
-    _follow_redirects: bool = field(default=False, kw_only=True)
-    _httpx_args: Dict[str, Any] = field(factory=dict, kw_only=True)
+    _base_url: str = field(alias="base_url")
+    _cookies: Dict[str, str] = field(factory=dict, kw_only=True, alias="cookies")
+    _headers: Dict[str, str] = field(factory=dict, kw_only=True, alias="headers")
+    _timeout: Optional[httpx.Timeout] = field(default=None, kw_only=True, alias="timeout")
+    _verify_ssl: Union[str, bool, ssl.SSLContext] = field(default=True, kw_only=True, alias="verify_ssl")
+    _follow_redirects: bool = field(default=False, kw_only=True, alias="follow_redirects")
+    _httpx_args: Dict[str, Any] = field(factory=dict, kw_only=True, alias="httpx_args")
     _client: Optional[httpx.Client] = field(default=None, init=False)
     _async_client: Optional[httpx.AsyncClient] = field(default=None, init=False)
 {% endmacro %}{{ attributes() }}
@@ -163,4 +163,4 @@ class AuthenticatedClient:
     auth_header_name: str = "Authorization"
 
 {{ builders("AuthenticatedClient") }}
-{{ httpx_stuff("AuthenticatedClient", "self._headers[self.auth_header_name] = f\"{self.prefix} {self.token}\" if self.prefix else self.token") }}
+{{ httpx_stuff("AuthenticatedClient", "self._headers[self.auth_header_name] = f\"{self.prefix} {self.token}\" if self.prefix else self.token") }}

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/templates/endpoint_module.py.jinja

@@ -31,7 +31,7 @@ def _get_kwargs(
         {% if endpoint.path_parameters %}
         "url": "{{ endpoint.path }}".format(
         {%- for parameter in endpoint.path_parameters -%}
-        {{parameter.name}}={{parameter.python_name}},
+        {{parameter.python_name}}={{parameter.python_name}},
         {%- endfor -%}
         ),
         {% else %}

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/templates/errors.py.jinja

@@ -7,6 +7,8 @@ class UnexpectedStatus(Exception):
         self.status_code = status_code
         self.content = content
 
-        super().__init__(f"Unexpected status code: {status_code}")
+        super().__init__(
+            f"Unexpected status code: {status_code}\n\nResponse content:\n{content.decode(errors='ignore')}"
+        )
 
 __all__ = ["UnexpectedStatus"]

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/templates/pyproject.toml.jinja

@@ -25,7 +25,7 @@ dependencies = [
 ]
 
 [tool.pdm]
-package-type = "library"
+distribution = true
 {% endif %}
 {% if poetry %}
 

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/openapi_python_client/utils.py

@@ -6,6 +6,8 @@ from email.message import Message
 from keyword import iskeyword
 from typing import Any
 
+from .config import Config
+
 DELIMITERS = r"\. _-"
 
 
@@ -105,10 +107,11 @@ def remove_string_escapes(value: str) -> str:
     return value.replace('"', r"\"")
 
 
-def get_content_type(content_type: str) -> str | None:
+def get_content_type(content_type: str, config: Config) -> str | None:
     """
     Given a string representing a content type with optional parameters, returns the content type only
     """
+    content_type = config.content_type_overrides.get(content_type, content_type)
     message = Message()
     message.add_header("Content-Type", content_type)
 

{openapi_python_client-0.18.0 → openapi_python_client-0.19.1}/pyproject.toml

@@ -6,7 +6,7 @@ license = { text = "MIT" }
 requires-python = ">=3.8,<4.0"
 dependencies = [
     "jinja2>=3.0.0,<4.0.0",
-    "typer>0.6,<0.10",
+    "typer>0.6,<0.12",
     "colorama>=0.4.3; sys_platform == \"win32\"",
     "shellingham>=1.3.2,<2.0.0",
     "pydantic>=2.1.1,<3.0.0",
@@ -14,11 +14,11 @@ dependencies = [
     "python-dateutil>=2.8.1,<3.0.0",
     "httpx>=0.20.0,<0.28.0",
     "PyYAML>=6.0,<7.0",
-    "ruff>=0.2,<0.3",
+    "ruff>=0.2,<0.4",
     "typing-extensions>=4.8.0,<5.0.0",
 ]
 name = "openapi-python-client"
-version = "0.18.0"
+version = "0.19.1"
 description = "Generate modern Python clients from OpenAPI"
 keywords = [
     "OpenAPI",