openapi-python-client 0.29.0__py3-none-any.whl → 0.30.0__py3-none-any.whl

openapi_python_client/templates/client.py.jinja

@@ -1,8 +1,8 @@
 import ssl
-from typing import Any
+from typing import Any, Self
 
 from attrs import define, field, evolve
-import httpx
+import httpx2
 
 
 {% set attrs_info = {
@@ -34,8 +34,8 @@ import httpx
 class Client:
     """A class for keeping track of data related to the API
 
-{% macro httpx_args_docstring() %}
-    The following are accepted as keyword arguments and will be used to construct httpx Clients internally:
+{% macro httpx2_args_docstring() %}
+    The following are accepted as keyword arguments and will be used to construct httpx2 Clients internally:
 
         ``base_url``: The base URL for the API, all requests are made to a relative path to this URL
 
@@ -44,16 +44,16 @@ class Client:
         ``headers``: A dictionary of headers to be sent with every request
 
         ``timeout``: The maximum amount of a time a request can take. API functions will raise
-        httpx.TimeoutException if this is exceeded.
+        httpx2.TimeoutException if this is exceeded.
 
         ``verify_ssl``: Whether or not to verify the SSL certificate of the API server. This should be True in production,
         but can be set to False for testing purposes.
 
         ``follow_redirects``: Whether or not to follow redirects. Default value is False.
 
-        ``httpx_args``: A dictionary of additional arguments to be passed to the ``httpx.Client`` and ``httpx.AsyncClient`` constructor.
+        ``httpx_args``: A dictionary of additional arguments to be passed to the ``httpx2.Client`` and ``httpx2.AsyncClient`` constructor.
 {% endmacro %}
-{{ httpx_args_docstring() }}
+{{ httpx2_args_docstring() }}
 {% if not config.docstrings_on_attributes %}
 
     Attributes:
@@ -65,12 +65,12 @@ class Client:
     _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: httpx.Timeout | None = field(default=None, kw_only=True, alias="timeout")
+    _timeout: httpx2.Timeout | None = field(default=None, kw_only=True, alias="timeout")
     _verify_ssl: 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: httpx.Client | None = field(default=None, init=False)
-    _async_client: httpx.AsyncClient | None = field(default=None, init=False)
+    _client: httpx2.Client | None = field(default=None, init=False)
+    _async_client: httpx2.AsyncClient | None = field(default=None, init=False)
 {% endmacro %}{{ attributes() }}
 {% macro builders(self) %}
     def with_headers(self, headers: dict[str, str]) -> "{{ self }}":
@@ -89,7 +89,7 @@ class Client:
             self._async_client.cookies.update(cookies)
         return evolve(self, cookies={**self._cookies, **cookies})
 
-    def with_timeout(self, timeout: httpx.Timeout) -> "{{ self }}":
+    def with_timeout(self, timeout: httpx2.Timeout) -> "{{ self }}":
         """Get a new client matching this one with a new timeout configuration"""
         if self._client is not None:
             self._client.timeout = timeout
@@ -97,22 +97,22 @@ class Client:
             self._async_client.timeout = timeout
         return evolve(self, timeout=timeout)
 {% endmacro %}{{ builders("Client") }}
-{% macro httpx_stuff(name, custom_constructor=None) %}
-    def set_httpx_client(self, client: httpx.Client) -> "{{ name }}":
-        """Manually set the underlying httpx.Client
+{% macro httpx2_stuff(name, custom_constructor=None) %}
+    def set_httpx_client(self, client: httpx2.Client) -> Self:
+        """Manually set the underlying httpx2.Client
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """
         self._client = client
         return self
 
-    def get_httpx_client(self) -> httpx.Client:
-        """Get the underlying httpx.Client, constructing a new one if not previously set"""
+    def get_httpx_client(self) -> httpx2.Client:
+        """Get the underlying httpx2.Client, constructing a new one if not previously set"""
         if self._client is None:
         {% if custom_constructor %}
             {{ custom_constructor | indent(12) }}
         {% endif %}
-            self._client = httpx.Client(
+            self._client = httpx2.Client(
                 base_url=self._base_url,
                 cookies=self._cookies,
                 headers=self._headers,
@@ -123,30 +123,30 @@ class Client:
             )
         return self._client
 
-    def __enter__(self) -> "{{ name }}":
-        """Enter a context manager for self.client—you cannot enter twice (see httpx docs)"""
+    def __enter__(self) -> Self:
+        """Enter a context manager for self.client—you cannot enter twice (see httpx2 docs)"""
         self.get_httpx_client().__enter__()
         return self
 
     def __exit__(self, *args: Any, **kwargs: Any) -> None:
-        """Exit a context manager for internal httpx.Client (see httpx docs)"""
+        """Exit a context manager for internal httpx2.Client (see httpx2 docs)"""
         self.get_httpx_client().__exit__(*args, **kwargs)
 
-    def set_async_httpx_client(self, async_client: httpx.AsyncClient) -> "{{ name }}":
-        """Manually set the underlying httpx.AsyncClient
+    def set_async_httpx_client(self, async_client: httpx2.AsyncClient) -> Self:
+        """Manually set the underlying httpx2.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """
         self._async_client = async_client
         return self
 
-    def get_async_httpx_client(self) -> httpx.AsyncClient:
-        """Get the underlying httpx.AsyncClient, constructing a new one if not previously set"""
+    def get_async_httpx_client(self) -> httpx2.AsyncClient:
+        """Get the underlying httpx2.AsyncClient, constructing a new one if not previously set"""
         if self._async_client is None:
         {% if custom_constructor %}
             {{ custom_constructor | indent(12) }}
         {% endif %}
-            self._async_client = httpx.AsyncClient(
+            self._async_client = httpx2.AsyncClient(
                 base_url=self._base_url,
                 cookies=self._cookies,
                 headers=self._headers,
@@ -157,21 +157,21 @@ class Client:
             )
         return self._async_client
 
-    async def __aenter__(self) -> "{{ name }}":
-        """Enter a context manager for underlying httpx.AsyncClient—you cannot enter twice (see httpx docs)"""
+    async def __aenter__(self) -> Self:
+        """Enter a context manager for underlying httpx2.AsyncClient—you cannot enter twice (see httpx2 docs)"""
         await self.get_async_httpx_client().__aenter__()
         return self
 
     async def __aexit__(self, *args: Any, **kwargs: Any) -> None:
-        """Exit a context manager for underlying httpx.AsyncClient (see httpx docs)"""
+        """Exit a context manager for underlying httpx2.AsyncClient (see httpx2 docs)"""
         await self.get_async_httpx_client().__aexit__(*args, **kwargs)
-{% endmacro %}{{ httpx_stuff("Client") }}
+{% endmacro %}{{ httpx2_stuff("Client") }}
 
 @define
 class AuthenticatedClient:
     """A Client which has been authenticated for use on secured endpoints
 
-{{ httpx_args_docstring() }}
+{{ httpx2_args_docstring() }}
 {% if not config.docstrings_on_attributes %}
 
     Attributes:
@@ -188,4 +188,4 @@ class AuthenticatedClient:
     {{ declare_attr("auth_header_name") | indent(4) }}
 
 {{ builders("AuthenticatedClient") }}
-{{ httpx_stuff("AuthenticatedClient", "self._headers[self.auth_header_name] = f\"{self.prefix} {self.token}\" if self.prefix else self.token") }}
+{{ httpx2_stuff("AuthenticatedClient", "self._headers[self.auth_header_name] = f\"{self.prefix} {self.token}\" if self.prefix else self.token") }}

openapi_python_client/templates/endpoint_macros.py.jinja

@@ -1,5 +1,5 @@
 {% from "property_templates/helpers.jinja" import guarded_statement %}
-{% from "helpers.jinja" import safe_docstring %}
+{% from "helpers.jinja" import docstring as _docstring %}
 
 {% macro header_params(endpoint) %}
 {% if endpoint.header_parameters or endpoint.bodies | length > 0 %}
@@ -12,7 +12,7 @@ headers: dict[str, Any] = {}
         {% else %}
             {% set expression = parameter.python_name %}
         {% endif %}
-        {% set statement = 'headers["' +  parameter.name + '"]' + " = " + expression %}
+        {% set statement = 'headers["' + (parameter.name | in_double_quote_literal) + '"]' + " = " + expression %}
 {{ guarded_statement(parameter, parameter.python_name, statement) }}
     {% endfor %}
 {% endif %}
@@ -24,10 +24,10 @@ headers: dict[str, Any] = {}
 cookies = {}
     {% for parameter in endpoint.cookie_parameters %}
         {% if parameter.required %}
-cookies["{{ parameter.name}}"] = {{ parameter.python_name }}
+cookies["{{ parameter.name | in_double_quote_literal }}"] = {{ parameter.python_name }}
         {% else %}
 if {{ parameter.python_name }} is not UNSET:
-    cookies["{{ parameter.name}}"] = {{ parameter.python_name }}
+    cookies["{{ parameter.name | in_double_quote_literal }}"] = {{ parameter.python_name }}
         {% endif %}
 
     {% endfor %}
@@ -47,7 +47,7 @@ params: dict[str, Any] = {}
 {{ prop_template.transform(property, property.python_name, destination) }}
     {% endif %}
     {%- if not property.json_is_dict %}
-params["{{ property.name }}"] = {{ destination }}
+params["{{ property.name | in_double_quote_literal }}"] = {{ destination }}
     {% else %}
 {{ guarded_statement(property, destination, "params.update(" + destination + ")") }}
     {% endif %}
@@ -105,7 +105,7 @@ if not isinstance({{property.python_name}}, Unset):
 {% macro arguments(endpoint, include_client=True) %}
 {# path parameters #}
 {% for parameter in endpoint.path_parameters %}
-{{ parameter.to_string() }},
+{{ parameter.to_string() | as_unembedded_code }},
 {% endfor %}
 {% if include_client or ((endpoint.list_all_parameters() | length) > (endpoint.path_parameters | length)) %}
 *,
@@ -120,24 +120,24 @@ client: AuthenticatedClient | Client,
 {% endif %}
 {# Any allowed bodies #}
 {% if endpoint.bodies | length == 1 %}
-body: {{ endpoint.bodies[0].prop.get_type_string() }}{% if not endpoint.bodies[0].prop.required %} = UNSET{% endif %},
+body: {{ endpoint.bodies[0].prop.get_type_string() | as_unembedded_code }}{% if not endpoint.bodies[0].prop.required %} = UNSET{% endif %},
 {% elif endpoint.bodies | length > 1 %}
 body:
     {%- for body in endpoint.bodies -%}{% set body_required = body_required and body.prop.required %}
-    {{ body.prop.get_type_string(no_optional=True) }} {% if not loop.last %} | {% endif %}
+    {{ body.prop.get_type_string(no_optional=True) | as_unembedded_code }} {% if not loop.last %} | {% endif %}
     {%- endfor -%}{% if not body_required %} | Unset = UNSET{% endif %}
 ,
 {% endif %}
 {# query parameters #}
 {% for parameter in endpoint.query_parameters %}
-{{ parameter.to_string() }},
+{{ parameter.to_string() | as_unembedded_code }},
 {% endfor %}
 {% for parameter in endpoint.header_parameters %}
-{{ parameter.to_string() }},
+{{ parameter.to_string() | as_unembedded_code }},
 {% endfor %}
 {# cookie parameters #}
 {% for parameter in endpoint.cookie_parameters %}
-{{ parameter.to_string() }},
+{{ parameter.to_string() | as_unembedded_code }},
 {% endfor %}
 {% endmacro %}
 
@@ -164,10 +164,10 @@ body=body,
 {% endmacro %}
 
 {% macro docstring_content(endpoint, return_string, is_detailed) %}
-{% if endpoint.summary %}{{ endpoint.summary | wordwrap(100)}}
+{% if endpoint.summary %}{{ endpoint.summary | safe_for_docstring | wordwrap(100)}}
 
 {% endif -%}
-{%- if endpoint.description %} {{ endpoint.description | wordwrap(100) }}
+{%- if endpoint.description %} {{ endpoint.description | safe_for_docstring | wordwrap(100) }}
 
 {% endif %}
 {% if not endpoint.summary and not endpoint.description %}
@@ -184,28 +184,28 @@ Args:
 {% endif %}
 Raises:
     errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
-    httpx.TimeoutException: If the request takes longer than Client.timeout.
+    httpx2.TimeoutException: If the request takes longer than Client.timeout.
 
 Returns:
 {% if is_detailed %}
-    Response[{{ return_string }}]
+    Response[{{ return_string | safe_for_docstring }}]
 {% else %}
-    {{ return_string }}
+    {{ return_string | safe_for_docstring }}
 {% endif %}
 {% endmacro %}
 
 {% macro docstring(endpoint, return_string, is_detailed) %}
-{{ safe_docstring(docstring_content(endpoint, return_string, is_detailed)) }}
+{{ _docstring(docstring_content(endpoint, return_string, is_detailed)) }}
 {% endmacro %}
 
 {% macro parse_response(parsed_responses, response) %}
 {% if parsed_responses %}{% import "property_templates/" + response.prop.template as prop_template %}
 {% if prop_template.construct %}
 {{ prop_template.construct(response.prop, response.source.attribute) }}
-{% elif response.source.return_type == response.prop.get_type_string()  %}
+{% elif response.source.return_type == response.prop.get_type_string() | as_unembedded_code  %}
 {{ response.prop.python_name }} = {{ response.source.attribute }}
 {% else %}
-{{ response.prop.python_name }} = cast({{ response.prop.get_type_string() }}, {{ response.source.attribute }})
+{{ response.prop.python_name }} = cast({{ response.prop.get_type_string() | as_unembedded_code }}, {{ response.source.attribute }})
 {% endif %}
 return {{ response.prop.python_name }}
 {% else %}

openapi_python_client/templates/endpoint_module.py.jinja

@@ -2,7 +2,7 @@ from http import HTTPStatus
 from typing import Any, cast
 from urllib.parse import quote
 
-import httpx
+import httpx2
 
 from ...client import AuthenticatedClient, Client
 from ...types import Response, UNSET
@@ -16,7 +16,7 @@ from ... import errors
     arguments, client, kwargs, parse_response, docstring, body_to_kwarg %}
 
 {% set return_string = endpoint.response_type() %}
-{% set parsed_responses = (endpoint.responses | length > 0) and return_string != "Any" %}
+{% set parsed_responses = (endpoint.responses | length > 0) and return_string != PythonCode("Any") %}
 
 def _get_kwargs(
     {{ arguments(endpoint, include_client=False) | indent(4) }}
@@ -30,13 +30,13 @@ def _get_kwargs(
     _kwargs: dict[str, Any] = {
         "method": "{{ endpoint.method }}",
         {% if endpoint.path_parameters %}
-        "url": "{{ endpoint.path }}".format(
+        "url": "{{ endpoint.path | in_double_quote_literal }}".format(
         {%- for parameter in endpoint.path_parameters -%}
         {{parameter.python_name}}=quote(str({{parameter.python_name}}), safe=""),
         {%- endfor -%}
         ),
         {% else %}
-        "url": "{{ endpoint.path }}",
+        "url": "{{ endpoint.path | in_double_quote_literal }}",
         {% endif %}
         {% if endpoint.query_parameters %}
         "params": params,
@@ -48,21 +48,18 @@ def _get_kwargs(
 
 {% if endpoint.bodies | length > 1 %}
 {% for body in endpoint.bodies %}
-    if isinstance(body, {{body.prop.get_type_string(no_optional=True) }}):
+    if isinstance(body, {{body.prop.get_type_string(no_optional=True) | as_unembedded_code }}):
         {{ body_to_kwarg(body) | indent(8) }}
-        {%- if body.content_type == "multipart/form-data" %}
-        headers["Content-Type"] = "multipart/form-data; boundary=+++"
-        {% else %}
-        headers["Content-Type"] = "{{ body.content_type }}"
+        {#- httpx2 sets multipart/form-data with a random boundary itself, a fixed one could appear in the content #}
+        {%- if body.content_type != "multipart/form-data" %}
+        headers["Content-Type"] = "{{ body.content_type | in_double_quote_literal }}"
         {% endif %}
 {% endfor %}
 {% elif endpoint.bodies | length == 1 %}
 {% set body = endpoint.bodies[0] %}
     {{ body_to_kwarg(body) | indent(4) }}
-    {%- if body.content_type == "multipart/form-data" %}
-    headers["Content-Type"] = "multipart/form-data; boundary=+++"
-    {% else %}
-    headers["Content-Type"] = "{{ body.content_type }}"
+    {%- if body.content_type != "multipart/form-data" %}
+    headers["Content-Type"] = "{{ body.content_type | in_double_quote_literal }}"
     {% endif %}
 {% endif %}
 
@@ -72,13 +69,13 @@ def _get_kwargs(
     return _kwargs
 
 {% if endpoint.responses.default %}
-    {% set return_type = return_string %}
+    {% set return_type = return_string | as_unembedded_code %}
 {% else %}
-    {% set return_type = return_string + " | None" %}
+    {% set return_type = (return_string | as_unembedded_code) + " | None" %}
 {% endif %}
 
 
-def _parse_response(*, client: AuthenticatedClient | Client, response: httpx.Response) -> {{return_type}}:
+def _parse_response(*, client: AuthenticatedClient | Client, response: httpx2.Response) -> {{return_type}}:
     {% for response in endpoint.responses.patterns %}
     {% set code_range = response.status_code.range %}
     {% if code_range[0] == code_range[1] %}
@@ -98,7 +95,7 @@ def _parse_response(*, client: AuthenticatedClient | Client, response: httpx.Res
     {% endif %}
 
 
-def _build_response(*, client: AuthenticatedClient | Client, response: httpx.Response) -> Response[{{ return_string }}]:
+def _build_response(*, client: AuthenticatedClient | Client, response: httpx2.Response) -> Response[{{ return_string | as_unembedded_code }}]:
     return Response(
         status_code=HTTPStatus(response.status_code),
         content=response.content,
@@ -109,7 +106,7 @@ def _build_response(*, client: AuthenticatedClient | Client, response: httpx.Res
 
 def sync_detailed(
     {{ arguments(endpoint) | indent(4) }}
-) -> Response[{{ return_string }}]:
+) -> Response[{{ return_string | as_unembedded_code }}]:
     {{ docstring(endpoint, return_string, is_detailed=true) | indent(4) }}
 
     kwargs = _get_kwargs(
@@ -125,7 +122,7 @@ def sync_detailed(
 {% if parsed_responses %}
 def sync(
     {{ arguments(endpoint) | indent(4) }}
-) -> {{ return_string }} | None:
+) -> {{ return_string | as_unembedded_code }} | None:
     {{ docstring(endpoint, return_string, is_detailed=false) | indent(4) }}
 
     return sync_detailed(
@@ -135,7 +132,7 @@ def sync(
 
 async def asyncio_detailed(
     {{ arguments(endpoint) | indent(4) }}
-) -> Response[{{ return_string }}]:
+) -> Response[{{ return_string | as_unembedded_code }}]:
     {{ docstring(endpoint, return_string, is_detailed=true) | indent(4) }}
 
     kwargs = _get_kwargs(
@@ -151,7 +148,7 @@ async def asyncio_detailed(
 {% if parsed_responses %}
 async def asyncio(
     {{ arguments(endpoint) | indent(4) }}
-) -> {{ return_string }} | None:
+) -> {{ return_string | as_unembedded_code }} | None:
     {{ docstring(endpoint, return_string, is_detailed=false) | indent(4) }}
 
     return (await asyncio_detailed(

openapi_python_client/templates/helpers.jinja

@@ -1,10 +1,6 @@
-{% macro safe_docstring(content, omit_if_empty=False) %}
-{# This macro returns the provided content as a docstring, set to a raw string if it contains a backslash #}
-{% if (not omit_if_empty) or (content | trim) %}
-{% if '\\' in content -%}
-r""" {{ content }} """
-{%- else -%}
+{% macro docstring(content) %}
+{# This macro returns the provided content as a docstring unless it's empty, then it emits nothing. #}
+{% if (content | trim) %}
 """ {{ content }} """
 {%- endif -%}
-{% endif %}
 {% endmacro %}

openapi_python_client/templates/literal_enum.py.jinja

@@ -4,7 +4,7 @@ from typing import Literal
 
 {{ enum.get_class_name_snake_case() | upper }}_VALUES: set[{{ enum.class_info.name }}] = { {% for v in enum.values|list|sort %}{{"%r"|format(v)}}, {% endfor %} }
 
-def check_{{ enum.get_class_name_snake_case() }}(value: {{ enum.get_instance_type_string() }}) -> {{ enum.class_info.name}}:
+def check_{{ enum.get_class_name_snake_case() }}(value: {{ enum.get_instance_type_string() | as_unembedded_code }}) -> {{ enum.class_info.name}}:
     if value in {{ enum.get_class_name_snake_case() | upper }}_VALUES:
         return value
     raise TypeError(f"Unexpected value {value!r}. Expected one of {{"{"}}{{ enum.get_class_name_snake_case() | upper }}_VALUES!r}")

openapi_python_client/templates/model.py.jinja

@@ -25,21 +25,21 @@ if TYPE_CHECKING:
 
 
 {% if model.additional_properties %}
-{% set additional_property_type = 'Any' if model.additional_properties == True else model.additional_properties.get_type_string() %}
+{% set additional_property_type = 'Any' if model.additional_properties == True else model.additional_properties.get_type_string() | as_unembedded_code %}
 {% endif %}
 
 {% set class_name = model.class_info.name %}
 {% set module_name = model.class_info.module_name %}
 
-{% from "helpers.jinja" import safe_docstring %}
+{% from "helpers.jinja" import docstring %}
 
 T = TypeVar("T", bound="{{ class_name }}")
 
 {% macro class_docstring_content(model) %}
-    {% if model.title %}{{ model.title | wordwrap(116) }}
+    {% if model.title %}{{ model.title | safe_for_docstring | wordwrap(116) }}
 
     {% endif -%}
-    {%- if model.description %}{{ model.description | wordwrap(116) }}
+    {%- if model.description %}{{ model.description | safe_for_docstring | wordwrap(116) }}
 
     {% endif %}
     {% if not model.title and not model.description %}
@@ -48,7 +48,7 @@ T = TypeVar("T", bound="{{ class_name }}")
     {% endif %}
     {% if model.example %}
     Example:
-        {{ model.example | string | wordwrap(112) | indent(12) }}
+        {{ model.example | safe_for_docstring | wordwrap(112) | indent(12) }}
 
     {% endif %}
     {% if (not config.docstrings_on_attributes) and (model.required_properties or model.optional_properties) %}
@@ -60,16 +60,16 @@ T = TypeVar("T", bound="{{ class_name }}")
 
 {% macro declare_property(property) %}
 {%- if config.docstrings_on_attributes and property.description -%}
-{{ property.to_string() }}
-{{ safe_docstring(property.description, omit_if_empty=True) | wordwrap(112) }}
+{{ property.to_string() | as_unembedded_code }}
+{{ docstring(property.description | safe_for_docstring) | wordwrap(112) }}
 {%- else -%}
-{{ property.to_string() }}
+{{ property.to_string() | as_unembedded_code }}
 {%- endif -%}
 {% endmacro %}
 
 @_attrs_define
 class {{ class_name }}:
-    {{ safe_docstring(class_docstring_content(model), omit_if_empty=config.docstrings_on_attributes) | indent(4) }}
+    {{ docstring(class_docstring_content(model)) | indent(4) }}
 
     {% for property in model.required_properties + model.optional_properties %}
     {% if property.default is none and property.required %}
@@ -128,7 +128,7 @@ field_dict.update(self.additional_properties)
 field_dict.update({
     {% for property in model.required_properties + model.optional_properties %}
     {% if property.required %}
-    "{{ property.name }}": {{ property.python_name }},
+    "{{ property.name | in_double_quote_literal }}": {{ property.python_name }},
     {% endif %}
     {% endfor %}
 })
@@ -136,7 +136,7 @@ field_dict.update({
 {% for property in model.optional_properties %}
 {% if not property.required %}
 if {{ property.python_name }} is not UNSET:
-    field_dict["{{ property.name }}"] = {{ property.python_name }}
+    field_dict["{{ property.name | in_double_quote_literal }}"] = {{ property.python_name }}
 {% endif %}
 {% endfor %}
 
@@ -145,19 +145,19 @@ return field_dict
 
     def to_dict(self) -> dict[str, Any]:
     {% for lazy_import in model.lazy_imports | sort %}
-        {{ lazy_import }}
+        {{ lazy_import }} # noqa: PLC0415
     {% endfor %}
         {{ _to_dict() | indent(8) }}
 
 {% if model.is_multipart_body %}
     def to_multipart(self) -> types.RequestFiles:
     {% for lazy_import in model.lazy_imports | sort %}
-        {{ lazy_import }}
+        {{ lazy_import }} # noqa: PLC0415
     {% endfor %}
         files: types.RequestFiles = []
 
         {% for property in model.required_properties + model.optional_properties %}
-        {% set destination = "\"" + property.name + "\"" %}
+        {% set destination = "\"" + (property.name | in_double_quote_literal) + "\"" %}
         {{ multipart(property, "self." + property.python_name, destination) | indent(8) }}
 
         {% endfor %}
@@ -174,15 +174,15 @@ return field_dict
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
     {% for lazy_import in model.lazy_imports | sort %}
-        {{ lazy_import }}
+        {{ lazy_import }} # noqa: PLC0415
     {% endfor %}
 {% if (model.required_properties or model.optional_properties or model.additional_properties) %}
         d = dict(src_dict)
 {% for property in model.required_properties + model.optional_properties %}
     {% if property.required %}
-        {% set property_source = 'd.pop("' + property.name + '")' %}
+        {% set property_source = 'd.pop("' + (property.name | in_double_quote_literal) + '")' %}
     {% else %}
-        {% set property_source = 'd.pop("' + property.name + '", UNSET)' %}
+        {% set property_source = 'd.pop("' + (property.name | in_double_quote_literal) + '", UNSET)' %}
     {% endif %}
     {% import "property_templates/" + property.template as prop_template %}
     {% if prop_template.construct %}
@@ -205,7 +205,7 @@ return field_dict
 
 {% if model.additional_properties.lazy_imports %}
     {% for lazy_import in model.additional_properties.lazy_imports | sort %}
-        {{ lazy_import }}
+        {{ lazy_import }} # noqa: PLC0415
     {% endfor %}
 {% endif %}
     {% else %}

openapi_python_client/templates/package_init.py.jinja

@@ -1,6 +1,6 @@
-{% from "helpers.jinja" import safe_docstring %}
+{% from "helpers.jinja" import docstring %}
 
-{{ safe_docstring(package_description) }}
+{{ docstring(package_description | safe_for_docstring) }}
 from .client import AuthenticatedClient, Client
 
 __all__ = (

openapi_python_client/templates/property_templates/const_property.py.jinja

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

openapi_python_client/templates/property_templates/date_property.py.jinja

@@ -17,7 +17,7 @@ datetime.date.fromisoformat({{ source }})
 {%- else %}
 {% if not skip_unset %}
     {% if declare_type %}
-        {% set type_annotation = property.get_type_string(json=True) %}
+        {% set type_annotation = property.get_type_string(json=True) | as_unembedded_code %}
 {{ destination }}: {{ type_annotation }} = UNSET
     {% else %}
 {{ destination }} = UNSET

openapi_python_client/templates/property_templates/datetime_property.py.jinja

@@ -17,7 +17,7 @@ datetime.datetime.fromisoformat({{ source }})
 {%- else %}
     {% if not skip_unset %}
         {% if declare_type %}
-        {% set type_annotation = property.get_type_string(json=True) %}
+        {% set type_annotation = property.get_type_string(json=True) | as_unembedded_code %}
 {{ destination }}: {{ type_annotation }} = UNSET
         {% else %}
 {{ destination }} = UNSET

openapi_python_client/templates/property_templates/enum_property.py.jinja

@@ -12,7 +12,7 @@
 
 {% macro transform(property, source, destination, declare_type=True, skip_unset=False) %}
 {% set transformed = source + ".value" %}
-{% set type_string = property.get_type_string(json=True) %}
+{% set type_string = property.get_type_string(json=True) | as_unembedded_code %}
 {% if property.required %}
 {{ destination }} = {{ transformed }}
 {%- else %}

openapi_python_client/templates/property_templates/file_property.py.jinja

@@ -16,7 +16,7 @@ File(
 {% if property.required %}
 {{ destination }} = {{ source }}.to_tuple()
 {% else %}
-{% if not skip_unset %}{{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) }}{% endif %} = UNSET{% endif +%}
+{% if not skip_unset %}{{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) | as_unembedded_code }}{% endif %} = UNSET{% endif +%}
 if not isinstance({{ source }}, Unset):
     {{ destination }} = {{ source }}.to_tuple()
 {% endif %}

openapi_python_client/templates/property_templates/list_property.py.jinja

@@ -11,7 +11,7 @@ for {{ inner_source }} in (_{{ property.python_name }}):
     {{ property.python_name }}.append({{ inner_property.python_name }})
 {% else %}
 _{{ property.python_name }} = {{ source }}
-{{ property.python_name }}: {{ property.get_type_string() }} = UNSET
+{{ property.python_name }}: {{ property.get_type_string() | as_unembedded_code }} = UNSET
 if _{{ property.python_name }} is not UNSET:
     {{ property.python_name }} = []
     for {{ inner_source }} in _{{ property.python_name }}:
@@ -19,7 +19,7 @@ if _{{ property.python_name }} is not UNSET:
         {{ property.python_name }}.append({{ inner_property.python_name }})
 {% endif %}
 {% else %}
-{{ property.python_name }} = cast({{ property.get_type_string(no_optional=True) }}, {{ source }})
+{{ property.python_name }} = cast({{ property.get_type_string(no_optional=True) | as_unembedded_code }}, {{ source }})
 {% endif %}
 {% endmacro %}
 
@@ -41,7 +41,7 @@ for {{ inner_source }} in {{ source }}:
 
 {% macro transform(property, source, destination, declare_type=True, skip_unset=False) %}
 {% set inner_property = property.inner_property %}
-{% set type_string = property.get_type_string(json=True) %}
+{% set type_string = property.get_type_string(json=True) | as_unembedded_code %}
 {% if property.required %}
 {{ _transform(property, source, destination, "to_dict") }}
 {% else %}