qena-shared-lib 0.1.20__tar.gz → 0.1.22__tar.gz

{qena_shared_lib-0.1.20 → qena_shared_lib-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qena-shared-lib
-Version: 0.1.20
+Version: 0.1.22
 Summary: A shared tools for other services
 Requires-Dist: fastapi[all]==0.115.6
 Requires-Dist: prometheus-client==0.21.1

{qena_shared_lib-0.1.20 → qena_shared_lib-0.1.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qena-shared-lib"
-version = "0.1.20"
+version = "0.1.22"
 description = "A shared tools for other services"
 readme = "README.md"
 requires-python = ">=3.10"

{qena_shared_lib-0.1.20 → qena_shared_lib-0.1.22}/src/qena_shared_lib/mongodb.py

@@ -388,25 +388,28 @@ class RepositoryBase(Generic[T]):
         session: AsyncClientSession | None = None,
     ) -> T | P | None:
         if projection is not None:
-            return projection.from_raw_projected_document(
-                await self.collection.find_one(
-                    filter=filter,
-                    projection=projection.get_projection(),
-                    skip=skip,
-                    sort=sort,
-                    session=session or self.session,
-                )
+            document = await self.collection.find_one(
+                filter=filter,
+                projection=projection.get_projection(),
+                skip=skip,
+                sort=sort,
+                session=session or self.session,
             )
-
-        return self.document_type.from_raw_document(
-            await self.collection.find_one(
+        else:
+            document = await self.collection.find_one(
                 filter=filter,
-                projection=projection,
                 skip=skip,
                 sort=sort,
                 session=session or self.session,
             )
-        )
+
+        if document is None:
+            return None
+
+        if projection is not None:
+            return projection.from_raw_projected_document(document)
+
+        return self.document_type.from_raw_document(document)
 
     async def replace(
         self, replacement: T, session: AsyncClientSession | None = None
@@ -584,16 +587,40 @@ class RepositoryBase(Generic[T]):
 
         return cast(int, await self.collection.estimated_document_count())
 
-    async def aggregate(
+    @overload
+    def aggregate(
         self,
+        *,
         aggregation: type[A],
         let: dict[str, Any] | None = None,
         session: AsyncClientSession | None = None,
     ) -> AsyncGenerator[A, None]:
+        pass
+
+    @overload
+    def aggregate(
+        self,
+        *,
+        aggregation: type[A],
+        pipeline: list[Any],
+        let: dict[str, Any] | None = None,
+        session: AsyncClientSession | None = None,
+    ) -> AsyncGenerator[A, None]:
+        pass
+
+    async def aggregate(
+        self, *_: Any, **kwarg: Any
+    ) -> AsyncGenerator[Any, None]:
+        aggregation = cast(AggregatedDocument, kwarg.get("aggregation"))
+        pipeline = kwarg.get("pipeline")
+
+        if pipeline is None:
+            pipeline = aggregation.get_pipeline()
+
         async with await self.collection.aggregate(
-            pipeline=aggregation.get_pipeline(),
-            let=let,
-            session=session or self.session,
+            pipeline=pipeline,
+            let=kwarg.get("let"),
+            session=kwarg.get("session") or self.session,
         ) as cursor:
             async for document in cursor:
                 yield aggregation.from_raw_aggregated_document(document)