internal 1.0.105__tar.gz → 1.0.107__tar.gz

{internal-1.0.105 → internal-1.0.107}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.0.105
+Version: 1.0.107
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: arrow (>=1.3.0,<2.0.0)
+Requires-Dist: asgi-correlation-id (>=4.3.4,<5.0.0)
 Requires-Dist: beanie (>=1.29.0,<2.0.0)
 Requires-Dist: dictdiffer (>=0.9.0,<0.10.0)
 Requires-Dist: fastapi (>=0.115.6,<0.116.0)

{internal-1.0.105 → internal-1.0.107}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.0.105"
+version = "1.0.107"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"
@@ -19,6 +19,7 @@ beanie = "^1.29.0"
 dictdiffer = "^0.9.0"
 redis = "^5.2.1"
 uvicorn = "^0.34.0"
+asgi-correlation-id = "^4.3.4"
 
 [build-system]
 requires = ["poetry-core"]

{internal-1.0.105 → internal-1.0.107}/src/internal/base_factory.py

@@ -5,6 +5,7 @@ import traceback
 from abc import ABCMeta, abstractmethod
 from contextlib import asynccontextmanager
 from functools import lru_cache
+from asgi_correlation_id import CorrelationIdMiddleware
 
 import dotenv
 import watchtower
@@ -20,6 +21,7 @@ from .exception.internal_exception import BadGatewayException, GatewayTimeoutExc
 from .ext.amazon import aws
 from .http.requests import async_request
 from .http.responses import async_response
+from .log_config import LOGGING
 from .middleware.log_request import LogRequestMiddleware
 from .utils import update_dict_with_cast
 
@@ -115,8 +117,11 @@ class BaseFactory(metaclass=ABCMeta):
             allow_credentials=True,
             allow_methods=["*"],
             allow_headers=["*"],
+            expose_headers=['X-Request-ID']
         )
 
+        app.add_middleware(CorrelationIdMiddleware)
+
         self.__load_local_config()
         app.state.config = self.get_app_config()
         self.__setup_main_logger(app, level=logging.DEBUG)
@@ -227,6 +232,7 @@ class BaseFactory(metaclass=ABCMeta):
 
     #
     def __setup_logger(self, app, logger_name, level=logging.INFO):
+        logging.config.dictConfig(LOGGING)
         logger = logging.getLogger(logger_name)
         logger.setLevel(level)
 

{internal-1.0.105 → internal-1.0.107}/src/internal/const.py

@@ -7,7 +7,7 @@ DT_FMT = f"{DATE_FMT} {TIME_FMT}:%S"
 
 DEFAULT_LOGGER_NAME = "uvicorn"
 LOG_DT_FMT = f"{DT_FMT},%03d"
-LOG_FMT_NO_DT = "[%(levelname)7s][%(name)s][%(filename)s::%(funcName)s(%(lineno)s)]: %(message)s"
+LOG_FMT_NO_DT = "[%(levelname)7s][%(correlation_id)s][%(name)s][%(filename)s::%(funcName)s(%(lineno)s)]: %(message)s"
 LOG_FMT = "[%(asctime)s]" + LOG_FMT_NO_DT
 
 ARR_EXPORT_SHORT_FMT = "MM/DD HH:mm"

internal-1.0.107/src/internal/log_config.py

@@ -0,0 +1,32 @@
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'filters': {
+        'correlation_id': {
+            '()': 'asgi_correlation_id.CorrelationIdFilter',
+            'uuid_length': 32,
+            'default_value': '-',
+        },
+    },
+    'formatters': {
+        'web': {
+            'class': 'logging.Formatter',
+            'datefmt': '%H:%M:%S',
+            'format': '%(levelname)s ... [%(correlation_id)s] %(name)s %(message)s',
+        },
+    },
+    'handlers': {
+        'web': {
+            'class': 'logging.StreamHandler',
+            'filters': ['correlation_id'],
+            'formatter': 'web',
+        },
+    },
+    'loggers': {
+        'my_project': {
+            'handlers': ['web'],
+            'level': 'DEBUG',
+            'propagate': True,
+        },
+    },
+}

internal-1.0.105/src/internal/common_enum/event_trigger_type.py

@@ -1,34 +0,0 @@
-from enum import Enum
-
-
-# 待廢
-class EventTriggerTypeEnum(str, Enum):
-    MANUAL_CANCEL_SERVICE_TICKET = "manual_cancel_service_ticket"
-    MANUAL_TRACING_START_SERVICE_TICKET = "manual_tracking_start_service_ticket"
-    MANUAL_TRACING_STOP_SERVICE_TICKET = "manual_tracking_stop_service_ticket"
-    MANUAL_CREATE_SERVICE_TICKET = "manual_create_service_ticket"
-    MANUAL_IMPORT_RESERVATION_SMWS = "manual_import_reservation_smws"
-    MANUAL_MODIFY_USER_SERVICE_TICKET = "manual_modify_user_service_ticket"
-    MANUAL_MODIFY_ESTIMATED_ARRIVAL_TIME_SERVICE_TICKET = "manual_modify_estimated_arrival_time_service_ticket"
-    MANUAL_MODIFY_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_modify_estimated_delivery_time_service_ticket"
-    MANUAL_DELETE_ESTIMATED_DELIVERY_TIME_SERVICE_TICKET = "manual_delete_estimated_delivery_time_service_ticket"
-    MANUAL_BOOKING_MESSAGE_SERVICE_TICKET = "manual_booking_message_service_ticket"
-    MANUAL_DELIVERY_MESSAGE_SERVICE_TICKET = "manual_delivery_message_service_ticket"
-
-    NOSHOW_SERVICE_TICKET_AUTO_CANCEL = "noshow_service_ticket_auto_cancel"
-    IMPORT_RESERVATION_CONFLICT_AUTO_CANCEL = "import_reservation_conflict_auto_cancel"
-    BOOKING_REMINDING_SERVICE_TICKET = "booking_reminding_service_ticket"
-    TODAY_REPAIR_WORKING_SERVICE_TICKET_AUTO_CLOSED = "today_repair_working_service_ticket_auto_closed"
-
-    LPNR_IN_ESTABLISHED = "lpnr_in_established"
-    LPNR_IN_RECEPTION = "lpnr_in_reception"
-    LPNR_IN_WORKING = "lpnr_in_working"
-    LPNR_IN_NO_SERVICE_TICKET = "lpnr_in_no_service_ticket"
-    LPNR_OUT = "lpnr_out"
-    LPNR_OUT_GENERAL = "lpnr_out_general"
-    LPNR_OUT_NO_SERVE = "lpnr_out_no_serve"
-    LPNR_IN_POSITION = "lpnr_in_position"
-    LPNR_OUT_POSITION = "lpnr_out_position"
-
-    LPR_STATE = "lpr_state"
-    LPR = "lpr"

internal-1.0.105/src/internal/common_enum/feature.py

@@ -1,6 +0,0 @@
-from enum import Enum
-
-# 討論是否廢
-class FeatureEnum(str, Enum):
-    IMPORT = 'import'
-    QUERY = 'query'

internal-1.0.105/src/internal/common_enum/notify_type.py

@@ -1,10 +0,0 @@
-from enum import Enum
-
-
-# 討論是否廢
-class NotifyTypeEnum(str, Enum):
-    APP = "app"
-    LINE = "line"
-    SMS = "sms"
-    NOTIFICATION = "notification"
-    WEBSOCKET = "websocket"