feat: generate xpathLite

Author: codematrixer

.gitignore

@@ -159,3 +159,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 .DS_Store
+prompt.txt

docs/treeData/android.json

@@ -14,7 +14,7 @@
 from hmdriver2 import hdc
 from fastapi import HTTPException
 
-from uiviewer._utils import file_to_base64, image_to_base64
+from uiviewer._utils import file2base64, image2base64
 from uiviewer._models import Platform, BaseHierarchy
 from uiviewer.parser import android_hierarchy, ios_hierarchy, harmony_hierarchy
 
@@ -56,7 +56,7 @@ def take_screenshot(self) -> str:
         with tempfile.NamedTemporaryFile(delete=True, suffix=".png") as f:
             path = f.name
             self.hdc.screenshot(path)
-            return file_to_base64(path)
+            return file2base64(path)
 
     def dump_hierarchy(self) -> BaseHierarchy:
         packageName, pageName = self.hdc.current_app()
@@ -82,12 +82,12 @@ def _window_size(self) -> Tuple:
 
     def take_screenshot(self) -> str:
         img: Image.Image = self.d.screenshot()
-        return image_to_base64(img)
+        return image2base64(img)
 
     def dump_hierarchy(self) -> BaseHierarchy:
         current = self.d.app_current()
         page_xml = self.d.dump_hierarchy()
-        page_json = android_hierarchy.get_android_hierarchy(page_xml)
+        page_json = android_hierarchy.convert_android_hierarchy(page_xml)
         return BaseHierarchy(
             jsonHierarchy=page_json,
             activityName=current['activity'],
@@ -123,7 +123,7 @@ def _check_wda_health(self) -> bool:
 
     def take_screenshot(self) -> str:
         img: Image.Image = self.client.screenshot()
-        return image_to_base64(img)
+        return image2base64(img)
 
     def _current_bundle_id(self) -> str:
         resp = request("GET", f"{self.wda_url}/wda/activeAppInfo", timeout=10).json()

docs/treeData/harmony.json

@@ -31,4 +31,9 @@ class BaseHierarchy(BaseModel):
     windowSize: Tuple[int, int]
     scale: int = 1
     activityName: Optional[str] = None
-    packageName: Optional[str] = None
+    packageName: Optional[str] = None
+
+
+class XPathLiteRequest(BaseModel):
+    tree_data: Dict[str, Any]
+    node_id: str

docs/treeData/ios.json

@@ -1,20 +1,33 @@
 # -*- coding: utf-8 -*-
 
 import base64
+import json
+from typing import Dict
 from PIL import Image
 from io import BytesIO
 
+from uiviewer._logger import logger
 
-def file_to_base64(path: str) -> str:
+
+def file2base64(path: str) -> str:
     with open(path, "rb") as file:
         base64_encoded = base64.b64encode(file.read())
         return base64_encoded.decode('utf-8')
 
 
-def image_to_base64(image: Image.Image, format: str = "PNG") -> str:
+def image2base64(image: Image.Image, format: str = "PNG") -> str:
     """
     PIL Image to base64 string
     """
     buffered = BytesIO()
     image.save(buffered, format=format)
     return base64.b64encode(buffered.getvalue()).decode('utf-8')
+
+
+def str2json(s: str) -> Dict:
+    try:
+        json_obj = json.loads(s)
+        return json_obj
+    except json.JSONDecodeError as e:
+        logger.error(f"Invalid JSON data: {e}")
+        return {}

uiviewer/_device.py

@@ -63,29 +63,31 @@ def _parse_uiautomator_node(node):
     return attributes
 
 
-def get_android_hierarchy(page_xml: str) -> Dict:
+def convert_android_hierarchy(page_xml: str) -> Dict:
     dom = xml.dom.minidom.parseString(page_xml)
     root = dom.documentElement
 
-    def travel(node):
+    def __travel(node, parent_id=""):
         if node.attributes is None:
             return
         json_node = _parse_uiautomator_node(node)
         json_node['_id'] = str(uuid.uuid4())
+        json_node['_parentId'] = parent_id
+        json_node['xpath'] = ""
         json_node.pop("package", None)
         if node.childNodes:
             children = []
             for n in node.childNodes:
-                child = travel(n)
+                child = __travel(n, json_node['_id'])
                 if child:
                     children.append(child)
             json_node['children'] = children
 
         # Sort the keys
-        keys_order = ['_type', 'resourceId', 'text', 'description']
+        keys_order = ['xpath', '_type', 'resourceId', 'text', 'description']
         sorted_node = {k: json_node[k] for k in keys_order if k in json_node}
         sorted_node.update({k: json_node[k] for k in json_node if k not in keys_order})
 
         return sorted_node
 
-    return travel(root)
+    return __travel(root)

uiviewer/_models.py

@@ -5,9 +5,9 @@
 
 
 def convert_harmony_hierarchy(data: Dict) -> Dict:
-    ret = {"_id": str(uuid.uuid4()), "children": []}
+    ret = {"_id": str(uuid.uuid4()), "children": [], "_parentId": ""}
 
-    def __recursive_convert(node_a):
+    def __travel(node_a, parent_id=""):
         node_b = {
             "index": 0,
             "text": "",
@@ -30,17 +30,20 @@ def __recursive_convert(node_a):
                 "height": 0
             },
             "_id": str(uuid.uuid4()),
+            "_parentId": parent_id,
+            "xpath": ""
         }
 
         attributes = node_a.get("attributes", {})
