Update tools/orchestrator.py

tools/orchestrator.py

@@ -7,7 +7,7 @@ import time
 from model_logic import call_model_stream, MODELS_BY_PROVIDER, get_default_model_display_name_for_provider
 from memory_logic import retrieve_memories_semantic, retrieve_rules_semantic
 from tools.websearch import search_and_scrape_duckduckgo, scrape_url
-from tools.space_builder import create_huggingface_space, update_huggingface_space_file
+from tools.space_builder import create_huggingface_space, update_huggingface_space_file, list_space_files, get_space_file_content
 import prompts
 from utils import format_insights_for_prompt
 
@@ -26,7 +26,7 @@ def decide_on_tool(user_input: str, chat_history_for_prompt: list, initial_insig
         if url_match:
             return "scrape_url_and_report", {"url": url_match.group(1)}
 
-    tool_trigger_keywords = ["what is", "how to", "explain", "search for", "build", "create", "make", "update", "modify", "change", "fix"]
+    tool_trigger_keywords = ["search", "build", "create", "make", "update", "modify", "change", "fix", "list", "show", "files", "get", "read", "edit"]
     if len(user_input.split()) > 3 or "?" in user_input or any(w in user_input_lower for w in tool_trigger_keywords):
         history_snippet = "\n".join([f"{msg['role']}: {msg['content'][:100]}" for msg in chat_history_for_prompt[-2:]])
         guideline_snippet = initial_insights_ctx_str[:200].replace('\n', ' ')
@@ -40,11 +40,7 @@ def decide_on_tool(user_input: str, chat_history_for_prompt: list, initial_insig
                 json_match_tool = re.search(r"\{.*\}", tool_resp_raw, re.DOTALL)
                 if json_match_tool:
                     action_data = json.loads(json_match_tool.group(0))
-                    action_type = action_data.get("action", "quick_respond")
-                    action_input = action_data.get("action_input", {})
-                    if not isinstance(action_input, dict):
-                        action_input = {}
-                    return action_type, action_input
+                    return action_data.get("action", "quick_respond"), action_data.get("action_input", {})
             except Exception as e:
                 logger.error(f"Tool decision LLM error: {e}")
 
@@ -71,56 +67,53 @@ def orchestrate_and_respond(user_input: str, provider_name: str, model_display_n
         params = ["owner", "space_name", "sdk", "description"]
         if all(p in action_input for p in params):
             yield "status", "[Tool: Generating space content...]"
-            description = action_input["description"]
-            owner = action_input["owner"]
-            space_name = action_input["space_name"]
-            sdk = action_input["sdk"]
-
-            space_gen_user_prompt = prompts.get_space_generation_user_prompt(description, owner, space_name)
             space_gen_messages = [
                 {"role": "system", "content": prompts.SPACE_GENERATION_SYSTEM_PROMPT},
-                {"role": "user", "content": space_gen_user_prompt}
+                {"role": "user", "content": prompts.get_space_generation_user_prompt(**action_input)}
             ]
-            
-            markdown_content = "".join(list(call_model_stream(
-                provider=provider_name, model_display_name=model_display_name,
-                messages=space_gen_messages, api_key_override=ui_api_key_override,
-                temperature=0.1, max_tokens=4096
-            )))
-            
-            yield "status", "[Tool: Creating Space with generated content...]"
-            
-            result = create_huggingface_space(
-                owner=owner, space_name=space_name, sdk=sdk,
-                markdown_content=markdown_content.strip()
-            )
-            context_str = f"Tool Result (Create Space): {result.get('result') or result.get('error', 'Unknown outcome from tool.')}"
+            markdown_content = "".join(list(call_model_stream(provider_name, model_display_name, space_gen_messages, ui_api_key_override, 0.1, 4096)))
+            yield "status", "[Tool: Creating Space...]"
+            result = create_huggingface_space(markdown_content=markdown_content.strip(), **action_input)
+            context_str = f"Tool Result (Create Space): {result.get('result') or result.get('error', 'Unknown outcome')}"
+        else:
+            context_str = "Tool Failed: Missing parameters for create_huggingface_space. Required: " + ", ".join(params)
+    elif action_type == "list_space_files":
+        params = ["owner", "space_name"]
+        if all(p in action_input for p in params):
+            yield "status", "[Tool: Listing files...]"
+            result = list_space_files(**action_input)
+            if "error" in result:
+                context_str = f"Tool Result (List Files): Error - {result['error']}"
+            else:
+                files_str = "\n- ".join(result.get("files", []))
+                context_str = f"Tool Result (List Files):\nStatus: {result.get('status', 'OK')}\nFiles:\n- {files_str}"
         else:
-            context_str = "Tool Failed: Missing required parameters for create_huggingface_space. Required: " + ", ".join(params)
+            context_str = "Tool Failed: Missing parameters for list_space_files. Required: " + ", ".join(params)
+    elif action_type == "get_space_file_content":
+        params = ["owner", "space_name", "file_path"]
+        if all(p in action_input for p in params):
+            yield "status", "[Tool: Reading file content...]"
+            result = get_space_file_content(**action_input)
+            if "error" in result:
+                context_str = f"Tool Result (Get Content): Error - {result['error']}"
+            else:
+                context_str = f"Tool Result (Get Content for '{action_input['file_path']}'):\nStatus: {result.get('status', 'OK')}\n```\n{result.get('content', '')}\n```"
+        else:
+            context_str = "Tool Failed: Missing parameters for get_space_file_content. Required: " + ", ".join(params)
     elif action_type == "update_huggingface_space_file":
-        yield "status", "[Tool: Updating file...]"
         params = ["owner", "space_name", "file_path", "new_content", "commit_message"]
         if all(p in action_input for p in params):
+            yield "status", "[Tool: Updating file...]"
             result = update_huggingface_space_file(**action_input)
-            context_str = f"Tool Result (Update File): {result.get('result') or result.get('error', 'Unknown outcome from tool.')}"
+            context_str = f"Tool Result (Update File): {result.get('result') or result.get('error', 'Unknown outcome')}"
         else:
-            context_str = "Tool Failed: Missing required parameters for update_huggingface_space_file. Required: " + ", ".join(params)
+            context_str = "Tool Failed: Missing parameters for update_huggingface_space_file. Required: " + ", ".join(params)
     elif action_type == "search_duckduckgo_and_report" and WEB_SEARCH_ENABLED:
         query = action_input.get("search_engine_query")
         if query:
             yield "status", f"[Web: '{query[:60]}'...]"
             results = search_and_scrape_duckduckgo(query, num_results=2)
             context_str = "Web Content:\n" + "\n".join([f"Source {i+1} ({r.get('url','N/A')}):\n{r.get('content', r.get('error', 'N/A'))[:3000]}\n---" for i, r in enumerate(results)])
-        else:
-            context_str = "Tool Failed: Missing 'search_engine_query' for web search."
-    elif action_type == "scrape_url_and_report" and WEB_SEARCH_ENABLED:
-        url = action_input.get("url")
-        if url:
-            yield "status", f"[Web: '{url[:60]}'...]"
-            result = scrape_url(url)
-            context_str = f"Web Content for {url}:\n{result.get('content', result.get('error', 'No content scraped.'))}"
-        else:
-            context_str = "Tool Failed: Missing 'url' for scraping."
     elif action_type == "answer_using_conversation_memory":
         yield "status", "[Searching conversation memory...]"
         mems = retrieve_memories_semantic(f"User query: {user_input}\nContext:\n{history_str_for_prompt[-1000:]}", k=2)
@@ -132,8 +125,6 @@ def orchestrate_and_respond(user_input: str, provider_name: str, model_display_n
     streamed_response = ""
     try:
         for chunk in call_model_stream(provider_name, model_display_name, final_llm_messages, ui_api_key_override, max_tokens=4096):
-            if isinstance(chunk, str) and chunk.startswith("Error:"):
-                streamed_response += f"\n{chunk}\n"; yield "response_chunk", f"\n{chunk}\n"; break
             streamed_response += chunk
             yield "response_chunk", chunk
     except Exception as e: