Merge configurable-permissions: add confirm_cpu_jobs, auto_file_upload, keep yolo mode

agent/config.py

@@ -24,6 +24,10 @@ class Config(BaseModel):
     auto_save_interval: int = 3  # Save every N user turns (0 = disabled)
     yolo_mode: bool = False  # Auto-approve all tool calls without confirmation
 
+    # Permission control parameters
+    confirm_cpu_jobs: bool = True
+    auto_file_upload: bool = False
+
 
 def substitute_env_vars(obj: Any) -> Any:
     """

agent/core/agent_loop.py

@@ -11,6 +11,7 @@ from lmnr import observe
 from agent.config import Config
 from agent.core.session import Event, OpType, Session
 from agent.core.tools import ToolRouter
+from agent.tools.jobs_tool import CPU_FLAVORS
 
 ToolCall = ChatCompletionMessageToolCall
 
@@ -37,10 +38,10 @@ def _validate_tool_args(tool_args: dict) -> tuple[bool, str | None]:
     return True, None
 
 
-def _needs_approval(tool_name: str, tool_args: dict, yolo_mode: bool = False) -> bool:
-    """Check if a tool call requires user approval before execution"""
+def _needs_approval(tool_name: str, tool_args: dict, config: Config | None = None) -> bool:
+    """Check if a tool call requires user approval before execution."""
     # Yolo mode: skip all approvals
-    if yolo_mode:
+    if config and config.yolo_mode:
         return False
 
     # If args are malformed, skip approval (validation error will be shown later)
@@ -49,15 +50,33 @@ def _needs_approval(tool_name: str, tool_args: dict, yolo_mode: bool = False) ->
         return False
 
     if tool_name == "hf_jobs":
-        # Check if it's a run or uv operation
         operation = tool_args.get("operation", "")
-        return operation in ["run", "uv"]
-
+        if operation not in ["run", "uv", "scheduled run", "scheduled uv"]:
+            return False
+        
+        # Check if this is a CPU-only job
+        args = tool_args.get("args", {})
+        hardware_flavor = args.get("flavor") or args.get("hardware") or args.get("hardware_flavor") or "cpu-basic"
+        is_cpu_job = hardware_flavor in CPU_FLAVORS
+        
+        if is_cpu_job:
+            if config and not config.confirm_cpu_jobs:
+                return False
+            return True
+        
+        return True
+    
+    # Check for file upload operations (hf_private_repos or other tools)
     if tool_name == "hf_private_repos":
-        # Repo creation and file uploads require approval
         operation = tool_args.get("operation", "")
-        return operation in ["create_repo", "upload_file"]
-
+        if operation == "upload_file":
+            if config and config.auto_file_upload:
+                return False
+            return True
+        # Other operations (create_repo, etc.) always require approval
+        if operation in ["create_repo"]:
+            return True
+    
     return False
 
 
@@ -147,7 +166,7 @@ class Handlers:
                     tool_name = tc.function.name
                     tool_args = json.loads(tc.function.arguments)
 
-                    if _needs_approval(tool_name, tool_args, session.config.yolo_mode):
+                    if _needs_approval(tool_name, tool_args, session.config):
                         approval_required_tools.append(tc)
                     else:
                         non_approval_tools.append(tc)

configs/main_agent_config.json

@@ -2,6 +2,8 @@
   "model_name": "anthropic/claude-opus-4-5-20251101",
   "save_sessions": true,
   "session_dataset_repo": "akseljoonas/hf-agent-sessions",
+  "confirm_cpu_jobs": false,
+  "auto_file_upload": false,
   "mcpServers": {
     "hf-mcp-server": {
       "transport": "http",
@@ -11,4 +13,4 @@
       }
     }
   }
-}
+}

skills

@@ -0,0 +1 @@
+Subproject commit 9a355bbd756d4c61a717323fd855eb9b615eff4d

test_dataset_tools.py

@@ -0,0 +1,79 @@
+"""
+Test script for unified dataset inspection tool
+"""
+
+import asyncio
+import sys
+from typing import TypedDict
+from unittest.mock import MagicMock
+
+
+# Mock the types module before importing dataset_tools
+class ToolResult(TypedDict, total=False):
+    formatted: str
+    totalResults: int
+    resultsShared: int
+    isError: bool
+
+
+mock_types = MagicMock()
+mock_types.ToolResult = ToolResult
+sys.modules["agent.tools.types"] = mock_types
+
+# Now import directly from the file
+sys.path.insert(0, "/Users/akseljoonas/Documents/hf-agent/agent/tools")
+from dataset_tools import hf_inspect_dataset_handler, inspect_dataset
+
+
+async def test_inspect_dataset():
+    """Test the unified inspect_dataset function"""
+    print("=" * 70)
+    print("Testing inspect_dataset()")
+    print("=" * 70)
+
+    # Test with akseljoonas/hf-agent-sessions as specified
+    print("\n→ inspect_dataset('akseljoonas/hf-agent-sessions'):")
+    result = await inspect_dataset("akseljoonas/hf-agent-sessions")
+    print(f"   isError: {result['isError']}")
+    print(f"   Output:\n{result['formatted']}")
+
+    print("\n" + "=" * 70)
+
+    # # Test with stanfordnlp/imdb
+    # print("\n→ inspect_dataset('stanfordnlp/imdb'):")
+    # result = await inspect_dataset("stanfordnlp/imdb")
+    # print(f"   isError: {result['isError']}")
+    # print(f"   Output:\n{result['formatted']}")
+
+    # print("\n" + "=" * 70)
+
+    # # Test with multi-config dataset
+    # print("\n→ inspect_dataset('nyu-mll/glue', config='mrpc'):")
+    # result = await inspect_dataset("nyu-mll/glue", config="mrpc")
+    # print(f"   isError: {result['isError']}")
+    # print(f"   Output:\n{result['formatted']}")
+
+
+async def test_handler():
+    """Test the handler (what the agent calls)"""
+    print("\n" + "=" * 70)
+    print("Testing hf_inspect_dataset_handler()")
+    print("=" * 70)
+
+    result, success = await hf_inspect_dataset_handler(
+        {
+            "dataset": "stanfordnlp/imdb",
+            "sample_rows": 2,
+        }
+    )
+    print("\n→ Handler result:")
+    print(f"   success: {success}")
+    print(f"   output:\n{result}")
+
+
+if __name__ == "__main__":
+    print("\nUnified Dataset Inspection Tool Test\n")
+    asyncio.run(test_inspect_dataset())
+    # asyncio.run(test_handler())
+    print("\n" + "=" * 70)
+    print("Done!")