mongo-entity-orm 0.1.2__tar.gz → 0.1.4__tar.gz

{mongo_entity_orm-0.1.2 → mongo_entity_orm-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mongo-entity-orm
-Version: 0.1.2
+Version: 0.1.4
 Summary: A MongoDB ORM for Python
 License: MIT
 Keywords: mongodb,orm,mongo,async

{mongo_entity_orm-0.1.2 → mongo_entity_orm-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "mongo-entity-orm"
-version = "0.1.2"
+version = "0.1.4"
 description = "A MongoDB ORM for Python"
 readme = "README.md"
 authors = ["Juraj Bezdek <juraj.bezdek@gmail.com>"]

{mongo_entity_orm-0.1.2 → mongo_entity_orm-0.1.4}/src/mongo_orm/core.py

@@ -309,7 +309,7 @@ class BaseEntity(BaseModel):
                 )
 
     @classmethod
-    def delete_by_id(cls, id, tenant_id: str):
+    def delete_by_id(cls, id, tenant_id: str = "*") -> bool:
 
         filter = {"_id": id}
         if tenant_id != "*":
@@ -321,7 +321,7 @@ class BaseEntity(BaseModel):
     def get(
         cls: Type[T],
         id: str,
-        tenant_id: str,
+        tenant_id: str = "*",
         namespace: str = None,
         raise_not_found: bool = False,
     ) -> T | None:
@@ -342,7 +342,7 @@ class BaseEntity(BaseModel):
     async def aget(
         cls: Type[T],
         id: str,
-        tenant_id: str,
+        tenant_id: str = "*",
         namespace: str = None,
         raise_not_found: bool = False,
     ) -> T | None:
@@ -378,7 +378,7 @@ class BaseEntity(BaseModel):
         return entity
 
     @classmethod
-    def count(cls, tenant_id: str, filter: dict = None, limit=None) -> int:
+    def count(cls, tenant_id: str = "*", filter: dict = None, limit=None) -> int:
 
         if not filter:
             _filter = {}
@@ -394,7 +394,7 @@ class BaseEntity(BaseModel):
         return cls.collection.count_documents(_filter, **extra)
 
     @classmethod
-    async def acount(cls, tenant_id: str, filter: dict = None, limit=None) -> int:
+    async def acount(cls, tenant_id: str = "*", filter: dict = None, limit=None) -> int:
 
         if not filter:
             _filter = {}
@@ -412,7 +412,7 @@ class BaseEntity(BaseModel):
     @classmethod
     async def afind(
         cls: Type[T],
-        tenant_id: str,
+        tenant_id: str = "*",
         namespace: str = None,
         skip: int = 0,
         limit: int = 100,
@@ -422,8 +422,10 @@ class BaseEntity(BaseModel):
     ) -> List[T]:
         if not filter:
             filter = {}
+        else:
+            filter = {**filter}
         if tenant_id != "*":
-            filter.update({"tenant_id": tenant_id, **additional_filters})
+            filter.update({"tenant_id": tenant_id})
 
         filter.update(additional_filters)
         if "id" in filter:
@@ -454,7 +456,7 @@ class BaseEntity(BaseModel):
     @classmethod
     def scroll_pages(
         cls: Type[T],
-        tenant_id: str,
+        tenant_id: str = "*",
         filter: dict = None,
         order_by: str = None,
         page_size: int = 100,
@@ -476,7 +478,7 @@ class BaseEntity(BaseModel):
     @classmethod
     async def ascroll_pages(
         cls: Type[T],
-        tenant_id: str,
+        tenant_id: str = "*",
         filter: dict = None,
         order_by: str = None,
         page_size: int = 100,
@@ -498,7 +500,7 @@ class BaseEntity(BaseModel):
     @classmethod
     def find(
         cls: Type[T],
-        tenant_id: str,
+        tenant_id: str = "*",
         namespace: str = None,
         skip: int = 0,
         limit: int | None = 100,
@@ -511,7 +513,7 @@ class BaseEntity(BaseModel):
         else:
             filter = {**filter}
         if tenant_id != "*":
-            filter.update({"tenant_id": tenant_id, **additional_filters})
+            filter.update({"tenant_id": tenant_id})
 
         filter.update(additional_filters)
         if "id" in filter:
@@ -544,13 +546,15 @@ class BaseEntity(BaseModel):
         return res
 
     @classmethod
-    def find_first(cls, tenant_id, filter=None, order_by=None, **kwargs):
+    def find_first(cls, tenant_id: str = "*", filter=None, order_by=None, **kwargs):
         kwargs.pop("limit", None)
         items = cls.find(tenant_id, filter=filter, order_by=order_by, limit=1, **kwargs)
         return items[0] if items else None
 
     @classmethod
-    async def afind_first(cls, tenant_id, filter=None, order_by=None, **kwargs):
+    async def afind_first(
+        cls, tenant_id: str = "*", filter=None, order_by=None, **kwargs
+    ):
         items = await cls.afind(
             tenant_id, filter=filter, order_by=order_by, limit=1, **kwargs
         )

{mongo_entity_orm-0.1.2 → mongo_entity_orm-0.1.4}/src/mongo_orm/utils.py

@@ -17,11 +17,11 @@ def _get_index_hash(collection_name: str, spec: "IndexSpec") -> str:
     # Normalize keys to a stable tuple representation
     if isinstance(keys, dict):
         # Keep order as provided in dict
-        norm_keys = tuple((str(k), float(v)) for k, v in keys.items())
+        norm_keys = tuple((str(k), str(v)) for k, v in keys.items())
     elif isinstance(keys, list):
-        norm_keys = tuple((str(k), float(v)) for k, v in keys)
+        norm_keys = tuple((str(k), str(v)) for k, v in keys)
     else:
-        norm_keys = ((str(keys), 1.0),)
+        norm_keys = ((str(keys), "1.0"),)
 
     # Create a stable representation of the spec including important options
     relevant_parts = {
@@ -48,10 +48,10 @@ def index_exists(collection: Collection, spec: "IndexSpec") -> bool:
     elif isinstance(keys, list):
         target_key = keys
     else:
-        target_key = [(keys, 1)]
+        target_key = [(keys, "1.0")]
 
-    # Normalize values to floats for comparison
-    target_key = [(str(k), float(v)) for k, v in target_key]
+    # Normalize values to strings for comparison
+    target_key = [(str(k), str(v)) for k, v in target_key]
 
     existing_indexes = collection.index_information()
 
@@ -59,9 +59,9 @@ def index_exists(collection: Collection, spec: "IndexSpec") -> bool:
         # info['key'] can be a list of tuples or a SON/dict object
         raw_existing_key = info["key"]
         if hasattr(raw_existing_key, "items"):
-            existing_key = [(str(k), float(v)) for k, v in raw_existing_key.items()]
+            existing_key = [(str(k), str(v)) for k, v in raw_existing_key.items()]
         else:
-            existing_key = [(str(k), float(v)) for k, v in raw_existing_key]
+            existing_key = [(str(k), str(v)) for k, v in raw_existing_key]
 
         if existing_key == target_key:
             return True