internal 1.1.40__py3-none-any.whl → 1.1.42__py3-none-any.whl

internal/model/base_model.py

@@ -45,7 +45,7 @@ class InternalBaseDocument(Document):
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
 
-            if not any(s[0] == cls.id for s in final_sort):
+            if not any(s[0] == str(cls.id) for s in sort):
                 final_sort.append((cls.id, pymongo.ASCENDING))
 
         if exclude_field_list:
@@ -144,7 +144,7 @@ class InternalBaseDocument(Document):
                     print(f"order type value error: temp_sort:{temp_sort}")
                     continue
 
-            if not any(s[0] == cls.id for s in final_sort):
+            if not any(s[0] == str(cls.id) for s in sort):
                 final_sort.append((cls.id, pymongo.ASCENDING))
 
         if exclude_field_list:

internal/utils.py

@@ -6,7 +6,7 @@ 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):
@@ -49,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:

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

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

{internal-1.1.40.dist-info → internal-1.1.42.dist-info}/RECORD

@@ -31,10 +31,10 @@ internal/interface/base_interface.py,sha256=3YaVjIgLi_pZpLk5SEIk8WVkuICM8qPavT8r
 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=QxPYao2xi8CcE8jM-iUOf0ymH3W3nAGrnOtEUnp-4-A,8022
+internal/model/base_model.py,sha256=-YlVPZGuG926PksyQw5SgKjkdC80q_eQTL3EnzVSfIs,8020
 internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
-internal/utils.py,sha256=dVhKi3WPXQzVjaIGZBdfNjkMYtE7O-vKeyyOSX4mTG0,4518
-internal/validator_utils.py,sha256=CqjaVFoAu5MqvBG_AkTP-r7AliWawtUWB851USj4moI,1519
-internal-1.1.40.dist-info/METADATA,sha256=2DwfAmZTLGE7cjFmSdeKkGEF2ftaaNGFiFnmwUNCyXA,939
-internal-1.1.40.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-internal-1.1.40.dist-info/RECORD,,
+internal/utils.py,sha256=6iIM1EPLeYYj5LEdgqDADGH-52q9YM6lOxaaxs6z1Gg,4559
+internal/validator_utils.py,sha256=0Wkf3fjpIQx1lrYmDJM-olamEb6q6CI15NN_XpsLHgQ,1640
+internal-1.1.42.dist-info/METADATA,sha256=wrl81JhcSdmzm0cH7WNxu9sd-mToyhK2dmUYvgsYnKs,939
+internal-1.1.42.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+internal-1.1.42.dist-info/RECORD,,