internal 1.0.9__py3-none-any.whl → 1.0.11__py3-none-any.whl

internal/base_factory.py

@@ -70,7 +70,7 @@ class BaseFactory(metaclass=ABCMeta):
         self.__load_cloud_config(app)
 
         if self.get_app_config().LOGGER_REQUEST_ENABLE:
-            app.add_middleware(LogRequestMiddleware, logger=self.state.logger)
+            app.add_middleware(LogRequestMiddleware, logger=app.state.logger)
 
         mongodb = database.MongoDB(self.get_app_config().DATABASE_USERNAME, self.get_app_config().DATABASE_PASSWORD,
                                    self.get_app_config().DATABASE_HOST, self.get_app_config().DATABASE_PORT,

internal/common_enum/order_type.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class OrderTypeEnum(str, Enum):
+    ASC = "ASC"
+    DESC = "DESC"

internal/model/base_model.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from enum import Enum
+
 from typing import List, Tuple, Union, Dict, Type
 
 import arrow
@@ -11,6 +11,7 @@ from pydantic import Field, BaseModel
 from .operate import Operate
 from ..const import DEF_PAGE_SIZE, DEF_PAGE_NO
 from ..exception.internal_exception import NoChangeException
+from ..common_enum.order_type import OrderTypeEnum
 
 
 class InternalBaseDocument(Document):
@@ -39,6 +40,7 @@ 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()
@@ -50,7 +52,8 @@ class InternalBaseDocument(Document):
 
         return page_no, page_size, total_num, page_data
 
-    async def update_wrap(self, schema: Union[Dict, Type[BaseModel]]) -> Tuple[Operate, 'InternalBaseDocument', 'InternalBaseDocument']:
+    async def update_wrap(self, schema: Union[Dict, Type[BaseModel]]) -> Tuple[
+        Operate, 'InternalBaseDocument', 'InternalBaseDocument']:
         if not issubclass(type(schema), dict) and not issubclass(type(schema), BaseModel):
             raise TypeError("Schema must be a subclass of BaseModel or dict")
 
@@ -71,8 +74,3 @@ class InternalBaseDocument(Document):
 
         await self.save()
         return operate, original_model, self
-
-
-class OrderTypeEnum(str, Enum):
-    ASC = "ASC"
-    DESC = "DESC"

{internal-1.0.9.dist-info → internal-1.0.11.dist-info}/METADATA

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

{internal-1.0.9.dist-info → internal-1.0.11.dist-info}/RECORD

@@ -1,10 +1,11 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/base_config.py,sha256=5-s2muyaLOGKhrq8kVqq0qaXFD09FrcQZCAFmw1FQtk,1755
-internal/base_factory.py,sha256=KtqCeyCNlEzcw4oe-AC9UMwidl6LigbspD0ZNSrlAuY,7855
+internal/base_factory.py,sha256=Cxi0NQMiAiPNcbsyXqo_Ilc91TU3KbnLL1F6RIG9L08,7854
 internal/common_enum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/common_enum/contact_type.py,sha256=uwZjxImXltMmfoAbe-1IeK3ry-p_wJ-wPPWR6NB7WXM,142
 internal/common_enum/event_type.py,sha256=jMuqiVGhOcYaJ7rYpn-nSpVH08bUsycF7ezHqpXk_Mc,114
 internal/common_enum/operator_type.py,sha256=dkLgO3EX0jiU-gAj5985FKOs68xBYPX2BNZZ5Vyvk2Y,125
+internal/common_enum/order_type.py,sha256=15n3272PkihkQtsQWCYOrBytQAm5Q4-elKxPXZ_bZaY,90
 internal/common_enum/service_ticket_event_trigger_type.py,sha256=g5t4h7-Puk5Gc8AjLi2kSE88iU2WtLvbiv0ZOmidZo0,511
 internal/const.py,sha256=U1S9r7bjtHgad2oYQoHO19s8D4V0WDUG-L-haV4UaIw,1025
 internal/database.py,sha256=atf0iyEqeG97eYr3s4GrTHKM5LjLiKlCNWiuAWoE2vs,2124
@@ -23,9 +24,9 @@ internal/interface/base_interface.py,sha256=R5MmO5oa5-ORPV_adkegLVCwsVio2zFOuQFG
 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
-internal/model/base_model.py,sha256=svULVdROpcnmTyhIbZ7M6pn40vhb_qIZ5W2CEyuEWZE,3002
+internal/model/base_model.py,sha256=wnAKz21bXcbR4QqENc1_hKbUkzc8a8aT8oyhS9WT7kw,3032
 internal/model/operate.py,sha256=luEoP_Asvso_11qz1SAE1Kn5KxAnDRptM0VylC5tNik,1493
 internal/utils.py,sha256=0SubS0iUhDvjSX1F4TykasA5-enYJzt2VH-f7_0BnjI,1509
-internal-1.0.9.dist-info/METADATA,sha256=NDFoiFWuYxUq76ZMMqqb843vMfNkO84tjAyR3UEmWj4,624
-internal-1.0.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-internal-1.0.9.dist-info/RECORD,,
+internal-1.0.11.dist-info/METADATA,sha256=76JoBWBzPP6I51-ZoyUIJHAGWFxhpTJMAxC48U1IXlI,625
+internal-1.0.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+internal-1.0.11.dist-info/RECORD,,