mlmongo 2.0.0__tar.gz → 2.0.2__tar.gz

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

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

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

@@ -1,8 +1,8 @@
 import warnings
 from pydantic import BaseModel
 import asyncio
-from typing import Any, AsyncGenerator, Self
-from .model import MGField, MGFunction, MGConfig as _MGConfig, MongoModel as _MongoModel
+from typing import Any, Self
+from .model import AMGIt, MGField, MGFunction, MGConfig as _MGConfig, MongoModel as _MongoModel
 try:
     from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorCollection
 except:
@@ -15,15 +15,7 @@ def _limit(afunc):
             return await afunc(self, *args, **kwargs)
     
     return _main
-
-def _limit_iterator(afunc):
-    async def _main(self:'AMongoModel', *args, **kwargs):
-        async with self.MGConfig.getSem():
-            async for result in afunc(self, *args, **kwargs):
-                yield result
     
-    return _main
-
 class MGConfig(_MGConfig):
     limit:int = 300
     # _client:AsyncIOMotorCollection=None
@@ -70,27 +62,27 @@ class AMongoModel(_MongoModel):
         return result and (result if cig or is_get_dt else cls(**result))
     
     @classmethod
-    @_limit_iterator 
-    async def mg_find_all(cls, *querys: dict, cig:dict=None, is_get_dt:bool=False,
-                        sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->AsyncGenerator[Self|dict, None]:
+    def mg_find_all(cls, *querys: dict, cig:dict=None, is_get_dt:bool=False,
+                    sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->AMGIt[Self|dict]:
         cursor  = cls.MGConfig.getConnect().find(MGFunction.and_(*querys),  cig if cig else {})
         if sort_map: cursor=cursor.sort(sort_map)
         if skip: cursor=cursor.skip(skip)
         if limit: cursor=cursor.limit(limit)
-        async for dt in cursor:
-            yield dt if cig or is_get_dt else cls(**dt) 
+        return AMGIt(cursor, cls, if_get_cls=not is_get_dt and not cig)
             
     @classmethod
-    @_limit_iterator
-    async def mg_find_onekey_all(cls, key:str, *querys: dict, 
-                              sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->AsyncGenerator[Any, None]:
+    def mg_find_onekey_all(cls, key:str, *querys: dict, 
+                              sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->AMGIt[Any]:
         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)
         if limit: cursor=cursor.limit(limit)
-        async for dt in cursor:
-            yield dt[key]
-    
+        async def temp():
+            async for dt in cursor:
+                yield dt[key]
+                
+        return AMGIt(temp(), cls)
+        
     @classmethod
     @_limit
     async def mg_find_onecol(cls, key:str, *querys: dict, default=None):
@@ -144,14 +136,14 @@ class AMongoModel(_MongoModel):
     @_limit
     async def mg_insert(cls, data:Self|dict)-> Self:
         data = cls(**data) if isinstance(data, dict) else data
-        data.id_ = (await cls.MGConfig.getConnect().insert_one(data if isinstance(data, dict) else data.model_dump())).inserted_id
+        data.mgt_set_id((await cls.MGConfig.getConnect().insert_one(data if isinstance(data, dict) else data.mgt_model_dump())).inserted_id)
         return data
     
     @classmethod
     @_limit
     async def mg_insert_many(cls, datas: list[Self|dict]):
         if not datas: return None
-        return await cls.MGConfig.getConnect().insert_many([(data.model_dump() if isinstance(data, BaseModel) else data) for data in datas])
+        return await cls.MGConfig.getConnect().insert_many([(data.mgt_model_dump() if isinstance(data, BaseModel) else data) for data in datas])
     
     @classmethod
     @_limit
@@ -164,20 +156,19 @@ class AMongoModel(_MongoModel):
         return (await cls.MGConfig.getConnect().delete_many(cls.mgt_get_id_query(ids))).raw_result
     
     @classmethod
-    @_limit_iterator
-    async def mg_aggregate(cls, data:list)->AsyncGenerator[Any, None]:
-        async for d in cls.MGConfig.getConnect().aggregate(data):
-            yield d
+    def mg_aggregate(cls, data:list)->AMGIt[dict]:
+        return AMGIt(cls.MGConfig.getConnect().aggregate(data), cls)
         
     @_limit
     async def mg_self_sync(self):
         """同步数据库到对象"""
         kv = self.mgt_get_key_value()
         if isinstance(kv, str): return warnings.warn(f'{kv} is None')
-        newer = await self.mg_id_find(value)
+        newer = await self.mg_id_find(*[kv[k] for k in self.MGConfig.default_ids])
         if newer:
             for key, value in newer.model_dump().items():
                 if hasattr(self, key): setattr(self, key, value)
+            self.mgt_set_id(newer.id_)
         else:
             warnings.warn(f'数据库中没有对应数据 - keys: {kv}')
     
@@ -187,12 +178,12 @@ class AMongoModel(_MongoModel):
         kv = self.mgt_get_key_value()
         if check_id and isinstance(kv, str): raise ValueError(f'{kv} is None')
         if is_force_new or kv=='_id':
-            self.id_ = (await self.MGConfig.getConnect().insert_one(self.model_dump())).inserted_id
+            self.mgt_set_id((await self.MGConfig.getConnect().insert_one(self.mgt_model_dump())).inserted_id)
         elif isinstance(kv, dict): 
             if is_replace:
-                await self.MGConfig.getConnect().replace_one(kv, self.model_dump(), upsert=True)
+                await self.MGConfig.getConnect().replace_one(kv, self.mgt_model_dump(), upsert=True)
             else:
-                await self.MGConfig.getConnect().update_one(kv, {'$set': self.model_dump()}, upsert=True)
+                await self.MGConfig.getConnect().update_one(kv, {'$set': self.mgt_model_dump()}, upsert=True)
         else:
             raise ValueError(f'{kv} is None')
     
@@ -201,7 +192,7 @@ class AMongoModel(_MongoModel):
         kv = self.mgt_get_key_value()
         if isinstance(kv, str): return warnings.warn(f'{kv} is None')
         result = (await self.MGConfig.getConnect().delete_many(kv)).raw_result
-        self.id_ = None
+        self.mgt_set_id(None)
         return result
     
 

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

@@ -5,10 +5,58 @@ from bson import ObjectId
 from pydantic import AliasChoices, AliasPath, BaseModel, PydanticUserError
 from pydantic.fields import FieldInfo
 from pydantic.config import JsonDict
-from typing import Any, Callable, Literal, overload
+from typing import Any, Callable, Generic, Literal, overload, TypeVar
 from pydantic_core import PydanticUndefined
 
 
+T = TypeVar('T')
+
+class AMGIt(Generic[T]):
+    def __init__(self, ait, cls:T, if_get_cls=False):
+        self._it = ait
+        self.if_get_cls = if_get_cls
+        self._cls = cls
+        self._sem = cls.MGConfig.getSem()
+    
+    async def __anext__(self)->T|Any:
+        async with self._sem:
+            value = await self._it.__anext__()
+        return self._cls(**value) if self.if_get_cls else value
+    
+    def __aiter__(self):
+        return self
+    
+    async def to_list(self)->list[T|Any]:
+        return [mes async for mes in self]
+    
+    async def first(self)->T|Any:
+        return await self.__anext__()
+    
+    async def last(self)->T|Any:
+        return (await self.to_list())[-1]
+
+class MGIt(Generic[T]):
+    def __init__(self, it, cls:T, if_get_cls=False):
+        self._it = it
+        self.if_get_cls = if_get_cls
+        self._cls = cls
+    
+    def __next__(self)->T|Any:
+        value = self._it.__next__()
+        return self._cls(**value) if self.if_get_cls else value
+    
+    def __iter__(self):
+        return self
+    
+    def to_list(self)->list[T|Any]:
+        return [mes for mes in self]
+    
+    def first(self)->T|Any:
+        return self.__next__()
+    
+    def last(self)->T|Any:
+        return self.to_list()[-1]
+    
 class _MGFieldInfo(FieldInfo):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -319,6 +367,8 @@ class MGConfig:
     db:str
     col:str
     default_ids:tuple[str] = ('_id',)
+    # 用于同步_id字段的内容
+    sync_ids: tuple[str] = ()
     
 class MGFunction:
     @staticmethod
@@ -339,7 +389,11 @@ class MGFunction:
 
     @staticmethod
     def data_set_(data:dict|BaseModel):
-        return {'$set': data if isinstance(data, dict) else data.model_dump()}
+        if isinstance(data, MongoModel):
+            data = data.mgt_model_dump()
+        elif isinstance(data, BaseModel):
+            data = data.model_dump()
+        return {'$set': data}
     
     @staticmethod
     def set_(field:_MGFieldInfo|str, value): 
@@ -383,6 +437,10 @@ class MGFunction:
 class MongoModel(BaseModel):
     id_: object|None = MGField(default=None, exclude=True, alias='_id')
     
+    def __init__(self, /, **kwargs):
+        super().__init__(**kwargs)
+        self.mgt_set_id(self.id_)
+    
     class MGConfig(MGConfig):
         pass
     
@@ -413,4 +471,11 @@ class MongoModel(BaseModel):
                 else:
                     # 如果操作符不存在，直接添加
                     merged[op] = value
-        return merged
+        return merged
+    
+    def mgt_set_id(self, id_: ObjectId|None):
+        self.id_ = id_
+        for field in self.MGConfig.sync_ids: setattr(self, field, self._id)
+        
+    def mgt_model_dump(self)->dict:
+        return self.model_dump(exclude=self.MGConfig.sync_ids or None)

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

@@ -1,10 +1,10 @@
 import warnings
 from pydantic import BaseModel
 from typing import Any, Generator, Self
-from .model import MGField, MGFunction, MGConfig as _MGConfig, MongoModel as _MongoModel
+from .model import MGIt, MGField, MGFunction, MGConfig as _MGConfig, MongoModel as _MongoModel
 from pymongo import MongoClient
 
-
+    
 class MGConfig(_MGConfig):
     @classmethod
     def _getClient(cls):
@@ -15,7 +15,7 @@ class MGConfig(_MGConfig):
     def getConnect(cls):
         if not hasattr(cls, '_client'): cls._client=cls._getClient()
         return cls._client
-    
+
 class MongoModel(_MongoModel):
     class MGConfig(MGConfig):
         pass
@@ -39,23 +39,25 @@ class MongoModel(_MongoModel):
     
     @classmethod
     def mg_find_all(cls, *querys: dict, cig:dict=None, is_get_dt:bool=False,
-                        sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->Generator[Self|dict, None, None]:
+                        sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->MGIt[Self|dict]:
         cursor  = cls.MGConfig.getConnect().find(MGFunction.and_(*querys),  cig if cig else {})
         if sort_map: cursor=cursor.sort(sort_map)
         if skip: cursor=cursor.skip(skip)
         if limit: cursor=cursor.limit(limit)
-        for dt in cursor:
-            yield dt if cig or is_get_dt else cls(**dt) 
+        return MGIt(cursor, cls, if_get_cls=not is_get_dt and not cig)
             
     @classmethod
     def mg_find_onekey_all(cls, key:str, *querys: dict, 
-                              sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->Generator[Any, None, None]:
+                              sort_map: dict[str, int]=None, skip:int=None, limit:int=None)->MGIt[Any]:
         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)
         if limit: cursor=cursor.limit(limit)
-        for dt in cursor:
-            yield dt[key]
+        def temp():
+            for dt in cursor:
+                yield dt[key]
+                
+        return MGIt(temp(), cls)
     
     @classmethod
     def mg_find_onecol(cls, key:str, *querys: dict, default=None):
@@ -99,13 +101,13 @@ class MongoModel(_MongoModel):
     @classmethod
     def mg_insert(cls, data:Self|dict)-> Self:
         data = cls(**data) if isinstance(data, dict) else data
-        data.id_ = (cls.MGConfig.getConnect().insert_one(data if isinstance(data, dict) else data.model_dump())).inserted_id
+        data.mgt_set_id(cls.MGConfig.getConnect().insert_one(data if isinstance(data, dict) else data.mgt_model_dump()).inserted_id)
         return data
     
     @classmethod
     def mg_insert_many(cls, datas: list[Self|dict]):
         if not datas: return None
-        return cls.MGConfig.getConnect().insert_many([(data.model_dump() if isinstance(data, BaseModel) else data) for data in datas])
+        return cls.MGConfig.getConnect().insert_many([(data.mgt_model_dump() if isinstance(data, BaseModel) else data) for data in datas])
     
     @classmethod
     def mg_delete(cls, *querys: dict)->dict:
@@ -116,18 +118,18 @@ class MongoModel(_MongoModel):
         return cls.MGConfig.getConnect().delete_many(cls.mgt_get_id_query(ids)).raw_result
     
     @classmethod
-    def mg_aggregate(cls, data:list)->Generator[Any, None, None]:
-        for d in cls.MGConfig.getConnect().aggregate(data):
-            yield d
+    def mg_aggregate(cls, data:list)->MGIt[dict]:
+        return MGIt(cls.MGConfig.getConnect().aggregate(data), cls)
         
     def mg_self_sync(self):
         """同步数据库到对象"""
         kv = self.mgt_get_key_value()
         if isinstance(kv, str): return warnings.warn(f'{kv} is None')
-        newer = self.mg_id_find(value)
+        newer = self.mg_id_find(*[kv[k] for k in self.MGConfig.default_ids])
         if newer:
             for key, value in newer.model_dump().items():
                 if hasattr(self, key): setattr(self, key, value)
+            self.mgt_set_id(newer.id_)
         else:
             warnings.warn(f'数据库中没有对应数据 - keys: {kv}')
     
@@ -136,12 +138,12 @@ class MongoModel(_MongoModel):
         kv = self.mgt_get_key_value()
         if check_id and isinstance(kv, str): raise ValueError(f'{kv} is None')
         if is_force_new or kv=='_id':
-            self.id_ = (self.MGConfig.getConnect().insert_one(self.model_dump())).inserted_id
+            self.mgt_set_id(self.MGConfig.getConnect().insert_one(self.mgt_model_dump()).inserted_id)
         elif isinstance(kv, dict): 
             if is_replace:
-                self.MGConfig.getConnect().replace_one(kv, self.model_dump(), upsert=True)
+                self.MGConfig.getConnect().replace_one(kv, self.mgt_model_dump(), upsert=True)
             else:
-                self.MGConfig.getConnect().update_one(kv, {'$set': self.model_dump()}, upsert=True)
+                self.MGConfig.getConnect().update_one(kv, {'$set': self.mgt_model_dump()}, upsert=True)
         else:
             raise ValueError(f'{kv} is None')
     
@@ -149,5 +151,5 @@ class MongoModel(_MongoModel):
         kv = self.mgt_get_key_value()
         if isinstance(kv, str): return warnings.warn(f'{kv} is None')
         result = (self.MGConfig.getConnect().delete_many(kv)).raw_result
-        self.id_ = None
+        self.mgt_set_id(None)
         return result

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

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