internal 1.1.35__py3-none-any.whl → 1.1.45__py3-none-any.whl

internal/common_enum/operator_type.py

@@ -7,3 +7,4 @@ class OperatorTypeEnum(str, Enum):
     CUSTOMER = "customer"
     PROVIDER = "provider"
     CLIENT = "client"
+    ADMIN = "admin"

internal/http/requests.py

@@ -1,4 +1,5 @@
 import asyncio
+import json
 import random
 
 import httpx
@@ -21,9 +22,16 @@ async def invoke_request(timeout: httpx.Timeout, method: str, url: str, app: Fas
 
             response = await client.request(method, url, **kwargs)
 
-            app.state.logger.info(
-                f"RESPONSE | {kwargs.get('headers').get(CORRELATION_ID_HEADER_KEY_NAME)} | {method} | {url} | {response.status_code} | {response.text}"
-            )
+            try:
+                response_json = json.loads(response.text)
+                response_text = json.dumps(response_json, ensure_ascii=False)
+                app.state.logger.info(
+                    f"RESPONSE | {kwargs.get('headers').get(CORRELATION_ID_HEADER_KEY_NAME)} | {method} | {url} | {response.status_code} | {response_text}"
+                )
+            except json.decoder.JSONDecodeError:
+                app.state.logger.info(
+                    f"RESPONSE | {kwargs.get('headers').get(CORRELATION_ID_HEADER_KEY_NAME)} | {method} | {url} | {response.status_code} | {response.text}"
+                )
 
             return response
     except httpx.TimeoutException as exc:

internal/http/responses.py

@@ -2,6 +2,7 @@ import json
 import arrow
 
 from datetime import datetime, date
+from pydantic import BaseModel
 
 import httpx
 
@@ -16,23 +17,29 @@ async def async_response(data=None, message=None, code=None, page_no=None, total
                          time_zone="UTC", time_format=ARR_HUMAN_READ_FMT, date_format=ARR_DATE_FMT,
                          status_code=status.HTTP_200_OK):
     def _serialize(data):
-        if issubclass(type(data), Document):
+        if issubclass(type(data), Document) or issubclass(type(data), BaseModel):
             link_field_list = []
             datetime_field_list = []
             date_field_list = []
+            replace_dict = {}
             for field_name in data.__annotations__:
                 field_type = getattr(data, field_name)
+                if field_name in ["contact", "pick_up", "car", "customer"]:
+                    if field_type:
+                        replace_dict[field_name] = _serialize(field_type)
+
                 if isinstance(field_type, Link):
                     link_field_list.append(field_name)
 
-                if field_name.endswith('_date') or field_name == "birthday":
+                if field_name.endswith('_date') or field_name == "birthday" or field_name.endswith('_birthday'):
                     date_field_list.append(field_name)
                 elif isinstance(field_type, datetime):
                     datetime_field_list.append(field_name)
                 elif isinstance(field_type, date):
                     date_field_list.append(field_name)
 
-            data = json.loads(data.model_dump_json(exclude={"password", "metadata", "otp_code_universal"}, by_alias=False))
+            data = json.loads(
+                data.model_dump_json(exclude={"password", "metadata", "otp_code_universal"}, by_alias=False))
             if link_field_list:
                 for field_name in link_field_list:
                     if isinstance(data[field_name], dict) and "id" in data[field_name].keys():
@@ -44,6 +51,34 @@ async def async_response(data=None, message=None, code=None, page_no=None, total
                 if data[field_name]:
                     data[field_name] = arrow.get(data[field_name]).to(time_zone).format(date_format)
 
+            for key, value in replace_dict.items():
+                data[key] = value
+
+            if "create_time" in data.keys() and data.get("create_time"):
+                data["create_time"] = arrow.get(data["create_time"]).to(time_zone).format(ARR_HUMAN_READ_FMT)
+
+            if "update_time" in data.keys() and data.get("update_time"):
+                data["update_time"] = arrow.get(data["update_time"]).to(time_zone).format(ARR_HUMAN_READ_FMT)
+
+        elif isinstance(data, dict):
+            datetime_field_list = []
+            date_field_list = []
+            for field_name, field_type in data.items():
+                if field_name.endswith('_date') or field_name == "birthday" or field_name.endswith('_birthday'):
+                    date_field_list.append(field_name)
+                elif isinstance(field_type, datetime):
+                    datetime_field_list.append(field_name)
+                elif isinstance(field_type, date):
+                    date_field_list.append(field_name)
+
+            data = json.loads(json.dumps(data, default=jsonable_encoder))
+            for field_name in datetime_field_list:
+                if data[field_name]:
+                    data[field_name] = arrow.get(data[field_name]).to(time_zone).format(time_format)
+            for field_name in date_field_list:
+                if data[field_name]:
+                    data[field_name] = arrow.get(data[field_name]).to(time_zone).format(date_format)
+
             if "create_time" in data.keys() and data.get("create_time"):
                 data["create_time"] = arrow.get(data["create_time"]).to(time_zone).format(ARR_HUMAN_READ_FMT)
 

internal/middleware/log_request.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import time
 
@@ -30,18 +31,60 @@ class LogRequestMiddleware(BaseHTTPMiddleware):
         params = {k: v[0] if len(v) == 1 else v for k, v in temp.items()}
 
         body = await request.body()
+
+        # 解碼 body 為字符串（如果不是 multipart）
         if is_multipart:
-            self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: 因上傳檔案不顯示body \nHeaders: {headers} \nstart processing...")
+            body_str = "因上傳檔案不顯示body"
         else:
-            self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: {body} \nHeaders: {headers} \nstart processing...")
+            try:
+                # 嘗試使用 UTF-8 解碼
+                body_str = body.decode('utf-8')
+            except UnicodeDecodeError:
+                # 如果解碼失敗，顯示原始 bytes
+                body_str = str(body)
+
+        request_info = {
+            "request_id": request_id,
+            "method": method,
+            "url": url,
+            "params": params,
+            "body": body_str,
+            "content_type": content_type,
+            "user_agent": headers.get("user-agent", "")
+        }
+        self.logger.info(f"Request started: {json.dumps(request_info, ensure_ascii=False)}")
 
         # 记录请求处理时间
         start_time = time.time()
-        response = await call_next(request)
-        process_time = time.time() - start_time
+        try:
+            response = await call_next(request)
+            process_time = time.time() - start_time
+            status_code = response.status_code
 
-        if is_multipart:
-            self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: 因上傳檔案不顯示body \nCompleted in {process_time:.4f} seconds")
-        else:
-            self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: {body} \nCompleted in {process_time:.4f} seconds")
-        return response
+            # 记录成功响应
+            response_info = {
+                "request_id": request_id,
+                "method": method,
+                "url": url,
+                "status_code": status_code,
+                "process_time": round(process_time, 4)
+            }
+
+            self.logger.info(f"Request completed: {json.dumps(response_info, ensure_ascii=False)}")
+
+            return response
+
+        except Exception as e:
+            process_time = time.time() - start_time
+
+            # 记录异常
+            error_info = {
+                "request_id": request_id,
+                "method": method,
+                "url": url,
+                "error": str(e),
+                "process_time": round(process_time, 4)
+            }
+
+            self.logger.error(f"Request failed: {json.dumps(error_info, ensure_ascii=False)}")
+            raise

internal/model/base_model.py

@@ -1,8 +1,6 @@
 from datetime import datetime
 
 from typing import List, Tuple, Union, Dict, Type, Optional, Any, Literal, Union, Set, Mapping
-import typing_extensions
-from pydantic_core import PydanticUndefined
 from typing_extensions import Self, TypeAlias, Unpack
 
 import arrow
@@ -27,8 +25,8 @@ class InternalBaseDocument(Document):
     @classmethod
     async def get_pagination_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None,
                                   page_size: int = DEF_PAGE_SIZE, page_no: int = DEF_PAGE_NO,
-                                  ignore_cache: bool = False,
-                                  fetch_links: bool = False):
+                                  ignore_cache: bool = False, fetch_links: bool = False,
+                                  exclude_field_list: List[str] = None):
         if not query:
             final_query = []
         else:
