Update webapp.py

webapp.py

@@ -3,64 +3,42 @@ import gradio as gr
 from google import genai
 from google.genai.types import GenerateContentConfig, GoogleSearch, Tool
 
-# -----------------------------
-# 1) Initialize GenAI Client
-# -----------------------------
-API_KEY = os.getenv("GOOGLE_API_KEY")  # Set in Hugging Face Secrets
+API_KEY = os.getenv("GOOGLE_API_KEY")
 client = genai.Client(api_key=API_KEY)
 
-MODEL_ID = "models/gemini-2.5-flash"  # Replace with your desired model ID
+MODEL_ID = "models/gemini-2.5-flash"
 
-# -----------------------------
-# 2) (Optional) System Instruction
-# -----------------------------
 SYSTEM_INSTRUCTION = """
 You are a helpful assistant.
 If web search is enabled, use it to improve factual accuracy.
 Keep answers clear and structured.
 """
 
-# -----------------------------
-# 3) Gemini Call (with optional web search)
-# -----------------------------
 def google_search_query(question: str, use_web_search: bool):
     try:
-        # Base response (no web search)
+        config_kwargs = {"system_instruction": SYSTEM_INSTRUCTION}
+
+        if use_web_search:
+            google_search_tool = Tool(google_search=GoogleSearch())
+            config_kwargs["tools"] = [google_search_tool]
+
         response = client.models.generate_content(
             model=MODEL_ID,
             contents=question,
-            config=GenerateContentConfig(
-                system_instruction=SYSTEM_INSTRUCTION
-            ),
+            config=GenerateContentConfig(**config_kwargs),
         )
+
         ai_response = response.text if hasattr(response, "text") else "No response."
 
         search_results = "Web search not used."
         if use_web_search:
-            google_search_tool = Tool(google_search=GoogleSearch())
-            response = client.models.generate_content(
-                model=MODEL_ID,
-                contents=question,
-                config=GenerateContentConfig(
-                    system_instruction=SYSTEM_INSTRUCTION,
-                    tools=[google_search_tool],
-                ),
-            )
-
-            # Prefer web-assisted answer text if present
-            if hasattr(response, "text") and response.text:
-                ai_response = response.text
-
-            # Safely extract rendered search content (may not always exist)
             try:
                 search_results = (
                     response.candidates[0]
                     .grounding_metadata
                     .search_entry_point
                     .rendered_content
-                )
-                if not search_results:
-                    search_results = "Web search enabled, but no rendered search content returned."
+                ) or "Web search enabled, but no rendered search content returned."
             except Exception:
                 search_results = "Web search enabled, but search results could not be extracted."
 
@@ -69,9 +47,6 @@ def google_search_query(question: str, use_web_search: bool):
     except Exception as e:
         return f"Error: {str(e)}", ""
 
-# -----------------------------
-# 4) Gradio UI (Chatbot + Checkbox)
-# -----------------------------
 with gr.Blocks(theme=gr.themes.Glass(secondary_hue="violet")) as app:
     gr.Markdown("# Gemini + Google Search Custom UI")
 
@@ -95,7 +70,6 @@ with gr.Blocks(theme=gr.themes.Glass(secondary_hue="violet")) as app:
 
         ai_response, search_results = google_search_query(question, use_web_search)
 
-        # Chatbot expects tuples: (user, assistant)
         if use_web_search:
             final_answer = f"{ai_response}\n\n---\n\n**Web Search Results:**\n{search_results}"
         else:
@@ -110,10 +84,6 @@ with gr.Blocks(theme=gr.themes.Glass(secondary_hue="violet")) as app:
         outputs=[chatbot]
     )
 
-    clear_button.click(
-        fn=lambda: [],
-        inputs=None,
-        outputs=[chatbot]
-    )
+    clear_button.click(fn=lambda: [], inputs=None, outputs=[chatbot])
 
 app.launch()