Allow datetime strings, and custom datetime formatting

barjomet · barjomet · commit d5cac5596dd6 · 2021-07-25T10:21:12.000+03:00
diff --git a/openapi_python_client/templates/client.py.jinja b/openapi_python_client/templates/client.py.jinja
@@ -6,12 +6,16 @@ import attr
 class Client:
     """ A class for keeping track of data related to the API """
 
+
+
     base_url: str
     cookies: Dict[str, str] = attr.ib(factory=dict, kw_only=True)
     headers: Dict[str, str] = attr.ib(factory=dict, kw_only=True)
     timeout: float = attr.ib(5.0, kw_only=True)
     token: str = None
     verify: Optional[bool] = False
+    date_format: str = '%Y-%m-%d'
+    datetime_format: str = '%Y-%m-%dT%H:%M:%S.%f%z'
 
     def get_headers(self) -> Dict[str, str]:
         """ Get headers to be used in all endpoints """
diff --git a/openapi_python_client/templates/property_templates/date_property.py.jinja b/openapi_python_client/templates/property_templates/date_property.py.jinja
@@ -12,14 +12,14 @@ isoparse({{ source }}).date()
 
 {% macro transform(property, source, destination, declare_type=True, stringify=False) %}
 {% if property.required %}
-{{ destination }} = {{ source }}.isoformat() {% if property.nullable %}if {{ source }} else None {%endif%}
+{{ destination }} = {{ source }}.strftime(self.client.date_format) {% if property.nullable %}if {{ source }} else None {%endif%}
 {% else %}
 {{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) }}{% endif %} = UNSET
-if not isinstance({{ source }}, Unset):
+if not isinstance({{ source }}, (Unset, str)):
 {% if property.nullable %}
-    {{ destination }} = {{ source }}.isoformat() if {{ source }} else None
+    {{ destination }} = {{ source }}.strftime(self.client.date_format) if {{ source }} else None
 {% else %}
-    {{ destination }} = {{ source }}.isoformat()
+    {{ destination }} = {{ source }}.strftime(self.client.date_format)
 {% endif %}
 {% endif %}
 {% endmacro %}
diff --git a/openapi_python_client/templates/property_templates/datetime_property.py.jinja b/openapi_python_client/templates/property_templates/datetime_property.py.jinja
@@ -13,17 +13,17 @@ isoparse({{ source }})
 {% macro transform(property, source, destination, declare_type=True, stringify=False) %}
 {% if property.required %}
 {% if property.nullable %}
-{{ destination }} = {{ source }}.isoformat() if {{ source }} else None
+{{ destination }} = {{ source }}.strftime(self.client.datetime_format) if {{ source }} else None
 {% else %}
-{{ destination }} = {{ source }}.isoformat()
+{{ destination }} = {{ source }}.strftime(self.client.datetime_format)
 {% endif %}
 {% else %}
 {{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) }}{% endif %} = UNSET
-if not isinstance({{ source }}, Unset):
+if not isinstance({{ source }}, (Unset, str)):
 {% if property.nullable %}
-    {{ destination }} = {{ source }}.isoformat() if {{ source }} else None
+    {{ destination }} = {{ source }}.strftime(self.client.datetime_format) if {{ source }} else None
 {% else %}
-    {{ destination }} = {{ source }}.isoformat()
+    {{ destination }} = {{ source }}.strftime(self.client.datetime_format)
 {% endif %}
 {% endif %}
 {% endmacro %}
