Added support for JSON bodies

Closes #6

Author: dbanty

openapi_python_client/models/openapi.py

@@ -61,8 +61,10 @@ def from_dict(d: Dict[str, Dict[str, Dict[str, Any]]], /) -> Dict[str, EndpointC
                         )
                     responses.append(response)
                 form_body_reference = None
+                json_body = None
                 if "requestBody" in method_data:
-                    form_body_reference = Endpoint.parse_request_body(method_data["requestBody"])
+                    form_body_reference = Endpoint.parse_request_form_body(method_data["requestBody"])
+                    json_body = Endpoint.parse_request_json_body(method_data["requestBody"])
 
                 endpoint = Endpoint(
                     path=path,
@@ -73,6 +75,7 @@ def from_dict(d: Dict[str, Dict[str, Dict[str, Any]]], /) -> Dict[str, EndpointC
                     path_parameters=path_parameters,
                     responses=responses,
                     form_body_reference=form_body_reference,
+                    json_body=json_body,
                     requires_security=bool(method_data.get("security")),
                 )
 
@@ -81,6 +84,14 @@ def from_dict(d: Dict[str, Dict[str, Dict[str, Any]]], /) -> Dict[str, EndpointC
                     collection.relative_imports.add(
                         import_string_from_reference(form_body_reference, prefix="..models")
                     )
+                if (
+                    json_body is not None
+                    and isinstance(json_body, (ListProperty, RefProperty, EnumProperty))
+                    and json_body.reference is not None
+                ):
+                    collection.relative_imports.add(
+                        import_string_from_reference(json_body.reference, prefix="..models")
+                    )
         return endpoints_by_tag
 
 
@@ -99,17 +110,27 @@ class Endpoint:
     responses: List[Response]
     requires_security: bool
     form_body_reference: Optional[Reference]
+    json_body: Optional[Property]
 
     @staticmethod
-    def parse_request_body(body: Dict[str, Any], /) -> Optional[Reference]:
-        """ Return form_body_ref """
+    def parse_request_form_body(body: Dict[str, Any], /) -> Optional[Reference]:
+        """ Return form_body_reference """
         form_body_reference = None
         body_content = body["content"]
         form_body = body_content.get("application/x-www-form-urlencoded")
         if form_body:
             form_body_reference = Reference(form_body["schema"]["$ref"])
         return form_body_reference
 
+    @staticmethod
+    def parse_request_json_body(body: Dict[str, Any], /) -> Optional[Property]:
+        """ Return json_body """
+        body_content = body["content"]
+        json_body = body_content.get("application/json")
+        if json_body:
+            return property_from_dict("json_body", required=True, data=json_body["schema"])
+        return None
+
 
 @dataclass
 class Schema:

openapi_python_client/models/properties.py

@@ -173,6 +173,10 @@ def get_type_string(self) -> str:
             return self.reference.class_name
         return f"Optional[{self.reference.class_name}]"
 
+    def transform(self) -> str:
+        """ Convert this into a JSONable value """
+        return f"{self.name}.to_dict()"
+
 
 @dataclass
 class DictProperty(Property):

openapi_python_client/templates/endpoint_module.pyi

@@ -1,5 +1,5 @@
 from dataclasses import asdict
-from typing import List, Optional, Union
+from typing import Dict, List, Optional, Union
 
 import requests
 
@@ -23,6 +23,10 @@ def {{ endpoint.name }}(
     {% if endpoint.form_body_reference %}
     form_data: {{ endpoint.form_body_reference.class_name }},
     {% endif %}
+    {# Form data if any #}
+    {% if endpoint.json_body %}
+    json_body: {{ endpoint.json_body.get_type_string() }},
+    {% endif %}
     {# query parameters #}
     {% if endpoint.query_parameters %}
     {% for parameter in endpoint.query_parameters %}
@@ -51,6 +55,9 @@ def {{ endpoint.name }}(
         {% if endpoint.form_body_reference %}
         data=asdict(form_data),
         {% endif %}
+        {% if endpoint.json_body %}
+        json={{ endpoint.json_body.transform() }},
+        {% endif %}
         {% if endpoint.query_parameters %}
         params=params,
         {% endif %}

openapi_python_client/templates/model.pyi

@@ -16,6 +16,13 @@ class {{ schema.reference.class_name }}:
     {{ property.to_string() }}
     {% endfor %}
 
+    def to_dict(self) -> Dict:
+        return {
+            {% for property in schema.required_properties + schema.optional_properties %}
+            "{{ property.name }}": self.{{ property.transform() }} if self.{{ property.name }} else None,
+            {% endfor %}
+        }
+
     @staticmethod
     def from_dict(d: Dict) -> {{ schema.reference.class_name }}:
         {% for property in schema.required_properties + schema.optional_properties %}