windows-mcp 0.5.4__py3-none-any.whl → 0.5.5__py3-none-any.whl

windows_mcp/__main__.py

@@ -243,10 +243,10 @@ def wait_tool(duration:int)->str:
 def scrape_tool(url:str)->str:
     desktop_state=desktop.desktop_state
     tree_state=desktop_state.tree_state
-    if not tree_state.dom_node:
-        return f'Unable to scrape URL: {url}. No DOM node found.'
-    dom_node=tree_state.dom
-    vertical_scroll_percent=dom_node.vertical_scroll_percent
+    if not tree_state.dom_info:
+        return f'No DOM information found. Please open {url} in browser first.'
+    dom_info=tree_state.dom_info
+    vertical_scroll_percent=dom_info.vertical_scroll_percent
     content='\n'.join([node.text for node in tree_state.dom_informative_nodes])
     header_status = "Reached top" if vertical_scroll_percent <= 0 else "Scroll up to see more"
     footer_status = "Reached bottom" if vertical_scroll_percent >= 100 else "Scroll down to see more"

windows_mcp/tree/service.py

@@ -1,6 +1,6 @@
 from windows_mcp.tree.config import INTERACTIVE_CONTROL_TYPE_NAMES,DOCUMENT_CONTROL_TYPE_NAMES,INFORMATIVE_CONTROL_TYPE_NAMES, DEFAULT_ACTIONS, THREAD_MAX_RETRIES
+from windows_mcp.tree.views import TreeElementNode, ScrollElementNode, TextElementNode, Center, BoundingBox, TreeState, DOMInfo
 from uiautomation import Control,ImageControl,ScrollPattern,WindowControl,Rect,GetRootControl,PatternId
-from windows_mcp.tree.views import TreeElementNode, ScrollElementNode, TextElementNode, Center, BoundingBox, TreeState
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from windows_mcp.tree.utils import random_point_within_bounding_box
 from PIL import Image, ImageFont, ImageDraw
@@ -24,58 +24,22 @@ class Tree:
     def __init__(self,desktop:'Desktop'):
         self.desktop=desktop
         self.screen_size=self.desktop.get_screen_size()
-        self.dom:Optional[Control]=None
+        self.dom_info:Optional[DOMInfo]=None
         self.dom_bounding_box:BoundingBox=None
         self.screen_box=BoundingBox(
             top=0, left=0, bottom=self.screen_size.height, right=self.screen_size.width,
             width=self.screen_size.width, height=self.screen_size.height 
         )
-        self.root:Optional[TreeElementNode]=None
 
     def get_state(self,active_app:App,other_apps:list[App],use_dom:bool=False)->TreeState:
-        self.root=GetRootControl()
+        root=GetRootControl()
         other_apps_handle=set(map(lambda other_app: other_app.handle,other_apps))
-        apps=list(filter(lambda app:app.NativeWindowHandle not in other_apps_handle,self.root.GetChildren()))
+        apps=list(filter(lambda app:app.NativeWindowHandle not in other_apps_handle,root.GetChildren()))
         del other_apps_handle
         if active_app:
             apps=list(filter(lambda app:app.ClassName!='Progman',apps))
         interactive_nodes,scrollable_nodes,dom_informative_nodes=self.get_appwise_nodes(apps=apps,use_dom=use_dom)
