refactored-starting

services/notify.py

@@ -3,7 +3,7 @@ import json
 from orm.notification import Notification
 from services.db import local_session
 from utils.logger import root_logger as logger
-from cache.rediscache import redis
+from services.redis import redis
 
 
 def save_notification(action: str, entity: str, payload):

services/redis.py

@@ -0,0 +1,63 @@
+import logging
+
+import redis.asyncio as aredis
+
+from settings import REDIS_URL
+
+# Set redis logging level to suppress DEBUG messages
+logger = logging.getLogger("redis")
+logger.setLevel(logging.WARNING)
+
+
+class RedisService:
+    def __init__(self, uri=REDIS_URL):
+        self._uri: str = uri
+        self.pubsub_channels = []
+        self._client = None
+
+    async def connect(self):
+        self._client = aredis.Redis.from_url(self._uri, decode_responses=True)
+
+    async def disconnect(self):
+        if self._client:
+            await self._client.close()
+
+    async def execute(self, command, *args, **kwargs):
+        if self._client:
+            try:
+                logger.debug(f"{command}")  # {args[0]}") # {args} {kwargs}")
+                for arg in args:
+                    if isinstance(arg, dict):
+                        if arg.get("_sa_instance_state"):
+                            del arg["_sa_instance_state"]
+                r = await self._client.execute_command(command, *args, **kwargs)
+                # logger.debug(type(r))
+                # logger.debug(r)
+                return r
+            except Exception as e:
+                logger.error(e)
+
+    async def subscribe(self, *channels):
+        if self._client:
+            async with self._client.pubsub() as pubsub:
+                for channel in channels:
+                    await pubsub.subscribe(channel)
+                    self.pubsub_channels.append(channel)
+
+    async def unsubscribe(self, *channels):
+        if not self._client:
+            return
+        async with self._client.pubsub() as pubsub:
+            for channel in channels:
+                await pubsub.unsubscribe(channel)
+                self.pubsub_channels.remove(channel)
+
+    async def publish(self, channel, data):
+        if not self._client:
+            return
+        await self._client.publish(channel, data)
+
+
+redis = RedisService()
+
+__all__ = ["redis"]

services/search.py

@@ -6,7 +6,7 @@ import os
 from opensearchpy import OpenSearch
 
 from utils.encoders import CustomJSONEncoder
-from cache.rediscache import redis
+from services.redis import redis
 
 # Set redis logging level to suppress DEBUG messages
 logger = logging.getLogger("search")

services/viewed.py

@@ -13,7 +13,7 @@ from orm.author import Author
 from orm.shout import Shout, ShoutAuthor, ShoutTopic
 from orm.topic import Topic
 from services.db import local_session
-from services.logger import root_logger as logger
+from utils.logger import root_logger as logger
 
 GOOGLE_KEYFILE_PATH = os.environ.get("GOOGLE_KEYFILE_PATH") or "/dump/google-service.json"
 GOOGLE_PROPERTY_ID = os.environ.get("GOOGLE_PROPERTY_ID")