windows-mcp 0.5.8__py3-none-any.whl → 0.5.9__py3-none-any.whl

windows_mcp/tree/views.py

@@ -1,116 +1,142 @@
-from dataclasses import dataclass,field
-from tabulate import tabulate
-from typing import Optional
-
-@dataclass
-class DOMInfo:
-    horizontal_scrollable: bool
-    horizontal_scroll_percent: float
-    vertical_scrollable: bool
-    vertical_scroll_percent: float
-
-@dataclass
-class TreeState:
-    interactive_nodes:list['TreeElementNode']=field(default_factory=list)
-    scrollable_nodes:list['ScrollElementNode']=field(default_factory=list)
-    dom_informative_nodes:list['TextElementNode']=field(default_factory=list)
-    dom_info:Optional['DOMInfo']=None
-
-    def interactive_elements_to_string(self) -> str:
-        if not self.interactive_nodes:
-            return "No interactive elements"
-        headers = ["Label", "App Name", "ControlType", "Name", "Value", "Shortcut", "Coordinates" ,"IsFocused"]
-        rows = [node.to_row(idx) for idx, node in enumerate(self.interactive_nodes)]
-        return tabulate(rows, headers=headers, tablefmt="simple")
-
-    def scrollable_elements_to_string(self) -> str:
-        if not self.scrollable_nodes:
-            return "No scrollable elements"
-        headers = [
-            "Label", "App Name", "ControlType", "Name", "Coordinates",
-            "Horizontal Scrollable", "Horizontal Scroll Percent(%)", "Vertical Scrollable", "Vertical Scroll Percent(%)", "IsFocused"
-        ]
-        base_index = len(self.interactive_nodes)
-        rows = [node.to_row(idx, base_index) for idx, node in enumerate(self.scrollable_nodes)]
-        return tabulate(rows, headers=headers, tablefmt="simple")
-    
-@dataclass
-class BoundingBox:
-    left:int
-    top:int
-    right:int
-    bottom:int
-    width:int
-    height:int
-
-    def get_center(self)->'Center':
-        return Center(x=self.left+self.width//2,y=self.top+self.height//2)
-
-    def xywh_to_string(self):
-        return f'({self.left},{self.top},{self.width},{self.height})'
-    
-    def xyxy_to_string(self):
-        x1,y1,x2,y2=self.convert_xywh_to_xyxy()
-        return f'({x1},{y1},{x2},{y2})'
-    
-    def convert_xywh_to_xyxy(self)->tuple[int,int,int,int]:
-        x1,y1=self.left,self.top
-        x2,y2=self.left+self.width,self.top+self.height
-        return x1,y1,x2,y2
-
-@dataclass
-class Center:
-    x:int
-    y:int
-
-    def to_string(self)->str:
-        return f'({self.x},{self.y})'
-
-@dataclass
-class TreeElementNode:
-    name: str
-    control_type: str
-    app_name: str
-    value:str
-    shortcut: str
-    bounding_box: BoundingBox
-    center: Center
-    xpath:str
-    is_focused:bool
-
-    def to_row(self, index: int):
-        return [index, self.app_name, self.control_type, self.name, self.value, self.shortcut, self.center.to_string(),self.is_focused]
-
-@dataclass
-class ScrollElementNode:
-    name: str
-    control_type: str
-    xpath:str
-    app_name: str
-    bounding_box: BoundingBox
-    center: Center
-    horizontal_scrollable: bool
-    horizontal_scroll_percent: float
-    vertical_scrollable: bool
-    vertical_scroll_percent: float
-    is_focused: bool
-
-    def to_row(self, index: int, base_index: int):
-        return [
-            base_index + index,
-            self.app_name,
-            self.control_type,
-            self.name,
-            self.center.to_string(),
-            self.horizontal_scrollable,
-            self.horizontal_scroll_percent,
-            self.vertical_scrollable,
-            self.vertical_scroll_percent,
-            self.is_focused
-        ]
-
-@dataclass
-class TextElementNode:
-    text:str
-
-ElementNode=TreeElementNode|ScrollElementNode
+from dataclasses import dataclass,field
+from tabulate import tabulate
+from typing import Optional
+
+@dataclass
+class TreeState:
+    root_node:Optional['TreeElementNode']=None
+    dom_node:Optional['ScrollElementNode']=None
+    interactive_nodes:list['TreeElementNode']=field(default_factory=list)
+    scrollable_nodes:list['ScrollElementNode']=field(default_factory=list)
+    dom_informative_nodes:list['TextElementNode']=field(default_factory=list)
+
+    def interactive_elements_to_string(self) -> str:
+        if not self.interactive_nodes:
+            return "No interactive elements"
+        # TOON-like format: Pipe-separated values with clear header
+        # Using abbreviations in header to save tokens
+        header = "# id|app|type|name|coords|focus"
+        rows = [header]
+        for idx, node in enumerate(self.interactive_nodes):
+            row = f"{idx}|{node.app_name}|{node.control_type}|{node.name}|{node.center.to_string()}|{node.is_focused}"
+            rows.append(row)
+        return "\n".join(rows)
+
+    def scrollable_elements_to_string(self) -> str:
+        if not self.scrollable_nodes:
+            return "No scrollable elements"
+        # TOON-like format
+        header = "# id|app|type|name|coords|h_scroll|h_pct|v_scroll|v_pct|focus"
+        rows = [header]
+        base_index = len(self.interactive_nodes)
+        for idx, node in enumerate(self.scrollable_nodes):
+            row = (f"{base_index + idx}|{node.app_name}|{node.control_type}|{node.name}|"
+                   f"{node.center.to_string()}|{node.horizontal_scrollable}|{node.horizontal_scroll_percent}|"
+                   f"{node.vertical_scrollable}|{node.vertical_scroll_percent}|{node.is_focused}")
+            rows.append(row)
+        return "\n".join(rows)
+    
+@dataclass
+class BoundingBox:
+    left:int
+    top:int
+    right:int
+    bottom:int
+    width:int
+    height:int
+
+    @classmethod
+    def from_bounding_rectangle(cls,bounding_rectangle:'BoundingRectangle')->'BoundingBox':
+        return cls(
+            left=bounding_rectangle.left,
+            top=bounding_rectangle.top,
+            right=bounding_rectangle.right,
+            bottom=bounding_rectangle.bottom,
+            width=bounding_rectangle.width(),
+            height=bounding_rectangle.height()
+        )
+
+    def get_center(self)->'Center':
+        return Center(x=self.left+self.width//2,y=self.top+self.height//2)
+
+    def xywh_to_string(self):
+        return f'({self.left},{self.top},{self.width},{self.height})'
+    
+    def xyxy_to_string(self):
+        x1,y1,x2,y2=self.convert_xywh_to_xyxy()
+        return f'({x1},{y1},{x2},{y2})'
+    
+    def convert_xywh_to_xyxy(self)->tuple[int,int,int,int]:
+        x1,y1=self.left,self.top
+        x2,y2=self.left+self.width,self.top+self.height
+        return x1,y1,x2,y2
+
+@dataclass
+class Center:
+    x:int
+    y:int
+
+    def to_string(self)->str:
+        return f'({self.x},{self.y})'
+
+@dataclass
+class TreeElementNode:
+    bounding_box: BoundingBox
+    center: Center
+    name: str=''
+    control_type: str=''
+    app_name: str=''
+    value:str=''
+    shortcut: str=''
+    xpath:str=''
+    is_focused:bool=False
+
+    def update_from_node(self,node:'TreeElementNode'):
+        self.name=node.name
+        self.control_type=node.control_type
+        self.app_name=node.app_name
+        self.value=node.value
+        self.shortcut=node.shortcut
+        self.bounding_box=node.bounding_box
+        self.center=node.center
+        self.xpath=node.xpath
+        self.is_focused=node.is_focused
+
+    # Legacy method kept for compatibility if needed, but not used in new format
+    def to_row(self, index: int):
+        return [index, self.app_name, self.control_type, self.name, self.value, self.shortcut, self.center.to_string(),self.is_focused]
+
+@dataclass
+class ScrollElementNode:
+    name: str
+    control_type: str
+    xpath:str
+    app_name: str
+    bounding_box: BoundingBox
+    center: Center
+    horizontal_scrollable: bool
+    horizontal_scroll_percent: float
+    vertical_scrollable: bool
+    vertical_scroll_percent: float
+    is_focused: bool
+
+    # Legacy method kept for compatibility
+    def to_row(self, index: int, base_index: int):
+        return [
+            base_index + index,
+            self.app_name,
+            self.control_type,
+            self.name,
+            self.center.to_string(),
+            self.horizontal_scrollable,
+            self.horizontal_scroll_percent,
+            self.vertical_scrollable,
+            self.vertical_scroll_percent,
+            self.is_focused
+        ]
+
+@dataclass
+class TextElementNode:
+    text:str
+
+ElementNode=TreeElementNode|ScrollElementNode|TextElementNode

windows_mcp/uia/controls.py

@@ -242,9 +242,10 @@ class Control():
         return self.Element.CachedAutomationId
 
     @property
-    def CachedBoundingRectangle(self) -> Any:
+    def CachedBoundingRectangle(self) -> Rect:
         """Get the cached bounding rectangle."""
-        return self.Element.CachedBoundingRectangle
+        rect = self.Element.CachedBoundingRectangle
+        return Rect(rect.left, rect.top, rect.right, rect.bottom)
 
     @property
     def CachedClassName(self) -> str:
@@ -256,6 +257,14 @@ class Control():
         """Get the cached control type."""
         return self.Element.CachedControlType
 
+    @property
+    def CachedControlTypeName(self) -> str:
+        """Get the cached control type name."""
+        try:
+            return ControlTypeNames.get(self.CachedControlType, "Unknown")
+        except:
+            return "Unknown"
+
     @property
     def CachedControllerFor(self) -> Any:
         """Get the cached controller for."""

windows_mcp/uia/core.py

@@ -62,6 +62,15 @@ def WheelUp(wheelTimes: int = 1, interval: float = 0.05, waitTime: float = OPERA
 def GetScreenSize() -> Tuple[int, int]:
     return ctypes.windll.user32.GetSystemMetrics(0), ctypes.windll.user32.GetSystemMetrics(1)
 
+def GetVirtualScreenRect() -> Tuple[int, int, int, int]:
+    """Returns (left, top, width, height) of the virtual screen."""
+    return (
+        ctypes.windll.user32.GetSystemMetrics(76), # SM_XVIRTUALSCREEN
+        ctypes.windll.user32.GetSystemMetrics(77), # SM_YVIRTUALSCREEN
+        ctypes.windll.user32.GetSystemMetrics(78), # SM_CXVIRTUALSCREEN
+        ctypes.windll.user32.GetSystemMetrics(79)  # SM_CYVIRTUALSCREEN
+    )
+
 def IsTopLevelWindow(handle: int) -> bool:
     return ctypes.windll.user32.GetParent(handle) == 0
 

windows_mcp/vdm/__init__.py

@@ -0,0 +1 @@
+from .core import *