openapi-python-client 0.18.0__py3-none-any.whl → 0.19.1__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/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/templates/pyproject.toml.jinja

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

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.dist-info → openapi_python_client-0.19.1.dist-info}/METADATA

@@ -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.dist-info → openapi_python_client-0.19.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-openapi_python_client/__init__.py,sha256=SC1bT_ZWzCc5TP3ZwPaRRcxf_H8wCOMbj353hLtgXlE,14144
+openapi_python_client/__init__.py,sha256=qbA68XeTN8YjMcHxLk2T2CtaKMbqRbOYyahpUmikNEA,14142
 openapi_python_client/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 openapi_python_client/cli.py,sha256=xechvVovBJOpknubtm_Fd5NP4vT1-J96F4cMofpzaVo,6073
-openapi_python_client/config.py,sha256=L-yVu65cY3Fe1D6IjjLRNtkEM10AD7r2n_0YXpIl3dI,3410
+openapi_python_client/config.py,sha256=9pxDar4EmiE0rnyZfXOEOWIDPJHNii_icn-VO-0OYgk,3590
 openapi_python_client/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
-openapi_python_client/utils.py,sha256=EvstEcRMP_SBGR0rhqHmxxA8qQj-BCakzNS8hgpB-JA,3823
-openapi_python_client/parser/__init__.py,sha256=nd03to3C55KDOL3sg63VYc5O_HOA7OuYfz8Ok471b6w,179
-openapi_python_client/parser/bodies.py,sha256=n26CjME-kA1PMH8gbqjFpmyXWd8SQTrHTz19PgPM4KU,3825
+openapi_python_client/utils.py,sha256=BuobeCxNjKe28GcqCezeropyCfKKMutMUJDoUGQq-nM,3948
+openapi_python_client/parser/__init__.py,sha256=dpY1jYmWFPBubtjKCZIlg2uHC_DLC-KpfuMNdQF8RUc,177
+openapi_python_client/parser/bodies.py,sha256=OdUKHlUUIZxpXZT7e_angecetMSXOL44hN9hDrIXt10,3833
 openapi_python_client/parser/errors.py,sha256=TPyvRDreHGD3qGHHaKO4LVDWEPqay4BzIEf0MONwhMI,1225
-openapi_python_client/parser/openapi.py,sha256=y8hA-VjRiVk_hZhuEb23DEH11n1iONWkCUVGNcVHDZU,21824
-openapi_python_client/parser/responses.py,sha256=YOEGmcGTVNgjgIQtBidZWf8E9HCVsaUkzyUiecVtpM0,4354
+openapi_python_client/parser/openapi.py,sha256=lLz-mQLqZ0ylZAmgJ8YgbNySbm8LddmSWvo5nt1BP9s,21976
+openapi_python_client/parser/responses.py,sha256=hrxI5pRqeyCEJTJPCwrs85wYpAm4HSD-jiFTi2bSzXs,4386
 openapi_python_client/parser/properties/__init__.py,sha256=uu_9MWrnKLU58V6mqTtRRFoXBJ583NJZafW6dnC6ihA,15191
 openapi_python_client/parser/properties/any.py,sha256=7fR8qDNjMH4vd4vS2UjkJhgneLnid8UwSJmNH9Mktho,1187
 openapi_python_client/parser/properties/boolean.py,sha256=6TRRJMfZq3tA1JjJ3CCDfDcqIvSMm-nu19sJHXJOpAA,1955
-openapi_python_client/parser/properties/const.py,sha256=Qb3_oLIvVtQyLqzardqxcVE61SyWmb17OaQuWy5yv0o,3794
+openapi_python_client/parser/properties/const.py,sha256=6vsHJkyDjHQwY5aJC4SeGCKKfAgGJtZ5Ge_6HmZ9nEo,3786
 openapi_python_client/parser/properties/date.py,sha256=TiB1J5SLsIilER3TIk-SjAkI4SV1SGRaofg0uUEeQFQ,2325
 openapi_python_client/parser/properties/datetime.py,sha256=H1NgfeGcIyErC-6nJg3YAyUYL9dSbhGZkcJla-zKmEg,2353
 openapi_python_client/parser/properties/enum_property.py,sha256=ileLJkiRP35LxRpwiLUjpuWufSEcCEy3hmFmBZRa0Is,8215
