Update bot/integrations/http.py

bot/integrations/http.py

@@ -4,15 +4,14 @@ from typing import Any, Dict, Optional
 
 import httpx
 
-# One global client (HF no persistence, but process lives)
+# One global client
 _client: Optional[httpx.AsyncClient] = None
 
 
 def get_client() -> httpx.AsyncClient:
     """
     Shared HTTP client for Worker calls.
-    - Retries handled in request_json()
-    - trust_env=False avoids weird proxy/env issues on HF
+    - trust_env=False avoids proxy/env issues on HF
     """
     global _client
     if _client is not None:
@@ -56,16 +55,12 @@ async def request_json(
     backoff_base: float = 0.6,
 ) -> Dict[str, Any]:
     """
-    Standard wrapper used by cf_worker1/cf_worker2.
-    Returns a dict always:
-      - on success: parsed JSON dict (or {"ok": True, "raw": "..."} if non-json)
-      - on error: {"ok": False, "status": <int>, "err": "<msg>"}
-
-    Handles DNS glitches like:
-      [Errno -5] No address associated with hostname
+    Returns dict always:
+      - success: JSON dict (adds ok=True if missing)
+      - error:   {"ok": False, "status": <int>, "err": "<msg>"}
     """
     c = get_client()
-    last_err = None
+    last_err: Optional[BaseException] = None
 
     for attempt in range(retries):
         try:
@@ -77,26 +72,24 @@ async def request_json(
                 data=data,
             )
 
-            # Try parse JSON always
+            # parse JSON if possible
             try:
                 j = r.json()
             except Exception:
                 txt = (r.text or "").strip()
-                j = {"ok": r.is_success, "raw": txt}
+                j = {"raw": txt}
 
             if r.is_success:
-                # if API didn't include ok, add it
-                if isinstance(j, dict) and "ok" not in j:
-                    j["ok"] = True
-                return j
+                if isinstance(j, dict):
+                    j.setdefault("ok", True)
+                    return j
+                return {"ok": True, "raw": j}
 
-            # non-2xx -> return error payload
+            # non-2xx
             if isinstance(j, dict):
-                # keep server error if present
                 j.setdefault("ok", False)
                 j.setdefault("status", r.status_code)
-                if "err" not in j:
-                    j["err"] = f"http_{r.status_code}"
+                j.setdefault("err", f"http_{r.status_code}")
                 return j
 
             return {"ok": False, "status": r.status_code, "err": f"http_{r.status_code}"}
@@ -109,8 +102,17 @@ async def request_json(
         except Exception as e:
             last_err = e
 
-        # retry with exponential backoff
         if attempt < retries - 1:
             await asyncio.sleep(backoff_base * (2 ** attempt))
 
-    return {"ok": False, "status": 0, "err": str(last_err) if last_err else "unknown_error"}
+    return {"ok": False, "status": 0, "err": str(last_err) if last_err else "unknown_error"}
+
+
+# ----------------- Backward-compatible helpers -----------------
+# (your old files import these names)
+
+async def post_json(url: str, payload: Dict[str, Any], headers: Optional[Dict[str, str]] = None) -> Dict[str, Any]:
+    return await request_json("POST", url, headers=headers, json_body=payload)
+
+async def get_json(url: str, headers: Optional[Dict[str, str]] = None) -> Dict[str, Any]:
+    return await request_json("GET", url, headers=headers)