androidviewclient 25.0.1__tar.gz → 25.1.0__tar.gz

{androidviewclient-25.0.1/src/androidviewclient.egg-info → androidviewclient-25.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: androidviewclient
-Version: 25.0.1
+Version: 25.1.0
 Summary: AndroidViewClient is a 100% pure python library and tools
 Home-page: https://github.com/dtmilano/AndroidViewClient/
 Author: Diego Torres Milano
@@ -16,7 +16,6 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 License-File: LICENSE
-Requires-Dist: setuptools
 Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: matplotlib

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-      version='25.0.1',
+      version='25.1.0',
       description='''AndroidViewClient is a 100% pure python library and tools
         that simplifies test script creation providing higher level
         operations and the ability of obtaining the tree of Views present at
@@ -33,7 +33,6 @@ setup(name='androidviewclient',
                    'Programming Language :: Python :: 3.11',
                    'Programming Language :: Python :: 3.12'],
       install_requires=[
-          'setuptools',
           'requests',
           'numpy',
           'matplotlib',

{androidviewclient-25.0.1 → androidviewclient-25.1.0/src/androidviewclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: androidviewclient
-Version: 25.0.1
+Version: 25.1.0
 Summary: AndroidViewClient is a 100% pure python library and tools
 Home-page: https://github.com/dtmilano/AndroidViewClient/
 Author: Diego Torres Milano
@@ -16,7 +16,6 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 License-File: LICENSE
-Requires-Dist: setuptools
 Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: matplotlib

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/androidviewclient.egg-info/requires.txt

@@ -1,4 +1,3 @@
-setuptools
 requests
 numpy
 matplotlib

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/adb/adbclient.py

@@ -27,7 +27,7 @@ from typing import Optional
 
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 import sys
 import warnings

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/adb/dumpsys.py

@@ -23,7 +23,7 @@ import re
 import sys
 from _warnings import warn
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 DEBUG = False
 

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/code_generator.py

@@ -3,7 +3,7 @@ import textwrap
 from abc import ABC
 from datetime import date
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 from typing import TextIO, Union, Dict, List
 

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/common.py

@@ -20,7 +20,7 @@ limitations under the License.
 
 from __future__ import print_function
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 import ast
 import os

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/concertina.py

@@ -22,7 +22,7 @@ import json
 import random
 
 __author__ = 'diego'
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 DEBUG = True
 

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/controlpanel.py

@@ -20,7 +20,7 @@
     '''
 import platform
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 import tkinter
 import tkinter.ttk

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/culebron.py

@@ -38,7 +38,7 @@ from com.dtmilano.android.keyevent import KEY_EVENT
 from com.dtmilano.android.uiautomator.uiautomatorhelper import UiAutomatorHelper
 from com.dtmilano.android.viewclient import ViewClient, View, VERSION_SDK_PROPERTY
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 import sys
 import threading
@@ -46,7 +46,28 @@ import warnings
 import copy
 import os
 import platform
-from pkg_resources import Requirement, resource_filename
+from importlib.metadata import PackageNotFoundError, distribution
+
+
+def _culebra_icon_path() -> Optional[str]:
+    """
+    Path to the culebra window icon, or None if it cannot be found.
+
+    Replaces pkg_resources.resource_filename(Requirement.parse("androidviewclient"), ...),
+    which resolved the file relative to the installed distribution's location. pkg_resources
+    has been removed from setuptools, so it is looked up with the standard library instead,
+    falling back to the source tree when running from a checkout.
+    """
+    relative = os.path.join('share', 'pixmaps', 'culebra.png')
+    try:
+        located = str(distribution('androidviewclient').locate_file(relative))
+        if os.path.isfile(located):
+            return located
+    except PackageNotFoundError:
+        pass
+    # src/com/dtmilano/android/culebron.py -> src/share/pixmaps/culebra.png
+    in_tree = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', '..', relative)
+    return os.path.normpath(in_tree) if os.path.isfile(in_tree) else None
 
 # noinspection PyBroadException
 try:
@@ -289,9 +310,8 @@ This is usually installed by python package. Check your distribution details.
         self.concertinaConfigFile = concertinaConfigFile
         self.window = tkinter.Tk()
         try:
-            f = resource_filename(Requirement.parse("androidviewclient"),
-                                  "share/pixmaps/culebra.png")
-            icon = ImageTk.PhotoImage(file=f)
+            f = _culebra_icon_path()
+            icon = ImageTk.PhotoImage(file=f) if f else None
         except:
             icon = None
         if icon:

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/mcp/__init__.py

@@ -21,7 +21,7 @@ For more information, see:
     https://github.com/dtmilano/AndroidViewClient/
 """
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 __author__ = 'Diego Torres Milano'
 __email__ = 'dtmilano@gmail.com'
 

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/mcp/object_store.py

@@ -25,7 +25,7 @@ limitations under the License.
 
 from typing import Dict, Any, Optional
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 
 class ObjectStore:

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/mcp/server.py

@@ -31,7 +31,7 @@ from culebratester_client import ApiClient, Configuration
 from culebratester_client.api import DefaultApi
 from com.dtmilano.android.mcp.object_store import ObjectStore
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 # Configure logging
 DEBUG = os.environ.get('CULEBRATESTER2_DEBUG', '').lower() in ('1', 'true', 'yes')

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/mcp/tools.py

@@ -65,10 +65,10 @@ def getDeviceInfo() -> str:
 @mcp.tool()
 def dumpUiHierarchy() -> str:
     """
-    Dump the current UI hierarchy as XML.
-    
+    Dump the current UI hierarchy.
+
     Returns:
-        JSON string with UI hierarchy XML
+        JSON string whose "data" is the window hierarchy as a nested dict
     """
     try:
         hierarchy = client.ui_device_dump_window_hierarchy_get()
@@ -351,19 +351,29 @@ def startApp(packageName: str, activityName: str = None) -> str:
     
     Args:
         packageName: The package name of the app (e.g., "com.example.app")
-        activityName: Optional activity name to start (e.g., ".MainActivity")
-        
+        activityName: The activity to start, either fully qualified
+            ("com.example.app.MainActivity") or relative to the package
+            (".MainActivity"). Required: CulebraTester2's startActivity
+            endpoint takes an explicit class and cannot resolve a launcher
+            activity from the package name alone.
+
     Returns:
         JSON string with success status
     """
     try:
-        # Build component string
-        if activityName:
-            component = "{}/{}".format(packageName, activityName)
-        else:
-            component = packageName
-        
-        result = client.target_context_start_activity_get(component=component)
+        if not activityName:
+            return json.dumps({
+                "success": False,
+                "error": "activityName is required (e.g. \".MainActivity\"): "
+                         "CulebraTester2 starts activities by explicit class"
+            })
+
+        # The endpoint takes pkg and cls as separate required query params,
+        # and the server does not expand a relative class name -- ".Main"
+        # reaches the Intent verbatim and fails with ActivityNotFoundException.
+        cls = packageName + activityName if activityName.startswith('.') else activityName
+
+        result = client.target_context_start_activity_get(pkg=packageName, cls=cls)
         return json.dumps({
             "success": True,
             "data": str(result) if result else "OK"

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/plot.py

@@ -31,7 +31,7 @@ from mpl_toolkits.axes_grid1 import host_subplot
 
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 DEBUG = False
 

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/robotframework/viewclientwrapper.py

@@ -18,7 +18,7 @@ limitations under the License.
 @author: Diego Torres Milano
 '''
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 __author__ = 'diego'
 
 import sys

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py

@@ -20,7 +20,7 @@ limitations under the License.
 
 from __future__ import print_function
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 import math
 import os
@@ -500,8 +500,15 @@ class UiAutomatorHelper:
 
             :see https://github.com/dtmilano/CulebraTester2-public/blob/master/openapi.yaml
             :param _format: the format (e.g.: JSON, XML)
-            :return: the window hierarchy
-            """
+            :return: the window hierarchy: a WindowHierarchy for JSON, the XML document as a str for XML
+            """
+            if _format and _format.upper() == 'XML':
+                # The server answers XML as a text/plain document, but the generated client declares a
+                # single response type (WindowHierarchy) for this endpoint and tries to deserialize the
+                # XML into it, which fails. Take the body undeserialized and hand back the document.
+                response = self.uiAutomatorHelper.api_instance.ui_device_dump_window_hierarchy_get(
+                    format=_format, _preload_content=False)
+                return response.data.decode('utf-8')
             return self.uiAutomatorHelper.api_instance.ui_device_dump_window_hierarchy_get(format=_format)
 
         @kato.kato

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/src/com/dtmilano/android/viewclient.py

@@ -26,7 +26,7 @@ from typing import Literal, Optional, Union, Dict, Tuple
 import culebratester_client
 from culebratester_client import WindowHierarchyChild, WindowHierarchy
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 import sys
 import warnings

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/tools/culebra

@@ -28,7 +28,7 @@ from typing import Pattern
 import culebratester_client
 from culebratester_client import WindowHierarchy, Selector
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 import calendar
 import codecs

{androidviewclient-25.0.1 → androidviewclient-25.1.0}/tools/dump

@@ -8,7 +8,7 @@ Created on Feb 3, 2012
 
 from __future__ import print_function
 
-__version__ = '25.0.1'
+__version__ = '25.1.0'
 
 import getopt
 import os