rb-commons 0.1.16__tar.gz → 0.1.18__tar.gz

{rb_commons-0.1.16 → rb_commons-0.1.18}/PKG-INFO

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

{rb_commons-0.1.16 → rb_commons-0.1.18}/rb_commons/configs/injections.py

@@ -1,6 +1,6 @@
 from typing import Annotated
 
-from rb_commons.permissions import IsAdmin, IsCustomer
+from rb_commons.permissions.role_permissions import IsAdmin, IsCustomer
 from rb_commons.schemes.jwt import Claims
 from fastapi import Request, Depends
 

rb_commons-0.1.18/rb_commons/http/exceptions.py

@@ -0,0 +1,41 @@
+from fastapi import HTTPException, status
+
+
+class CustomHTTPException(HTTPException):
+    def __init__(self, message: str, status: int, code: str = None, additional_info: dict = None):
+        super().__init__(status_code=status, detail=message)
+
+        self.code = code
+        self.message = message
+        self.status = status
+        self.additional_info = additional_info
+
+
+class NotAuthorizedException(CustomHTTPException):
+    def __init__(self, message: str = "You are not authorized", status: int = 401, code: str = None,
+                 additional_info: dict = None):
+        super().__init__(message=message, status=status, code=code, additional_info=additional_info)
+
+
+class ForbiddenException(CustomHTTPException):
+    def __init__(self, message: str = "Permission denied", status: int = 403, code: str = None,
+                 additional_info: dict = None):
+        super().__init__(message=message, status=status, code=code, additional_info=additional_info)
+
+
+class BadRequestException(CustomHTTPException):
+    def __init__(self, message: str = "Bad request", status: int = 400, code: str = None,
+                 additional_info: dict = None):
+        super().__init__(message=message, status=status, code=code, additional_info=additional_info)
+
+
+class NotFoundException(CustomHTTPException):
+    def __init__(self, message: str = "Not found", status: int = 404, code: str = None,
+                 additional_info: dict = None):
+        super().__init__(message=message, status=status, code=code, additional_info=additional_info)
+
+
+class InternalException(CustomHTTPException):
+    def __init__(self, message: str = "Internal exception", status: int = 500, code: str = None,
+                 additional_info: dict = None):
+        super().__init__(message=message, status=status, code=code, additional_info=additional_info)

{rb_commons-0.1.16 → rb_commons-0.1.18}/rb_commons/orm/managers.py

@@ -1,8 +1,11 @@
-from typing import TypeVar, Type, Generic, Optional, List, Dict
+import uuid
+from typing import TypeVar, Type, Generic, Optional, List, Dict, Literal, Union
 from sqlalchemy import select, delete, update
 from sqlalchemy.exc import IntegrityError, SQLAlchemyError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import declarative_base
+
+from rb_commons.http.exceptions import NotFoundException
 from rb_commons.orm.exceptions import DatabaseException, InternalException
 
 ModelType = TypeVar('ModelType', bound=declarative_base())
@@ -12,27 +15,55 @@ class BaseManager(Generic[ModelType]):
 
     def __init__(self, session: AsyncSession) -> None:
         self.session = session
+        self.data = None
+        self.filters = {}
 
-    async def get(self, **kwargs) -> Optional[ModelType]:
+    async def get(self, pk: Union[str, int, uuid.UUID]) -> Optional[ModelType]:
         """
            get object based on conditions
        """
-        query = select(self.model).filter_by(**kwargs)
+        query = select(self.model).filter_by(id=pk)
         result = await self.session.execute(query)
-        return result.scalar_one_or_none()
+        instance = result.scalar_one_or_none()
+
+        if instance is None:
+            raise NotFoundException(
+                message="Object does not exist",
+                status=404,
+                code="0001",
+            )
+
+        return instance
 
-    async def filter(self, **kwargs) -> List[ModelType]:
+    async def filter(self, **kwargs) -> 'BaseManager[ModelType]':
         """
            Filter objects based on conditions
        """
-        query = select(self.model).filter_by(**kwargs)
+        self.filters.update(kwargs)
+        return self
+
+    async def all(self) -> List[ModelType]:
+        """Return all filtered results."""
+        query = select(self.model).filter_by(**self.filters)
         result = await self.session.execute(query)
         return list(result.scalars().all())
 
+    async def first(self) -> Optional[ModelType]:
+        """Return the first matching object, or None."""
+        query = select(self.model).filter_by(**self.filters)
+        result = await self.session.execute(query)
+        return result.scalars().first()
+
+    async def count(self) -> int:
+        """Return the count of matching records."""
+        query = select(self.model).filter_by(**self.filters)
+        result = await self.session.execute(query)
+        return len(result.scalars().all())
+
     async def create(self, **kwargs) -> ModelType:
         """
                Create a new object
-       """
+        """
         obj = self.model(**kwargs)
 
         try:
@@ -52,7 +83,7 @@ class BaseManager(Generic[ModelType]):
             raise InternalException(f"Unexpected error during creation: {str(e)}") from e
 
 
-    async def delete(self, id: Optional[int] = None, **filters) -> bool | None:
+    async def delete(self, id: Optional[int] = None, **filters):
         """
         Delete object(s) with flexible filtering options
 

{rb_commons-0.1.16 → rb_commons-0.1.18}/rb_commons/permissions/role_permissions.py

@@ -1,13 +1,14 @@
-from fastapi import Depends, HTTPException
+from fastapi import Depends
 
 from rb_commons.configs.injections import get_claims
+from rb_commons.http.exceptions import ForbiddenException
 from rb_commons.schemes.jwt import Claims, UserRole
 
 
 class BasePermission:
     def __call__(self, claims: Claims = Depends(get_claims)):
         if not self.has_permission(claims):
-            raise HTTPException(status_code=403, detail="Permission Denied")
+            raise ForbiddenException(message=f"Access denied", status=401, code="0000")
 
     def has_permission(self, claims: Claims) -> bool:
         return False

{rb_commons-0.1.16 → rb_commons-0.1.18}/rb_commons.egg-info/PKG-INFO

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

{rb_commons-0.1.16 → rb_commons-0.1.18}/rb_commons.egg-info/SOURCES.txt

@@ -9,6 +9,8 @@ rb_commons.egg-info/top_level.txt
 rb_commons/configs/__init__.py
 rb_commons/configs/config.py
 rb_commons/configs/injections.py
+rb_commons/http/__init__.py
+rb_commons/http/exceptions.py
 rb_commons/orm/__init__.py
 rb_commons/orm/exceptions.py
 rb_commons/orm/managers.py

{rb_commons-0.1.16 → rb_commons-0.1.18}/setup.py

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

rb_commons-0.1.16/rb_commons/permissions/__init__.py

@@ -1 +0,0 @@
-from role_permissions import *