@@ -46,21 +44,59 @@ class InternalBaseDocument(Document):
                 else:
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
-            final_sort.append((cls.id, pymongo.ASCENDING))
 
-        total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
-            *final_sort).count()
+            if not any(s[0] == str(cls.id) for s in sort):
+                final_sort.append((cls.id, pymongo.ASCENDING))
+
+        if exclude_field_list:
+            # 當需要排除欄位時，使用 Motor 直接操作
+            collection = cls.get_motor_collection()
+            projection = {field: 0 for field in exclude_field_list}
+
+            # 建立查詢條件
+            mongo_query = {}
+            for q in final_query:
+                if hasattr(q, 'query'):
+                    mongo_query.update(q.query)
+
+            # 計算總數
+            total_num = await collection.count_documents(mongo_query)
+            total_pages = (total_num + page_size - 1) // page_size
+
+            if total_pages == 0:
+                page_no = 1
+                page_data = []
+            else:
+                page_no = max(1, min(page_no, total_pages))
+
+                # 執行分頁查詢
+                cursor = collection.find(mongo_query, projection).sort(final_sort).skip(
+                    (page_no - 1) * page_size).limit(page_size)
+                documents = await cursor.to_list(None)
+
+                # 轉換為 Pydantic 模型
+                page_data = []
+                for doc in documents:
+                    try:
+                        page_data.append(cls.model_validate(doc))
+                    except Exception as e:
+                        print(f"模型驗證失敗: {e}")
+                        continue
+        else:
+            # 沒有排除欄位時使用 Beanie 的方法
+            total_num = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                *final_sort).count()
 