@@ -25,7 +25,7 @@ openapi_python_client/parser/properties/none.py,sha256=3Q9kQcDD9JPfsRLJQQaq6GxEp
 openapi_python_client/parser/properties/property.py,sha256=qxD7T58txbjjz8MKgsP2wDAV5qpogcAxspZNVG94lkk,869
 openapi_python_client/parser/properties/protocol.py,sha256=qs1kjTowjzUaxcpwDz6npQE6mK3izc5xnkAPkMXEXeQ,7014
 openapi_python_client/parser/properties/schemas.py,sha256=rNpsP-wyuW9EUXLJP4DCKsY1QNGdb1ED3LjuvtGjSBY,8267
-openapi_python_client/parser/properties/string.py,sha256=8idAQDos_nsr3yY8mfUsf3fcmf_f1wZtylP3yxzBS1g,2004
+openapi_python_client/parser/properties/string.py,sha256=9yN2tUdlebwzTxSb0JjD8J13adD1PTwYVEHL-HnMuxg,1996
 openapi_python_client/parser/properties/union.py,sha256=SjvnzPsA1jvKWw1JZEPUSNysdsZbzy8WaqcTmi-h7dk,8086
 openapi_python_client/schema/3.0.3.md,sha256=0a25-q_HFDVcsxOnMOGeTo67K4FtLHqMfI5U8VwneJg,126244
 openapi_python_client/schema/3.1.0.md,sha256=O4SlQ2wux5Sa68Q9jrCcZYEJ5RcqXniJ9pSixtR15Rc,131397
@@ -68,17 +68,17 @@ openapi_python_client/schema/openapi_schema_pydantic/xml.py,sha256=-qME-ijLKa4bh
 openapi_python_client/templates/.gitignore.jinja,sha256=SwZvl9qyKaHN9YjwaQrBsmpAclN11usf9Gohz1SFVg8,195
 openapi_python_client/templates/README.md.jinja,sha256=Ht7n3bEff22HtCt892wqZf9xClqNLWPvQ83a8nyz_Jc,5047
 openapi_python_client/templates/api_init.py.jinja,sha256=87ApBzKyGb5zsgTMOkQXDqsLZCmaSFoJMwbGzCDQZMw,47
-openapi_python_client/templates/client.py.jinja,sha256=mZ6j6DztHBzyHftYosiZnyswmYx0NIpOw6ohVvox684,7249
+openapi_python_client/templates/client.py.jinja,sha256=tBr7gtf6PcTTWZSnsvFvKNWfssnLNW4URvFZwP_9QDc,7393
 openapi_python_client/templates/endpoint_init.py.jinja,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openapi_python_client/templates/endpoint_macros.py.jinja,sha256=rCmoHFbLP5gw40quYt-fdhjM1WPkGqYZ7P6gfo2HRpY,6155
-openapi_python_client/templates/endpoint_module.py.jinja,sha256=uYnWvEjYoVftUfEdlYIie2LuGv-8m1x1gJk29orkja8,5106
-openapi_python_client/templates/errors.py.jinja,sha256=_GGQR07QqeoL_GBsWLovjjU6H220cg5N3hcTbgivSGw,468
+openapi_python_client/templates/endpoint_module.py.jinja,sha256=pTh7NaeCa2g-7x66k6hlKWVeDl9O2txjQC6MUQ4Yjfw,5113
+openapi_python_client/templates/errors.py.jinja,sha256=trp-p5qn1_JLRxGZhdHtICaNPaCrcDCe4TgIihBravk,546
 openapi_python_client/templates/helpers.jinja,sha256=vNYu1mL_cfrV3c4eMvVlUhl8Tzb-k6GNCWK7FUFAsuw,257
 openapi_python_client/templates/int_enum.py.jinja,sha256=z4d2hVsdgmlxUB1fbVs4w8tJaq2SdmhLjs4mjbZ5GLw,224
 openapi_python_client/templates/model.py.jinja,sha256=aQwzT5g_4YVNaTQ_YnyOgzYfV9bJ5GZi6xH9PGQlJL0,7336
 openapi_python_client/templates/models_init.py.jinja,sha256=T2Sj1uGxWlYb5Vc8G3cC65KMDk-mtnEH0g5Xp0xE1Ro,233
 openapi_python_client/templates/package_init.py.jinja,sha256=EMOU4q7ceaoKJItVKu52vrRTD-BzhrNBjB8VZHN5LgY,196
