Update Deployment_UI_BE.py

Deployment_UI_BE.py

@@ -152,6 +152,7 @@ def _normalize_blob_url(u: str | None) -> str | None:
     u = str(u).strip()
     if u.startswith(("http://", "https://")):
         return u
+    # Treat '/x' or 'x' as local to this app (same origin as FE)
     if u.startswith("/"):
         return f"{_LOCAL_BASE}{u}"
     return f"{_LOCAL_BASE}/{u}"
@@ -169,7 +170,6 @@ def _fetch_url(u: str):
 def _fetch_blob_from_page():
     return _fetch_url(f"{_LOCAL_BASE}/modelblob.json")
 
-# --- UPDATED: healthRoute + predictRoute caching ---
 def _ingest_blob(parsed: dict, model_id_hint: str = "", container_image_hint: str = ""):
     if not isinstance(parsed, dict):
         raise HTTPException(400, "Invalid blob (expected JSON object).")
@@ -189,15 +189,45 @@ def _ingest_blob(parsed: dict, model_id_hint: str = "", container_image_hint: st
             _INST[k] = v.strip()
 
     image_uri = (c.get("imageUri") or "").strip().lower()
-    pr_hint, hr_hint = _infer_routes_from_image(image_uri)
-
-    # mirror Vertex defaults
-    if not _INST.get("predictRoute"):
-        _INST["predictRoute"] = pr_hint or "/predict"
-    if not _INST.get("healthRoute"):
-        _INST["healthRoute"] = hr_hint or "/health"
+    pr, hr = _infer_routes_from_image(image_uri)
+    if pr and not _INST.get("predictRoute"):
+        _INST["predictRoute"] = pr
+    if hr and not _INST.get("healthRoute"):
+        _INST["healthRoute"] = hr  # <-- only addition: cache healthRoute hint
 
     return True
+
+@router.post("/api/ingest/from_landing")
+def api_ingest_from_landing(blob_url: str | None = None):
+    """
+    Ingest the deployment blob for downstream use.
+    Mirrors FE behavior: resolve relative paths like '/modelblob.json'
+    against the app origin.
+    """
+    u = _normalize_blob_url(blob_url) or _normalize_blob_url("/modelblob.json")
+    parsed = _fetch_url(u)
+    if not parsed:
+        return JSONResponse({"error": "Blob not available"}, 404)
+    _ingest_blob(parsed, model_id_hint="", container_image_hint="")
+    return JSONResponse({"ok": True, "source": u})
+
+# (Optional compatibility: UI posting to /Deployment_UI; accepts blob_url via query)
+@router.post("/Deployment_UI")
+async def deployment_ui_ingest(request: Request,
+                               model_id: str = Form(""),
+                               container_image: str = Form(""),
+                               blob: str = Form("")):
+    """
+    Legacy entry used by the Deployment UI page.
+    Prefers blob_url from query string; falls back to the modelblob page JSON.
+    """
+    blob_url = request.query_params.get("blob_url")
+    u = _normalize_blob_url(blob_url) if blob_url else _normalize_blob_url("/modelblob.json")
+    parsed = _fetch_url(u)
+    if not parsed:
+        return HTMLResponse("<pre>Missing blob (no /modelblob.json and no blob_url)</pre>", 400)
+    _ingest_blob(parsed, model_id_hint=model_id, container_image_hint=container_image)
+    return RedirectResponse("/Deployment_UI", 303)
 # ---------------------------------------------------------------------
 # Create instance
 # ---------------------------------------------------------------------