Merge pull request #10 from MarcoMuellner/6-aiohttp-is-not-implementedsupported

6 aiohttp is not implementedsupported

Author: MarcoMuellner

README.md

@@ -35,6 +35,7 @@ __Documentation:__ [here][documentation]
 - __Support for multiple rest frameworks.__ __OpenAPI python generator__ currently supports the following:
     - [httpx](https://pypi.org/project/httpx/)
     - [requests](https://pypi.org/project/requests/)
+    - [aiohttp](https://pypi.org/project/aiohttp/)
 - __Async and sync code generation support__, depending on the framework. It will automatically create both for frameworks that support both.
 - __Easily extendable using Jinja2 templates__. The code is designed to be easily extendable and should support even more languages and frameworks in the future.
 - __Fully tested__. Every generated code is automatically tested against the OpenAPI spec and we have 100% coverage.

docs/tutorial/index.md

@@ -647,48 +647,62 @@ take a look at the `User.py` and the `Team.py` files:
 
     ``` py
     from typing import *
+    
+    from pydantic import BaseModel, Field
+    
+    
+    class User(BaseModel):
+    """
+    User model
 
-    from pydantic import BaseModel
+    """
 
+    id: int = Field(alias="id")
 
-    class User(BaseModel):
-        """
-        User model
+    username: str = Field(alias="username")
 
-        """
+    email: str = Field(alias="email")
+
+    password: str = Field(alias="password")
+
+    is_active: Optional[bool] = Field(alias="is_active", default=None)
+
+    created_at: Optional[str] = Field(alias="created_at", default=None)
 
-        id: int
-        username: str
-        email: str
-        password: str
-        is_active: Optional[bool] = None
-        created_at: Optional[str] = None
     ```
 
 === "Team.py"
 
     ``` py
     from typing import *
-
-    from pydantic import BaseModel
-
+    
+    from pydantic import BaseModel, Field
+    
     from .User import User
 
 
     class Team(BaseModel):
-        """
-        Team model
+    """
+    Team model
 
-        """
+    """
+
+    id: int = Field(alias="id")
+
+    name: str = Field(alias="name")
+
+    description: str = Field(alias="description")
+
+    is_active: Optional[bool] = Field(alias="is_active", default=None)
+
+    created_at: Optional[str] = Field(alias="created_at", default=None)
+
+    updated_at: Optional[str] = Field(alias="updated_at", default=None)
+
+    users: Optional[List[User]] = Field(alias="users", default=None)
+
+    captain: Optional[User] = Field(alias="captain", default=None)
 
-        id: int
-        name: str
-        description: str
-        is_active: Optional[bool] = None
-        created_at: Optional[str] = None
-        updated_at: Optional[str] = None
-        users: Optional[List[User]] = None
-        captain: Optional[User] = None
 
     ```
 

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openapi-python-generator"
-version = "0.3.10"
+version = "0.4.0"
 description = "Openapi Python Generator"
 authors = ["Marco Müllner <[email protected]>"]
 license = "MIT"
@@ -51,10 +51,12 @@ pytest-cov = "^3.0.0"
 fastapi = "^0.78.0"
 uvicorn = "^0.18.1"
 respx = "^0.20.1"
+aiohttp = "^3.8.3"
 
 [tool.poetry.scripts]
 openapi-python-generator = "openapi_python_generator.__main__:main"
 
+
 [tool.coverage.paths]
 source = ["src", "*/site-packages"]
 tests = ["tests", "*/tests"]

pyproject.toml

@@ -0,0 +1,35 @@
+async def {{ operation_id }}({{ params }}) -> {% if return_type.type is none or return_type.type.converted_type is none %}None{% else %}{{ return_type.type.converted_type}}{% endif %}:
+    base_path = APIConfig.base_path
+    path = f'{{ path_name }}'
+    headers = {
+    'Content-Type': 'application/json',
+    'Accept': 'application/json',
+    'Authorization': f'Bearer { APIConfig.get_access_token() }',
+    }
+    query_params : Dict[str,Any] = {
+    {% if query_params|length > 0 %}
+        {{ query_params | join(',\n') | safe }}
+    {% endif %}
+    }
+
+    query_params = {key:value for (key,value) in query_params.items() if value is not None}
+
+    async with aiohttp.ClientSession(headers=headers) as session:
+        async with session.request(
+            '{{ method }}',
+            base_path + path,
+            params=query_params,
+        ) as inital_response:
+            if inital_response.status != {{ return_type.status_code }}:
+                raise HTTPException(inital_response.status, f'{{ operationId }} failed with status code: {inital_response.status}')
+            response = await inital_response.json()
+
+{% if return_type.complex_type %}
+{% if return_type.list_type is none %}
+            return {{ return_type.type.converted_type }}(**response.json()) if response.json() is not None else {{ return_type.type.converted_type }}()
+{% else %}
+            return [{{ return_type.list_type }}(**item) for item in response.json()]
+{% endif %}
+{% else %}
+            return response.json()
+{% endif %}

src/openapi_python_generator/language_converters/python/templates/aiohttp.jinja2

@@ -15,10 +15,7 @@ def runner() -> CliRunner:
 
 @pytest.mark.parametrize(
     "library",
-    [
-        HTTPLibrary.httpx,
-        HTTPLibrary.requests,
-    ],
+    [HTTPLibrary.httpx, HTTPLibrary.requests, HTTPLibrary.aiohttp],
 )
 def test_issue_7(runner: CliRunner, model_data_with_cleanup, library) -> None:
     """

tests/regression/test_issue_7.py

@@ -35,6 +35,8 @@ def test_get_auth_token_without_env(model_data_with_cleanup):
         (HTTPLibrary.requests, False),
         (HTTPLibrary.httpx, True),
         (HTTPLibrary.requests, True),
+        (HTTPLibrary.aiohttp, True),
+        (HTTPLibrary.aiohttp, False),
     ],
 )
 @respx.mock

tests/test_generated_code.py

@@ -16,10 +16,7 @@ def runner() -> CliRunner:
 
 @pytest.mark.parametrize(
     "library",
-    [
-        HTTPLibrary.httpx,
-        HTTPLibrary.requests,
-    ],
+    [HTTPLibrary.httpx, HTTPLibrary.requests, HTTPLibrary.aiohttp],
 )
 def test_main_succeeds(runner: CliRunner, model_data_with_cleanup, library) -> None:
     """It exits with a status code of zero."""