kailash 0.6.3__py3-none-any.whl → 0.6.4__py3-none-any.whl

kailash/nodes/admin/role_management.py

@@ -171,7 +171,7 @@ class RoleManagementNode(Node):
         ...         }
         ...     }
         ... )
-        >>> result = node.run()
+        >>> result = node.execute()
         >>> role_id = result["role"]["role_id"]
 
         >>> # Bulk user assignment
@@ -181,7 +181,7 @@ class RoleManagementNode(Node):
         ...     user_ids=["user1", "user2", "user3"],
         ...     validate_hierarchy=True
         ... )
-        >>> result = node.run()
+        >>> result = node.execute()
         >>> assigned_count = result["stats"]["assigned"]
     """
 
@@ -500,7 +500,7 @@ class RoleManagementNode(Node):
         """
 
         # Execute database insert
-        db_result = self._db_node.run(
+        db_result = self._db_node.execute(
             query=insert_query,
             parameters=[
                 role_record["role_id"],
@@ -563,7 +563,7 @@ class RoleManagementNode(Node):
         WHERE user_id = $1 AND role_id = $2 AND tenant_id = $3 AND is_active = true
         """
 
-        existing = self._db_node.run(
+        existing = self._db_node.execute(
             query=existing_query,
             parameters=[user_id, role_id, tenant_id],
             result_format="dict",
@@ -594,7 +594,7 @@ class RoleManagementNode(Node):
             is_active = true
         """
 
-        db_result = self._db_node.run(
+        db_result = self._db_node.execute(
             query=insert_query,
             parameters=[
                 user_id,
@@ -740,7 +740,9 @@ class RoleManagementNode(Node):
 
         params = [tenant_id] + list(parent_roles)
 
-        result = self._db_node.run(query=query, parameters=params, result_format="dict")
+        result = self._db_node.execute(
+            query=query, parameters=params, result_format="dict"
+        )
         existing_roles = {row["role_id"] for row in result.get("data", [])}
 
         missing_roles = parent_roles - existing_roles
@@ -798,7 +800,7 @@ class RoleManagementNode(Node):
             query += " AND role_id != $2"
             params.append(exclude_role)
 
-        result = self._db_node.run(query=query, parameters=params, fetch_mode="all")
+        result = self._db_node.execute(query=query, parameters=params, fetch_mode="all")
         roles_data = result.get("data", [])
 
         # Convert to hierarchy dict
@@ -841,7 +843,7 @@ class RoleManagementNode(Node):
         WHERE role_id = $1 AND tenant_id = $2
         """
 
-        result = self._db_node.run(
+        result = self._db_node.execute(
             query=query, parameters=[role_id, tenant_id], result_format="dict"
         )
         data = result.get("data", [])
@@ -865,7 +867,7 @@ class RoleManagementNode(Node):
             WHERE role_id = $1 AND tenant_id = $2
             """
 
-            result = self._db_node.run(
+            result = self._db_node.execute(
                 query=get_query,
                 parameters=[parent_role_id, tenant_id],
                 result_format="dict",
@@ -893,7 +895,7 @@ class RoleManagementNode(Node):
                 WHERE role_id = $3 AND tenant_id = $4
                 """
 
-                self._db_node.run(
+                self._db_node.execute(
                     query=update_query,
                     parameters=[
                         json.dumps(current_child_roles),
@@ -964,7 +966,7 @@ class RoleManagementNode(Node):
         RETURNING role_id, name, description, permissions, parent_roles, attributes, is_active, updated_at
         """
 
-        result = self._db_node.run(
+        result = self._db_node.execute(
             query=update_query, parameters=params, fetch_mode="one"
         )
         updated_role = result.get("data", [])
@@ -1027,7 +1029,7 @@ class RoleManagementNode(Node):
             ) AND tenant_id = $2 AND is_active = true
             """
 
-            child_result = self._db_node.run(
+            child_result = self._db_node.execute(
                 query=child_roles_query,
                 parameters=[role_id, tenant_id],
                 fetch_mode="all",
@@ -1046,7 +1048,7 @@ class RoleManagementNode(Node):
             WHERE role_id = $1 AND tenant_id = $2
             """
 
-            user_result = self._db_node.run(
+            user_result = self._db_node.execute(
                 query=user_assignments_query,
                 parameters=[role_id, tenant_id],
                 fetch_mode="one",
@@ -1067,7 +1069,7 @@ class RoleManagementNode(Node):
             DELETE FROM user_role_assignments WHERE role_id = $1 AND tenant_id = $2
             """
 
-            self._db_node.run(
+            self._db_node.execute(
                 query=delete_assignments_query, parameters=[role_id, tenant_id]
             )
 
@@ -1092,7 +1094,7 @@ class RoleManagementNode(Node):
         ) AND tenant_id = $3
         """
 
-        self._db_node.run(
+        self._db_node.execute(
             query=update_children_query,
             parameters=[role_id, datetime.now(UTC), tenant_id],
         )
@@ -1102,7 +1104,7 @@ class RoleManagementNode(Node):
         DELETE FROM roles WHERE role_id = $1 AND tenant_id = $2
         """
 
-        self._db_node.run(query=delete_query, parameters=[role_id, tenant_id])
+        self._db_node.execute(query=delete_query, parameters=[role_id, tenant_id])
 
         return {
             "result": {
@@ -1170,7 +1172,7 @@ class RoleManagementNode(Node):
             base_query += f" OFFSET ${param_count}"
             params.append(offset)
 
-        result = self._db_node.run(
+        result = self._db_node.execute(
             query=base_query, parameters=params, fetch_mode="all"
         )
         roles_data = result.get("data", [])
@@ -1182,7 +1184,7 @@ class RoleManagementNode(Node):
         WHERE {' AND '.join(where_conditions)}
         """
 
-        count_result = self._db_node.run(
+        count_result = self._db_node.execute(
             query=count_query,
             parameters=(
                 params[: param_count - 2] if limit > 0 else params
@@ -1309,7 +1311,7 @@ class RoleManagementNode(Node):
             ORDER BY ur.assigned_at DESC
             """
 
-            users_result = self._db_node.run(
+            users_result = self._db_node.execute(
                 query=users_query, parameters=[role_id, tenant_id], fetch_mode="all"
             )
             users_data = users_result.get("data", [])
@@ -1349,7 +1351,7 @@ class RoleManagementNode(Node):
         WHERE user_id = $1 AND role_id = $2 AND tenant_id = $3
         """
 
-        existing = self._db_node.run(
+        existing = self._db_node.execute(
             query=check_query,
             parameters=[user_id, role_id, tenant_id],
             fetch_mode="one",
@@ -1377,7 +1379,9 @@ class RoleManagementNode(Node):
         WHERE user_id = $1 AND role_id = $2 AND tenant_id = $3
         """
 
-        self._db_node.run(query=delete_query, parameters=[user_id, role_id, tenant_id])
+        self._db_node.execute(
+            query=delete_query, parameters=[user_id, role_id, tenant_id]
+        )
 
         return {
             "result": {
@@ -1436,7 +1440,7 @@ class RoleManagementNode(Node):
         RETURNING permissions
         """
 
-        result = self._db_node.run(
+        result = self._db_node.execute(
             query=update_query,
             parameters=[
                 json.dumps(new_permissions),
@@ -1496,7 +1500,7 @@ class RoleManagementNode(Node):
         RETURNING permissions
         """
 
-        result = self._db_node.run(
+        result = self._db_node.execute(
             query=update_query,
             parameters=[
                 json.dumps(new_permissions),
@@ -1600,7 +1604,7 @@ class RoleManagementNode(Node):
 
         roles_query += " ORDER BY ur.assigned_at DESC"
 
-        result = self._db_node.run(
+        result = self._db_node.execute(
             query=roles_query, parameters=params, fetch_mode="all"
         )
         roles_data = result.get("data", [])
@@ -1699,7 +1703,7 @@ class RoleManagementNode(Node):
             LIMIT $3 OFFSET $4
             """
 
-        result = self._db_node.run(
+        result = self._db_node.execute(
             query=users_query,
             parameters=[role_id, tenant_id, limit, offset],
             fetch_mode="all",
@@ -1713,7 +1717,7 @@ class RoleManagementNode(Node):
         WHERE role_id = $1 AND tenant_id = $2
         """
 
-        count_result = self._db_node.run(
+        count_result = self._db_node.execute(
             query=count_query, parameters=[role_id, tenant_id], fetch_mode="one"
         )
         total_count = count_result.get("data", [{}])[0].get("total", 0)
@@ -1921,7 +1925,7 @@ class RoleManagementNode(Node):
         WHERE role_id = $3 AND tenant_id = $4
         """
 
-        self._db_node.run(
+        self._db_node.execute(
             query=update_query,
             parameters=[
                 orphaned_child_id,
@@ -1951,7 +1955,7 @@ class RoleManagementNode(Node):
         ))
         """
 
-        self._db_node.run(
+        self._db_node.execute(
             query=add_child_query,
             parameters=[child_role_id, datetime.now(UTC), parent_role_id, tenant_id],
         )

kailash/nodes/admin/schema.sql

@@ -346,19 +346,24 @@ BEGIN
 END;
 $$ language 'plpgsql';
 
--- Apply auto-update triggers
+-- Apply auto-update triggers with conflict resolution
+DROP TRIGGER IF EXISTS update_users_updated_at ON users;
 CREATE TRIGGER update_users_updated_at BEFORE UPDATE ON users
     FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 
+DROP TRIGGER IF EXISTS update_roles_updated_at ON roles;
 CREATE TRIGGER update_roles_updated_at BEFORE UPDATE ON roles
     FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 
+DROP TRIGGER IF EXISTS update_permissions_updated_at ON permissions;
 CREATE TRIGGER update_permissions_updated_at BEFORE UPDATE ON permissions
     FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 
+DROP TRIGGER IF EXISTS update_user_attributes_updated_at ON user_attributes;
 CREATE TRIGGER update_user_attributes_updated_at BEFORE UPDATE ON user_attributes
     FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 
+DROP TRIGGER IF EXISTS update_resource_attributes_updated_at ON resource_attributes;
 CREATE TRIGGER update_resource_attributes_updated_at BEFORE UPDATE ON resource_attributes
     FOR EACH ROW EXECUTE FUNCTION update_updated_at_column();
 

kailash/nodes/admin/schema_manager.py

@@ -57,7 +57,7 @@ class AdminSchemaManager:
                 schema_sql = f.read()
 
             # Execute schema creation
-            self.db_node.run(query=schema_sql)
+            self.db_node.execute(query=schema_sql)
 
             # Verify schema creation
             tables = self._get_existing_tables()
@@ -113,7 +113,7 @@ class AdminSchemaManager:
 
             # Check schema version
             try:
-                version_result = self.db_node.run(
+                version_result = self.db_node.execute(
                     query="SELECT version FROM admin_schema_version ORDER BY created_at DESC LIMIT 1",
                     result_format="dict",
                 )
@@ -225,14 +225,14 @@ class AdminSchemaManager:
 
         for table in tables_to_drop:
             try:
-                self.db_node.run(query=f"DROP TABLE IF EXISTS {table} CASCADE")
+                self.db_node.execute(query=f"DROP TABLE IF EXISTS {table} CASCADE")
             except Exception as e:
                 self.logger.warning(f"Could not drop table {table}: {e}")
 
     def _get_existing_tables(self) -> List[str]:
         """Get list of existing tables in the database."""
         try:
-            result = self.db_node.run(
+            result = self.db_node.execute(
                 query="""
                 SELECT table_name
                 FROM information_schema.tables
@@ -252,7 +252,7 @@ class AdminSchemaManager:
     def _get_existing_indexes(self) -> List[str]:
         """Get list of existing indexes."""
         try:
-            result = self.db_node.run(
+            result = self.db_node.execute(
                 query="""
                 SELECT indexname
                 FROM pg_indexes
@@ -280,11 +280,11 @@ class AdminSchemaManager:
         )
         """
 
-        self.db_node.run(query=version_table_sql)
+        self.db_node.execute(query=version_table_sql)
 
     def _record_schema_version(self):
         """Record the current schema version."""
-        self.db_node.run(
+        self.db_node.execute(
             query="""
             INSERT INTO admin_schema_version (version, migration_notes)
             VALUES ($1, $2)
@@ -298,7 +298,7 @@ class AdminSchemaManager:
     def _get_current_schema_version(self) -> Optional[str]:
         """Get the current schema version."""
         try:
-            result = self.db_node.run(
+            result = self.db_node.execute(
                 query="SELECT version FROM admin_schema_version ORDER BY created_at DESC LIMIT 1",
                 result_format="dict",
             )
@@ -350,7 +350,7 @@ class AdminSchemaManager:
     def _get_table_columns(self, table_name: str) -> List[str]:
         """Get column names for a table."""
         try:
-            result = self.db_node.run(
+            result = self.db_node.execute(
                 query="""
                 SELECT column_name
                 FROM information_schema.columns
@@ -370,7 +370,7 @@ class AdminSchemaManager:
     def _get_table_info(self) -> Dict[str, Any]:
         """Get detailed table information."""
         try:
-            result = self.db_node.run(
+            result = self.db_node.execute(
                 query="""
                 SELECT
                     t.table_name,
@@ -398,7 +398,7 @@ class AdminSchemaManager:
 
         for table in tables:
             try:
-                result = self.db_node.run(
+                result = self.db_node.execute(
                     query=f"SELECT COUNT(*) as count FROM {table}",
                     result_format="dict",
                 )
@@ -411,11 +411,11 @@ class AdminSchemaManager:
     def _get_database_info(self) -> Dict[str, Any]:
         """Get general database information."""
         try:
-            version_result = self.db_node.run(
+            version_result = self.db_node.execute(
                 query="SELECT version()", result_format="dict"
             )
 
-            size_result = self.db_node.run(
+            size_result = self.db_node.execute(
                 query="SELECT pg_size_pretty(pg_database_size(current_database())) as size",
                 result_format="dict",
             )

kailash/nodes/admin/security_event.py

@@ -24,11 +24,7 @@ from enum import Enum
 from typing import Any, Dict, List, Optional, Tuple
 
 from kailash.access_control import UserContext
-from kailash.nodes.admin.audit_log import (
-    AuditEventType,
-    AuditSeverity,
-    EnterpriseAuditLogNode,
-)
+from kailash.nodes.admin.audit_log import AuditEventType, AuditSeverity, EnterpriseAuditLogNode
 from kailash.nodes.base import Node, NodeParameter, register_node
 from kailash.nodes.data import AsyncSQLDatabaseNode
 from kailash.sdk_exceptions import NodeExecutionError, NodeValidationError
@@ -214,7 +210,7 @@ class EnterpriseSecurityEventNode(Node):
         ...         "detection_method": "geolocation_analysis"
         ...     }
         ... )
-        >>> result = node.run()
+        >>> result = node.execute()
         >>> event_id = result["security_event"]["event_id"]
 
         >>> # Analyze threats in time window
@@ -226,7 +222,7 @@ class EnterpriseSecurityEventNode(Node):
         ...         "risk_threshold": 7.0
         ...     }
         ... )
-        >>> result = node.run()
+        >>> result = node.execute()
         >>> threats = result["threat_analysis"]["high_risk_events"]
 
         >>> # Monitor user behavior for anomalies
@@ -238,7 +234,7 @@ class EnterpriseSecurityEventNode(Node):
         ...         "anomaly_threshold": 0.8
         ...     }
         ... )
-        >>> result = node.run()
+        >>> result = node.execute()
         >>> anomalies = result["behavior_analysis"]["anomalies"]
     """
 
@@ -487,7 +483,7 @@ class EnterpriseSecurityEventNode(Node):
             }
         )
 
-        db_result = self._db_node.run()
+        db_result = self._db_node.execute()
 
         # Log to audit trail
         audit_event_data = {
@@ -504,7 +500,7 @@ class EnterpriseSecurityEventNode(Node):
             },
         }
 
-        self._audit_node.run(
+        self._audit_node.execute(
             operation="log_event", event_data=audit_event_data, tenant_id=tenant_id
         )
 
@@ -552,7 +548,7 @@ class EnterpriseSecurityEventNode(Node):
             }
         )
 
-        result = self._db_node.run()
+        result = self._db_node.execute()
         events = result.get("result", {}).get("data", [])
 
         # Analyze threats
@@ -600,7 +596,7 @@ class EnterpriseSecurityEventNode(Node):
             }
         )
 
-        result = self._db_node.run()
+        result = self._db_node.execute()
         events = result.get("result", {}).get("data", [])
 
         # Analyze behavior patterns
@@ -829,7 +825,7 @@ class EnterpriseSecurityEventNode(Node):
             }
         )
 
-        self._db_node.run()
+        self._db_node.execute()
 
         return incident_id
 
@@ -869,7 +865,7 @@ class EnterpriseSecurityEventNode(Node):
             {"query": query, "params": params, "fetch_mode": "all"}
         )
 
-        result = self._db_node.run()
+        result = self._db_node.execute()
         events = result.get("result", {}).get("data", [])
 
         # Perform anomaly detection
@@ -917,7 +913,7 @@ class EnterpriseSecurityEventNode(Node):
             }
         )
 
-        result = self._db_node.run()
+        result = self._db_node.execute()
         high_risk_events = result.get("result", {}).get("data", [])
 
         # Generate alerts
@@ -995,7 +991,7 @@ class EnterpriseSecurityEventNode(Node):
             {"query": query, "params": params, "fetch_mode": "all"}
         )
 
-        result = self._db_node.run()
+        result = self._db_node.execute()
         incidents = result.get("result", {}).get("data", [])
 
         return {
@@ -1071,7 +1067,7 @@ class EnterpriseSecurityEventNode(Node):
             }
         )
 
-        self._db_node.run()
+        self._db_node.execute()
 
         return {
             "result": {
@@ -1127,7 +1123,7 @@ class EnterpriseSecurityEventNode(Node):
 
         self._db_node.config.update({"query": query, "params": params})
 
-        self._db_node.run()
+        self._db_node.execute()
 
         return {
             "result": {
@@ -1217,7 +1213,7 @@ class EnterpriseSecurityEventNode(Node):
             }
         )
 
-        result = self._db_node.run()
+        result = self._db_node.execute()
         events = result.get("result", {}).get("data", [])
 
         # Calculate risk metrics
@@ -1347,7 +1343,7 @@ class EnterpriseSecurityEventNode(Node):
             {"query": query, "params": params, "fetch_mode": "all"}
         )
 
-        result = self._db_node.run()
+        result = self._db_node.execute()
         events = result.get("result", {}).get("data", [])
 
         # Perform forensic analysis

kailash/nodes/admin/tenant_isolation.py

@@ -59,7 +59,7 @@ class TenantIsolationManager:
         users_query = """
             SELECT user_id FROM users WHERE tenant_id = $1 AND status = 'active'
         """
-        users_result = self.db_node.run(
+        users_result = self.db_node.execute(
             query=users_query, parameters=[tenant_id], result_format="dict"
         )
         user_ids = {row["user_id"] for row in users_result.get("data", [])}
@@ -68,7 +68,7 @@ class TenantIsolationManager:
         roles_query = """
             SELECT role_id FROM roles WHERE tenant_id = $1 AND is_active = true
         """
-        roles_result = self.db_node.run(
+        roles_result = self.db_node.execute(
             query=roles_query, parameters=[tenant_id], result_format="dict"
         )
         role_ids = {row["role_id"] for row in roles_result.get("data", [])}
@@ -85,7 +85,7 @@ class TenantIsolationManager:
             FROM roles
             WHERE tenant_id = $1 AND is_active = true
         """
-        permissions_result = self.db_node.run(
+        permissions_result = self.db_node.execute(
             query=permissions_query, parameters=[tenant_id], result_format="dict"
         )
         permissions = {row["permission"] for row in permissions_result.get("data", [])}

kailash/nodes/admin/transaction_utils.py

@@ -96,7 +96,7 @@ class TransactionHelper:
 
         while time.time() - start_time < timeout_seconds:
             try:
-                result = self.db_node.run(
+                result = self.db_node.execute(
                     query=verification_query, result_format="dict"
                 )
                 data = result.get("data", [])
@@ -136,7 +136,7 @@ class TransactionHelper:
             from .user_management import UserManagementNode
 
             user_mgmt = UserManagementNode(database_url=self.db_node.connection_string)
-            return user_mgmt.run(
+            return user_mgmt.execute(
                 operation="create_user", user_data=user_data, tenant_id=tenant_id
             )
 
@@ -179,7 +179,7 @@ class TransactionHelper:
             from .role_management import RoleManagementNode
 
             role_mgmt = RoleManagementNode(database_url=self.db_node.connection_string)
-            return role_mgmt.run(
+            return role_mgmt.execute(
                 operation="assign_user",
                 user_id=user_id,
                 role_id=role_id,