Update streamlit_app.py

streamlit_app.py

@@ -13,7 +13,7 @@ from dotenv import load_dotenv
 
 load_dotenv()
 
-# Try SDK import
+# Try to import SDK
 HAS_GENAI = False
 genai = None
 upload_file = None
@@ -275,7 +275,6 @@ def get_runtime_api_key():
         return key
     return os.getenv("GOOGLE_API_KEY", "").strip() or None
 
-# --- Compatibility layer: SDK-first, HTTP fallback using /v1/responses ---
 def _messages_to_prompt(messages):
     if not messages:
         return ""
@@ -296,6 +295,7 @@ def _http_generate_responses(api_key: str, model: str, prompt: str, max_tokens:
     }
     r = requests.post(url, json=payload, headers=headers, timeout=30)
     if r.status_code != 200:
+        # include body for debugging
         raise RuntimeError(f"HTTP {r.status_code}: {r.text}")
     return r.json()
 
@@ -314,7 +314,7 @@ def responses_generate(model, messages, files, max_output_tokens, api_key):
                 return responses_obj.generate(**sdk_kwargs)
         except Exception:
             pass
-    # HTTP fallback (Responses API)
+    # HTTP fallback (Responses v1)
     prompt = _messages_to_prompt(messages)
     return _http_generate_responses(api_key, model, prompt, max_output_tokens)
 
@@ -333,56 +333,55 @@ def call_responses_once(model_used, system_msg, user_msg, fname, max_tokens):
 def extract_text_from_response(response):
     if response is None:
         return None
-    # dict-style
     if isinstance(response, dict):
-        # Responses v1: look for "output" or "candidates" or "outputText"
-        if "output" in response and isinstance(response["output"], list):
-            pieces = []
-            for item in response["output"]:
-                if isinstance(item, dict):
-                    # new Responses API nested content sometimes in "content" list with dicts
-                    if "content" in item and isinstance(item["content"], list):
-                        for c in item["content"]:
-                            if isinstance(c, dict) and "text" in c:
-                                pieces.append(c["text"])
-                    else:
-                        c = item.get("content") or item.get("text")
-                        if isinstance(c, str):
-                            pieces.append(c)
-            if pieces:
-                return "\n\n".join(pieces)
-        # older style candidates
-        if "candidates" in response and isinstance(response["candidates"], list) and response["candidates"]:
+        # new Responses v1 shape: "output" -> list of items, each may contain "content" list with {"text":...}
+        out = []
+        for item in response.get("output", []) or []:
+            if isinstance(item, dict):
+                # content list
+                for c in item.get("content", []) or []:
+                    if isinstance(c, dict) and "text" in c:
+                        out.append(c["text"])
+                # fallback short text fields
+                if "text" in item and isinstance(item["text"], str):
+                    out.append(item["text"])
+                if "content" in item and isinstance(item["content"], str):
+                    out.append(item["content"])
+        if out:
+            return "\n\n".join(out)
+        # older candidates style
+        if "candidates" in response and response["candidates"]:
             cand = response["candidates"][0]
             if isinstance(cand, dict):
-                return cand.get("content") or cand.get("text") or response.get("text")
-        if "outputText" in response and isinstance(response["outputText"], str):
-            return response["outputText"]
-        if "text" in response and isinstance(response["text"], str):
-            return response["text"]
-        # fallback: stringified body
-        return json.dumps(response)[:16000]
-    # object-style (SDK)
+                return cand.get("content") or cand.get("text")
+        # fallback simple fields
+        if "outputText" in response:
+            return response.get("outputText")
+        if "text" in response:
+            return response.get("text")
+        return None
+    # SDK object style
     try:
         outputs = getattr(response, "output", None) or getattr(response, "candidates", None)
         if outputs:
-            pieces = []
+            parts = []
             for item in outputs:
-                txt = None
+                # SDK item may be object or dict-like
                 if hasattr(item, "content"):
-                    txt = getattr(item, "content")
-                    if isinstance(txt, list):
-                        # SDK content lists may contain dicts with 'text'
-                        for c in txt:
-                            if isinstance(c, dict) and "text" in c:
-                                pieces.append(c["text"])
-                    elif isinstance(txt, str):
-                        pieces.append(txt)
-                txt = txt or getattr(item, "text", None)
+                    c = getattr(item, "content")
+                    if isinstance(c, list):
+                        for e in c:
+                            if isinstance(e, dict) and "text" in e:
+                                parts.append(e["text"])
+                            elif isinstance(e, str):
+                                parts.append(e)
+                    elif isinstance(c, str):
+                        parts.append(c)
+                txt = getattr(item, "text", None)
                 if isinstance(txt, str):
-                    pieces.append(txt)
-            if pieces:
-                return "\n\n".join(pieces)
+                    parts.append(txt)
+            if parts:
+                return "\n\n".join(parts)
         txt = getattr(response, "text", None) or getattr(response, "output_text", None)
         if txt:
             return txt