internal 0.1.64__py3-none-any.whl → 0.1.66__py3-none-any.whl

internal/http/requests.py

@@ -5,16 +5,16 @@ from fastapi import FastAPI
 from ..exception.internal_exception import GatewayTimeoutException, BadGatewayException
 
 
-async def async_request(app: FastAPI, method, url, token=None, **kwargs):
+async def async_request(app: FastAPI, method, url, current_user: dict = None, **kwargs):
     timeout = httpx.Timeout(connect=app.state.config.REQUEST_CONN_TIMEOUT, read=app.state.config.REQUEST_READ_TIMEOUT,
                             write=app.state.config.REQUEST_WRITE_TIMEOUT, pool=app.state.config.REQUEST_POOL_TIMEOUT)
 
-    if token:
+    if current_user and "access_token" in current_user:
         if "headers" in kwargs.keys():
-            kwargs.get("headers")["Authorization"] = f"Bearer {token}"
+            kwargs.get("headers")["Authorization"] = f"Bearer {current_user.get('access_token')}"
         else:
             kwargs["headers"] = {
-                "Authorization": f"Bearer {token}"
+                "Authorization": f"Bearer {current_user.get('access_token')}"
             }
 
     try:

internal/http/responses.py

@@ -6,7 +6,8 @@ from fastapi.responses import JSONResponse
 from beanie import Document, Link
 
 
-async def async_generate_content(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None):
+async def async_response(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None,
+                         status_code=status.HTTP_200_OK):
     def _serialize(data):
         if isinstance(data, Document):
             link_field_list = []
@@ -45,14 +46,4 @@ async def async_generate_content(data=None, message=None, code=None, page_no=Non
     else:
         ret['data'] = data
 
-    return ret
-
-
-async def async_response(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None,
-                         status_code=status.HTTP_200_OK):
-    content = await async_generate_content(data=data, message=message, code=code, page_no=page_no, total_num=total_num,
-                                           page_size=page_size)
-    if isinstance(content, JSONResponse):
-        return content
-
-    return JSONResponse(status_code=status_code, content=content)
+    return JSONResponse(status_code=status_code, content=ret)

{internal-0.1.64.dist-info → internal-0.1.66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 0.1.64
+Version: 0.1.66
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-0.1.64.dist-info → internal-0.1.66.dist-info}/RECORD

@@ -11,8 +11,8 @@ internal/ext/amazon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 internal/ext/amazon/aws/__init__.py,sha256=2YFjb-rHG1JaZGZiZffYDesgTAJjDshOqQbswOYzhP8,834
 internal/ext/amazon/aws/const.py,sha256=l4WMg5bKWujwOKABBkCO2zclNg3abnYOfbhD7DG8GsA,109
 internal/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/http/requests.py,sha256=qRkDP23H8afC98Xx-P1CwDVeU_PUMEFbBEW6vuM6YcY,1290
-internal/http/responses.py,sha256=Xf1kk-lK8nDQoRQA_Yfu4TAU5EELWAyisyouJBj7ses,1953
+internal/http/requests.py,sha256=Uof9HbxVBconKNENlZkkvYpCbcU7XzBHpUAk1RutALc,1401
+internal/http/responses.py,sha256=_N9d1qVBOGySv4Kj1mEV8SntjcIXiX-W2Sz8T_fQoeQ,1566
 internal/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/interface/base_interface.py,sha256=R5MmO5oa5-ORPV_adkegLVCwsVio2zFOuQFGiby3khs,340
 internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,6 +21,6 @@ internal/model/operate.py,sha256=Yuq7oyM2xmBy_X9021SgrpnpYQW6D_bgydI9PRFuQVQ,161
 internal/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/schema/base_schema.py,sha256=PwMFPG1uNeO01wNxmamj9RlAfbPIYiQo3pduPywOg8w,435
 internal/utils.py,sha256=0SubS0iUhDvjSX1F4TykasA5-enYJzt2VH-f7_0BnjI,1509
-internal-0.1.64.dist-info/METADATA,sha256=kgtuMymri__YlyXJMa5_l3S4SLqF8rPOZ2pQcmo77h0,625
-internal-0.1.64.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-internal-0.1.64.dist-info/RECORD,,
+internal-0.1.66.dist-info/METADATA,sha256=dX_NsChgtsCptuzTE0guY7kKK0o_pDAa0ae3k07fIB0,625
+internal-0.1.66.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+internal-0.1.66.dist-info/RECORD,,