internal 1.1.11__py3-none-any.whl → 1.1.13__py3-none-any.whl

internal/base_config.py

@@ -13,12 +13,12 @@ class BaseConfig(BaseSettings):
     # Request
     REQUEST_VERIFY_SSL: bool = False
     REQUEST_PROXY: str = ''
-    REQUEST_RETRY_COUNT: int = 3
-    REQUEST_RETRY_DELAY_INITIAL_SECONDS: int = 1
-    REQUEST_CONN_POOL_TIMEOUT: float = 5
-    REQUEST_CONN_TIMEOUT: float = 5
-    REQUEST_WRITE_TIMEOUT: float = 5
-    RESPONSE_READ_TIMEOUT: float = 5
+    REQUEST_RETRY_COUNT: int = 2
+    REQUEST_RETRY_DELAY_INITIAL_SECONDS: float = 1.0
+    REQUEST_CONN_POOL_TIMEOUT: float = 5.0
+    REQUEST_CONN_TIMEOUT: float = 5.0
+    REQUEST_WRITE_TIMEOUT: float = 5.0
+    RESPONSE_READ_TIMEOUT: float = 5.0
 
     # AWS
     AWS_ACCESS_KEY_ID: str = ""
@@ -54,7 +54,7 @@ class BaseConfig(BaseSettings):
     # Exception Notify
     WEBHOOK_BASE_URL: str = ""
     WEBHOOK_RETRY_COUNT: int = 5
-    WEBHOOK_RETRY_DELAY_INITIAL_SECONDS: int = 1
+    WEBHOOK_RETRY_DELAY_INITIAL_SECONDS: float = 1.0
 
     # Default System Account Password
     SYSTEM_ACCOUNT: str = "cruisys"

internal/base_factory.py

@@ -19,7 +19,7 @@ from .const import LOG_FMT, LOG_FMT_NO_DT, LOG_DT_FMT, DEFAULT_LOGGER_NAME, CORR
 from .exception.base_exception import InternalBaseException
 from .exception.internal_exception import BadGatewayException, GatewayTimeoutException
 from .ext.amazon import aws
-from .http.requests import async_request
+from .http.requests import send_webhook_message
 from .http.responses import async_response
 from .middleware.log_request import LogRequestMiddleware
 from .utils import update_dict_with_cast
@@ -155,21 +155,11 @@ class BaseFactory(metaclass=ABCMeta):
             detail = exc.detail
 
             if isinstance(exc, BadGatewayException):
-                if self.get_app_config().WEBHOOK_BASE_URL:
-                    message = f"【{self.DEFAULT_APP_NAME}】Bad gateway, request:{request.__dict__}, exc:{exc}"
-                    payload = {"text": message}
-                    try:
-                        await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                    except Exception as e:
-                        app.state.logger.warn(f"Notify failure, Exception:{e}")
+                message = f"【{self.DEFAULT_APP_NAME}】Bad gateway, request:{request.__dict__}, exc:{exc}"
+                await send_webhook_message(app, message)
             elif isinstance(exc, GatewayTimeoutException):
-                if self.get_app_config().WEBHOOK_BASE_URL:
-                    message = f"【{self.DEFAULT_APP_NAME}】Gateway timeout, request:{request.__dict__}, exc:{exc}"
-                    payload = {"text": message}
-                    try:
-                        await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                    except Exception as e:
-                        app.state.logger.warn(f"Notify failure, Exception:{e}")
+                message = f"【{self.DEFAULT_APP_NAME}】Gateway timeout, request:{request.__dict__}, exc:{exc}"
+                await send_webhook_message(app, message)
 
             return await async_response(data=detail.get("data"), code=detail.get("code"), message=detail.get("message"),
                                         status_code=exc.status_code)
@@ -187,13 +177,8 @@ class BaseFactory(metaclass=ABCMeta):
         async def http_exception_handler(request: Request, exc: Exception):
             app.state.logger.warn(f"Exception, request:{request.__dict__}, exc:{exc}")
             app.state.logger.warn(traceback.format_exc())
-            if self.get_app_config().WEBHOOK_BASE_URL:
-                message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, request:{request.__dict__}, exc:{exc}"
-                payload = {"text": message}
-                try:
-                    await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
-                except Exception as e:
-                    app.state.logger.warn(f"Notify failure, Exception:{e}")
+            message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, request:{request.__dict__}, exc:{exc}"
+            await send_webhook_message(app, message)
 
             return await async_response(code="error_internal_server", message="Internal server error",
                                         status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)