+        node_b["xpath"] = attributes.get("xpath", "")
         node_b["_type"] = attributes.get("type", "")
         node_b["id"] = attributes.get("id", "")
         node_b["description"] = attributes.get("description", "")
         node_b["text"] = attributes.get("text", "")
         node_b["checkable"] = attributes.get("checkable", "").lower() == "true"
         node_b["clickable"] = attributes.get("clickable", "").lower() == "true"
         node_b["enabled"] = attributes.get("enabled", "").lower() == "true"
-        node_b["focusable"] = attributes.get("focused", "").lower() == "true"
+        node_b["focusable"] = attributes.get("focusable", "").lower() == "true"
         node_b["focused"] = attributes.get("focused", "").lower() == "true"
         node_b["scrollable"] = attributes.get("scrollable", "").lower() == "true"
         node_b["longClickable"] = attributes.get("longClickable", "").lower() == "true"
@@ -53,11 +56,11 @@ def __recursive_convert(node_a):
 
         children = node_a.get("children", [])
         if children:
-            node_b["children"] = [__recursive_convert(child) for child in children]
+            node_b["children"] = [__travel(child, node_b["_id"]) for child in children]
 
         return node_b
 
     # Recursively convert children of a to match b's structure
-    ret["children"] = [__recursive_convert(child) for child in data.get("children", [])]
+    ret["children"] = [__travel(child, ret["_id"]) for child in data.get("children", [])]
 
     return ret

uiviewer/_utils.py

@@ -6,23 +6,25 @@
 
 def convert_ios_hierarchy(data: Dict, scale: int) -> Dict:
 
-    def __travel(node):
+    def __travel(node, parent_id=""):
         node['_id'] = str(uuid.uuid4())
+        node['_parentId'] = parent_id
         node['_type'] = node.pop('type', "null")
         node['id'] = node.pop('rawIdentifier', "null")
+        node['xpath'] = ""
         if 'rect' in node:
             rect = node['rect']
             node['rect'] = {k: v * scale for k, v in rect.items()}
 
         # Recursively process children nodes
         if 'children' in node:
-            node['children'] = [__travel(child) for child in node['children']]
+            node['children'] = [__travel(child, node['_id']) for child in node['children']]
 
         # Sort the keys
-        keys_order = ['_type', 'label', 'name', 'id', 'value']
+        keys_order = ['xpath', '_type', 'label', 'name', 'id', 'value']
         sorted_node = {k: node[k] for k in keys_order if k in node}
         sorted_node.update({k: node[k] for k in node if k not in keys_order})
 
         return sorted_node
 
-    return __travel(data)
+    return __travel(data)