[CLEAN] general (#11)

Author: raphaelauv

README.md

@@ -1,9 +1,12 @@
 ![Python](https://github.com/raphaelauv/fastAPI-aiohttp-example/workflows/Python/badge.svg?branch=master)
 
-# Full exemple of [FastAPI](https://github.com/tiangolo/fastapi) with an [aiohttp](https://github.com/aio-libs/aiohttp) client
+# Full example of [FastAPI](https://github.com/tiangolo/fastapi) with an [aiohttp](https://github.com/aio-libs/aiohttp) client
+
+### This is an example with FastAPI, but you can use this logic with any async ( ASGI ) web framework
+
+
+### [EXAMPLE FOR HTTPX](https://github.com/raphaelauv/fastAPI-httpx-example/)
 
-### This is an exemple with FastAPI but you can use this logic with any async ( ASGI ) web framework
-#
 
 #### Implemented logic : 
 

src/fastAPI_aiohttp/fastAPI.py

@@ -1,11 +1,9 @@
-import json
 import asyncio
 from collections.abc import Coroutine
 from socket import AF_INET
 from typing import List, Optional, Any, Dict
 
 import aiohttp
-from aioresponses import aioresponses
 from fastapi import FastAPI
 from fastapi.logger import logger as fastAPI_logger  # convenient name
 from fastapi.requests import Request
@@ -65,29 +63,20 @@ async def on_shutdown() -> None:
 @app.get('/endpoint')
 async def endpoint() -> Any:
     url = "http://localhost:8080/test"
-
-    with aioresponses() as mock_server:  # mock answer , remove in real
-        mock_server.post(url=url, status=200, body=json.dumps({"succes": 1}))
-
-        rst = await SingletonAiohttp.query_url(url)
-    return rst
+    return await SingletonAiohttp.query_url(url)
 
 
 @app.get('/endpoint_multi')
 async def endpoint_multi() -> Dict[str, int]:
     url = "http://localhost:8080/test"
 
-    with aioresponses() as mock_server:  # mock answer , remove in real
-        mock_server.post(url=url, status=200, body=json.dumps({"succes": 1}))
-        mock_server.post(url=url, status=200, body=json.dumps({"succes": 2}))
-
-        async_calls: List[Coroutine[Any, Any, Any]] = list()  # store all async operations
+    async_calls: List[Coroutine[Any, Any, Any]] = list()  # store all async operations
 
-        async_calls.append(SingletonAiohttp.query_url(url))
-        async_calls.append(SingletonAiohttp.query_url(url))
+    async_calls.append(SingletonAiohttp.query_url(url))
+    async_calls.append(SingletonAiohttp.query_url(url))
 
-        all_results: List[Dict[Any, Any]] = await asyncio.gather(*async_calls)  # wait for all async operations
-    return {'succes': sum([x['succes'] for x in all_results])}
+    all_results: List[Dict[Any, Any]] = await asyncio.gather(*async_calls)  # wait for all async operations
+    return {'success': sum([x['success'] for x in all_results])}
 
 
 @app.post("/endpoint_stream/")

src/tests/test_fastAPI_aiohttp.py

@@ -7,13 +7,11 @@
 
 from fastAPI_aiohttp.fastAPI import app, SingletonAiohttp
 
-url = "test/toto"
-
 
 @pytest.fixture
 def client_aio():
     with aioresponses() as m:
-        m.post(url=url,
+        m.post(url="test/toto",
                status=200,
                body=json.dumps({"result": 2}))
         yield m
@@ -26,24 +24,33 @@ def client_fastAPI():
 
 @pytest.mark.asyncio
 async def test_query_url(client_aio):
-    rst = await SingletonAiohttp.query_url(url)
+    rst = await SingletonAiohttp.query_url("test/toto")
     assert rst == {"result": 2}
 
 
 def test_endpoint(client_fastAPI):
-    result: httpx.Response = client_fastAPI.get(url='/endpoint/')
+    url = "http://localhost:8080/test"
+    with aioresponses() as mock_server:
+        mock_server.post(url=url, status=200, body=json.dumps({"success": 1}))
+
+        result: httpx.Response = client_fastAPI.get(url='/endpoint/')
     assert result is not None
 
     result_json = result.json()
-    assert result_json == {'succes': 1}
+    assert result_json == {'success': 1}
 
 
 def test_endpoint_multi(client_fastAPI):
-    result: httpx.Response = client_fastAPI.get(url='/endpoint_multi/')
+    url = "http://localhost:8080/test"
+    with aioresponses() as mock_server:
+        mock_server.post(url=url, status=200, body=json.dumps({"success": 1}))
+        mock_server.post(url=url, status=200, body=json.dumps({"success": 2}))
+
+        result: httpx.Response = client_fastAPI.get(url='/endpoint_multi/')
     assert result is not None
 
     result_json = result.json()
-    assert result_json == {'succes': 3}
+    assert result_json == {'success': 3}
 
 
 def test_endpoint_stream(client_fastAPI):