implement review remarks

Author: mlikasam-askui

src/askui/models/shared/__init__.py

@@ -1,7 +1,9 @@
 from .android_base_tool import AndroidBaseTool
 from .computer_base_tool import ComputerBaseTool
+from .tool_tags import ToolTags
 
 __all__ = [
     "AndroidBaseTool",
     "ComputerBaseTool",
+    "ToolTags",
 ]

src/askui/models/shared/tool_tags.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class ToolTags(str, Enum):
+    """Default tool tags."""
+
+    ANDROID = "android"
+    COMPUTER = "computer"
+    SCALED_AGENT_OS = "scaled_agent_os"

src/askui/tools/agent_os.py

@@ -4,6 +4,8 @@
 from PIL import Image
 from pydantic import BaseModel, ConfigDict, Field
 
+from askui.models.shared import ToolTags
+
 if TYPE_CHECKING:
     from askui.tools.askui.askui_ui_controller_grpc.generated.AgentOS_Send_Request_2501 import (  # noqa: E501
         RenderObjectStyle,
@@ -201,7 +203,7 @@ def tags(self) -> list[str]:
             list[str]: A list of tags that identify this agent OS type.
         """
         if not hasattr(self, "_tags"):
-            self._tags = ["computer"]
+            self._tags = [ToolTags.COMPUTER.value]
         return self._tags
 
     @tags.setter

src/askui/tools/android/agent_os_facade.py

@@ -2,6 +2,7 @@
 
 from PIL import Image
 
+from askui.models.shared import ToolTags
 from askui.tools.android.agent_os import ANDROID_KEY, AndroidAgentOs, AndroidDisplay
 from askui.utils.image_utils import scale_coordinates, scale_image_to_fit
 
@@ -17,7 +18,7 @@ def __init__(self, agent_os: AndroidAgentOs) -> None:
         self._agent_os: AndroidAgentOs = agent_os
         self._target_resolution: Tuple[int, int] = (1024, 768)
         self._real_screen_resolution: Optional[Tuple[int, int]] = None
-        self.tags = self._agent_os.tags + ["agent_os_facade"]
+        self.tags = self._agent_os.tags + [ToolTags.SCALED_AGENT_OS.value]
 
     def connect(self) -> None:
         self._agent_os.connect()

src/askui/tools/android/tools.py

@@ -4,7 +4,7 @@
 from PIL import Image
 from typing_extensions import override
 
-from askui.models.shared import AndroidBaseTool
+from askui.models.shared import AndroidBaseTool, ToolTags
 from askui.tools.android.agent_os import ANDROID_KEY
 from askui.tools.android.agent_os_facade import AndroidAgentOsFacade
 
@@ -26,7 +26,7 @@ def __init__(self, agent_os_facade: AndroidAgentOsFacade | None = None) -> None:
                 """
             ),
             agent_os=agent_os_facade,
-            required_tags=["agent_os_facade"],
+            required_tags=[ToolTags.SCALED_AGENT_OS.value],
         )
 
     @override
@@ -81,7 +81,7 @@ def __init__(self, agent_os_facade: AndroidAgentOsFacade | None = None) -> None:
                 "required": ["x", "y", "repeat", "repeat_delay_in_ms"],
             },
             agent_os=agent_os_facade,
-            required_tags=["agent_os_facade"],
+            required_tags=[ToolTags.SCALED_AGENT_OS.value],
         )
 
     @override
@@ -189,7 +189,7 @@ def __init__(self, agent_os_facade: AndroidAgentOsFacade | None = None) -> None:
                 "required": ["x1", "y1", "x2", "y2"],
             },
             agent_os=agent_os_facade,
-            required_tags=["agent_os_facade"],
+            required_tags=[ToolTags.SCALED_AGENT_OS.value],
         )
 
     @override
@@ -296,7 +296,7 @@ def __init__(self, agent_os_facade: AndroidAgentOsFacade | None = None) -> None:
                 "required": ["x1", "y1", "x2", "y2"],
             },
             agent_os=agent_os_facade,
-            required_tags=["agent_os_facade"],
+            required_tags=[ToolTags.SCALED_AGENT_OS.value],
         )
 
     @override

src/askui/tools/computer/get_mouse_position_tool.py

@@ -1,4 +1,4 @@
-from askui.models.shared import ComputerBaseTool
+from askui.models.shared import ComputerBaseTool, ToolTags
 from askui.tools.computer_agent_os_facade import ComputerAgentOsFacade
 
 
@@ -10,7 +10,7 @@ def __init__(self, agent_os: ComputerAgentOsFacade | None = None) -> None:
             name="computer_get_mouse_position",
             description="Get the current mouse position.",
             agent_os=agent_os,
-            required_tags=["agent_os_facade"],
+            required_tags=[ToolTags.SCALED_AGENT_OS.value],
         )
 
     def __call__(self) -> str:

src/askui/tools/computer/mouse_scroll_tool.py

@@ -1,4 +1,4 @@
-from askui.models.shared import ComputerBaseTool
+from askui.models.shared import ComputerBaseTool, ToolTags
 from askui.tools.computer_agent_os_facade import ComputerAgentOsFacade
 
 
@@ -30,7 +30,7 @@ def __init__(self, agent_os: ComputerAgentOsFacade | None = None) -> None:
                 "required": ["x", "y"],
             },
             agent_os=agent_os,
-            required_tags=["agent_os_facade"],
+            required_tags=[ToolTags.SCALED_AGENT_OS.value],
         )
 
     def __call__(self, x: int, y: int) -> str:

src/askui/tools/computer/move_mouse_tool.py

@@ -1,4 +1,4 @@
-from askui.models.shared import ComputerBaseTool
+from askui.models.shared import ComputerBaseTool, ToolTags
 from askui.tools.computer_agent_os_facade import ComputerAgentOsFacade
 
 
@@ -24,7 +24,7 @@ def __init__(self, agent_os: ComputerAgentOsFacade | None = None) -> None:
                 "required": ["x", "y"],
             },
             agent_os=agent_os,
-            required_tags=["agent_os_facade"],
+            required_tags=[ToolTags.SCALED_AGENT_OS.value],
         )
 
     def __call__(self, x: int, y: int) -> str:

src/askui/tools/computer/screenshot_tool.py

@@ -1,6 +1,6 @@
 from PIL import Image
 
-from askui.models.shared import ComputerBaseTool
+from askui.models.shared import ComputerBaseTool, ToolTags
 from askui.tools.computer_agent_os_facade import ComputerAgentOsFacade
 
 
@@ -12,7 +12,7 @@ def __init__(self, agent_os: ComputerAgentOsFacade | None = None) -> None:
             name="computer_screenshot",
             description="Take a screenshot of the current screen.",
             agent_os=agent_os,
-            required_tags=["agent_os_facade"],
+            required_tags=[ToolTags.SCALED_AGENT_OS.value],
         )
 
     def __call__(self) -> tuple[str, Image.Image]:

src/askui/tools/computer/type_tool.py

@@ -34,5 +34,5 @@ def __call__(self, text: str, typing_speed: int = 50) -> str:
         self.agent_os.type(text, typing_speed)
         return (
             f"Text was typed: {text} with typing speed: "
-            " {typing_speed} characters per minute."
+            f" {typing_speed} characters per minute."
         )