wappa 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

wappa/persistence/json/handlers/state_handler.py

@@ -5,7 +5,7 @@ Provides state cache operations using JSON file storage.
 """
 
 import logging
-from typing import Any, Dict, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -18,47 +18,51 @@ logger = logging.getLogger("JSONStateHandler")
 class JSONStateHandler:
     """
     JSON-based state cache handler.
-    
+
     Mirrors RedisStateHandler functionality using file-based JSON storage.
     Maintains the same API for seamless cache backend switching.
     """
-    
+
     def __init__(self, tenant: str, user_id: str):
         """
         Initialize JSON state handler.
-        
+
         Args:
             tenant: Tenant identifier
             user_id: User identifier
         """
         if not tenant or not user_id:
-            raise ValueError(f"Missing required parameters: tenant={tenant}, user_id={user_id}")
-        
+            raise ValueError(
+                f"Missing required parameters: tenant={tenant}, user_id={user_id}"
+            )
+
         self.tenant = tenant
         self.user_id = user_id
         self.keys = default_key_factory
-    
+
     def _key(self, handler_name: str) -> str:
         """Build handler key using KeyFactory (same as Redis)."""
         return self.keys.handler(self.tenant, handler_name, self.user_id)
-    
+
     # ---- Public API matching RedisStateHandler ----
     async def get(
         self, handler_name: str, models: type[BaseModel] | None = None
     ) -> dict[str, Any] | None:
         """
         Get handler state data.
-        
+
         Args:
             handler_name: Handler name
             models: Optional BaseModel class for deserialization
-        
+
         Returns:
             Handler state data or None if not found
         """
         key = self._key(handler_name)
-        return await storage_manager.get("states", self.tenant, self.user_id, key, models)
-    
+        return await storage_manager.get(
+            "states", self.tenant, self.user_id, key, models
+        )
+
     async def upsert(
         self,
         handler_name: str,
@@ -67,66 +71,68 @@ class JSONStateHandler:
     ) -> bool:
         """
         Create or update handler state data.
-        
+
         Args:
             handler_name: Handler name
             data: State data to store
             ttl: Time to live in seconds
-        
+
         Returns:
             True if successful, False otherwise
         """
         key = self._key(handler_name)
-        return await storage_manager.set("states", self.tenant, self.user_id, key, data, ttl)
-    
+        return await storage_manager.set(
+            "states", self.tenant, self.user_id, key, data, ttl
+        )
+
     async def delete(self, handler_name: str) -> int:
         """
         Delete handler state data.
-        
+
         Args:
             handler_name: Handler name
-        
+
         Returns:
             1 if deleted, 0 if didn't exist
         """
         key = self._key(handler_name)
         success = await storage_manager.delete("states", self.tenant, self.user_id, key)
         return 1 if success else 0
-    
+
     async def exists(self, handler_name: str) -> bool:
         """
         Check if handler state exists.
-        
+
         Args:
             handler_name: Handler name
-        
+
         Returns:
             True if exists, False otherwise
         """
         key = self._key(handler_name)
         return await storage_manager.exists("states", self.tenant, self.user_id, key)
-    
+
     async def get_field(self, handler_name: str, field: str) -> Any | None:
         """
         Get a specific field from handler state.
-        
+
         Args:
             handler_name: Handler name
             field: Field name
-        
+
         Returns:
             Field value or None if not found
         """
         state_data = await self.get(handler_name)
         if state_data is None:
             return None
-        
+
         if isinstance(state_data, dict):
             return state_data.get(field)
         else:
             # BaseModel instance
             return getattr(state_data, field, None)
-    
+
     async def update_field(
         self,
         handler_name: str,
@@ -136,26 +142,26 @@ class JSONStateHandler:
     ) -> bool:
         """
         Update a specific field in handler state.
-        
+
         Args:
             handler_name: Handler name
             field: Field name
             value: New value
             ttl: Time to live in seconds
-        
+
         Returns:
             True if successful, False otherwise
         """
         state_data = await self.get(handler_name)
         if state_data is None:
             state_data = {}
-        
+
         if isinstance(state_data, BaseModel):
             state_data = state_data.model_dump()
-        
+
         state_data[field] = value
         return await self.upsert(handler_name, state_data, ttl)
-    
+
     async def increment_field(
         self,
         handler_name: str,
@@ -165,34 +171,36 @@ class JSONStateHandler:
     ) -> int | None:
         """
         Atomically increment an integer field in handler state.
-        
+
         Args:
             handler_name: Handler name
             field: Field name
             increment: Amount to increment by
             ttl: Time to live in seconds
