internal 1.0.106__py3-none-any.whl → 1.0.108__py3-none-any.whl

internal/base_factory.py

@@ -1,4 +1,5 @@
 import logging
+import logging.config
 import logging.handlers
 import os
 import traceback
@@ -21,6 +22,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
 
@@ -231,6 +233,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/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.106.dist-info → internal-1.0.108.dist-info}/METADATA

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

{internal-1.0.106.dist-info → internal-1.0.108.dist-info}/RECORD

@@ -1,16 +1,13 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/base_config.py,sha256=CtGIJhMSYsJQxvfkr5rZxuuXpGUY9RYyAf-p8MDv2pM,2142
-internal/base_factory.py,sha256=KoXaEibkb2GsAqbjzj0HFiG9JaRs4ta5Be9bE-Qguak,11001
+internal/base_factory.py,sha256=j4CKCtQWOllFe1ILK1ZrmFTg28o93OpbFAvsQRbO_kc,11098
 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
 internal/common_enum/description_type.py,sha256=kGwkFQh6dMnjDl6ipWYpA-qbNRrhEpnPq3NleTsNwwk,118
 internal/common_enum/device_code.py,sha256=lDTqRmP8zl6-k62HCsRehNAKCTXxH6WltZnvijy8Ijc,223
 internal/common_enum/event_code.py,sha256=L-1Q14pPTXkmE6XgpRQouB6cmat6sTyPGS3zI5jkFRQ,1880
-internal/common_enum/event_trigger_type.py,sha256=OwGToYb02bBB1_XX6svuoq0zssTR2YQzncm0JfA0Fjs,1799
-internal/common_enum/feature.py,sha256=JYjug8-LVbZErwhdmK3y8ljvlQPffBcI6EsdJ5Mtpj8,113
 internal/common_enum/lpr_direction.py,sha256=glCGSkcXHUB6_p2jO_7IdEHycyFVhu0vHDDDXbFJ174,113
-internal/common_enum/notify_type.py,sha256=nXPe6qziCwonn5ARIpq0vfc5n6dOBDMQwimPpHyrNUM,187
 internal/common_enum/operator_type.py,sha256=XfHwGDsuOG6-ajitDoRuLFLT1LhHKoXXzFRW4e5vmJ8,173
 internal/common_enum/order_type.py,sha256=XwAl5JaZgFLahBQhBKG4VuMJ39Si9KZEhcSS0-DKKzQ,90
 internal/const.py,sha256=gcUn6kINa7PqxmL05agLp5FFd8Nl8jcZrPPsdXM5tKI,1126
@@ -28,6 +25,7 @@ internal/http/requests.py,sha256=jnclx5SPjCAfQ9b4bOSPLPCocMLL9Fr7_SXEsWmMnx4,278
 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
+internal/log_config.py,sha256=kVa44o3XgU7ZICADeB7jQv6NW0YhnEOQTbv1461JVQA,804
 internal/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/middleware/log_request.py,sha256=bXAxmvvsYDhObXzfUw4ZNreKAWOo8ee_vpb6Xin5ztc,854
 internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,6 +33,6 @@ internal/model/base_model.py,sha256=NWjysNOp2MfXvAHGFqaQA_l8ZfTFvJbXQPUPuOXN_2g,
 internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
 internal/utils.py,sha256=i6YZdiXsiWnOjRdlJ6afNCGpyMe3Uo9mhm3xlQBy3Ls,2824
 internal/validator_utils.py,sha256=5ZLcNIgw1hvkYOj1f6gS9AYxe7Y3ufW9FyDxUS7FsMQ,1226
-internal-1.0.106.dist-info/METADATA,sha256=6Ie90kTCYUdNBwuE0n10p3p3pcrzs4Yo-rK2GiKwtlU,809
-internal-1.0.106.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-internal-1.0.106.dist-info/RECORD,,
+internal-1.0.108.dist-info/METADATA,sha256=rCcjz6I0AfuktscLbodoao-cS2O1HPfGROu81UYfDM4,809
+internal-1.0.108.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+internal-1.0.108.dist-info/RECORD,,

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/common_enum/feature.py

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

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"