canonicalwebteam.store-api 6.9.0__tar.gz → 7.0.0__tar.gz

{canonicalwebteam_store_api-6.9.0 → canonicalwebteam_store_api-7.0.0}/PKG-INFO

@@ -1,22 +1,23 @@
 Metadata-Version: 2.3
 Name: canonicalwebteam.store-api
-Version: 6.9.0
+Version: 7.0.0
 Summary: 
 License: LGPL-3.0
 Author: Canonical Web Team
 Author-email: webteam@canonical.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+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)
 Requires-Dist: pymacaroons (==0.13.0)
+Requires-Dist: redis (>=6.4.0,<7.0.0)
 Requires-Dist: requests (>=2.32.2,<3.0.0)
 Description-Content-Type: text/markdown
 

{canonicalwebteam_store_api-6.9.0 → canonicalwebteam_store_api-7.0.0}/canonicalwebteam/store_api/devicegw.py

@@ -132,7 +132,6 @@ class DeviceGW(Base):
         if featured:
             params["featured"] = featured
         response = self.session.get(url, params=params, headers=headers)
-        # pprint(response.json())
         return self.process_response(response)
 
     def get_all_items(self, size: int, api_version: int = 1) -> dict:

canonicalwebteam_store_api-7.0.0/canonicalwebteam/stores_web_redis/utility.py

@@ -0,0 +1,87 @@
+import os
+from cachetools import TTLCache
+import redis
+import json
+import logging
+from typing import Optional, Any
+
+logger = logging.getLogger(__name__)
+
+host = os.getenv("REDIS_DB_HOSTNAME", "localhost")
+port = os.getenv("REDIS_DB_PORT", "6379")
+password = os.getenv("REDIS_DB_PASSWORD", None)
+
+
+class RedisCache:
+    def __init__(self, namespace: str, maxsize: int, ttl: int = 300):
+        self.namespace = namespace
+        self.fallback = TTLCache(maxsize=maxsize, ttl=ttl)
+        try:
+            self.client = redis.Redis(
+                host=host,
+                port=int(port),
+                password=password,
+                decode_responses=True,
+            )
+            self.client.ping()
+            self.redis_available = True
+        except redis.RedisError as e:
+            logger.warning("Redis unavailable: %s", e)
+            self.redis_available = False
+
+    def _build_key(self, key: str) -> str:
+        return f"{self.namespace}:{key}"
+
+    def _serialize(self, value: Any) -> str:
+        if isinstance(value, str):
+            return value
+        try:
+            return json.dumps(value)
+        except (TypeError, ValueError) as e:
+            logger.error("Serialization error: %s", e)
+            raise
+
+    def _deserialize(
+        self, value: Optional[str], expected_type: type = str
+    ) -> Any:
+        if value is None:
+            return None
+        if expected_type is str:
+            return value
+        try:
+            return json.loads(value)
+        except (TypeError, ValueError) as e:
+            logger.error("Deserialization error: %s", e)
+            raise
+
+    def get(self, key: str, expected_type: type = str) -> Any:
+        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)
+        return value
+
+    def set(self, key: str, value: Any, ttl=300):
+        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
+
+    def delete(self, key: str):
+        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)

{canonicalwebteam_store_api-6.9.0 → canonicalwebteam_store_api-7.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'canonicalwebteam.store-api'
-version = '6.9.0'
+version = '7.0.0'
 description = ''
 authors = ['Canonical Web Team <webteam@canonical.com>']
 license = 'LGPL-3.0'
@@ -10,11 +10,13 @@ readme = 'README.md'
 include = 'canonicalwebteam'
 
 [tool.poetry.dependencies]
-python = '^3.8'
+python = '^3.9'
 coverage = '^7.0'
 pymacaroons = '0.13.0'
 requests = '^2.32.2'
 mypy = "^1.14.1"
+redis = "^6.4.0"
+cachetools = "^6.2.0"
 
 [tool.poetry.dev-dependencies]
 vcrpy-unittest = '^0.1.7'