Update streamlit_app.py

streamlit_app.py

@@ -406,7 +406,7 @@ if generate_now and not st.session_state.get("busy"):
                         # Do not re-raise; we'll fallback to genai.responses.generate below
 
                 if not out:
-                    # Fallback to direct Responses API flow
+                    # Fallback to direct Responses API flow (robust multi-version support)
                     try:
                         if not HAS_GENAI or genai is None:
                             raise RuntimeError("Responses API not available; install google.generativeai SDK.")
@@ -414,26 +414,51 @@ if generate_now and not st.session_state.get("busy"):
                         fname = file_name_or_id(processed)
                         if not fname:
                             raise RuntimeError("Uploaded file missing name/id")
+                    
                         system_msg = {"role": "system", "content": prompt_text}
                         user_msg = {"role": "user", "content": "Please summarize the attached video."}
-
+                    
+                        response = None
+                        # Try 1: new-style responses API (genai.responses.generate)
                         try:
-                            response = genai.responses.generate(
-                                model=model_used,
-                                messages=[system_msg, user_msg],
-                                files=[{"name": fname}],
-                                safety_settings=safety_settings,
-                                max_output_tokens=max_tokens,
-                            )
-                        except TypeError:
-                            response = genai.responses.generate(
-                                model=model_used,
-                                input=[{"text": prompt_text, "files": [{"name": fname}]}],
-                                safety_settings=safety_settings,
-                                max_output_tokens=max_tokens,
-                            )
-
-                        # Defensive normalization of response -> outputs list
+                            if hasattr(genai, "responses") and hasattr(genai.responses, "generate"):
+                                response = genai.responses.generate(
+                                    model=model_used,
+                                    messages=[system_msg, user_msg],
+                                    files=[{"name": fname}],
+                                    safety_settings=safety_settings,
+                                    max_output_tokens=max_tokens,
+                                )
+                        except Exception:
+                            response = None
+                    
+                        # Try 2: model-based interface (GenerativeModel / model.generate_content)
+                        if response is None:
+                            try:
+                                # prefer GenerativeModel if present
+                                if hasattr(genai, "GenerativeModel"):
+                                    model_obj = genai.GenerativeModel(model=model_used)
+                                    if hasattr(model_obj, "generate_content"):
+                                        response = model_obj.generate_content([system_msg, user_msg], files=[{"name": fname}], max_output_tokens=max_tokens)
+                                    elif hasattr(model_obj, "generate"):
+                                        response = model_obj.generate([system_msg, user_msg], files=[{"name": fname}], max_output_tokens=max_tokens)
+                            except Exception:
+                                response = None
+                    
+                        # Try 3: generic genai.generate / genai.create
+                        if response is None:
+                            try:
+                                if hasattr(genai, "generate"):
+                                    response = genai.generate(model=model_used, input=[{"text": prompt_text, "files": [{"name": fname}]}], max_output_tokens=max_tokens)
+                                elif hasattr(genai, "create"):
+                                    response = genai.create(model=model_used, input=[{"text": prompt_text, "files": [{"name": fname}]}], max_output_tokens=max_tokens)
+                            except Exception:
+                                response = None
+                    
+                        if response is None:
+                            raise RuntimeError("No supported generate method found on google.generativeai; check SDK version.")
+                    
+                        # Defensive normalization of response -> outputs list (keeps your existing extraction logic)
                         outputs = []
                         if response is None:
                             outputs = []
@@ -449,22 +474,20 @@ if generate_now and not st.session_state.get("busy"):
                                         outputs = v
                                         break
                         else:
-                            for attr in ("output", "candidates", "items", "responses"):
+                            for attr in ("output", "candidates", "items", "responses", "candidates"):
                                 val = getattr(response, attr, None)
                                 if isinstance(val, list) and val:
                                     outputs = val
                                     break
-
-                        # ensure list
+                    
                         if not isinstance(outputs, list):
                             outputs = list(outputs) if outputs else []
-
-                        # extract text pieces safely
+                    
+                        # extract text pieces safely (identical to your prior logic)
                         text_pieces = []
                         for item in outputs:
                             if item is None:
                                 continue
-                            # item may be dict or object; attempt to find text-rich fields
                             cand_contents = None
                             if isinstance(item, dict):
                                 for k in ("content", "text", "message", "output_text", "output"):
@@ -476,12 +499,12 @@ if generate_now and not st.session_state.get("busy"):
                                     cand_contents = getattr(item, k, None)
                                     if cand_contents:
                                         break
-
+                    
                             if isinstance(cand_contents, str):
                                 if cand_contents.strip():
                                     text_pieces.append(cand_contents.strip())
                                 continue
-
+                    
                             if isinstance(cand_contents, (list, tuple)):
                                 for c in cand_contents:
                                     if c is None:
@@ -497,7 +520,7 @@ if generate_now and not st.session_state.get("busy"):
                                     if t:
                                         text_pieces.append(str(t).strip())
                                 continue
-
+                    
                             direct = None
                             if isinstance(item, dict):
                                 direct = item.get("text") or item.get("output_text") or item.get("message")
@@ -505,7 +528,7 @@ if generate_now and not st.session_state.get("busy"):
                                 direct = getattr(item, "text", None) or getattr(item, "output_text", None) or getattr(item, "message", None)
                             if direct:
                                 text_pieces.append(str(direct).strip())
-
+                    
                         if not text_pieces:
                             top_text = None
                             if isinstance(response, dict):
@@ -514,7 +537,7 @@ if generate_now and not st.session_state.get("busy"):
                                 top_text = getattr(response, "text", None) or getattr(response, "message", None)
                             if top_text:
                                 text_pieces.append(str(top_text).strip())
-
+                    
                         # dedupe preserving order
                         seen = set()
                         filtered = []
@@ -525,8 +548,8 @@ if generate_now and not st.session_state.get("busy"):
                                 filtered.append(t)
                                 seen.add(t)
                         out = "\n\n".join(filtered)
+                    
                     except Exception as e:
-                        # Capture clear error to UI and include debug_info
                         tb = traceback.format_exc()
                         st.session_state["last_error"] = f"Responses API error: {e}\n\nDebug: {debug_info}\n\nTraceback:\n{tb}"
                         st.error("An error occurred while generating the story. You can try Generate again; the uploaded video will be reused.")