added upstash

redis_keep_alive_service.py

@@ -10,8 +10,8 @@ from pydantic import BaseModel
 # Logging (console only)
 logging.basicConfig(
     level=logging.INFO,
-    format='%(asctime)s - %(levelname)s - %(message)s',
-    handlers=[logging.StreamHandler()]
+    format="%(asctime)s - %(levelname)s - %(message)s",
+    handlers=[logging.StreamHandler()],
 )
 logger = logging.getLogger(__name__)
 
@@ -29,7 +29,6 @@ REDIS_SERVICES = {
         "port": os.getenv("REDIS_DEVELOPMENT_PORT"),
         "password": os.getenv("REDIS_DEVELOPMENT_PASSWORD"),
     },
-
     # Upstash Redis (REST API)
     "upstash_dev": {
         "rest_url": os.getenv("UPSTASH_REDIS_DEV_REST_URL"),
@@ -42,7 +41,7 @@ REDIS_SERVICES = {
 }
 
 
-# ---------- Pydantic Response ----------
+# ---------- Pydantic Response Models ----------
 class RedisPingResponse(BaseModel):
     service_name: str
     success: bool
@@ -55,6 +54,10 @@ class RedisPingResponse(BaseModel):
     value: str | None = None
 
 
+class RedisPingAllResponse(BaseModel):
+    services: list[RedisPingResponse]
+
+
 # ---------- Self-managed Redis ----------
 def ping_redis(service_name: str, redis_config: dict) -> RedisPingResponse:
     now = datetime.utcnow().isoformat()
@@ -75,15 +78,17 @@ def ping_redis(service_name: str, redis_config: dict) -> RedisPingResponse:
         key = f"healthcheck:{uuid.uuid4()}"
         r.set(key, "ok")
         got = r.get(key)
+        got_value = got.decode() if got else None  # ✅ ensure only str, not bytes or Redis object
 
-        logger.info(f"{service_name} PING OK, latency {latency:.2f}ms, value={got.decode()}")
+        logger.info(f"{service_name} PING OK, latency {latency:.2f}ms, value={got_value}")
         return RedisPingResponse(
             service_name=service_name,
             success=True,
             error=None,
             time=now,
             latency_ms=latency,
-            type="self-managed"
+            type="self-managed",
+            value=got_value,
         )
     except Exception as e:
         error_msg = str(e)
@@ -94,7 +99,7 @@ def ping_redis(service_name: str, redis_config: dict) -> RedisPingResponse:
             error=error_msg,
             time=now,
             latency_ms=None,
-            type="self-managed"
+            type="self-managed",
         )
 
 
@@ -120,7 +125,6 @@ def ping_upstash(service_name: str, redis_config: dict) -> RedisPingResponse:
                 type="upstash",
             )
 
-        result = None
         try:
             result = resp.json().get("result")
         except Exception:
@@ -136,7 +140,7 @@ def ping_upstash(service_name: str, redis_config: dict) -> RedisPingResponse:
                 type="upstash",
             )
 
-        # ✅ SET/GET
+        # ✅ SET/GET test
         key = f"healthcheck:{uuid.uuid4()}"
         value = "ok"
 
@@ -163,7 +167,6 @@ def ping_upstash(service_name: str, redis_config: dict) -> RedisPingResponse:
             get_latency_ms=get_latency,
             value=got_value,
         )
-
     except Exception as e:
         return RedisPingResponse(
             service_name=service_name,
@@ -176,7 +179,7 @@ def ping_upstash(service_name: str, redis_config: dict) -> RedisPingResponse:
 
 
 # ---------- Run All ----------
-def ping_all_redis_projects() -> list[RedisPingResponse]:
+def ping_all_redis_projects() -> RedisPingAllResponse:
     logger.info("Starting Redis service health check")
     results: list[RedisPingResponse] = []
 
@@ -189,7 +192,4 @@ def ping_all_redis_projects() -> list[RedisPingResponse]:
             results.append(ping_redis(service_name, config))
 
     logger.info("Completed all Redis service checks")
-    return results
-
-
-
+    return RedisPingAllResponse(services=results)