Update app.py

app.py

@@ -1,3 +1,5 @@
+"""Main application for the OpenDeepResearch Gradio interface."""
+
 import mimetypes
 import os
 import re
@@ -122,7 +124,6 @@ class ModelManager:
             if chosen_inference == "openai":
                 if not key_manager:
                     raise ValueError("Key manager required for OpenAI model")
-
                 return OpenAIServerModel(
                     model_id=model_id, api_key=key_manager.get_key("openai_api_key")
                 )
@@ -135,7 +136,6 @@ class ModelManager:
                 )
 
             raise ValueError(f"Invalid inference type: {chosen_inference}")
-
         except Exception as e:
             print(f"✗ Couldn't load model: {e}")
             raise
@@ -165,7 +165,7 @@ class ToolRegistry:
             return Tool.from_space(
                 space_id="xkerser/FLUX.1-dev",
                 name="image_generator",
-                description="Generates high-quality AgentImage using the FLUX.1-dev model based on text prompts.",
+                description="Generates high-quality AgentImage with text prompt (77 token limit).",
             )
         except Exception as e:
             print(f"✗ Couldn't initialize image generation tool: {e}")
@@ -196,16 +196,17 @@ def create_agent():
     # Collect all tools in a single list
     web_tools = ToolRegistry.load_web_tools(model, browser, text_limit)
     image_generator = ToolRegistry.load_image_generation_tools()
-    clean_text = ToolRegistry.load_clean_text_tool()
+    clean_text = TextCleanerTool()  # Instantiate TextCleanerTool
 
     # Combine all tools into a single list (not a tuple)
