internal 1.0.59__py3-none-any.whl → 1.0.61__py3-none-any.whl

internal/base_config.py

@@ -14,10 +14,10 @@ class BaseConfig(BaseSettings):
     REQUEST_VERIFY_SSL: bool = True
     REQUEST_PROXY: str = ''
     REQUEST_RETRY: int = 5
+    REQUEST_CONN_POOL_TIMEOUT: float = 5
     REQUEST_CONN_TIMEOUT: float = 5
-    REQUEST_READ_TIMEOUT: float = 5
     REQUEST_WRITE_TIMEOUT: float = 5
-    REQUEST_POOL_TIMEOUT: float = 5
+    RESPONSE_READ_TIMEOUT: float = 5
 
     # AWS
     AWS_ACCESS_KEY_ID: str = ""
@@ -55,6 +55,8 @@ class BaseConfig(BaseSettings):
     # Default System Account Password
     SYSTEM_ACCOUNT: str = "cruisys"
     SYSTEM_PASSWORD: str = "cs50951855"
+    SYSTEM_BRAND: str = "cruisys"
+    SYSTEM_ORGANIZATION_ID: str = "cruisys"
 
     class Config:
         case_sensitive = False

internal/http/requests.py

@@ -6,9 +6,21 @@ from fastapi.encoders import jsonable_encoder
 from ..exception.internal_exception import GatewayTimeoutException, BadGatewayException
 
 
-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)
+async def async_request(app: FastAPI, method, url, current_user: dict = None,
+                        request_conn_pool_timeout: float = 0, request_conn_timeout: float = 0,
+                        request_write_timeout: float = 0, response_read_timeout: float = 0,
+                        **kwargs):
+    if request_conn_pool_timeout <= 0:
+        request_conn_pool_timeout = app.state.config.REQUEST_CONN_POOL_TIMEOUT
+    if request_conn_timeout <= 0:
+        request_conn_timeout = app.state.config.REQUEST_CONN_TIMEOUT
+    if request_write_timeout <= 0:
+        request_write_timeout = app.state.config.REQUEST_WRITE_TIMEOUT
+    if response_read_timeout <= 0:
+        response_read_timeout = app.state.config.RESPONSE_READ_TIMEOUT
+
+    timeout = httpx.Timeout(connect=request_conn_timeout, read=response_read_timeout,
+                            write=request_write_timeout, pool=request_conn_pool_timeout)
 
     if current_user and "access_token" in current_user:
         if "headers" in kwargs.keys():

{internal-1.0.59.dist-info → internal-1.0.61.dist-info}/METADATA

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

{internal-1.0.59.dist-info → internal-1.0.61.dist-info}/RECORD

@@ -1,5 +1,5 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/base_config.py,sha256=ZdqvHlPsF6ozELgmV0ZiSpYehSscasIclLp8eAjVE24,1870
+internal/base_config.py,sha256=tuEu2m98igYt4ZxMKtWjaQrFokpc85cRQcAjGtf_cI0,1954
 internal/base_factory.py,sha256=7UUiolLWYSodc9PxqLHaZ6KqDYUU3kC4g07iVggSymU,10125
 internal/common_enum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/common_enum/contact_type.py,sha256=7QkTQ71UxpaT1YHI40FpjmLz3r-UbRU-sd0m5ajH1as,142
@@ -19,7 +19,7 @@ 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=PA3Z9Yqb-TWO-bP1xVvRAw8LptZTJPPt1MrfukpVJqk,2167
+internal/http/requests.py,sha256=W6MFRs3pBTzHRWzTnkqXT52k6qiTPbmwxXgrJqcMvo4,2750
 internal/http/responses.py,sha256=_xhp52Y4T8tGQ4g6U8gh71WADLECibOAV42jKSvtvtw,2923
 internal/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/interface/base_interface.py,sha256=3YaVjIgLi_pZpLk5SEIk8WVkuICM8qPavT8rB0MdB5U,1536
@@ -29,6 +29,6 @@ internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/model/base_model.py,sha256=NS_GZvw_IqU1aZPHPpyQs6A741O34ybmzVzBPm9nGWU,3014
 internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
 internal/utils.py,sha256=CXYZs4rDDe33Zac27YeknBE4uQN437ys1YAbW3Xeyow,1517
-internal-1.0.59.dist-info/METADATA,sha256=aPhw--KFIRCLOY4csF9gGhu42Ok2-DUTr26TdAhhLFM,625
-internal-1.0.59.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-internal-1.0.59.dist-info/RECORD,,
+internal-1.0.61.dist-info/METADATA,sha256=H1zqTSqZUa7vUKxPNr2lvmLZFhqbg3W3-u3tHsn1oDo,625
+internal-1.0.61.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+internal-1.0.61.dist-info/RECORD,,