rb-commons 0.2.9__tar.gz → 0.3.1__tar.gz

{rb_commons-0.2.9 → rb_commons-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.2.9
+Version: 0.3.1
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.2.9 → rb_commons-0.3.1}/rb_commons/http/consul.py

@@ -5,8 +5,8 @@ from rb_commons.configs.config import configs
 
 
 class ServiceDiscovery:
-    def __init__(self) -> None:
-        self.consul_client = consul.Consul(host=configs.consul_host, port=configs.consul_port)
+    def __init__(self, host: str, port: int) -> None:
+        self.consul_client = consul.Consul(host=host, port=port)
         self.cache = aiocache.Cache(aiocache.SimpleMemoryCache)
 
     async def _get_service_instances(self, service_name: str) -> dict:

{rb_commons-0.2.9 → rb_commons-0.3.1}/rb_commons/orm/managers.py

@@ -1,9 +1,9 @@
 import uuid
-from typing import TypeVar, Type, Generic, Optional, List, Dict, Literal, Union
-from sqlalchemy import select, delete, update, and_, func
+from typing import TypeVar, Type, Generic, Optional, List, Dict, Literal, Union, Sequence
+from sqlalchemy import select, delete, update, and_, func, desc
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import declarative_base, InstrumentedAttribute
+from sqlalchemy.orm import declarative_base, InstrumentedAttribute, selectinload
 
 from rb_commons.http.exceptions import NotFoundException
 from rb_commons.orm.exceptions import DatabaseException, InternalException
@@ -47,12 +47,17 @@ class BaseManager(Generic[ModelType]):
             await self.session.refresh(instance)
             return instance
 
-    async def get(self, pk: Union[str, int, uuid.UUID]) -> Optional[ModelType]:
+    async def get(self, pk: Union[str, int, uuid.UUID], load_relations: Sequence[str] = None) -> Optional[ModelType]:
         """
            get object based on conditions
        """
-        query = select(self.model).filter_by(id=pk)
-        result = await self.session.execute(query)
+        stmt = select(self.model).filter_by(id=pk)
+
+        if load_relations:
+            for rel in load_relations:
+                stmt = stmt.options(selectinload(getattr(self.model, rel)))
+
+        result = await self.session.execute(stmt)
         instance = result.scalar_one_or_none()
 
         if instance is None:
@@ -129,12 +134,31 @@ class BaseManager(Generic[ModelType]):
         result = await self.session.execute(query)
         return list(result.scalars().all())
 
-    async def first(self) -> Optional[ModelType]:
+    async def first(self, load_relations: Sequence[str] = None) -> Optional[ModelType]:
         """Return the first matching object, or None."""
         self._ensure_filtered()
 
-        query = select(self.model).filter(and_(*self.filters))
-        result = await self.session.execute(query)
+        stmt = select(self.model).filter(and_(*self.filters))
+
+        if load_relations:
+            for rel in load_relations:
+                stmt = stmt.options(selectinload(getattr(self.model, rel)))
+
+        result = await self.session.execute(stmt)
+        return result.scalars().first()
+
+    async def last(self, load_relations: Sequence[str] = None) -> Optional[ModelType]:
+        """Return the last matching object, or None."""
+
+        self._ensure_filtered()
+
+        stmt = select(self.model).filter(and_(*self.filters)).order_by(desc(self.model.id))
+
+        if load_relations:
+            for rel in load_relations:
+                stmt = stmt.options(selectinload(getattr(self.model, rel)))
+
+        result = await self.session.execute(stmt)
         return result.scalars().first()
 
     async def count(self) -> int:

{rb_commons-0.2.9 → rb_commons-0.3.1}/rb_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rb-commons
-Version: 0.2.9
+Version: 0.3.1
 Summary: Commons of project and simplified orm based on sqlalchemy.
 Home-page: https://github.com/RoboSell-organization/rb-commons
 Author: Abdulvoris

{rb_commons-0.2.9 → rb_commons-0.3.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="rb-commons",
-    version="0.2.9",
+    version="0.3.1",
     author="Abdulvoris",
     author_email="erkinovabdulvoris101@gmail.com",
     description="Commons of project and simplified orm based on sqlalchemy.",