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

canonicalwebteam/stores_web_redis/utility.py

@@ -14,11 +14,19 @@ password = os.getenv("REDIS_DB_PASSWORD", None)
 
 class SafeJSONEncoder(json.JSONEncoder):
     def default(self, obj):
-        if isinstance(obj, bytes):
+        if isinstance(obj, (bytes, bytearray)):
             try:
-                return obj.decode("utf-8")
+                return bytes(obj).decode("utf-8")
             except UnicodeDecodeError:
-                return f"<<non-decodable-bytes ({len(obj)} bytes)>>"
+                return f"non-decodable-bytes ({len(obj)} bytes)"
+
+        if isinstance(obj, set):
+            try:
+                return sorted(obj)
+            except Exception:
+                return list(obj)
+        if isinstance(obj, tuple):
+            return list(obj)
         return super().default(obj)
 
 
@@ -81,12 +89,20 @@ class RedisCache:
         full_key = self._build_key(key)
         if self.redis_available:
             try:
-                value = self.client.get(full_key)
-                return self._deserialize(value, expected_type)
+                return self._deserialize(
+                    self.client.get(full_key), expected_type
+                )
             except redis.RedisError as e:
                 logger.error("Redis get error: %s", e)
-        value = self.fallback.get(full_key)
-        return value
+        else:
+            try:
+                return self._deserialize(
+                    self.fallback[full_key], expected_type
+                )
+            except KeyError:
+                return None
+            except Exception as e:
+                logger.error("Fallback cache get error: %s", e)
 
     def set(
         self,
@@ -95,14 +111,18 @@ class RedisCache:
         ttl=300,
     ):
         full_key = self._build_key(key)
+        serialized = self._serialize(value)
         if self.redis_available:
             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[full_key] = value
+        else:
+            try:
+                self.fallback[full_key] = serialized
+            except Exception as e:
+                logger.error("Fallback cache set error: %s", e)
 
     def delete(self, key: Union[str, tuple[str, Optional[dict[str, Any]]]]):
         full_key = self._build_key(key)

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

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: canonicalwebteam.store-api
-Version: 7.2.0
+Version: 7.3.1
 Summary: 
 License: LGPL-3.0
+License-File: LICENSE
 Author: Canonical Web Team
 Author-email: webteam@canonical.com
 Requires-Python: >=3.9,<4.0
@@ -13,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.10
 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: cachetools (>=6.2.0,<7.0.0)
 Requires-Dist: coverage (>=7.0,<8.0)
 Requires-Dist: mypy (>=1.14.1,<2.0.0)

{canonicalwebteam_store_api-7.2.0.dist-info → canonicalwebteam_store_api-7.3.1.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=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,,
+canonicalwebteam/stores_web_redis/utility.py,sha256=iT5Wb6tk53ywtDVWMcfzAT_Sljmvo0bdhaUg6uepT2o,4290
+canonicalwebteam_store_api-7.3.1.dist-info/METADATA,sha256=0a78lqaDEwQNx7geY_EaMJHOw7WwJ2pUyoaS9ayWJXo,2357
+canonicalwebteam_store_api-7.3.1.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+canonicalwebteam_store_api-7.3.1.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+canonicalwebteam_store_api-7.3.1.dist-info/RECORD,,

{canonicalwebteam_store_api-7.2.0.dist-info → canonicalwebteam_store_api-7.3.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.0
 Root-Is-Purelib: true
 Tag: py3-none-any