-        total_pages = (total_num + page_size - 1) // page_size
+            total_pages = (total_num + page_size - 1) // page_size
 
-        if total_pages == 0:
-            page_no = 1
-            page_data = []
-        else:
-            page_no = max(1, min(page_no, total_pages))
+            if total_pages == 0:
+                page_no = 1
+                page_data = []
+            else:
+                page_no = max(1, min(page_no, total_pages))
 
-            page_data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
-                *final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
+                page_data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                    *final_sort).limit(page_size).skip((page_no - 1) * page_size).to_list()
 
         return page_no, page_size, total_num, page_data
 
@@ -89,7 +125,7 @@ class InternalBaseDocument(Document):
 
     @classmethod
     async def get_list(cls, app: FastAPI, query: list = None, sort: List[Tuple] = None, ignore_cache: bool = False,
-                       fetch_links: bool = False):
+                       fetch_links: bool = False, exclude_field_list: List[str] = None):
         if not query:
             final_query = []
         else:
@@ -107,10 +143,37 @@ class InternalBaseDocument(Document):
                 else:
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
-            final_sort.append((cls.id, pymongo.ASCENDING))
 
-        data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
-            *final_sort).to_list()
+            if not any(s[0] == str(cls.id) for s in sort):
+                final_sort.append((cls.id, pymongo.ASCENDING))
+
+        if exclude_field_list:
+            # 當需要排除欄位時，使用 Motor 直接操作
+            collection = cls.get_motor_collection()
+            projection = {field: 0 for field in exclude_field_list}
+
+            # 建立查詢條件
+            mongo_query = {}
+            for q in final_query:
+                if hasattr(q, 'query'):
+                    mongo_query.update(q.query)
+
+            # 執行查詢
+            cursor = collection.find(mongo_query, projection).sort(final_sort)
+            documents = await cursor.to_list(None)
+
+            # 轉換為 Pydantic 模型
+            data = []
+            for doc in documents:
+                try:
+                    data.append(cls.model_validate(doc))
+                except Exception as e:
+                    print(f"模型驗證失敗: {e}")
+                    continue
+        else:
+            # 沒有排除欄位時使用 Beanie 的方法
+            data = await cls.find(*final_query, ignore_cache=ignore_cache, fetch_links=fetch_links).sort(
+                *final_sort).to_list()
 
         return data
 

internal/utils.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 import json
+import hashlib
 from datetime import datetime, timezone
 
 import arrow
 
 from .base_config import BaseConfig
-from .const import STR_EMPTY, ARR_EXPORT_DATETIME_FMT, STR_DASH, REDIS_LPR_DATA_LIST_PREFIX
+from .const import STR_EMPTY, ARR_EXPORT_DATETIME_FMT, STR_DASH, REDIS_LPR_DATA_LIST_PREFIX, STR_SPACE
 
 
 def is_today(time, system_time_zone):
@@ -48,7 +49,7 @@ def update_dict_with_cast(curr_settings: BaseConfig, new_conf: dict):
 
 
 def sanitize_plate_no(plate_no):
-    return plate_no.replace(STR_DASH, STR_EMPTY).upper()
+    return plate_no.replace(STR_SPACE, STR_EMPTY).replace(STR_DASH, STR_EMPTY).upper()
 
 
 def get_current_utc() -> datetime:
@@ -105,6 +106,7 @@ def get_dealer_by_organization_id(organization_id: str) -> str:
 
     return organization_id
 
+
 def extract_title(name):
     if '小姐' in name:
         return '小姐'
@@ -115,6 +117,7 @@ def extract_title(name):
     else:
         return None
 
+
 def extract_name(name):
     """从姓名中提取真实姓名"""
     # 检查是否包含 '小姐' 或 '先生' 并提取姓名
@@ -125,4 +128,28 @@ def extract_name(name):
     elif '先生' in name:
         return name.split('先生')[0].strip()
     else:
-        return name.strip()
+        return name.strip()
+
+
+def hash_login_password(passwd):
+    prefix = '___'
+    postfix = '_______'
+    data = str(passwd)
+    sha_256 = hashlib.sha256()
+    sha_256.update(prefix.encode())
+    sha_256.update(data.encode())
+    sha_256.update(postfix.encode())
+
+    return sha_256.hexdigest()
+
+
+def hash_secret_key(passwd):
+    prefix = '___'
+    postfix = '_______'
+    data = str(passwd)
+    sha_256 = hashlib.sha256()
+    sha_256.update(prefix.encode())
+    sha_256.update(data.encode())
+    sha_256.update(postfix.encode())
+
+    return sha_256.hexdigest()

