rb-commons 0.2.9__py3-none-any.whl → 0.3.1__py3-none-any.whl

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/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.dist-info → rb_commons-0.3.1.dist-info}/METADATA

@@ -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.dist-info → rb_commons-0.3.1.dist-info}/RECORD

@@ -7,18 +7,18 @@ rb_commons/configs/injections.py,sha256=6B1EOgIGnkWv3UrFaV9PRgG0-CJAbLu1UZ3kq-Sj
 rb_commons/configs/rabbitmq.py,sha256=vUqa_PcZkPp1lX0B6HLSAXVMUcPR2_8-8cN-C7xFxRI,741
 rb_commons/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/http/base_api.py,sha256=H0y5eClRzDMPeltSYeUd0xNCl6iqTD-7cW809Juv9_I,4916
-rb_commons/http/consul.py,sha256=mjMjLH7l7ub6A-_84impzDTwLjTXlwMG_VRlaNSFslc,1872
+rb_commons/http/consul.py,sha256=Ioq72VD1jGwoC96set7n2SgxN40olzI-myA2lwKkYi4,1864
 rb_commons/http/exceptions.py,sha256=EGRMr1cRgiJ9Q2tkfANbf0c6-zzXf1CD6J3cmCaT_FA,1885
 rb_commons/orm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/orm/exceptions.py,sha256=1aMctiEwrPjyehoXVX1l6ML5ZOhmDkmBISzlTD5ey1Y,509
-rb_commons/orm/managers.py,sha256=2ZTqi2heLZLeODNWjakaH5UrKIHuUSVpRbhMyVs-pAk,10061
+rb_commons/orm/managers.py,sha256=fnLs0J1xdKZGI8HV2HbTaYCKUKBtzEUEAYMsSkYbjgg,10979
 rb_commons/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/permissions/role_permissions.py,sha256=3ZTwKclavAKSheO58fybo2uLDeTkd-iluTY7hUEjRPk,957
 rb_commons/schemes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/schemes/jwt.py,sha256=F66JJDhholuOPPzlKeoC6f1TL4gXg4oRUrV5yheNpyo,1675
 rb_commons/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rb_commons/utils/media.py,sha256=KNY_9SdRa3Rp7d3B1tZaXkhmzVa65RcS62BYwZP1bVM,332
-rb_commons-0.2.9.dist-info/METADATA,sha256=wTmuteaNnTaLLgOG0qZUxJKhgnkA_E1VFWwy7yGrJ2s,6570
-rb_commons-0.2.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rb_commons-0.2.9.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
-rb_commons-0.2.9.dist-info/RECORD,,
+rb_commons-0.3.1.dist-info/METADATA,sha256=OtBaLh5JZXlD_jiFx4PBceQJMnXbQLpBFetwZzsvVTk,6570
+rb_commons-0.3.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rb_commons-0.3.1.dist-info/top_level.txt,sha256=HPx_WAYo3_fbg1WCeGHsz3wPGio1ucbnrlm2lmqlJog,11
+rb_commons-0.3.1.dist-info/RECORD,,