abs-auth-rbac-core 0.3.9__tar.gz → 0.3.11__tar.gz

{abs_auth_rbac_core-0.3.9 → abs_auth_rbac_core-0.3.11}/PKG-INFO

@@ -1,16 +1,16 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: abs-auth-rbac-core
-Version: 0.3.9
+Version: 0.3.11
 Summary: RBAC and Auth core utilities including JWT token management.
-License-Expression: MIT
+License: MIT
 Author: AutoBridgeSystems
 Author-email: info@autobridgesystems.com
 Requires-Python: >=3.11,<4.0
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: abs-exception-core (>=0.2.0,<0.3.0)
 Requires-Dist: abs-repository-core (>=0.3.0,<0.4.0)
 Requires-Dist: abs-utils (>=0.4.1,<0.5.0)

{abs_auth_rbac_core-0.3.9 → abs_auth_rbac_core-0.3.11}/abs_auth_rbac_core/rbac/service.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 import casbin
 from casbin_sqlalchemy_adapter import Adapter
 from casbin_redis_watcher import RedisWatcher, WatcherOptions,new_watcher
-from sqlalchemy import and_, select
+from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import Session, joinedload
 from ..schema import CreatePermissionSchema
 from ..models import (
@@ -182,23 +182,41 @@ class RBACService:
             except Exception as e:
                 raise e
             
-    async def get_permissions_by_condition(self, condition: dict, use_filter_by: bool = True):
+    def build_filter(self,cond: dict):
+        if "and" in cond:
+            return and_(*[self.build_filter(c) for c in cond["and"]])
+        elif "or" in cond:
+            return or_(*[self.build_filter(c) for c in cond["or"]])
+        else:
+            # Multiple simple field=value pairs in the same dict
+            return and_(*[
+                getattr(Permission, field) == value
+                for field, value in cond.items()
+            ])
+
+
+    async def get_permissions_by_condition(self, condition: dict):
         """
-        Get permission(s) based on a condition dict.
-        If use_filter_by is True, assumes all conditions are `==`.
+        Get permission(s) based on nested logical conditions.
+
+        Example:
+        {
+            "and": [
+                {"entity_id": "123"},
+                {"or": [
+                    {"user_id": "456"},
+                    {"group_id": "789"}
+                ]}
+            ]
+        }
         """
         with self.db() as session:
             try:
-                query = session.query(Permission)
-                if use_filter_by:
-                    query = query.filter_by(**condition)
-                else:
-                    filters = [getattr(Permission, k) == v for k, v in condition.items()]
-                    query = query.filter(*filters)
+                query = session.query(Permission).filter(self.build_filter(condition))
                 return query.all()
             except Exception as e:
                 raise e
-            
+
     async def delete_permission_by_uuids(self,permission_uuids:List[str]):
         """
         Delete a permission by uuids

{abs_auth_rbac_core-0.3.9 → abs_auth_rbac_core-0.3.11}/abs_auth_rbac_core/util/permission_constants.py

@@ -153,6 +153,10 @@ class PermissionAction(str, Enum):
     VIEW_IMPORT_DATA = "VIEW_IMPORT_DATA"
     VIEW_WORKFLOW = "VIEW_WORKFLOW"
     VIEW_ERROR_DATA = "VIEW_ERROR_DATA"
+    VIEW_ENTITY_RECORD = "VIEW_ENTITY_RECORD"
+    EDIT_ENTITY_RECORD = "EDIT_ENTITY_RECORD"
+    DELETE_ENTITY_RECORD = "DELETE_ENTITY_RECORD"
+    CREATE_ENTITY_RECORD = "CREATE_ENTITY_RECORD"
 
 
 
@@ -172,12 +176,17 @@ class PermissionModule(str, Enum):
     ASL = "ASL"
     EDS = "EDS"
     WORKFORCE_AGENT = "WORKFORCE_AGENT"
-
+    ENTITY = "ENTITY"
+    ENTITY_VIEW = "ENTITY_VIEW"
+    ENTITY_RECORD = "ENTITY_RECORD"
+    CHATBOT = "CHATBOT"
 
 
 class PermissionResource(str, Enum):
+    ENTITIES = "ENTITIES"
     DASHBOARD = "DASHBOARDS"
     WORKFORCE_AGENT = "WORKFORCE_AGENT"
+    CHATBOT = "CHATBOT"
     EPAR = "EPAR"
     EPARS = "EPARS"
     OCFO = "OCFO"

{abs_auth_rbac_core-0.3.9 → abs_auth_rbac_core-0.3.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "abs-auth-rbac-core"
-version = "0.3.9"
+version = "0.3.11"
 description = "RBAC and Auth core utilities including JWT token management."
 authors = [
     {name = "AutoBridgeSystems", email = "info@autobridgesystems.com"}