internal 1.0.24__tar.gz → 1.0.26__tar.gz

{internal-1.0.24 → internal-1.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 1.0.24
+Version: 1.0.26
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.0.24 → internal-1.0.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "internal"
-version = "1.0.24"
+version = "1.0.26"
 description = ""
 authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"

{internal-1.0.24 → internal-1.0.26}/src/internal/http/responses.py

@@ -1,7 +1,7 @@
 import json
 import arrow
 
-from datetime import datetime
+from datetime import datetime, date
 
 import httpx
 
@@ -9,21 +9,25 @@ from fastapi import status
 from fastapi.responses import JSONResponse
 from fastapi.encoders import jsonable_encoder
 from beanie import Document, Link
-from ..const import ARR_HUMAN_READ_FMT
+from ..const import ARR_HUMAN_READ_FMT, ARR_DATE_FMT
 
 
 async def async_response(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None,
-                         time_zone="UTC", time_format=ARR_HUMAN_READ_FMT, status_code=status.HTTP_200_OK):
+                         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):
             link_field_list = []
             datetime_field_list = []
+            date_field_list = []
             for field_name in data.__annotations__:
                 field_type = getattr(data, field_name)
                 if isinstance(field_type, Link):
                     link_field_list.append(field_name)
                 if isinstance(field_type, datetime):
                     datetime_field_list.append(field_name)
+                if isinstance(field_type, date):
+                    date_field_list.append(field_name)
 
             data = json.loads(data.model_dump_json(exclude="password", by_alias=False))
             if link_field_list:
@@ -33,6 +37,9 @@ async def async_response(data=None, message=None, code=None, page_no=None, total
             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)
 
         return data
 

{internal-1.0.24 → internal-1.0.26}/src/internal/model/base_model.py

@@ -63,7 +63,7 @@ class InternalBaseDocument(Document):
             delta_dict = schema.model_dump()
 
         for key, value in delta_dict.items():
-            if value is not None and hasattr(self, key):
+            if hasattr(self, key):
                 setattr(self, key, value)
 
         operate = await Operate.generate_operate(original_model.model_dump(), self.model_dump())