canonicalwebteam.store-api 7.0.0__py3-none-any.whl → 7.2.0__py3-none-any.whl

canonicalwebteam/stores_web_redis/utility.py

@@ -3,7 +3,7 @@ from cachetools import TTLCache
 import redis
 import json
 import logging
-from typing import Optional, Any
+from typing import Optional, Any, Union
 
 logger = logging.getLogger(__name__)
 
@@ -12,6 +12,16 @@ port = os.getenv("REDIS_DB_PORT", "6379")
 password = os.getenv("REDIS_DB_PASSWORD", None)
 
 
+class SafeJSONEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, bytes):
+            try:
+                return obj.decode("utf-8")
+            except UnicodeDecodeError:
+                return f"<<non-decodable-bytes ({len(obj)} bytes)>>"
+        return super().default(obj)
+
+
 class RedisCache:
     def __init__(self, namespace: str, maxsize: int, ttl: int = 300):
         self.namespace = namespace
@@ -29,14 +39,23 @@ class RedisCache:
             logger.warning("Redis unavailable: %s", e)
             self.redis_available = False
 
-    def _build_key(self, key: str) -> str:
-        return f"{self.namespace}:{key}"
+    def _build_key(
+        self, key: Union[str, tuple[str, Optional[dict[str, Any]]]]
+    ) -> str:
+        base_key, parts = key if isinstance(key, tuple) else (key, {})
+        key_parts = ":".join(f"{k}-{v}" for k, v in parts.items() if v)
+        full_key = (
+            f"{self.namespace}:{base_key}:{key_parts}"
+            if key_parts
+            else f"{self.namespace}:{base_key}"
+        )
+        return full_key
 
     def _serialize(self, value: Any) -> str:
         if isinstance(value, str):
             return value
         try:
-            return json.dumps(value)
+            return json.dumps(value, cls=SafeJSONEncoder)
         except (TypeError, ValueError) as e:
             logger.error("Serialization error: %s", e)
             raise
@@ -54,34 +73,43 @@ class RedisCache:
             logger.error("Deserialization error: %s", e)
             raise
 
-    def get(self, key: str, expected_type: type = str) -> Any:
+    def get(
+        self,
+        key: Union[str, tuple[str, Optional[dict[str, Any]]]],
+        expected_type: type = str,
+    ) -> Any:
+        full_key = self._build_key(key)
         if self.redis_available:
-            full_key = self._build_key(key)
             try:
                 value = self.client.get(full_key)
                 return self._deserialize(value, expected_type)
             except redis.RedisError as e:
                 logger.error("Redis get error: %s", e)
-        value = self.fallback.get(key)
+        value = self.fallback.get(full_key)
         return value
 
-    def set(self, key: str, value: Any, ttl=300):
+    def set(
+        self,
+        key: Union[str, tuple[str, Optional[dict[str, Any]]]],
+        value: Any,
+        ttl=300,
+    ):
+        full_key = self._build_key(key)
         if self.redis_available:
-            full_key = self._build_key(key)
             try:
                 serialized = self._serialize(value)
                 self.client.setex(full_key, ttl, serialized)
                 return
             except redis.RedisError as e:
                 logger.error("Redis set error: %s", e)
-        self.fallback[key] = value
+        self.fallback[full_key] = value
 
-    def delete(self, key: str):
+    def delete(self, key: Union[str, tuple[str, Optional[dict[str, Any]]]]):
+        full_key = self._build_key(key)
         if self.redis_available:
-            full_key = self._build_key(key)
             try:
                 self.client.delete(full_key)
             except redis.RedisError as e:
                 logger.error("Redis delete error: %s", e)
         else:
-            self.fallback.pop(key, None)
+            self.fallback.pop(full_key, None)

{canonicalwebteam_store_api-7.0.0.dist-info → canonicalwebteam_store_api-7.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: canonicalwebteam.store-api
-Version: 7.0.0
+Version: 7.2.0
 Summary: 
 License: LGPL-3.0
 Author: Canonical Web Team

{canonicalwebteam_store_api-7.0.0.dist-info → canonicalwebteam_store_api-7.2.0.dist-info}/RECORD

@@ -7,8 +7,8 @@ canonicalwebteam/store_api/dashboard.py,sha256=M5JLjTTahN-bfiVz9SuP6ahLjqEvOalwm
 canonicalwebteam/store_api/devicegw.py,sha256=i42fnc29-CF3vM_tm7mwoOjQraDhu41EDkxILle1pQ4,10627
 canonicalwebteam/store_api/publishergw.py,sha256=u2D2Y76xC8ms16XTZcUe_KmRdcyzqOV2g0aN9HYZBrQ,29702
 canonicalwebteam/stores_web_redis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-canonicalwebteam/stores_web_redis/utility.py,sha256=h-4AxoMM0TBYjgWgq6dlN1-c0VKzaB9ZDzSPe75CVdY,2787
-canonicalwebteam_store_api-7.0.0.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-canonicalwebteam_store_api-7.0.0.dist-info/METADATA,sha256=-iatcvbkeNQnpOgKOaPyTkdfl4LM1ckmUk05XMa1svI,2284
-canonicalwebteam_store_api-7.0.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-canonicalwebteam_store_api-7.0.0.dist-info/RECORD,,
+canonicalwebteam/stores_web_redis/utility.py,sha256=dsHn8Zasn3Wsq4M29igv2gLA1vmXMDo8PQduf5cF_ns,3677
+canonicalwebteam_store_api-7.2.0.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+canonicalwebteam_store_api-7.2.0.dist-info/METADATA,sha256=50eC9ov7cIBDajLYmhtdPDgj_Q8LlWp4qPCFtOgD9SI,2284
+canonicalwebteam_store_api-7.2.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+canonicalwebteam_store_api-7.2.0.dist-info/RECORD,,