mlmongo 2.0.2__tar.gz → 2.0.4__tar.gz

{mlmongo-2.0.2 → mlmongo-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlmongo
-Version: 2.0.2
+Version: 2.0.4
 Summary: mongodb数据库操作工具类
 Home-page: https://www.python.org
 Author: mengling

{mlmongo-2.0.2 → mlmongo-2.0.4}/mlmongo/asyncs.py

@@ -73,6 +73,7 @@ class AMongoModel(_MongoModel):
     @classmethod
     def mg_find_onekey_all(cls, key:str, *querys: dict, 
                               sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->AMGIt[Any]:
+        key = str(key)
         cursor  = cls.MGConfig.getConnect().find(MGFunction.and_(*querys), {'_id':0, key:1})
         if sort_map: cursor=cursor.sort(sort_map)
         if skip: cursor=cursor.skip(skip)
@@ -86,12 +87,14 @@ class AMongoModel(_MongoModel):
     @classmethod
     @_limit
     async def mg_find_onecol(cls, key:str, *querys: dict, default=None):
+        key = str(key)
         dt = (await cls.MGConfig.getConnect().find_one(MGFunction.and_(*querys), {'_id':0, key:1})) or {}
         return dt.get(key, default)
     
     @classmethod
     @_limit
     async def mg_id_find_onecol(cls, key:str, *ids:str|object|Any, default=None):
+        key = str(key)
         dt = (await cls.MGConfig.getConnect().find_one(cls.mgt_get_id_query(ids), {'_id':0, key:1})) or {}
         return dt.get(key, default)
     

{mlmongo-2.0.2 → mlmongo-2.0.4}/mlmongo/model.py

@@ -59,6 +59,8 @@ class MGIt(Generic[T]):
     
 class _MGFieldInfo(FieldInfo):
     def __init__(self, **kwargs):
+        # 用于同步_id字段的内容
+        self.sync_id = kwargs.pop('sync_id', False)
         super().__init__(**kwargs)
         self.fkey = None 
     
@@ -67,18 +69,21 @@ class _MGFieldInfo(FieldInfo):
     
     def __str__(self):
         assert self.fkey is not None, '_MGFieldInfo.fkey is None'
-        return self.fkey
+        return '_id' if self.sync_id else self.fkey
+    
+    def _get_value(self, value):
+        return ObjectId(value) if self.sync_id else value
     
     # 查询动作
-    def __gt__(self, value): return {self.fkey: {'$gt': value}}
-    def __ge__(self, value): return {self.fkey: {'$gte': value}}
-    def __lt__(self, value): return {self.fkey: {'$lt': value}}
-    def __le__(self, value): return {self.fkey: {'$lte': value}}
-    def __eq__(self, value): return {self.fkey: value}
-    def __ne__(self, value): return {self.fkey: {'$ne': value}}
-    def __mod__(self, value):  return {self.fkey: {'$regex': value}}
-    def in_(self, ls:list): return {self.fkey: {'$in': ls}}
-    def not_in_(self, ls:list): return {self.fkey: {'$nin': ls}}    
+    def __gt__(self, value): return {str(self): {'$gt': self._get_value(value)}}
+    def __ge__(self, value): return {str(self): {'$gte': self._get_value(value)}}
+    def __lt__(self, value): return {str(self): {'$lt': self._get_value(value)}}
+    def __le__(self, value): return {str(self): {'$lte': self._get_value(value)}}
+    def __eq__(self, value): return {str(self): self._get_value(value)}
+    def __ne__(self, value): return {str(self): {'$ne': self._get_value(value)}}
+    def __mod__(self, value):  return {str(self): {'$regex': self._get_value(value)}}
+    def in_(self, ls:list): return {str(self): {'$in': [self._get_value(v) for v in ls]}}
+    def not_in_(self, ls:list): return {str(self): {'$nin': [self._get_value(v) for v in ls]}}    
 
 _Unset: Any = PydanticUndefined
 @overload 
@@ -360,6 +365,7 @@ def MGField(
                         decimal_places=decimal_places,
                         union_mode=union_mode,
                         fail_fast=fail_fast,
+                        sync_id=extra.pop('sync_id', False)
                     )
 
 class MGConfig:
@@ -367,8 +373,6 @@ class MGConfig:
     db:str
     col:str
     default_ids:tuple[str] = ('_id',)
-    # 用于同步_id字段的内容
-    sync_ids: tuple[str] = ()
     
 class MGFunction:
     @staticmethod
@@ -473,9 +477,14 @@ class MongoModel(BaseModel):
                     merged[op] = value
         return merged
     
+    @property
+    def mgt_sync_ids(self)->list[str]:
+        return [field.fkey for field in self.__class__.model_fields.values() if isinstance(field, _MGFieldInfo) and field.sync_id]
+    
     def mgt_set_id(self, id_: ObjectId|None):
         self.id_ = id_
-        for field in self.MGConfig.sync_ids: setattr(self, field, self._id)
+        if id_: 
+            for field in self.mgt_sync_ids: setattr(self, field, self._id)
         
     def mgt_model_dump(self)->dict:
-        return self.model_dump(exclude=self.MGConfig.sync_ids or None)
+        return self.model_dump(exclude=self.mgt_sync_ids or None)

{mlmongo-2.0.2 → mlmongo-2.0.4}/mlmongo/sync.py

@@ -49,6 +49,7 @@ class MongoModel(_MongoModel):
     @classmethod
     def mg_find_onekey_all(cls, key:str, *querys: dict, 
                               sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->MGIt[Any]:
+        key = str(key)
         cursor  = cls.MGConfig.getConnect().find(MGFunction.and_(*querys), {'_id':0, key:1})
         if sort_map: cursor=cursor.sort(sort_map)
         if skip: cursor=cursor.skip(skip)
@@ -61,11 +62,13 @@ class MongoModel(_MongoModel):
     
     @classmethod
     def mg_find_onecol(cls, key:str, *querys: dict, default=None):
+        key = str(key)
         dt = (cls.MGConfig.getConnect().find_one(MGFunction.and_(*querys), {'_id':0, key:1})) or {}
         return dt.get(key, default)
     
     @classmethod
     def mg_id_find_onecol(cls, key:str, *ids:str|object|Any, default=None):
+        key = str(key)
         dt = (cls.MGConfig.getConnect().find_one(cls.mgt_get_id_query(ids), {'_id':0, key:1})) or {}
         return dt.get(key, default)
     

{mlmongo-2.0.2 → mlmongo-2.0.4}/mlmongo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mlmongo
-Version: 2.0.2
+Version: 2.0.4
 Summary: mongodb数据库操作工具类
 Home-page: https://www.python.org
 Author: mengling