Update app.py

app.py

@@ -91,11 +91,11 @@ class HuggingFaceSpaceSearcherTool(Tool):
                     f"   Likes: {space_data.likes if hasattr(space_data, 'likes') else 'N/A'}\n"
                     f"   Last Modified: {space_data.lastModified if hasattr(space_data, 'lastModified') else 'N/A'}\n\n"
                 )
-            results += ("\nTo use one of these, you should first try creating a tool using "
+            results += ("\nTo use one of these, you **MUST** first try creating a tool using " # Emphasized MUST
                         "`Tool.from_space(repo_id='SPACE_ID_HERE', name='custom_tool_name')`. "
                         "Then call that new tool: `result = custom_tool_name(argument_name=value)`. "
                         "The arguments depend on the specific Space. If `Tool.from_space` fails, "
-                        "the Space might not have a compatible public API.")
+                        "the Space might not have a compatible public API for this method.")
             return results
         except Exception as e:
             print(f"Error searching Spaces: {str(e)}")
@@ -121,10 +121,10 @@ Follow these steps:
 1.  **Understand the Request:** Carefully analyze the user's prompt. Identify the core task and any specific requirements or inputs.
 2.  **Check Predefined Tools:** Review your list of available tools. If a predefined tool can directly address the request, use it.
     * For the 'huggingface_space_searcher' tool, call it with direct keyword arguments like: `huggingface_space_searcher(query="your search term", top_k=3)`. The `query` is mandatory. `top_k` is optional and defaults to 3 if not provided.
-3.  **Search for Spaces (If Needed):** If no predefined tool is suitable, use the `huggingface_space_searcher` tool as described above.
-4.  **Select and Instantiate a Space Tool (PRIORITY):** From the search results, choose the most promising Space. **Your primary method to use this Space is to attempt to create a tool from it using `Tool.from_space(repo_id='SELECTED_SPACE_ID', name='a_unique_tool_name')`.** You *must* give it a unique and descriptive name.
-    * If `Tool.from_space()` succeeds, you now have a new tool. Call this new tool with the appropriate arguments for that Space.
-    * If `Tool.from_space()` fails (e.g., raises an exception), the Space might not have a compatible public API for this method. In this case, you can *then* consider if direct `gradio_client.Client` usage is feasible, but this is a fallback and often more complex.
+3.  **Search for Spaces (If Needed):** If no predefined tool is suitable, use the `huggingface_space_searcher` tool as described above. The search results will explicitly tell you to use `Tool.from_space()`.
+4.  **Select and Instantiate a Space Tool (CRITICAL PRIORITY):** From the search results, choose the most promising Space. **You MUST attempt to use this Space by creating a tool from it using `Tool.from_space(repo_id='SELECTED_SPACE_ID', name='a_unique_and_descriptive_tool_name')`. DO NOT use `gradio_client.Client()` directly unless `Tool.from_space()` explicitly fails for that Space.**
+    * If `Tool.from_space()` succeeds, you now have a new tool. Call this new tool with the appropriate arguments for that Space (e.g., `newly_created_tool(prompt="some prompt")`).
+    * If `Tool.from_space()` fails (e.g., raises an exception), print a message saying it failed and then you may consider trying the next Space from your search results using `Tool.from_space()` again, or falling back to a predefined tool if appropriate. Only consider `gradio_client.Client()` as an absolute last resort if all other methods fail and you have a very specific understanding of the Space's raw API.
 5.  **Execute the Tool:** Call the tool (predefined, or dynamically created via `Tool.from_space()`) with the necessary arguments.
     * **File Inputs:** If the user uploads files, their paths will be available as global string variables: `input_image_path`, `input_audio_path`, `input_video_path`, `input_3d_model_path`, `input_file_path`. Before using these variables, check if they exist and are not None. Pass these file paths as arguments to tools that require them.
     * **Imports in Generated Code:** If your code block for execution uses modules like `os` or `uuid`, **you must include the import statements (e.g., `import os`, `import uuid`) within that specific code block.**
