improve tool results

Author: mlikasam-askui

src/askui/tools/computer/get_mouse_position_tool.py

@@ -22,6 +22,6 @@ def __call__(self) -> str:
         server = self.agent_os.get_active_agent_os_server(report=False)
         cursor_position = self.agent_os.get_mouse_position()
         return (
-            f"[server {server.session_guid}]: Mouse is at position "
+            f"[Server with id '{server.computer_id}']: Mouse is at position "
             f"({cursor_position.x}, {cursor_position.y})."
         )

src/askui/tools/computer/get_system_info_tool.py

@@ -34,4 +34,4 @@ def __init__(self, agent_os: AgentOs | None = None) -> None:
     def __call__(self) -> str:
         server = self.agent_os.get_active_agent_os_server(report=False)
         system_info_json = self.agent_os.get_system_info().model_dump_json()
-        return f"[server {server.session_guid}]: {system_info_json}"
+        return f"[Server with id '{server.computer_id}']: {system_info_json}"

src/askui/tools/computer/list_displays_tool.py

@@ -20,4 +20,4 @@ def __call__(self) -> str:
         displays_json = self.agent_os.list_displays().model_dump_json(
             exclude={"data": {"__all__": {"size"}}},
         )
-        return f"[server {server.session_guid}]: {displays_json}"
+        return f"[Server with id '{server.computer_id}']: {displays_json}"

src/askui/tools/computer/retrieve_active_display_tool.py

@@ -21,4 +21,4 @@ def __call__(self) -> str:
         display_json = self.agent_os.retrieve_active_display().model_dump_json(
             exclude={"size"}
         )
-        return f"[server {server.session_guid}]: {display_json}"
+        return f"[Server with id '{server.computer_id}']: {display_json}"

src/askui/tools/computer/screenshot_tool.py

@@ -24,4 +24,7 @@ def __init__(self, agent_os: ComputerAgentOsFacade | None = None) -> None:
     def __call__(self) -> tuple[str, Image.Image]:
         server = self.agent_os.get_active_agent_os_server(report=False)
         screenshot = self.agent_os.screenshot()
-        return f"[server {server.session_guid}]: Screenshot was taken.", screenshot
+        return (
+            f"[Server with id '{server.computer_id}']: Screenshot was taken.",
+            screenshot,
+        )

tests/unit/tools/askui/test_askui_controller_client.py

@@ -131,7 +131,9 @@ def test_reset_with_no_args_leaves_manager_empty(self) -> None:
         assert client.list_agent_os_servers() == []
 
     def test_reset_with_new_list_replaces_registrations(self) -> None:
-        client = AskUiControllerClient(agent_os_servers=[_make_remote(computer_id="old")])
+        client = AskUiControllerClient(
+            agent_os_servers=[_make_remote(computer_id="old")]
+        )
         new_server = _make_remote(address="9.9.9.9:23000", computer_id="new")
         client.reset_agent_os_servers([new_server])
         assert client.list_agent_os_servers() == [new_server]
@@ -169,9 +171,13 @@ def test_temporary_select_restores_previous_even_on_exception(self) -> None:
         a = _make_local(computer_id="a")
         b = _make_remote(computer_id="b")
         client = AskUiControllerClient(agent_os_servers=[a, b])
-        with pytest.raises(RuntimeError, match="boom"), client.temporary_select("b"):
+        error_message = "boom"
+        with (
+            pytest.raises(RuntimeError, match=error_message),
+            client.temporary_select("b"),
+        ):
             assert client.agent_os_server_manager.active is b
-            raise RuntimeError("boom")
+            raise RuntimeError(error_message)
         assert client.agent_os_server_manager.active is a
 
     def test_temporary_select_same_id_is_a_noop_around_yield(self) -> None:

tests/unit/tools/computer/test_agent_os_server_tools.py

@@ -47,9 +47,7 @@ def test_tool_name(self, fake_agent_os: MagicMock) -> None:
         tool = ComputerSwitchAgentOsServerTool(agent_os=fake_agent_os)
         assert tool.base_name == "switch_agent_os_server"
 
-    def test_input_schema_requires_computer_id(
-        self, fake_agent_os: MagicMock
-    ) -> None:
+    def test_input_schema_requires_computer_id(self, fake_agent_os: MagicMock) -> None:
         tool = ComputerSwitchAgentOsServerTool(agent_os=fake_agent_os)
         schema = tool.input_schema
         assert "computer_id" in schema["properties"]
@@ -77,9 +75,7 @@ def test_is_not_cacheable(self, fake_agent_os: MagicMock) -> None:
         tool = ComputerGetActiveAgentOsServerTool(agent_os=fake_agent_os)
         assert tool.is_cacheable is False
 
-    def test_call_returns_active_server_repr(
-        self, fake_agent_os: MagicMock
-    ) -> None:
+    def test_call_returns_active_server_repr(self, fake_agent_os: MagicMock) -> None:
         active = RemoteAgentOsServer(
             address="1.1.1.1:23000", description="a", computer_id="a"
         )