canonicalwebteam.store-api 7.3.0__tar.gz → 7.3.2__tar.gz

{canonicalwebteam_store_api-7.3.0 → canonicalwebteam_store_api-7.3.2}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: canonicalwebteam.store-api
-Version: 7.3.0
+Version: 7.3.2
 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.3.0 → canonicalwebteam_store_api-7.3.2}/canonicalwebteam/store_api/devicegw.py

@@ -307,7 +307,7 @@ class DeviceGW(Base):
         )["revisions"]
 
     def get_featured_snaps(
-        self, api_version: int = 1, fields: str = "snap_id"
+        self, api_version: int = 1, fields: str = "snap_id", headers: dict = {}
     ) -> dict:
         """
         Documentation: (link to spec)
@@ -315,7 +315,9 @@ class DeviceGW(Base):
         Endpoint: https://api.snapcraft.io/api/v1/snaps/search
         """
         url = self.get_endpoint_url("search")
-        headers = self.config[api_version].get("headers")
+        default_headers = self.config[api_version].get("headers", {})
+
+        merged_headers = {**default_headers, **headers}
 
         params = {
             "scope": "wide",
@@ -326,5 +328,5 @@ class DeviceGW(Base):
         }
 
         return self.process_response(
-            self.session.get(url, params=params, headers=headers)
+            self.session.get(url, params=params, headers=merged_headers)
         )

{canonicalwebteam_store_api-7.3.0 → canonicalwebteam_store_api-7.3.2}/canonicalwebteam/stores_web_redis/utility.py

@@ -89,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,
@@ -103,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.3.0 → canonicalwebteam_store_api-7.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'canonicalwebteam.store-api'
-version = '7.3.0'
+version = '7.3.2'
 description = ''
 authors = ['Canonical Web Team <webteam@canonical.com>']
 license = 'LGPL-3.0'