fix lint problems

Author: mlikasam-askui

mypy.ini

@@ -16,6 +16,8 @@ plugins = pydantic.mypy,sqlalchemy.ext.mypy.plugin
 exclude = (?x)(
     ^src/askui/models/ui_tars_ep/ui_tars_api\.py$
     | ^src/askui/tools/askui/askui_ui_controller_grpc/.*$
+    | ^venv/.*$
+    | ^\.venv/.*$
   )
 mypy_path = src:tests
 explicit_package_bases = true

src/askui/computer_agent.py

@@ -59,7 +59,7 @@ class ComputerAgent(Agent):
         agent_os_servers (list[AgentOsServer] | None, optional):
             Agent OS servers used by the default `AskUiControllerClient`. Must contain
             at least one server, at most one local, and remote addresses must be unique.
-            Defaults to a single local Agent OS server. Ignored when `tools` is set.
+            Defaults to a single local Agent OS server.
         settings (AgentSettings | None, optional): Provider-based model settings. If `None`, uses the default AskUI model stack.
         retry (Retry, optional): The retry instance to use for retrying failed actions. Defaults to `ConfigurableRetry` with exponential backoff. Currently only supported for `locate()` method.
         act_tools (list[Tool] | None, optional): Additional tools to make available for the `act()` method.

src/askui/tools/askui/agent_os_server.py

@@ -177,25 +177,26 @@ def is_service(self) -> bool:
     @staticmethod
     def _is_askui_core_service_running() -> bool:
         """Return `True` when the `AskuiCoreService` Windows service is RUNNING."""
-        if sys.platform != "win32":
-            return False
-        try:
-            result = subprocess.run(
-                ["sc", "query", LocalAgentOsServer._ASKUI_CORE_SERVICE_NAME],
-                capture_output=True,
-                text=True,
-                timeout=5,
-                check=False,
-            )
-        except (OSError, subprocess.SubprocessError):
-            error_msg = (
-                f"Failed to query {LocalAgentOsServer._ASKUI_CORE_SERVICE_NAME} service"
-            )
-            logger.debug(error_msg)
-            return False
-        if result.returncode != 0:
-            return False
-        return "RUNNING" in result.stdout.upper()
+        if sys.platform == "win32":
+            try:
+                result = subprocess.run(
+                    ["sc", "query", LocalAgentOsServer._ASKUI_CORE_SERVICE_NAME],
+                    capture_output=True,
+                    text=True,
+                    timeout=5,
+                    check=False,
+                )
+            except (OSError, subprocess.SubprocessError):
+                error_msg = (
+                    "Failed to query "
+                    f"{LocalAgentOsServer._ASKUI_CORE_SERVICE_NAME} service"
+                )
+                logger.debug(error_msg)
+                return False
+            if result.returncode != 0:
+                return False
+            return "RUNNING" in result.stdout.upper()
+        return False
 
     def _parse_port(self) -> int:
         addr = self._address if "://" in self._address else "//" + self._address

tests/conftest.py

@@ -6,7 +6,6 @@
 from pytest_mock import MockerFixture
 
 from askui.tools.agent_os import AgentOs, Display, DisplaySize
-from askui.tools.toolbox import AgentToolbox
 
 
 @pytest.fixture
@@ -97,9 +96,13 @@ def agent_os_mock(mocker: MockerFixture) -> AgentOs:
 
 
 @pytest.fixture
-def agent_toolbox_mock(agent_os_mock: AgentOs) -> AgentToolbox:
-    """Fixture providing a mock agent toolbox."""
-    return AgentToolbox(agent_os=agent_os_mock)
+def agent_os_mock_patch(mocker: MockerFixture, agent_os_mock: AgentOs) -> AgentOs:
+    """Patches `AskUiControllerClient` so `ComputerAgent` uses `agent_os_mock`."""
+    mocker.patch(
+        "askui.computer_agent.AskUiControllerClient",
+        return_value=agent_os_mock,
+    )
+    return agent_os_mock
 
 
 @pytest.fixture(autouse=True)

tests/e2e/agent/conftest.py

@@ -27,7 +27,7 @@
 from askui.models.shared.settings import LocateSettings
 from askui.models.types.geometry import PointList
 from askui.reporting import Reporter, SimpleHtmlReporter
-from askui.tools.toolbox import AgentToolbox
+from askui.tools.agent_os import AgentOs
 from askui.utils.image_utils import ImageSource
 
 
@@ -98,75 +98,70 @@ def combo_locate_model(path_fixtures: pathlib.Path) -> LocateModel:
 @pytest.fixture
 def agent_with_pta_model(
     pta_locate_model: LocateModel,
-    agent_toolbox_mock: AgentToolbox,
+    agent_os_mock_patch: AgentOs,  # noqa: ARG001
     simple_html_reporter: Reporter,
 ) -> Generator[ComputerAgent, None, None]:
     with ComputerAgent(
         settings=AgentSettings(
             detection_provider=_LocateModelDetectionProvider(pta_locate_model)
         ),
         reporters=[simple_html_reporter],
-        tools=agent_toolbox_mock,
     ) as agent:
         yield agent
 
 
 @pytest.fixture
 def agent_with_ocr_model(
     ocr_locate_model: LocateModel,
-    agent_toolbox_mock: AgentToolbox,
+    agent_os_mock_patch: AgentOs,  # noqa: ARG001
     simple_html_reporter: Reporter,
 ) -> Generator[ComputerAgent, None, None]:
     with ComputerAgent(
         settings=AgentSettings(
             detection_provider=_LocateModelDetectionProvider(ocr_locate_model)
         ),
         reporters=[simple_html_reporter],
-        tools=agent_toolbox_mock,
     ) as agent:
         yield agent
 
 
 @pytest.fixture
 def agent_with_ai_element_model(
     ai_element_locate_model: LocateModel,
-    agent_toolbox_mock: AgentToolbox,
+    agent_os_mock_patch: AgentOs,  # noqa: ARG001
     simple_html_reporter: Reporter,
 ) -> Generator[ComputerAgent, None, None]:
     with ComputerAgent(
         settings=AgentSettings(
             detection_provider=_LocateModelDetectionProvider(ai_element_locate_model)
         ),
         reporters=[simple_html_reporter],
-        tools=agent_toolbox_mock,
     ) as agent:
         yield agent
 
 
 @pytest.fixture
 def agent_with_combo_model(
     combo_locate_model: LocateModel,
-    agent_toolbox_mock: AgentToolbox,
+    agent_os_mock_patch: AgentOs,  # noqa: ARG001
     simple_html_reporter: Reporter,
 ) -> Generator[ComputerAgent, None, None]:
     with ComputerAgent(
         settings=AgentSettings(
             detection_provider=_LocateModelDetectionProvider(combo_locate_model)
         ),
         reporters=[simple_html_reporter],
-        tools=agent_toolbox_mock,
     ) as agent:
         yield agent
 
 
 @pytest.fixture
 def vision_agent(
-    agent_toolbox_mock: AgentToolbox,
+    agent_os_mock_patch: AgentOs,  # noqa: ARG001
     simple_html_reporter: Reporter,
 ) -> Generator[ComputerAgent, None, None]:
     """Fixture providing a ComputerAgent instance."""
     with ComputerAgent(
         reporters=[simple_html_reporter],
-        tools=agent_toolbox_mock,
     ) as agent:
         yield agent