@@ -133,7 +133,7 @@ Follow these steps:
     * If a tool returns text, return that text.
 7.  **Clarity and Error Handling:** If you encounter issues (e.g., a Space tool fails, required inputs are missing), clearly explain the problem in your response. If a Space doesn't work, try to explain why or suggest an alternative if possible.
 
-Example of the PREFERRED way to use a discovered Space:
+Example of the **CORRECT AND PREFERRED** way to use a discovered Space:
 ```python
 # User prompt: "Find a space that can make an image of a cat and use it."
 #
@@ -141,7 +141,7 @@ Example of the PREFERRED way to use a discovered Space:
 # search_results = huggingface_space_searcher(query="text to image cat", top_k=1)
 # print(search_results) # Assume 'someuser/cat-image-generator' is found.
 #
-# Step 2: Try to create a tool from the discovered space
+# Step 2: Try to create a tool from the discovered space using Tool.from_space()
 # try:
 #     cat_tool = Tool.from_space(repo_id="someuser/cat-image-generator", name="cat_image_generator_tool")
 #     # Now use the newly created tool. Arguments depend on the Space's API.
@@ -149,9 +149,10 @@ Example of the PREFERRED way to use a discovered Space:
 #     image_filepath = cat_tool(prompt="A fluffy siamese cat, cyberpunk style")
 #     return image_filepath # Return the filepath directly
 # except Exception as e:
-#     print(f"Failed to create or use tool from Space 'someuser/cat-image-generator': {e}")
-#     # Optionally, try another space or a predefined tool if appropriate.
-#     # return "Could not use the discovered space. Trying a fallback..." (then try another step)
+#     print(f"Failed to create or use tool from Space 'someuser/cat-image-generator' using Tool.from_space(): {e}")
+#     # If Tool.from_space() fails, DO NOT immediately try gradio_client.Client(). 
+#     # Instead, consider another space or a predefined tool.
+#     # return "Could not use the discovered space via Tool.from_space(). Trying a fallback..." (then try another step)
 ```
 
 Example of using a predefined tool that returns a filepath:
@@ -171,15 +172,20 @@ def gradio_interface(user_prompt, input_image_path, input_audio_path, input_vide
     try:
         progress(0, desc="Initializing Agent...")
         full_prompt_with_instructions = f"{AGENT_INSTRUCTIONS}\n\nUSER PROMPT: {user_prompt}"
-        agent_kwargs = {}
-        if input_image_path: agent_kwargs["input_image_path"] = str(input_image_path)
-        if input_audio_path: agent_kwargs["input_audio_path"] = str(input_audio_path)
-        if input_video_path: agent_kwargs["input_video_path"] = str(input_video_path)
-        if input_3d_model_path: agent_kwargs["input_3d_model_path"] = str(input_3d_model_path)
-        if input_file_path: agent_kwargs["input_file_path"] = str(input_file_path)
+        
+        # Prepare a dictionary of global variables for the agent's execution scope
+        # These will be available as global variables in the agent's Python execution environment
+        # when agent.run is called with the code_globals parameter.
+        agent_code_globals = {}
+        if input_image_path: agent_code_globals["input_image_path"] = str(input_image_path)
+        if input_audio_path: agent_code_globals["input_audio_path"] = str(input_audio_path)
+        if input_video_path: agent_code_globals["input_video_path"] = str(input_video_path)
+        if input_3d_model_path: agent_code_globals["input_3d_model_path"] = str(input_3d_model_path)
+        if input_file_path: agent_code_globals["input_file_path"] = str(input_file_path)
 
         progress(0.2, desc="Agent processing request...")
-        result = agent.run(full_prompt_with_instructions, **agent_kwargs)
+        # Pass the global variables using the code_globals parameter
+        result = agent.run(full_prompt_with_instructions, code_globals=agent_code_globals)
 
         progress(0.8, desc="Processing result...")
         outputs = {
@@ -244,7 +250,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as app:
 
     submit_button.click(
         fn=gradio_interface,
-        inputs=[prompt_input, input_image, input_audio, input_video, input_model3d, input_file],
+        inputs=[prompt_input, input_image, input_audio, input_video, input_3d_model_path, input_file],
         outputs=[image_output, file_output, path_output, audio_output, model3d_output, text_output]
     )