-openapi_python_client/templates/pyproject.toml.jinja,sha256=GsnEjHcjr005M60x2Ey959D5yvZ2p5EVgr4nl3WIA3w,1058
+openapi_python_client/templates/pyproject.toml.jinja,sha256=M3cndKCCO1grCCD6HGpOs1D5i5wx7CC8pWezlxcxUhE,1053
 openapi_python_client/templates/pyproject_ruff.toml.jinja,sha256=OgFfCd9Ca3YsU8WdCxqJoJdCJEtzADpxAxfMghqzn80,74
 openapi_python_client/templates/setup.py.jinja,sha256=65P9kjUtLBijLbRnehigDdyE1qvmRf2gobkv-uftqq4,611
 openapi_python_client/templates/str_enum.py.jinja,sha256=5SxGRu_sZxEILC425D45YSu8s12vJGM2PWwYWjOUl8M,232
@@ -96,8 +96,8 @@ openapi_python_client/templates/property_templates/list_property.py.jinja,sha256
 openapi_python_client/templates/property_templates/model_property.py.jinja,sha256=a5wC34bkUbgP7KT4qMSrWqdrvf4s0jHI8fIzWp6MIns,1300
 openapi_python_client/templates/property_templates/property_macros.py.jinja,sha256=s0DqGOc8rbEKptUtH1tAht08wahN3xXpaGfyzVa3Kog,580
 openapi_python_client/templates/property_templates/union_property.py.jinja,sha256=fOpNOlmhGgUfJDYJDOnu5ZIMVvjn5fYpa2osxbIucWM,3388
-openapi_python_client-0.18.0.dist-info/METADATA,sha256=Y6I89wrQGpNLBNV8WtuhjJGX6wBu2Lvwg-BBY_a3-Xw,9797
-openapi_python_client-0.18.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-openapi_python_client-0.18.0.dist-info/entry_points.txt,sha256=iRfSdN2foASZXr8GghkYa6KRXkDgO0EFfLut5IXoBTU,72
-openapi_python_client-0.18.0.dist-info/licenses/LICENSE,sha256=4dpxQYqY0DB3aTauRrqYRuu6BVNsPSJdYeUT3sH6pQY,1075
-openapi_python_client-0.18.0.dist-info/RECORD,,
+openapi_python_client-0.19.1.dist-info/METADATA,sha256=vuhgn_jkHEnCNprvaRboQoJ37khkrcDDzjjaszemaK8,10099
+openapi_python_client-0.19.1.dist-info/WHEEL,sha256=uNdcs2TADwSd5pVaP0Z_kcjcvvTUklh2S7bxZMF8Uj0,87
+openapi_python_client-0.19.1.dist-info/entry_points.txt,sha256=iRfSdN2foASZXr8GghkYa6KRXkDgO0EFfLut5IXoBTU,72
+openapi_python_client-0.19.1.dist-info/licenses/LICENSE,sha256=4dpxQYqY0DB3aTauRrqYRuu6BVNsPSJdYeUT3sH6pQY,1075
+openapi_python_client-0.19.1.dist-info/RECORD,,

{openapi_python_client-0.18.0.dist-info → openapi_python_client-0.19.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.21.1
+Generator: hatchling 1.22.4
 Root-Is-Purelib: true
 Tag: py3-none-any