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

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/model/base_model.py

@@ -44,7 +44,9 @@ class InternalBaseDocument(Document):
                 else:
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
-            final_sort.append((cls.id, pymongo.ASCENDING))
+
+            if not any(s[0] == str(cls.id) for s in sort):
+                final_sort.append((cls.id, pymongo.ASCENDING))
 
         if exclude_field_list:
             # 當需要排除欄位時，使用 Motor 直接操作
@@ -141,7 +143,9 @@ class InternalBaseDocument(Document):
                 else:
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
-            final_sort.append((cls.id, pymongo.ASCENDING))
+
+            if not any(s[0] == str(cls.id) for s in sort):
+                final_sort.append((cls.id, pymongo.ASCENDING))
 
         if exclude_field_list:
             # 當需要排除欄位時，使用 Motor 直接操作

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.39.2.dist-info → internal-1.1.45.dist-info}/METADATA

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

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

@@ -25,16 +25,16 @@ internal/ext/amazon/aws/__init__.py,sha256=2YFjb-rHG1JaZGZiZffYDesgTAJjDshOqQbsw
 internal/ext/amazon/aws/const.py,sha256=l4WMg5bKWujwOKABBkCO2zclNg3abnYOfbhD7DG8GsA,109
 internal/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/http/requests.py,sha256=jLnOXEQOMEOpZrevVGFKlQ_MCkhjfudRqkuC-HWeHx0,8913
-internal/http/responses.py,sha256=75vJGS_aA9a5ff0HI6N03KM0CErIsAOtD06x7qr6yoQ,3079
+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=ZtCyfrF3IyKTF6Uj8L66CutdZi3srVmppqO_EXT5Tuw,3035
 internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/model/base_model.py,sha256=2M9EUWitzG-5FD4tYbUULBcWL6045HfS6OkpwzevmsY,7892
+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.39.2.dist-info/METADATA,sha256=qm4E1RtqITZlQDcWyZPBWiwY4FULRZrgHjJg7KCzIvg,941
-internal-1.1.39.2.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-internal-1.1.39.2.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,,