openapi-python-client 0.19.0__tar.gz → 0.20.0__tar.gz

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: openapi-python-client
-Version: 0.19.0
+Version: 0.20.0
 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>
@@ -25,10 +25,10 @@ Requires-Dist: httpx<0.28.0,>=0.20.0
 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.4,>=0.2
+Requires-Dist: ruamel-yaml<0.19.0,>=0.18.6
+Requires-Dist: ruff<0.5,>=0.2
 Requires-Dist: shellingham<2.0.0,>=1.3.2
-Requires-Dist: typer<0.10,>0.6
+Requires-Dist: typer<0.13,>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.19.0 → openapi_python_client-0.20.0}/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.19.0 → openapi_python_client-0.20.0}/openapi_python_client/__init__.py

@@ -11,8 +11,9 @@ from typing import Any, Dict, List, Optional, Sequence, Union
 
 import httpcore
 import httpx
-import yaml
 from jinja2 import BaseLoader, ChoiceLoader, Environment, FileSystemLoader, PackageLoader
+from ruamel.yaml import YAML
+from ruamel.yaml.error import YAMLError
 
 from openapi_python_client import utils
 
@@ -350,8 +351,9 @@ def _load_yaml_or_json(data: bytes, content_type: Optional[str]) -> Union[Dict[s
             return GeneratorError(header=f"Invalid JSON from provided source: {err}")
     else:
         try:
-            return yaml.safe_load(data)
-        except yaml.YAMLError as err:
+            yaml = YAML(typ="safe")
+            return yaml.load(data)
+        except YAMLError as err:
             return GeneratorError(header=f"Invalid YAML from provided source: {err}")
 
 

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/config.py

@@ -4,9 +4,9 @@ from enum import Enum
 from pathlib import Path
 from typing import Dict, List, Optional, Union
 
-import yaml
 from attr import define
 from pydantic import BaseModel
+from ruamel.yaml import YAML
 
 
 class ClassOverride(BaseModel):
@@ -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
@@ -50,7 +51,8 @@ class ConfigFile(BaseModel):
         if mime == "application/json":
             config_data = json.loads(path.read_text())
         else:
-            config_data = yaml.safe_load(path.read_text())
+            yaml = YAML(typ="safe")
+            config_data = yaml.load(path)
         config = ConfigFile(**config_data)
         return config
 
@@ -70,6 +72,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 +94,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.19.0 → openapi_python_client-0.20.0}/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.19.0 → openapi_python_client-0.20.0}/openapi_python_client/parser/properties/const.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, overload
+from typing import Any, ClassVar, overload
 
 from attr import define
 
@@ -12,7 +12,7 @@ from .string import StringProperty
 
 @define
 class ConstProperty(PropertyProtocol):
-    """A property representing a Union (anyOf) of other properties"""
+    """A property representing a const value"""
 
     name: str
     required: bool
@@ -21,6 +21,7 @@ class ConstProperty(PropertyProtocol):
     python_name: PythonIdentifier
     description: str | None
     example: None