-        root=TreeElementNode(**{
-            'name':'Desktop',
-            'control_type':'PaneControl',
-            'app_name':'Desktop',
-            'value':'',
-            'shortcut':'',
-            'bounding_box':self.screen_box,
-            'center':Center(x=self.screen_box.left+self.screen_box.width//2,y=self.screen_box.top+self.screen_box.height//2),
-            'xpath':'',
-            'is_focused':False
-        })
-        dom=None
-        if self.dom:
-            scroll_pattern=self.dom.GetPattern(PatternId.ScrollPattern)
-            bounding_box=self.dom.BoundingRectangle
-            dom=ScrollElementNode(**{
-                'name':"DOM",
-                'control_type':'DocumentControl',
-                'app_name':"DOM",
-                'bounding_box':BoundingBox(
-                    left=bounding_box.left,
-                    top=bounding_box.top,
-                    right=bounding_box.right,
-                    bottom=bounding_box.bottom,
-                    width=bounding_box.width(),
-                    height=bounding_box.height()
-                ),
-                'center':Center(x=bounding_box.left+bounding_box.width()//2,y=bounding_box.top+bounding_box.height()//2),
-                'horizontal_scrollable':scroll_pattern.HorizontallyScrollable,
-                'horizontal_scroll_percent':scroll_pattern.HorizontalScrollPercent if scroll_pattern.HorizontallyScrollable else 0,
-                'vertical_scrollable':scroll_pattern.VerticallyScrollable,
-                'vertical_scroll_percent':scroll_pattern.VerticalScrollPercent if scroll_pattern.VerticallyScrollable else 0,
-                'xpath':'',
-                'is_focused':False
-            })
-        return TreeState(root=root,dom=dom,interactive_nodes=interactive_nodes,scrollable_nodes=scrollable_nodes,dom_informative_nodes=dom_informative_nodes)
+        return TreeState(dom_info=self.dom_info,interactive_nodes=interactive_nodes,scrollable_nodes=scrollable_nodes,dom_informative_nodes=dom_informative_nodes)
 
     def get_appwise_nodes(self,apps:list[Control],use_dom:bool=False)-> tuple[list[TreeElementNode],list[ScrollElementNode],list[TextElementNode]]:
         interactive_nodes, scrollable_nodes,dom_informative_nodes = [], [], []
@@ -388,7 +352,13 @@ class Tree:
                     self.dom_bounding_box=BoundingBox(left=bounding_box.left,top=bounding_box.top,
                     right=bounding_box.right,bottom=bounding_box.bottom,width=bounding_box.width(),
                     height=bounding_box.height())
-                    self.dom=child
+                    scroll_pattern=child.GetPattern(PatternId.ScrollPattern)
+                    self.dom_info=DOMInfo(
+                        horizontal_scrollable=scroll_pattern.HorizontallyScrollable,
+                        horizontal_scroll_percent=scroll_pattern.HorizontalScrollPercent if scroll_pattern.HorizontallyScrollable else 0,
+                        vertical_scrollable=scroll_pattern.VerticallyScrollable,
+                        vertical_scroll_percent=scroll_pattern.VerticalScrollPercent if scroll_pattern.VerticallyScrollable else 0
+                    )
                     # enter DOM subtree
                     tree_traversal(child, is_dom=True, is_dialog=is_dialog)
                 # Check if the child is a dialog

windows_mcp/tree/views.py

@@ -2,13 +2,19 @@ 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:
-    root:Optional['TreeElementNode']=None
-    dom: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)
+    dom_info:Optional['DOMInfo']=None
 
     def interactive_elements_to_string(self) -> str:
         if not self.interactive_nodes:

{windows_mcp-0.5.4.dist-info → windows_mcp-0.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: windows-mcp
-Version: 0.5.4
+Version: 0.5.5
 Summary: Lightweight MCP Server for interacting with Windows Operating System.
 Project-URL: homepage, https://github.com/CursorTouch
 Author-email: Jeomon George <jeogeoalukka@gmail.com>

{windows_mcp-0.5.4.dist-info → windows_mcp-0.5.5.dist-info}/RECORD

@@ -1,16 +1,16 @@
 windows_mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-windows_mcp/__main__.py,sha256=kCgkB5ckRlb7hgjg_Gpj_OQWiWJdgEOEMcBFJ7Kqmy8,11920
+windows_mcp/__main__.py,sha256=pkwexVikZwUFHe0oqmMYFfiRavjNfs5Bv-ELvLv9Dpo,11939
 windows_mcp/desktop/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 windows_mcp/desktop/config.py,sha256=7rAb64pmC275PpNRXVOyOf0Psu089AOosRC8T5kVGWA,384
 windows_mcp/desktop/service.py,sha256=97e2E4TdMs3TwW6CtupVxnwhWqdBKU5eH4MDz6_5Hmk,18469
 windows_mcp/desktop/views.py,sha256=_hZ5sfY1uWVi5mpaysVd-plwP_DT6SXpKa33Z8WT6gI,1523
 windows_mcp/tree/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 windows_mcp/tree/config.py,sha256=k-Mjo_yIn0d1AzcEW_bxiaXyBFxBZZSyy7hCNQ3XVp0,1010
-windows_mcp/tree/service.py,sha256=KWdOHY5Q1HU-PJV6vMv_h9KVb5oL_E5vnAW-KICEzfw,24786
+windows_mcp/tree/service.py,sha256=evK62AwhMwifpq6lRQCdrmC4DPt1-w_HSp8nUwXsCVQ,23566
 windows_mcp/tree/utils.py,sha256=6hbxdIQPrAY-I3jcHsRqodHlxboTQj2GnLA71bf1lqY,911
-windows_mcp/tree/views.py,sha256=6A1bLGVt_MHPTvQt9kbUFoPpIqMI43JZjOSg-_o3ajk,3479
-windows_mcp-0.5.4.dist-info/METADATA,sha256=E8KB-mhjNa992NRPHAnl5r7nkCuAExc2cTPdrDhNuGY,13537
-windows_mcp-0.5.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-windows_mcp-0.5.4.dist-info/entry_points.txt,sha256=wW8NcVQ_OJK5e5GemZSE_nOKyxfUtBPq2acFLszRwaw,58
-windows_mcp-0.5.4.dist-info/licenses/LICENSE.md,sha256=U1UM4Xi_IX-jHnHjGT0rETNia-Ck8gd92iSQMqQ6a8Y,1089
-windows_mcp-0.5.4.dist-info/RECORD,,
+windows_mcp/tree/views.py,sha256=K2hTBDicjP4p_tPIRTLZ8Sq3pGYhsDtZVIROAnMGTz4,3599
+windows_mcp-0.5.5.dist-info/METADATA,sha256=Jx7stv6_Lm145NSLB8EdAsRJsBXiP0FhIQ-7cA2FmEU,13537
+windows_mcp-0.5.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+windows_mcp-0.5.5.dist-info/entry_points.txt,sha256=wW8NcVQ_OJK5e5GemZSE_nOKyxfUtBPq2acFLszRwaw,58
+windows_mcp-0.5.5.dist-info/licenses/LICENSE.md,sha256=U1UM4Xi_IX-jHnHjGT0rETNia-Ck8gd92iSQMqQ6a8Y,1089
+windows_mcp-0.5.5.dist-info/RECORD,,