added upstash

redis_keep_alive_service.py

@@ -50,6 +50,9 @@ class RedisPingResponse(BaseModel):
     time: str
     latency_ms: float | None = None
     type: str  # "self-managed" or "upstash"
+    set_latency_ms: float | None = None
+    get_latency_ms: float | None = None
+    value: str | None = None
 
 
 # ---------- Self-managed Redis ----------
@@ -96,8 +99,8 @@ def ping_redis(service_name: str, redis_config: dict) -> RedisPingResponse:
 
 
 # ---------- Upstash Redis ----------
-def ping_upstash(service_name, redis_config):
-    """Ping and benchmark Upstash Redis REST API."""
+def ping_upstash(service_name: str, redis_config: dict) -> RedisPingResponse:
+    now = datetime.utcnow().isoformat()
     try:
         headers = {"Authorization": f"Bearer {redis_config['rest_token']}"}
 
@@ -107,38 +110,33 @@ def ping_upstash(service_name, redis_config):
         resp = requests.get(url, headers=headers)
         latency = (datetime.now() - start_time).total_seconds() * 1000
 
-        if resp.status_code == 200:
-            try:
-                result = resp.json().get("result")
-            except Exception:
-                result = resp.text.strip()
-
-            if result and result.upper() == "PONG":
-                logger.info(
-                    f"PING {redis_config['rest_url']} "
-                    f"- Response: {result}, Latency: {latency:.2f}ms"
-                )
-            else:
-                logger.error(f"Unexpected Upstash PING response: {resp.status_code} - {resp.text}")
-                return {
-                    "service_name": service_name,
-                    "success": False,
-                    "error": f"Unexpected response: {resp.status_code} - {resp.text}",
-                    "time": datetime.now().isoformat(),
-                    "latency_ms": None,
-                    "type": "upstash",
-                }
-        else:
-            return {
-                "service_name": service_name,
-                "success": False,
-                "error": f"HTTP {resp.status_code}: {resp.text}",
-                "time": datetime.now().isoformat(),
-                "latency_ms": None,
-                "type": "upstash",
-            }
-
-        # ✅ If ping is OK, also test SET/GET
+        if resp.status_code != 200:
+            return RedisPingResponse(
+                service_name=service_name,
+                success=False,
+                error=f"HTTP {resp.status_code}: {resp.text}",
+                time=now,
+                latency_ms=None,
+                type="upstash",
+            )
+
+        result = None
+        try:
+            result = resp.json().get("result")
+        except Exception:
+            result = resp.text.strip()
+
+        if not result or result.upper() != "PONG":
+            return RedisPingResponse(
+                service_name=service_name,
+                success=False,
+                error=f"Unexpected response: {resp.status_code} - {resp.text}",
+                time=now,
+                latency_ms=None,
+                type="upstash",
+            )
+
+        # ✅ SET/GET
         key = f"healthcheck:{uuid.uuid4()}"
         value = "ok"
 
@@ -154,28 +152,27 @@ def ping_upstash(service_name, redis_config):
         if get_resp.status_code == 200:
             got_value = get_resp.json().get("result")
 
-        return {
-            "service_name": service_name,
-            "success": True,
-            "error": None,
-            "time": datetime.now().isoformat(),
-            "latency_ms": latency,
-            "type": "upstash",
-            "set_latency_ms": set_latency,
-            "get_latency_ms": get_latency,
-            "value": got_value,
-        }
+        return RedisPingResponse(
+            service_name=service_name,
+            success=True,
+            error=None,
+            time=now,
+            latency_ms=latency,
+            type="upstash",
+            set_latency_ms=set_latency,
+            get_latency_ms=get_latency,
+            value=got_value,
+        )
 
     except Exception as e:
-        logger.error(f"Failed to test Upstash: {str(e)}")
-        return {
-            "service_name": redis_config.get("name", "upstash"),
-            "success": False,
-            "error": str(e),
-            "time": datetime.now().isoformat(),
-            "latency_ms": None,
-            "type": "upstash",
-        }
+        return RedisPingResponse(
+            service_name=service_name,
+            success=False,
+            error=str(e),
+            time=now,
+            latency_ms=None,
+            type="upstash",
+        )
 
 
 # ---------- Run All ----------
@@ -185,7 +182,7 @@ def ping_all_redis_projects() -> list[RedisPingResponse]:
 
     for service_name, config in REDIS_SERVICES.items():
         if not config or not any(config.values()):
-            continue  # skip empty configs
+            continue
         if "rest_url" in config:  # Upstash
             results.append(ping_upstash(service_name, config))
         else:  # Self-managed
@@ -195,3 +192,4 @@ def ping_all_redis_projects() -> list[RedisPingResponse]:
     return results
 
 
+