internal 0.1.97__tar.gz → 0.1.99__tar.gz

{internal-0.1.97 → internal-0.1.99}/PKG-INFO

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

{internal-0.1.97 → internal-0.1.99}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "internal"
-version = "0.1.97"
+version = "0.1.99"
 description = ""
 authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"

{internal-0.1.97 → internal-0.1.99}/src/internal/base_config.py

@@ -48,9 +48,7 @@ class BaseConfig(BaseSettings):
     SCHEDULER_BASE_URL: str = "http://scheduler-service-api:5000"
 
     # Exception Notify
-    SLACK_WEBHOOK_BASE_URL: str = ""
-    SLACK_WEBHOOK_CHANNEL: str = ""
-    SLACK_WEBHOOK_USERNAME: str = ""
+    WEBHOOK_BASE_URL: str = ""
 
     class Config:
         case_sensitive = False

{internal-0.1.97 → internal-0.1.99}/src/internal/base_factory.py

@@ -112,11 +112,11 @@ 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().SLACK_WEBHOOK_BASE_URL and self.get_app_config().SLACK_WEBHOOK_CHANNEL and self.get_app_config().SLACK_WEBHOOK_USERNAME:
+            if self.get_app_config().WEBHOOK_BASE_URL:
                 message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, request:{request.__dict__}, exc:{exc}"
-                payload = {"channel": f"#{self.get_app_config().SLACK_WEBHOOK_CHANNEL}", "username": self.get_app_config().SLACK_WEBHOOK_USERNAME, "text": message}
+                payload = {"text": message}
                 try:
-                    await async_request(app, "POST", self.get_app_config().SLACK_WEBHOOK_BASE_URL, json=payload)
+                    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}")
 

{internal-0.1.97 → internal-0.1.99}/src/internal/http/requests.py

@@ -19,7 +19,10 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None, **
 
     try:
         async with httpx.AsyncClient(timeout=timeout, verify=False) as client:
+            app.state.logger.info(f"async_request() request, url: {url}, method: {method}, kwargs: {kwargs}")
             response = await client.request(method, url, **kwargs)
+            app.state.logger.info(
+                f"async_request() response, url: {url}, method: {method}, kwargs: {kwargs}, response: {response}")
             return response
     except httpx.TimeoutException as exc:
         app.state.logger.warn(