-        
+
         Returns:
             New value after increment or None on error
         """
         state_data = await self.get(handler_name)
         if state_data is None:
             state_data = {}
-        
+
         if isinstance(state_data, BaseModel):
             state_data = state_data.model_dump()
-        
+
         current_value = state_data.get(field, 0)
-        if not isinstance(current_value, (int, float)):
-            logger.warning(f"Cannot increment non-numeric field '{field}': {current_value}")
+        if not isinstance(current_value, int | float):
+            logger.warning(
+                f"Cannot increment non-numeric field '{field}': {current_value}"
+            )
             return None
-        
+
         new_value = int(current_value) + increment
         state_data[field] = new_value
-        
+
         success = await self.upsert(handler_name, state_data, ttl)
         return new_value if success else None
-    
+
     async def append_to_list(
         self,
         handler_name: str,
@@ -202,49 +210,49 @@ class JSONStateHandler:
     ) -> bool:
         """
         Append value to a list field in handler state.
-        
+
         Args:
             handler_name: Handler name
             field: Field name containing list
             value: Value to append
             ttl: Time to live in seconds
-        
+
         Returns:
             True if successful, False otherwise
         """
         state_data = await self.get(handler_name)
         if state_data is None:
             state_data = {}
-        
+
         if isinstance(state_data, BaseModel):
             state_data = state_data.model_dump()
-        
+
         current_list = state_data.get(field, [])
         if not isinstance(current_list, list):
             current_list = []
-        
+
         current_list.append(value)
         state_data[field] = current_list
-        
+
         return await self.upsert(handler_name, state_data, ttl)
-    
+
     async def get_ttl(self, key: str) -> int:
         """
         Get remaining time to live for state cache.
-        
+
         Returns:
             Remaining TTL in seconds, -1 if no expiry, -2 if doesn't exist
         """
         return await storage_manager.get_ttl("states", self.tenant, self.user_id)
-    
+
     async def renew_ttl(self, key: str, ttl: int) -> bool:
         """
         Renew time to live for state cache.
-        
+
         Args:
             ttl: New time to live in seconds
-        
+
         Returns:
             True if successful, False otherwise
         """
-        return await storage_manager.set_ttl("states", self.tenant, self.user_id, ttl)
+        return await storage_manager.set_ttl("states", self.tenant, self.user_id, ttl)

wappa/persistence/json/handlers/table_handler.py

@@ -5,7 +5,7 @@ Provides table cache operations using JSON file storage.
 """
 
 import logging
-from typing import Any, Dict, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -18,28 +18,28 @@ logger = logging.getLogger("JSONTable")
 class JSONTable:
     """
     JSON-based table cache handler.
-    
+
     Mirrors RedisTable functionality using file-based JSON storage.
     Maintains the same API for seamless cache backend switching.
     """
-    
+
     def __init__(self, tenant: str):
         """
         Initialize JSON table handler.
-        
+
         Args:
             tenant: Tenant identifier
         """
         if not tenant:
             raise ValueError(f"Missing required parameter: tenant={tenant}")
-        
+
         self.tenant = tenant
         self.keys = default_key_factory
-    
+
     def _key(self, table_name: str, pkid: str) -> str:
         """Build table key using KeyFactory (same as Redis)."""
         return self.keys.table(self.tenant, table_name, pkid)
-    
+
     # ---- Public API matching RedisTable ----
     async def get(
         self,
@@ -49,18 +49,18 @@ class JSONTable:
     ) -> dict[str, Any] | None:
         """
         Get table row data.
-        
+
         Args:
             table_name: Table name
             pkid: Primary key ID
             models: Optional BaseModel class for deserialization
-        
+
         Returns:
             Table row data or None if not found
         """
         key = self._key(table_name, pkid)
         return await storage_manager.get("tables", self.tenant, None, key, models)
-    
+
     async def upsert(
         self,
         table_name: str,
@@ -70,70 +70,70 @@ class JSONTable:
     ) -> bool:
         """
         Create or update table row data.
-        
+
         Args:
             table_name: Table name
             pkid: Primary key ID
             data: Data to store
             ttl: Time to live in seconds
-        
+
         Returns:
             True if successful, False otherwise
         """
         key = self._key(table_name, pkid)
         return await storage_manager.set("tables", self.tenant, None, key, data, ttl)
