Update Deployment_UI_BE.py

Deployment_UI_BE.py

@@ -376,7 +376,7 @@ async def api_create_instance(req: Request):
     _INST["port"] = _INST.get("port") or ""
     return JSONResponse(content, r.status_code)
 # ---------------------------------------------------------------------
-# Poll / read instance status + explicit readiness fields (updated)
+# Poll / read instance status + explicit readiness fields
 # ---------------------------------------------------------------------
 @router.get("/api/compute/pods/{pod_id}")
 def api_get_instance(pod_id: str = None):
@@ -424,13 +424,12 @@ def api_get_instance(pod_id: str = None):
             _log_status(f"PORT_MAPPING declared={declared} chosen={chosen} all={pm}")
             _log_status(f"RESOLVED_ENDPOINT base={base}")
 
-            # --- health-first readiness (mirror Vertex), fallback to predict existence ---
+            # --- NEW: health-first readiness (mirror Vertex), fallback to predict existence ---
             hr = (_INST.get("healthRoute") or "/health").strip()
             pr = (_INST.get("predictRoute") or "/predict").strip()
 
             code_h, ms_h, snippet_h = _probe("GET", f"{base}{hr}")
             _log_status(f"HEALTH_PROBE path={hr} code={code_h} ms={ms_h} body_snippet={snippet_h[:120]}")
-
             if code_h in (200, 204):
                 _INST["status"] = "READY"
             else:
@@ -439,12 +438,17 @@ def api_get_instance(pod_id: str = None):
                 if code_p in (200, 204, 400, 405):
                     _INST["status"] = "READY"
 
-            # final prompt URL log (unchanged)
-            if _INST.get("predictRoute"):
-                proute = _INST["predictRoute"]
+            # Final prompt URL (prefer IP; else proxy host)
+            proute = _INST.get("predictRoute") or "/predict"
+            if _INST.get("ip") and _INST.get("port"):
                 prompt_url = f"http://{_INST['ip']}:{_INST['port']}{proute}"
+            else:
+                proxy_base = f"https://{pid}-{declared}.proxy.runpod.net" if declared else ""
+                prompt_url = f"{proxy_base}{proute}" if proxy_base else ""
+            if prompt_url:
                 _log_status(f"PROMPT_ENDPOINT {prompt_url}")
 
+    # Always include cached readiness data for the UI
     merged = {**last, "cachedState": {
         "podId": _INST.get("podId"),
         "status": _INST.get("status"),
@@ -454,7 +458,6 @@ def api_get_instance(pod_id: str = None):
         "healthRoute": _INST.get("healthRoute"),
     }}
     return JSONResponse(merged)
-
 # ---------------------------------------------------------------------
 # Start, Stop, End All — same as before
 # ---------------------------------------------------------------------
@@ -507,7 +510,7 @@ async def api_end_all():
         return JSONResponse(status_code=500, content={"error": f"RunPod delete failed: {e}"})
 
 # ---------------------------------------------------------------------
-# Wait instance (updated: same health-first + predict fallback)
+# Wait instance
 # ---------------------------------------------------------------------
 @router.get("/api/compute/wait_instance")
 def api_wait_instance(pod_id: str = None):
@@ -534,23 +537,26 @@ def api_wait_instance(pod_id: str = None):
         pass
 
     if ip and pm:
-        if isinstance(declared, int) and str(declared) in pm:
-            port = str(pm[str(declared)])
-        elif "8080" in pm:
+        try:
+            if isinstance(declared, int) and str(declared) in pm:
+                port = str(pm[str(declared)])
+        except Exception:
+            pass
+        if not port and "8080" in pm:
             port = str(pm["8080"])
-        elif pm:
+        elif not port and pm:
             port = str(pm[next(iter(pm.keys()))])
 
     if ip and port:
         base = f"http://{ip}:{port}"
         _log_status(f"RESOLVED_IP {base}")
 
+        # --- NEW: health-first readiness (mirror Vertex), fallback to predict existence ---
         hr = (_INST.get("healthRoute") or "/health").strip()
         pr = (_INST.get("predictRoute") or "/predict").strip()
 
         code_h, ms_h, snippet_h = _probe("GET", f"{base}{hr}")
         _log_status(f"HEALTH_PROBE path={hr} code={code_h} ms={ms_h} body_snippet={snippet_h[:120]}")
-
         if code_h in (200, 204):
             _INST["status"] = "READY"
         else:
@@ -562,7 +568,6 @@ def api_wait_instance(pod_id: str = None):
         if _INST.get("predictRoute"):
             _log_status(f"PROMPT_ENDPOINT {base}{_INST['predictRoute']}")
 
-    # proxy base (unchanged)
     try:
         cspec = _get_container_spec()
         internal, _ = _get_port_and_proto(cspec)
@@ -574,7 +579,7 @@ def api_wait_instance(pod_id: str = None):
     except Exception:
         pass
 
-    _INST.update({"ip": ip or "", "port": port or ""})
+    _INST.update({"ip": ip or "", "port": port or "", "status": last.get("desiredStatus", "")})
     _save_state()
 
     merged = {
@@ -590,7 +595,6 @@ def api_wait_instance(pod_id: str = None):
         },
     }
     return JSONResponse(merged)
-
 # ---------------------------------------------------------------------
 # Debug: live probes against the instance (IP + Proxy)
 # ---------------------------------------------------------------------