-    all_tools = [visualizer, web_tools, image_generator, clean_text]
+    all_tools = [visualizer] + web_tools + [image_generator] + [clean_text]
 
     # Validate tools before creating agent
     for tool in all_tools:
         if not isinstance(tool, Tool):
             raise ValueError(
-                f"Invalid tool type: {type(tool)}. All tools must be instances of Tool class."
+                "Invalid tool type: "
+                f"{type(tool)}. All tools must be instances of Tool class."
             )
 
     return CodeAgent(
@@ -228,8 +229,7 @@ def stream_to_gradio(
     for step_log in agent.run(
         task, stream=True, reset=reset_agent_memory, additional_args=additional_args
     ):
-        for message in pull_messages_from_step(step_log):
-            yield message
+        yield from pull_messages_from_step(step_log)
 
     # Process final answer : Use a more comprehensive media output
     final_answer = step_log  # Last log is the run's final_answer
@@ -295,11 +295,7 @@ class GradioUI:
             print(f"Error in interaction: {str(e)}")
             raise
 
-    def upload_file(
-        self,
-        file,
-        file_uploads_log,
-    ):
+    def upload_file(self, file, file_uploads_log):
         """Handle file uploads with proper validation and security."""
         if file is None:
             return gr.Textbox("No file uploaded", visible=True), file_uploads_log
@@ -314,9 +310,7 @@ class GradioUI:
 
         # Sanitize file name
         original_name = os.path.basename(file.name)
-        sanitized_name = re.sub(
-            r"[^\w\-.]", "_", original_name
-        )  # Replace invalid chars with underscores
+        sanitized_name = re.sub(r"[^\w\-.]", "_", original_name)
 
         # Ensure the extension correlates to the mime type
         type_to_ext = {}
@@ -331,15 +325,11 @@ class GradioUI:
 
         # Limit File Size, and Throw Error
         max_file_size_mb = 50  # Define the limit
-        file_size_mb = os.path.getsize(file.name) / (1024 * 1024)  # Size in MB
+        file_size_mb = os.path.getsize(file.name) / (1024 * 1024)
 
         if file_size_mb > max_file_size_mb:
-            return (
-                gr.Textbox(
-                    f"File size exceeds {max_file_size_mb} MB limit.", visible=True
-                ),
-                file_uploads_log,
-            )
+            error_msg = f"File size exceeds {max_file_size_mb} MB limit."
+            return gr.Textbox(error_msg, visible=True), file_uploads_log
 
         # Save the uploaded file to the specified folder
         file_path = os.path.join(self.file_upload_folder, sanitized_name)
@@ -354,14 +344,17 @@ class GradioUI:
         message = text_input
 
         if file_uploads_log:
-            message += f"\nYou have been provided with these files, which might be helpful or not: {file_uploads_log}"  # Added file list
+            message += (
+                "\nYou have been provided with these files, which might be helpful"
+                f" or not: {file_uploads_log}"
+            )
 
         return (
             message,
             gr.Textbox(
                 value="",
                 interactive=False,
-                placeholder="Processing...",  # Changed placeholder.
+                placeholder="Processing...",
             ),
             gr.Button(interactive=False),
         )
@@ -369,29 +362,26 @@ class GradioUI:
     def detect_device(self, request: gr.Request):
         """Detect whether the user is on mobile or desktop device."""
         if not request:
-            return "Unknown device"  # Handle case where request is none.
+            return "Unknown device"
 
-        # Method 1: Check sec-ch-ua-mobile header
         is_mobile_header = request.headers.get("sec-ch-ua-mobile")
         if is_mobile_header:
             return "Mobile" if "?1" in is_mobile_header else "Desktop"
 
-        # Method 2: Check user-agent string
         user_agent = request.headers.get("user-agent", "").lower()
         mobile_keywords = ["android", "iphone", "ipad", "mobile", "phone"]
 
         if any(keyword in user_agent for keyword in mobile_keywords):
             return "Mobile"
 
-        # Method 3: Check platform
         platform = request.headers.get("sec-ch-ua-platform", "").lower()
         if platform:
             if platform in ['"android"', '"ios"']:
                 return "Mobile"
-            elif platform in ['"windows"', '"macos"', '"linux"']:
+            # Remove unnecessary elif
+            if platform in ['"windows"', '"macos"', '"linux"']:
                 return "Desktop"
 
-        # Default case if no clear indicators
         return "Desktop"
 
     def launch(self, **kwargs):
@@ -405,8 +395,8 @@ class GradioUI:
                 # Render layout with sidebar
                 if device == "Desktop":
                     return self._create_desktop_layout()
-                else:
-                    return self._create_mobile_layout()
+                # Replace unnecessary else
+                return self._create_mobile_layout()
 
         demo.queue(max_size=20).launch(
             debug=True, **kwargs
@@ -431,7 +421,7 @@ class GradioUI:
                     launch_research_btn = gr.Button("Run", variant="primary")
 
                 # If an upload folder is provided, enable the upload feature
-                if self.file_upload_folder is not None:
+                if self.file_upload_folder:
                     upload_file = gr.File(label="Upload a file")
                     upload_status = gr.Textbox(
                         label="Upload Status", interactive=False, visible=False
@@ -507,7 +497,7 @@ class GradioUI:
             )
 
             # If an upload folder is provided, enable the upload feature
-            if self.file_upload_folder is not None:
+            if self.file_upload_folder:
                 upload_file = gr.File(label="Upload a file")
                 upload_status = gr.Textbox(
                     label="Upload Status", interactive=False, visible=False
@@ -546,44 +536,49 @@ class GradioUI:
         session_state,
     ):
         """Connect the event handlers for input elements."""
+
+        # Helper function to avoid duplicated code.
+        def process_message():
+            return self.log_user_message(text_input, file_uploads_log)
+
+        def interact():
+            return self.interact_with_agent(stored_messages, chatbot, session_state)
+
+        def reset_input():
+            return (
+                gr.Textbox(
+                    interactive=True,
+                    placeholder="Enter your prompt here and press the button",
+                ),
+                gr.Button(interactive=True),
+            )
+
         # Connect text input submit event
         text_input.submit(
-            self.log_user_message,
+            process_message,
             [text_input, file_uploads_log],
             [stored_messages, text_input, launch_research_btn],
         ).then(
-            self.interact_with_agent,
+            interact,
             [stored_messages, chatbot, session_state],
             [chatbot],
         ).then(
-            lambda: (
-                gr.Textbox(
-                    interactive=True,
-                    placeholder="Enter your prompt here and press the button",
-                ),
-                gr.Button(interactive=True),
-            ),
+            reset_input,
             None,
             [text_input, launch_research_btn],
         )
 
         # Connect button click event
         launch_research_btn.click(
-            self.log_user_message,
+            process_message,
             [text_input, file_uploads_log],
             [stored_messages, text_input, launch_research_btn],
         ).then(
-            self.interact_with_agent,
+            interact,
             [stored_messages, chatbot, session_state],
             [chatbot],
         ).then(
-            lambda: (
-                gr.Textbox(
-                    interactive=True,
-                    placeholder="Enter your prompt here and press the button",
-                ),
-                gr.Button(interactive=True),
-            ),
+            reset_input,
             None,
             [text_input, launch_research_btn],
         )