Add ruff configuration for import sorting (#17)

Co-authored-by: openhands <openhands@all-hands.dev>

Author: xingyaoww

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
       - id: uv-format
         name: Format with uv format
         entry: uv
-        args: [format]
+        args: [run, ruff, format]
         language: system
         types: [python]
         pass_filenames: false

examples/hello_world.py

@@ -1,15 +1,17 @@
 import os
+
 from pydantic import SecretStr
+
 from openhands.core import (
-    OpenHandsConfig,
+    LLM,
+    CodeActAgent,
     Conversation,
     LLMConfig,
     Message,
+    OpenHandsConfig,
     TextContent,
-    LLM,
     Tool,
     get_logger,
-    CodeActAgent,
 )
 from openhands.core.runtime.tools import (
     BashExecutor,
@@ -18,6 +20,7 @@
     str_replace_editor_tool,
 )
 
+
 logger = get_logger(__name__)
 
 # Configure LLM
@@ -48,10 +51,6 @@
 conversation.send_message(
     message=Message(
         role="user",
-        content=[
-            TextContent(
-                text="Hello! Can you create a new Python file named hello.py that prints 'Hello, World!'?"
-            )
-        ],
+        content=[TextContent(text="Hello! Can you create a new Python file named hello.py that prints 'Hello, World!'?")],
     )
 )

openhands/__init__.py

@@ -1,8 +1,9 @@
 """OpenHands package."""
 
 import os
-from pathlib import Path
 from importlib.metadata import PackageNotFoundError, version
+from pathlib import Path
+
 
 __package_name__ = "openhands-ai"
 

openhands/core/__init__.py

@@ -1,9 +1,10 @@
 from .agenthub import AgentBase, CodeActAgent
-from .llm import LLM, Message, TextContent, ImageContent
-from .runtime import Tool, ActionBase, ObservationBase
-from .config import OpenHandsConfig, LLMConfig, MCPConfig
-from .logger import get_logger
+from .config import LLMConfig, MCPConfig, OpenHandsConfig
 from .conversation import Conversation
+from .llm import LLM, ImageContent, Message, TextContent
+from .logger import get_logger
+from .runtime import ActionBase, ObservationBase, Tool
+
 
 __all__ = [
     "LLM",

openhands/core/agenthub/__init__.py

@@ -1,7 +1,8 @@
-from .codeact_agent import CodeActAgent
 from .agent import AgentBase
+from .codeact_agent import CodeActAgent
 from .history import AgentHistory
 
+
 __all__ = [
     "CodeActAgent",
     "AgentBase",

openhands/core/agenthub/agent.py

@@ -1,10 +1,11 @@
 from typing import Callable
 
-from openhands.core.llm import LLM
-from openhands.core.runtime import Tool, ActionBase, ObservationBase
 from openhands.core.context.env_context import EnvContext
+from openhands.core.llm import LLM
 from openhands.core.llm.message import Message
 from openhands.core.logger import get_logger
+from openhands.core.runtime import ActionBase, ObservationBase, Tool
+
 
 logger = get_logger(__name__)
 
@@ -58,8 +59,7 @@ def reset(self) -> None:
     def run(
         self,
         user_input: Message,
-        on_event: Callable[[Message | ActionBase | ObservationBase], None]
-        | None = None,
+        on_event: Callable[[Message | ActionBase | ObservationBase], None] | None = None,
     ) -> None:
         """Runs the Agent with the given input and returns the output.
 

openhands/core/agenthub/codeact_agent/__init__.py

@@ -1,5 +1,6 @@
 from .codeact_agent import CodeActAgent
 
+
 __all__ = [
     "CodeActAgent",
 ]

openhands/core/agenthub/codeact_agent/codeact_agent.py

@@ -1,22 +1,24 @@
-import os
 import json
+import os
 from typing import Callable
 
-from openhands.core.logger import get_logger
-from openhands.core.context.prompt import PromptManager
-from openhands.core.context.env_context import EnvContext
-from openhands.core.llm import LLM, Message, TextContent, get_llm_metadata
-from openhands.core.runtime import Tool, ObservationBase, ActionBase
-from openhands.core.runtime.tools import finish_tool, FinishAction
-from openhands.core.agenthub.agent import AgentBase
-from openhands.core.agenthub.history import AgentHistory
 from litellm.types.utils import (
     ChatCompletionMessageToolCall,
+    Choices,
     Message as LiteLLMMessage,
     ModelResponse,
-    Choices,
 )
 
+from openhands.core.agenthub.agent import AgentBase
+from openhands.core.agenthub.history import AgentHistory
+from openhands.core.context.env_context import EnvContext
+from openhands.core.context.prompt import PromptManager
+from openhands.core.llm import LLM, Message, TextContent, get_llm_metadata
+from openhands.core.logger import get_logger
+from openhands.core.runtime import ActionBase, ObservationBase, Tool
+from openhands.core.runtime.tools import FinishAction, finish_tool
+
+
 logger = get_logger(__name__)
 
 
@@ -34,9 +36,7 @@ def __init__(
             prompt_dir=os.path.join(os.path.dirname(__file__), "prompts"),
             system_prompt_filename=system_prompt_filename,
         )
-        self.system_message: TextContent = self.prompt_manager.get_system_message(
-            cli_mode=cli_mode
-        )
+        self.system_message: TextContent = self.prompt_manager.get_system_message(cli_mode=cli_mode)
         self.history: AgentHistory = AgentHistory()
         self.max_iterations: int = 10
 
@@ -47,8 +47,7 @@ def reset(self) -> None:
     def run(
         self,
         user_input: Message,
-        on_event: Callable[[Message | ActionBase | ObservationBase], None]
-        | None = None,
+        on_event: Callable[[Message | ActionBase | ObservationBase], None] | None = None,
     ) -> None:
         assert user_input.role == "user", "Input message must have role 'user'"
 
@@ -59,9 +58,7 @@ def run(
                 on_event(sys_msg)
             content = user_input.content
             if self.env_context:
-                initial_env_context: list[TextContent] = self.env_context.render(
-                    self.prompt_manager
-                )
+                initial_env_context: list[TextContent] = self.env_context.render(self.prompt_manager)
                 content += initial_env_context
             user_msg = Message(role="user", content=content)
             self.history.messages.append(user_msg)
@@ -70,9 +67,7 @@ def run(
 
             if self.env_context and self.env_context.activated_microagents:
                 for microagent in self.env_context.activated_microagents:
-                    self.history.microagent_activations.append(
-                        (microagent.name, len(self.history.messages) - 1)
-                    )
+                    self.history.microagent_activations.append((microagent.name, len(self.history.messages) - 1))
 
         else:
             self.history.messages.append(user_input)
@@ -85,15 +80,9 @@ def run(
             response: ModelResponse = self.llm.completion(
                 messages=self.llm.format_messages_for_llm(self.history.messages),
                 tools=[tool.to_openai_tool() for tool in self.tools],
-                extra_body={
-                    "metadata": get_llm_metadata(
-                        model_name=self.llm.config.model, agent_name=self.name
-                    )
-                },
-            )
-            assert len(response.choices) == 1 and isinstance(
-                response.choices[0], Choices
+                extra_body={"metadata": get_llm_metadata(model_name=self.llm.config.model, agent_name=self.name)},
             )
+            assert len(response.choices) == 1 and isinstance(response.choices[0], Choices)
             llm_message: LiteLLMMessage = response.choices[0].message  # type: ignore
             message = Message.from_litellm_message(llm_message)
             self.history.messages.append(message)
@@ -107,9 +96,7 @@ def run(
 
                 if tool_call.function.name == finish_tool.name:
                     try:
-                        action = FinishAction.model_validate(
-                            json.loads(tool_call.function.arguments)
-                        )
+                        action = FinishAction.model_validate(json.loads(tool_call.function.arguments))
                         if on_event:
                             on_event(action)
                     finally:
@@ -126,18 +113,15 @@ def run(
     def _execute_tool_call(
         self,
         tool_call: ChatCompletionMessageToolCall,
-        on_event: Callable[[Message | ActionBase | ObservationBase], None]
-        | None = None,
+        on_event: Callable[[Message | ActionBase | ObservationBase], None] | None = None,
     ) -> Message:
         tool_name = tool_call.function.name
         assert tool_name is not None, "Tool call must have a name"
         tool = self.get_tool(tool_name)
         if tool is None:
             raise ValueError(f"Tool '{tool_name}' called by LLM is not found")
 
-        action: ActionBase = tool.action_type.model_validate(
-            json.loads(tool_call.function.arguments)
-        )
+        action: ActionBase = tool.action_type.model_validate(json.loads(tool_call.function.arguments))
         if on_event:
             on_event(action)
         if tool.executor is None:

openhands/core/agenthub/history.py

@@ -1,4 +1,5 @@
 from pydantic import BaseModel, Field
+
 from openhands.core.llm import Message
 
 

openhands/core/config/__init__.py

@@ -1,5 +1,6 @@
-from .openhands_config import OpenHandsConfig
 from .llm_config import LLMConfig
 from .mcp_config import MCPConfig
+from .openhands_config import OpenHandsConfig
+
 
 __all__ = ["OpenHandsConfig", "LLMConfig", "MCPConfig"]