internal/validator_utils.py

@@ -10,8 +10,12 @@ def verify_and_sanitize_plate_no(value: str, is_require: bool = False):
         raise PlateNoFormatException()
 
     if value:
-        if not re.match(r'^[A-Za-z0-9]{6,7}$', value):
+        # 移除空格和常見分隔符號進行檢查
+        cleaned = sanitize_plate_no(value)
+
+        if not re.match(r'^[外使領試臨軍A-Za-z0-9]{5,7}$', cleaned):
             raise PlateNoFormatException()
+
     return sanitize_plate_no(value)
 
 

{internal-1.1.35.dist-info → internal-1.1.45.dist-info}/METADATA

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

{internal-1.1.35.dist-info → internal-1.1.45.dist-info}/RECORD

@@ -9,7 +9,7 @@ internal/common_enum/device_code.py,sha256=lDTqRmP8zl6-k62HCsRehNAKCTXxH6WltZnvi
 internal/common_enum/event_code.py,sha256=XpxbgpP8wkykEngma4cGgv_NefuSU6Juqy33x_vsWio,2119
 internal/common_enum/lpr_direction.py,sha256=glCGSkcXHUB6_p2jO_7IdEHycyFVhu0vHDDDXbFJ174,113
 internal/common_enum/notify_type.py,sha256=p01d9ODiJ9vDpFBJ55bhu7WOyO7Te3slToOhvFKxQbk,188
-internal/common_enum/operator_type.py,sha256=XfHwGDsuOG6-ajitDoRuLFLT1LhHKoXXzFRW4e5vmJ8,173
+internal/common_enum/operator_type.py,sha256=RiAY5eUAWQRODG9XasYqsfZFRglCZv4Y0UbCSqBXKEk,193
 internal/common_enum/order_type.py,sha256=XwAl5JaZgFLahBQhBKG4VuMJ39Si9KZEhcSS0-DKKzQ,90
 internal/common_enum/point_type.py,sha256=nmrHw_6OJIadgWwqCa63IVnc4T5uf69vQojWPbAwCrE,120
 internal/common_enum/websocket_channel.py,sha256=BIhdE2z_xF3lgStS8GiaS5M8BXm4_g3vHQaaN5qNJTQ,283
@@ -24,17 +24,17 @@ 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=cgqDl9k4XsfvXW-EPLid-kPtHPWUyF8athu3GWQWAKo,8474
-internal/http/responses.py,sha256=75vJGS_aA9a5ff0HI6N03KM0CErIsAOtD06x7qr6yoQ,3079
+internal/http/requests.py,sha256=jLnOXEQOMEOpZrevVGFKlQ_MCkhjfudRqkuC-HWeHx0,8913
+internal/http/responses.py,sha256=CueHdh9JvUZ8MEuLgLefuB-yv4ikJZIDzA-dMWtYZAk,4872
 internal/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/interface/base_interface.py,sha256=3YaVjIgLi_pZpLk5SEIk8WVkuICM8qPavT8rB0MdB5U,1536
 internal/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/middleware/log_request.py,sha256=OFwWnGfzXnllcQsBHolAWVsahXKoEhw3OQ1YWOm7RHM,2087
+internal/middleware/log_request.py,sha256=ZtCyfrF3IyKTF6Uj8L66CutdZi3srVmppqO_EXT5Tuw,3035
 internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/model/base_model.py,sha256=hxleV8fYNvFgUoYmCv_inEP3kA4tD4HhCBCNFVK8SZg,5509
+internal/model/base_model.py,sha256=-YlVPZGuG926PksyQw5SgKjkdC80q_eQTL3EnzVSfIs,8020
 internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
-internal/utils.py,sha256=wK1QumW1AaWE1ga2-WcDH2rtXRr2hSLwXzy-iI5dTzY,3962
-internal/validator_utils.py,sha256=CqjaVFoAu5MqvBG_AkTP-r7AliWawtUWB851USj4moI,1519
-internal-1.1.35.dist-info/METADATA,sha256=3Smb8SVFmJITUWASgmak62MkOMqiIfxtvVqDT6n1iPI,939
-internal-1.1.35.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-internal-1.1.35.dist-info/RECORD,,
+internal/utils.py,sha256=6iIM1EPLeYYj5LEdgqDADGH-52q9YM6lOxaaxs6z1Gg,4559
+internal/validator_utils.py,sha256=iRI8aJLz0wz-j8p-T1BOGOF8VE2zwNh424uApbc8IZs,1640
+internal-1.1.45.dist-info/METADATA,sha256=-g_Uw-lP4eo9_jIYZVg_nSJdxhd_L8J5AQ-g8kZjtws,939
+internal-1.1.45.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+internal-1.1.45.dist-info/RECORD,,