-    
+
     async def delete(self, table_name: str, pkid: str) -> int:
         """
         Delete table row data.
-        
+
         Args:
             table_name: Table name
             pkid: Primary key ID
-        
+
         Returns:
             1 if deleted, 0 if didn't exist
         """
         key = self._key(table_name, pkid)
         success = await storage_manager.delete("tables", self.tenant, None, key)
         return 1 if success else 0
-    
+
     async def exists(self, table_name: str, pkid: str) -> bool:
         """
         Check if table row exists.
-        
+
         Args:
             table_name: Table name
             pkid: Primary key ID
-        
+
         Returns:
             True if exists, False otherwise
         """
         key = self._key(table_name, pkid)
         return await storage_manager.exists("tables", self.tenant, None, key)
-    
+
     async def get_field(self, table_name: str, pkid: str, field: str) -> Any | None:
         """
         Get a specific field from table row.
-        
+
         Args:
             table_name: Table name
             pkid: Primary key ID
             field: Field name
-        
+
         Returns:
             Field value or None if not found
         """
         row_data = await self.get(table_name, pkid)
         if row_data is None:
             return None
-        
+
         if isinstance(row_data, dict):
             return row_data.get(field)
         else:
             # BaseModel instance
             return getattr(row_data, field, None)
-    
+
     async def update_field(
         self,
         table_name: str,
@@ -144,27 +144,27 @@ class JSONTable:
     ) -> bool:
         """
         Update a specific field in table row.
-        
+
         Args:
             table_name: Table name
             pkid: Primary key ID
             field: Field name
             value: New value
             ttl: Time to live in seconds
-        
+
         Returns:
             True if successful, False otherwise
         """
         row_data = await self.get(table_name, pkid)
         if row_data is None:
             row_data = {}
-        
+
         if isinstance(row_data, BaseModel):
             row_data = row_data.model_dump()
-        
+
         row_data[field] = value
         return await self.upsert(table_name, pkid, row_data, ttl)
-    
+
     async def increment_field(
         self,
         table_name: str,
@@ -175,35 +175,37 @@ class JSONTable:
     ) -> int | None:
         """
         Atomically increment an integer field in table row.
-        
+
         Args:
             table_name: Table name
             pkid: Primary key ID
             field: Field name
             increment: Amount to increment by
             ttl: Time to live in seconds
-        
+
         Returns:
             New value after increment or None on error
         """
         row_data = await self.get(table_name, pkid)
         if row_data is None:
             row_data = {}
-        
+
         if isinstance(row_data, BaseModel):
             row_data = row_data.model_dump()
-        
+
         current_value = row_data.get(field, 0)
-        if not isinstance(current_value, (int, float)):
-            logger.warning(f"Cannot increment non-numeric field '{field}': {current_value}")
+        if not isinstance(current_value, int | float):
+            logger.warning(
+                f"Cannot increment non-numeric field '{field}': {current_value}"
+            )
             return None
-        
+
         new_value = int(current_value) + increment
         row_data[field] = new_value
-        
+
         success = await self.upsert(table_name, pkid, row_data, ttl)
         return new_value if success else None
-    
+
     async def append_to_list(
         self,
         table_name: str,
@@ -214,50 +216,50 @@ class JSONTable:
     ) -> bool:
         """
         Append value to a list field in table row.
-        
+
         Args:
             table_name: Table name
             pkid: Primary key ID
             field: Field name containing list
             value: Value to append
             ttl: Time to live in seconds
-        
+
         Returns:
             True if successful, False otherwise
         """
         row_data = await self.get(table_name, pkid)
         if row_data is None:
             row_data = {}
-        
+
         if isinstance(row_data, BaseModel):
             row_data = row_data.model_dump()
-        
+
         current_list = row_data.get(field, [])
         if not isinstance(current_list, list):
             current_list = []
-        
+
         current_list.append(value)
         row_data[field] = current_list
-        
+
         return await self.upsert(table_name, pkid, row_data, ttl)
-    
+
     async def get_ttl(self, key: str) -> int:
         """
         Get remaining time to live for table cache.
-        
+
         Returns:
             Remaining TTL in seconds, -1 if no expiry, -2 if doesn't exist
         """
         return await storage_manager.get_ttl("tables", self.tenant, None)
-    
+
     async def renew_ttl(self, key: str, ttl: int) -> bool:
         """
         Renew time to live for table cache.
-        
+
         Args:
             ttl: New time to live in seconds
-        
+
         Returns:
             True if successful, False otherwise
         """
-        return await storage_manager.set_ttl("tables", self.tenant, None, ttl)
+        return await storage_manager.set_ttl("tables", self.tenant, None, ttl)