internal/http/requests.py

@@ -17,40 +17,39 @@ async def invoke_request(timeout: httpx.Timeout, method: str, url: str, app: Fas
             if "json" in kwargs:
                 kwargs["json"] = jsonable_encoder(kwargs["json"])
 
-            app.state.logger.info(f"invoke_request() request, url: {method} {url} \nkwargs: {kwargs}")
+            app.state.logger.info(f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \ninvoke_request() request")
             response = await client.request(method, url, **kwargs)
             app.state.logger.info(
-                f"invoke_request() response, url: {method} {url} \nkwargs: {kwargs} \n\nresponse.status_code: {response.status_code} \nresponse.text: {response.text}"
+                f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \ninvoke_request() response \n\nstatus_code: {response.status_code} \ntext: {response.text}"
             )
             return response
     except httpx.TimeoutException as exc:
-        message = f"invoke_request(), TimeoutException, exc: {exc}, url: {url}, method: {method}, kwargs: {kwargs}"
+        message = f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \ninvoke_request(), TimeoutException, exc: {exc}"
         app.state.logger.warn(message)
         raise GatewayTimeoutException(str(exc)) from exc
     except Exception as exc:
-        message = f"invoke_request(), Exception, exc: {exc}, url: {url}, method: {method}, kwargs: {kwargs}"
+        message = f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \ninvoke_request(), Exception, exc: {exc}"
         app.state.logger.warn(message)
-        await send_webhook_message(app, message)
         raise BadGatewayException(str(exc))
 
 
 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,
-                        request_retry_count: int = 0, request_retry_delay: float = 0,
+                        request_conn_pool_timeout: float = -1.0, request_conn_timeout: float = -1.0,
+                        request_write_timeout: float = -1.0, response_read_timeout: float = -1.0,
+                        request_retry_count: int = -1, request_retry_delay_initial_seconds: float = -1.0,
                         **kwargs):
-    if request_conn_pool_timeout <= 0:
+    if request_conn_pool_timeout < 0:
         request_conn_pool_timeout = app.state.config.REQUEST_CONN_POOL_TIMEOUT
-    if request_conn_timeout <= 0:
+    if request_conn_timeout < 0:
         request_conn_timeout = app.state.config.REQUEST_CONN_TIMEOUT
-    if request_write_timeout <= 0:
+    if request_write_timeout < 0:
         request_write_timeout = app.state.config.REQUEST_WRITE_TIMEOUT
-    if response_read_timeout <= 0:
+    if response_read_timeout < 0:
         response_read_timeout = app.state.config.RESPONSE_READ_TIMEOUT
-    if request_retry_count <= 0:
+    if request_retry_count < 0:
         request_retry_count = app.state.config.REQUEST_RETRY_COUNT
-    if request_retry_delay <= 0:
-        request_retry_delay = app.state.config.REQUEST_RETRY_DELAY_INITIAL_SECONDS
+    if request_retry_delay_initial_seconds < 0:
+        request_retry_delay_initial_seconds = app.state.config.REQUEST_RETRY_DELAY_INITIAL_SECONDS
 
     timeout = httpx.Timeout(connect=request_conn_timeout, read=response_read_timeout,
                             write=request_write_timeout, pool=request_conn_pool_timeout)
@@ -75,10 +74,10 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None,
         return response
     else:
         retries = 0
-        current_delay = float(request_retry_delay)
+        current_delay = request_retry_delay_initial_seconds
 
         while retries <= request_retry_count:
-            app.state.logger.warn(f"url: {url}, method: {method}, kwargs: {kwargs}, 嘗試送請求 (第 {retries + 1} 次嘗試)...")
+            app.state.logger.warn(f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \n嘗試送請求 (第 {retries + 1} 次嘗試)...")
             try:
                 # 使用 await 關鍵字等待異步請求完成
                 response = await invoke_request(timeout, method, url, app, **kwargs)
@@ -87,19 +86,20 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None,
                 if retries < request_retry_count:
                     # 計算下一次的延遲時間：current_delay * 2^retries + 隨機抖動
                     sleep_time = current_delay * (2 ** retries) + random.uniform(0, 0.5)
-                    app.state.logger.warn(f"url: {url}, method: {method}, kwargs: {kwargs}, 等待 {sleep_time:.2f} 秒後重試...")
+                    app.state.logger.warn(f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \n等待 {sleep_time:.2f} 秒後重試...")
                     # 使用 asyncio.sleep 進行異步等待，不會阻塞主執行緒
                     await asyncio.sleep(sleep_time)
                     retries += 1
                 else:
-                    message = f"url: {url}, method: {method}, kwargs: {kwargs}, 已達到最大重試次數 ({request_retry_count})，放棄發送請求。"
+                    message = f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \n已達到最大重試次數 ({request_retry_count})，放棄發送請求。"
                     app.state.logger.warn(message)
                     raise  # 重新拋出最後一個異常
 
 
 async def invoke_webhook_message_api(app: FastAPI, message: str):
     payload = {"text": message}
-    response = await async_request(app, "POST", app.state.config.WEBHOOK_BASE_URL, json=payload)
+    response = await async_request(app, "POST", app.state.config.WEBHOOK_BASE_URL, request_retry_count=0,
+                                   request_retry_delay_initial_seconds=0.0, json=payload)
     response.raise_for_status()
     return response
 
@@ -118,7 +118,7 @@ async def send_webhook_message(app: FastAPI, message: str):
             app.state.logger.warn(f"Notify failure, Exception:{e}")
     else:
         retries = 0
-        current_delay = float(app.state.config.WEBHOOK_RETRY_DELAY_INITIAL_SECONDS)
+        current_delay = app.state.config.WEBHOOK_RETRY_DELAY_INITIAL_SECONDS
 
         while retries <= retry_count:
             app.state.logger.warn(f"嘗試發送訊息 (第 {retries + 1} 次嘗試)...")

{internal-1.1.11.dist-info → internal-1.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.1.11
+Version: 1.1.13
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.1.11.dist-info → internal-1.1.13.dist-info}/RECORD

@@ -1,6 +1,6 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/base_config.py,sha256=gbzgQklOzdQUY63b5k15dgk1sxVyYR4OcWXP0RHVNTI,2280
-internal/base_factory.py,sha256=DVWjOeCOURscykpm0MizOvT9PjbclpoVv92XySWMDkw,11353
+internal/base_config.py,sha256=MxCX2PKRgFZnL_IH2ukLwdoBJzQBHeV86GxxNxILlsc,2296
+internal/base_factory.py,sha256=ZzXow5iKXyiZqFy815Jy-S4_spNCoyLPVz637deie7w,10441
 internal/cache_redis.py,sha256=YMsrUXHd-wKjsjsboD79Y-ciBBowzT6aAjdJZ36-yEY,697
 internal/common_enum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/common_enum/contact_type.py,sha256=7QkTQ71UxpaT1YHI40FpjmLz3r-UbRU-sd0m5ajH1as,142
@@ -23,7 +23,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=JEblqezuQH2jMODUM9vEd0O8yfzOBV_O-htcVJkQt4I,7907
+internal/http/requests.py,sha256=SD1jClXQ1rQjSY143cL-vd8bC6yHcue7REDetWU3Sso,8106
 internal/http/responses.py,sha256=zvU0iRQ9-qxeEZfKmuvTi8lv9DFcaNAsHlQKOTCpVzw,2945
 internal/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/interface/base_interface.py,sha256=3YaVjIgLi_pZpLk5SEIk8WVkuICM8qPavT8rB0MdB5U,1536
@@ -34,6 +34,6 @@ internal/model/base_model.py,sha256=hxleV8fYNvFgUoYmCv_inEP3kA4tD4HhCBCNFVK8SZg,
 internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
 internal/utils.py,sha256=i6YZdiXsiWnOjRdlJ6afNCGpyMe3Uo9mhm3xlQBy3Ls,2824
 internal/validator_utils.py,sha256=CqjaVFoAu5MqvBG_AkTP-r7AliWawtUWB851USj4moI,1519
-internal-1.1.11.dist-info/METADATA,sha256=62bJWUCU0Ty1dBYZ96QHuYpE8EzSQAqVgzsoOL76Mgk,939
-internal-1.1.11.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-internal-1.1.11.dist-info/RECORD,,
+internal-1.1.13.dist-info/METADATA,sha256=VPqzG5UnLdEAxu2d8NYv2wQ8TDlEhiV_zzYHY84peQA,939
+internal-1.1.13.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+internal-1.1.13.dist-info/RECORD,,