+    template: ClassVar[str] = "const_property.py.jinja"
 
     @classmethod
     def build(

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/parser/properties/model_property.py

@@ -7,7 +7,9 @@ from attrs import define, evolve
 
 from ... import Config, utils
 from ... import schema as oai
+from ...utils import PythonIdentifier
 from ..errors import ParseError, PropertyError
+from .any import AnyProperty
 from .enum_property import EnumProperty
 from .protocol import PropertyProtocol, Value
 from .schemas import Class, ReferencePath, Schemas, parse_reference_path
@@ -30,7 +32,7 @@ class ModelProperty(PropertyProtocol):
     optional_properties: list[Property] | None
     relative_imports: set[str] | None
     lazy_imports: set[str] | None
-    additional_properties: bool | Property | None
+    additional_properties: Property | None
     _json_type_string: ClassVar[str] = "Dict[str, Any]"
 
     template: ClassVar[str] = "model_property.py.jinja"
@@ -78,7 +80,7 @@ class ModelProperty(PropertyProtocol):
         optional_properties: list[Property] | None = None
         relative_imports: set[str] | None = None
         lazy_imports: set[str] | None = None
-        additional_properties: bool | Property | None = None
+        additional_properties: Property | None = None
         if process_properties:
             data_or_err, schemas = _process_property_data(
                 data=data, schemas=schemas, class_info=class_info, config=config, roots=model_roots
@@ -386,6 +388,16 @@ def _process_properties(  # noqa: PLR0912, PLR0911
     )
 
 
+ANY_ADDITIONAL_PROPERTY = AnyProperty.build(
+    name="additional",
+    required=True,
+    default=None,
+    description="",
+    python_name=PythonIdentifier(value="additional", prefix=""),
+    example=None,
+)
+
+
 def _get_additional_properties(
     *,
     schema_additional: None | (bool | (oai.Reference | oai.Schema)),
@@ -393,18 +405,20 @@ def _get_additional_properties(
     class_name: utils.ClassName,
     config: Config,
     roots: set[ReferencePath | utils.ClassName],
-) -> tuple[bool | (Property | PropertyError), Schemas]:
+) -> tuple[Property | None | PropertyError, Schemas]:
     from . import property_from_data
 
     if schema_additional is None:
-        return True, schemas
+        return ANY_ADDITIONAL_PROPERTY, schemas
 
     if isinstance(schema_additional, bool):
-        return schema_additional, schemas
+        if schema_additional:
+            return ANY_ADDITIONAL_PROPERTY, schemas
+        return None, schemas
 
     if isinstance(schema_additional, oai.Schema) and not any(schema_additional.model_dump().values()):
         # An empty schema
-        return True, schemas
+        return ANY_ADDITIONAL_PROPERTY, schemas
 
     additional_properties, schemas = property_from_data(
         name="AdditionalProperty",
@@ -425,7 +439,7 @@ def _process_property_data(
     class_info: Class,
     config: Config,
     roots: set[ReferencePath | utils.ClassName],
-) -> tuple[tuple[_PropertyData, bool | Property] | PropertyError, Schemas]:
+) -> tuple[tuple[_PropertyData, Property | None] | PropertyError, Schemas]:
     property_data = _process_properties(
         data=data, schemas=schemas, class_name=class_info.name, config=config, roots=roots
     )
@@ -442,7 +456,7 @@ def _process_property_data(
     )
     if isinstance(additional_properties, PropertyError):
         return additional_properties, schemas
-    elif isinstance(additional_properties, bool):
+    elif additional_properties is None:
         pass
     else:
         property_data.relative_imports.update(additional_properties.get_imports(prefix=".."))

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/parser/properties/protocol.py

@@ -107,6 +107,8 @@ class PropertyProtocol(Protocol):
         """
         if json:
             type_string = self.get_base_json_type_string(quoted=quoted)
+        elif multipart:
+            type_string = "Tuple[None, bytes, str]"
         else:
             type_string = self.get_base_type_string(quoted=quoted)
 

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/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.19.0 → openapi_python_client-0.20.0}/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.19.0 → openapi_python_client-0.20.0}/openapi_python_client/templates/endpoint_macros.py.jinja

@@ -83,8 +83,8 @@ params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
 {% macro multipart_body(body, destination) %}
 {% set property = body.prop %}
 {% import "property_templates/" + property.template as prop_template %}
-{% if prop_template.transform_multipart %}
-{{ prop_template.transform_multipart(property, property.python_name, destination) }}
+{% if prop_template.transform_multipart_body %}
+{{ prop_template.transform_multipart_body(property, property.python_name, destination) }}
 {% endif %}
 {% endmacro %}
 

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/templates/model.py.jinja

@@ -80,10 +80,10 @@ class {{ class_name }}:
 {% macro _to_dict(multipart=False) %}
 {% for property in model.required_properties + model.optional_properties %}
 {% import "property_templates/" + property.template as prop_template %}
-{% if prop_template.transform %}
-{{ prop_template.transform(property, "self." + property.python_name, property.python_name, multipart=multipart) }}
-{% elif multipart %}
-{{ property.python_name }} = self.{{ property.python_name }} if isinstance(self.{{ property.python_name }}, Unset) else (None, str(self.{{ property.python_name }}).encode(), "text/plain")
+{% if multipart %}
+{{ prop_template.transform_multipart(property, "self." + property.python_name, property.python_name) }}
+{% elif prop_template.transform %}
+{{ prop_template.transform(property=property, source="self." + property.python_name, destination=property.python_name) }}
 {% else %}
 {{ property.python_name }} = self.{{ property.python_name }}
 {% endif %}
@@ -92,19 +92,13 @@ class {{ class_name }}:
 
 field_dict: Dict[str, Any] = {}
 {% if model.additional_properties %}
-{% if model.additional_properties.template %}{# Can be a bool instead of an object #}
-    {% import "property_templates/" + model.additional_properties.template as prop_template %}
-{% else %}
-    {% set prop_template = None %}
-{% endif %}
-{% if prop_template and prop_template.transform %}
+{% import "property_templates/" + model.additional_properties.template as prop_template %}
+{% if multipart %}
 for prop_name, prop in self.additional_properties.items():
-    {{ prop_template.transform(model.additional_properties, "prop", "field_dict[prop_name]", multipart=multipart, declare_type=false) | indent(4) }}
-{% elif multipart %}
-field_dict.update({
-    key: (None, str(value).encode(), "text/plain")
-    for key, value in self.additional_properties.items()
-})
+    {{ prop_template.transform_multipart(model.additional_properties, "prop", "field_dict[prop_name]") | indent(4) }}
+{% elif prop_template.transform %}
+for prop_name, prop in self.additional_properties.items():
+    {{ prop_template.transform(model.additional_properties, "prop", "field_dict[prop_name]", declare_type=false) | indent(4) }}
 {% else %}
 field_dict.update(self.additional_properties)
 {% endif %}

openapi_python_client-0.20.0/openapi_python_client/templates/property_templates/any_property.py.jinja

@@ -0,0 +1,7 @@
+{% macro transform_multipart(property, source, destination) %}
+{% if not property.required %}
+{{ destination }} = {{source}} if isinstance({{source}}, Unset) else (None, str({{source}}).encode(), "text/plain")
+{% else %}
+{{ destination }} =  (None, str({{ source }}).encode(), "text/plain")
+{% endif %}
+{% endmacro %}

openapi_python_client-0.20.0/openapi_python_client/templates/property_templates/boolean_property.py.jinja

@@ -0,0 +1,11 @@
+{% macro transform_header(source) %}
+"true" if {{ source }} else "false"
+{% endmacro %}
+
+{% macro transform_multipart(property, source, destination) %}
+{% if not property.required %}
+{{ destination }} = {{source}} if isinstance({{source}}, Unset) else (None, str({{source}}).encode(), "text/plain")
+{% else %}
+{{ destination }} =  (None, str({{ source }}).encode(), "text/plain")
+{% endif %}
+{% endmacro %}

openapi_python_client-0.20.0/openapi_python_client/templates/property_templates/const_property.py.jinja

@@ -0,0 +1,5 @@
+{% macro construct(property, source) %}
+{{ property.python_name }} = cast({{ property.get_type_string() }} , {{ source }})
+if {{ property.python_name }} != {{ property.value }}{% if not property.required %}and not isinstance({{ property.python_name }}, Unset){% endif %}:
+    raise ValueError(f"{{ property.name }} must match const {{ property.value }}, got '{{'{' + property.python_name + '}' }}'")
+{%- endmacro %}

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/templates/property_templates/date_property.py.jinja

@@ -10,17 +10,13 @@ isoparse({{ source }}).date()
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, str){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, multipart=False) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% set transformed = source + ".isoformat()" %}
-{% if multipart %}{# Multipart data must be bytes, not str #}
-{% set transformed = transformed + ".encode()" %}
-{% endif %}
 {% if property.required %}
 {{ destination }} = {{ transformed }}
 {%- else %}
 {% if declare_type %}
 {% set type_annotation = property.get_type_string(json=True) %}
-{% if multipart %}{% set type_annotation = type_annotation | replace("str", "bytes") %}{% endif %}
 {{ destination }}: {{ type_annotation }} = UNSET
 {% else %}
 {{ destination }} = UNSET
@@ -29,3 +25,15 @@ if not isinstance({{ source }}, Unset):
     {{ destination }} = {{ transformed }}
 {%- endif %}
 {% endmacro %}
+
+{% macro transform_multipart(property, source, destination) %}
+{% set transformed = source + ".isoformat().encode()" %}
+{% if property.required %}
+{{ destination }} = {{ transformed }}
+{%- else %}
+{% set type_annotation = property.get_type_string(json=True) | replace("str", "bytes") %}
+{{ destination }}: {{ type_annotation }} = UNSET
+if not isinstance({{ source }}, Unset):
+    {{ destination }} = {{ transformed }}
+{%- endif %}
+{% endmacro %}

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/templates/property_templates/datetime_property.py.jinja

@@ -10,17 +10,13 @@ isoparse({{ source }})
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, str){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, multipart=False) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% set transformed = source + ".isoformat()" %}
-{% if multipart %}{# Multipart data must be bytes, not str #}
-{% set transformed = transformed + ".encode()" %}
-{% endif %}
 {% if property.required %}
 {{ destination }} = {{ transformed }}
 {%- else %}
 {% if declare_type %}
 {% set type_annotation = property.get_type_string(json=True) %}
-{% if multipart %}{% set type_annotation = type_annotation | replace("str", "bytes") %}{% endif %}
 {{ destination }}: {{ type_annotation }} = UNSET
 {% else %}
 {{ destination }} = UNSET
@@ -29,3 +25,15 @@ if not isinstance({{ source }}, Unset):
     {{ destination }} = {{ transformed }}
 {%- endif %}
 {% endmacro %}
+
+{% macro transform_multipart(property, source, destination) %}
+{% set transformed = source + ".isoformat().encode()" %}
+{% if property.required %}
+{{ destination }} = {{ transformed }}
+{%- else %}
+{% set type_annotation = property.get_type_string(json=True) | replace("str", "bytes") %}
+{{ destination }}: {{ type_annotation }} = UNSET
+if not isinstance({{ source }}, Unset):
+    {{ destination }} = {{ transformed }}
+{%- endif %}
+{% endmacro %}

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/templates/property_templates/enum_property.py.jinja

@@ -13,10 +13,6 @@
 {% macro transform(property, source, destination, declare_type=True, multipart=False) %}
 {% set transformed = source + ".value" %}
 {% set type_string = property.get_type_string(json=True) %}
-{% if multipart %}
-    {% set transformed = "(None, str(" + transformed + ").encode(), \"text/plain\")" %}
-    {% set type_string = "Union[Unset, Tuple[None, bytes, str]]" %}
-{% endif %}
 {% if property.required %}
 {{ destination }} = {{ transformed }}
 {%- else %}
@@ -26,6 +22,18 @@ if not isinstance({{ source }}, Unset):
 {% endif %}
 {% endmacro %}
 
+{% macro transform_multipart(property, source, destination) %}
+{% set transformed = "(None, str(" + source + ".value" + ").encode(), \"text/plain\")" %}
+{% set type_string = "Union[Unset, Tuple[None, bytes, str]]" %}
+{% if property.required %}
+{{ destination }} = {{ transformed }}
+{%- else %}
+{{ destination }}: {{ type_string }} = UNSET
+if not isinstance({{ source }}, Unset):
+    {{ destination }} = {{ transformed }}
+{% endif %}
+{% endmacro %}
+
 {% macro transform_header(source) %}
 str({{ source }})
 {% endmacro %}

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/templates/property_templates/file_property.py.jinja

@@ -12,7 +12,7 @@ File(
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, bytes){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, multipart=False) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% if property.required %}
 {{ destination }} = {{ source }}.to_tuple()
 {% else %}
@@ -21,3 +21,13 @@ if not isinstance({{ source }}, Unset):
     {{ destination }} = {{ source }}.to_tuple()
 {% endif %}
 {% endmacro %}
+
+{% macro transform_multipart(property, source, destination) %}
+{% if property.required %}
+{{ destination }} = {{ source }}.to_tuple()
+{% else %}
+{{ destination }}: {{ property.get_type_string(json=True) }} = UNSET
+if not isinstance({{ source }}, Unset):
+    {{ destination }} = {{ source }}.to_tuple()
+{% endif %}
+{% endmacro %}

openapi_python_client-0.20.0/openapi_python_client/templates/property_templates/float_property.py.jinja

@@ -0,0 +1,11 @@
+{% macro transform_header(source) %}
+str({{ source }})
+{% endmacro %}
+
+{% macro transform_multipart(property, source, destination) %}
+{% if not property.required %}
+{{ destination }} = {{source}} if isinstance({{source}}, Unset) else (None, str({{source}}).encode(), "text/plain")
+{% else %}
+{{ destination }} =  (None, str({{ source }}).encode(), "text/plain")
+{% endif %}
+{% endmacro %}

openapi_python_client-0.20.0/openapi_python_client/templates/property_templates/int_property.py.jinja

@@ -0,0 +1,11 @@
+{% macro transform_header(source) %}
+str({{ source }})
+{% endmacro %}
+
+{% macro transform_multipart(property, source, destination) %}
+{% if not property.required %}
+{{ destination }} = {{source}} if isinstance({{source}}, Unset) else (None, str({{source}}).encode(), "text/plain")
+{% else %}
+{{ destination }} =  (None, str({{ source }}).encode(), "text/plain")
+{% endif %}
+{% endmacro %}

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/templates/property_templates/list_property.py.jinja

@@ -40,24 +40,38 @@ for {{ inner_source }} in {{ source }}:
 
 {% macro check_type_for_construct(property, source) %}isinstance({{ source }}, list){% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, multipart=False, transform_method="to_dict") %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% set inner_property = property.inner_property %}
-{% if multipart %}
-    {% set type_string = "Union[Unset, Tuple[None, bytes, str]]" %}
-{% else %}
-    {% set type_string = property.get_type_string(json=True) %}
-{% endif %}
+{% set type_string = property.get_type_string(json=True) %}
 {% if property.required %}
-{{ _transform(property, source, destination, multipart, transform_method) }}
+{{ _transform(property, source, destination, False, "to_dict") }}
 {% else %}
 {{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
 if not isinstance({{ source }}, Unset):
-    {{ _transform(property, source, destination, multipart, transform_method) | indent(4)}}
+    {{ _transform(property, source, destination, False, "to_dict") | indent(4)}}
 {% endif %}
-
-
 {% endmacro %}
 
 {% macro transform_multipart(property, source, destination) %}
-{{ transform(property, source, destination, transform_method="to_multipart") }}
+{% set inner_property = property.inner_property %}
+{% set type_string = "Union[Unset, Tuple[None, bytes, str]]" %}
+{% if property.required %}
+{{ _transform(property, source, destination, True, "to_dict") }}
+{% else %}
+{{ destination }}: {{ type_string }} = UNSET
+if not isinstance({{ source }}, Unset):
+{{ _transform(property, source, destination, True, "to_dict") | indent(4)}}
+{% endif %}
+{% endmacro %}
+
+{% macro transform_multipart_body(property, source, destination) %}
+{% set inner_property = property.inner_property %}
+{% set type_string = property.get_type_string(json=True) %}
+{% if property.required %}
+{{ _transform(property, source, destination, False, "to_multipart") }}
+{% else %}
+{{ destination }}: {{ type_string }} = UNSET
+if not isinstance({{ source }}, Unset):
+    {{ _transform(property, source, destination, False, "to_multipart") | indent(4)}}
+{% endif %}
 {% endmacro %}

openapi_python_client-0.20.0/openapi_python_client/templates/property_templates/model_property.py.jinja

@@ -0,0 +1,47 @@
+{% macro construct_function(property, source) %}
+{{ property.class_info.name }}.from_dict({{ source }})
+{% endmacro %}
+
+{% from "property_templates/property_macros.py.jinja" import construct_template %}
+
+{% macro construct(property, source) %}
+{{ construct_template(construct_function, property, source) }}
+{% endmacro %}
+
+{% macro check_type_for_construct(property, source) %}isinstance({{ source }}, dict){% endmacro %}
+
+{% macro transform(property, source, destination, declare_type=True) %}
+{% set transformed = source + ".to_dict()" %}
+{% set type_string = property.get_type_string(json=True) %}
+{% if property.required %}
+{{ destination }} = {{ transformed }}
+{%- else %}
+{{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
+if not isinstance({{ source }}, Unset):
+    {{ destination }} = {{ transformed }}
+{%- endif %}
+{% endmacro %}
+
+{% macro transform_multipart_body(property, source, destination) %}
+{% set transformed = source + ".to_multipart()" %}
+{% set type_string = property.get_type_string(multipart=True) %}
+{% if property.required %}
+{{ destination }} = {{ transformed }}
+{%- else %}
+{{ destination }}: {{ type_string }} = UNSET
+if not isinstance({{ source }}, Unset):
+    {{ destination }} = {{ transformed }}
+{%- endif %}
+{% endmacro %}
+
+{% macro transform_multipart(property, source, destination) %}
+{% set transformed = "(None, json.dumps(" + source + ".to_dict()" + ").encode(), 'application/json')" %}
+{% set type_string = property.get_type_string(multipart=True) %}
+{% if property.required %}
+{{ destination }} = {{ transformed }}
+{%- else %}
+{{ destination }}: {{ type_string }} = UNSET
+if not isinstance({{ source }}, Unset):
+    {{ destination }} = {{ transformed }}
+{%- endif %}
+{% endmacro %}

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/openapi_python_client/templates/property_templates/union_property.py.jinja

@@ -39,9 +39,9 @@ def _parse_{{ property.python_name }}(data: object) -> {{ property.get_type_stri
 {{ property.python_name }} = _parse_{{ property.python_name }}({{ source }})
 {% endmacro %}
 
-{% macro transform(property, source, destination, declare_type=True, multipart=False) %}
+{% macro transform(property, source, destination, declare_type=True) %}
 {% set ns = namespace(contains_properties_without_transform = false, contains_modified_properties = not property.required, has_if = false) %}
-{% if declare_type %}{{ destination }}: {{ property.get_type_string(json=not multipart, multipart=multipart) }}{% endif %}
+{% if declare_type %}{{ destination }}: {{ property.get_type_string(json=True, multipart=False) }}{% endif %}
 
 {% if not property.required %}
 if isinstance({{ source }}, Unset):
@@ -64,7 +64,7 @@ elif isinstance({{ source }}, {{ inner_property.get_instance_type_string() }}):
     {% else %}
 else:
     {% endif %}
-    {{ inner_template.transform(inner_property, source, destination, declare_type=False, multipart=multipart) | indent(4) }}
+    {{ inner_template.transform(inner_property, source, destination, declare_type=False) | indent(4) }}
 {% endfor %}
 {% if ns.contains_properties_without_transform and ns.contains_modified_properties %}
 else:
@@ -73,3 +73,27 @@ else:
 {{ destination }} = {{ source }}
 {%- endif %}
 {% endmacro %}
+
+
+{% macro transform_multipart(property, source, destination) %}
+{% set ns = namespace(has_if = false) %}
+{{ destination }}: {{ property.get_type_string(json=False, multipart=True) }}
+
+{% if not property.required %}
+if isinstance({{ source }}, Unset):
+    {{ destination }} = UNSET
+    {% set ns.has_if = true %}
+{% endif %}
+{% for inner_property in property.inner_properties %}
+{% if not ns.has_if %}
+if isinstance({{ source }}, {{ inner_property.get_instance_type_string() }}):
+{% set ns.has_if = true %}
+{% elif not loop.last %}
+elif isinstance({{ source }}, {{ inner_property.get_instance_type_string() }}):
+{% else %}
+else:
+{% endif %}
+{% import "property_templates/" + inner_property.template as inner_template %}
+    {{ inner_template.transform_multipart(inner_property, source, destination) | indent(4) | trim }}
+{% endfor %}
+{% endmacro %}

{openapi_python_client-0.19.0 → openapi_python_client-0.20.0}/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.19.0 → openapi_python_client-0.20.0}/pyproject.toml

@@ -6,19 +6,19 @@ 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.13",
     "colorama>=0.4.3; sys_platform == \"win32\"",
     "shellingham>=1.3.2,<2.0.0",
     "pydantic>=2.1.1,<3.0.0",
     "attrs>=21.3.0",
     "python-dateutil>=2.8.1,<3.0.0",
     "httpx>=0.20.0,<0.28.0",
-    "PyYAML>=6.0,<7.0",
-    "ruff>=0.2,<0.4",
+    "ruamel.yaml>=0.18.6,<0.19.0",
+    "ruff>=0.2,<0.5",
     "typing-extensions>=4.8.0,<5.0.0",
 ]
 name = "openapi-python-client"
-version = "0.19.0"
+version = "0.20.0"
 description = "Generate modern Python clients from OpenAPI"
 keywords = [
     "OpenAPI",
@@ -97,6 +97,7 @@ dev = [
     "types-PyYAML<7.0.0,>=6.0.3",
     "types-certifi<2021.10.9,>=2020.0.0",
     "types-python-dateutil<3.0.0,>=2.0.0",
+    "ruamel-yaml-string>=0.1.1",
 ]
 
 [tool.pdm.build]

openapi_python_client-0.19.0/openapi_python_client/templates/property_templates/boolean_property.py.jinja

@@ -1,3 +0,0 @@
-{% macro transform_header(source) %}
-"true" if {{ source }} else "false"
-{% endmacro %}

openapi_python_client-0.19.0/openapi_python_client/templates/property_templates/float_property.py.jinja

@@ -1,3 +0,0 @@
-{% macro transform_header(source) %}
-str({{ source }})
-{% endmacro %}

openapi_python_client-0.19.0/openapi_python_client/templates/property_templates/int_property.py.jinja

@@ -1,3 +0,0 @@
-{% macro transform_header(source) %}
-str({{ source }})
-{% endmacro %}

openapi_python_client-0.19.0/openapi_python_client/templates/property_templates/model_property.py.jinja

@@ -1,32 +0,0 @@
-{% macro construct_function(property, source) %}
-{{ property.class_info.name }}.from_dict({{ source }})
-{% endmacro %}
-
-{% from "property_templates/property_macros.py.jinja" import construct_template %}
-
-{% macro construct(property, source) %}
-{{ construct_template(construct_function, property, source) }}
-{% endmacro %}
-
-{% macro check_type_for_construct(property, source) %}isinstance({{ source }}, dict){% endmacro %}
-
-{% macro transform(property, source, destination, declare_type=True, multipart=False, transform_method="to_dict") %}
-{% set transformed = source + "." + transform_method + "()" %}
-{% if multipart %}
-    {% set transformed = "(None, json.dumps(" + transformed + ").encode(), 'application/json')" %}
-    {% set type_string = property.get_type_string(multipart=True) %}
-{% else %}
-    {% set type_string = property.get_type_string(json=True) %}
-{% endif %}
-{% if property.required %}
-{{ destination }} = {{ transformed }}
-{%- else %}
-{{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
-if not isinstance({{ source }}, Unset):
-    {{ destination }} = {{ transformed }}
-{%- endif %}
-{% endmacro %}
-
-{% macro transform_multipart(property, source, destination) %}
-{{ transform(property, source, destination, transform_method="to_multipart") }}
-{% endmacro %}