Kea2-python 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

kea2/adbUtils.py

@@ -6,7 +6,6 @@ from typing import List, Optional, Set, Tuple
 from kea2.utils import getLogger
 from adbutils import AdbDevice, adb
 from typing import IO, TYPE_CHECKING, Generator, Optional, List, Union
-from adbutils import AdbConnection
 
 logger = getLogger(__name__)
 
@@ -44,20 +43,29 @@ class ADBDevice(AdbDevice):
         super().__init__(client=adb, serial=ADBDevice.serial, transport_id=ADBDevice.transport_id)
 
     @property
-    def stream_shell(self) -> "ADBStreamShell_V2":
+    def stream_shell(self) -> "StreamShell":
         if "shell_v2" in self.get_features():
             return ADBStreamShell_V2(session=self)
         logger.warning("Using ADBStreamShell_V1. All output will be printed to stdout.")
         return ADBStreamShell_V1(session=self)
 
+    def kill_proc(self, proc_name):
+        r = self.shell(f"ps -ef")
+        pids = [l for l in r.splitlines() if proc_name in l]
+        if pids:
+            logger.info(f"{proc_name} running, trying to kill it.")
+            pid = pids[0].split()[1]
+            self.shell(f"kill {pid}")
+
 
 class StreamShell:
     def __init__(self, session: "ADBDevice"):
         self.dev: ADBDevice = session
-        self._thread = None
+        self._thread: threading.Thread = None
         self._exit_code = 255
         self.stdout = sys.stdout
         self.stderr = sys.stderr
+        self._finished = False
 
     def __call__(self, cmdargs: Union[List[str], str], stdout: IO = None, 
                  stderr: IO = None, timeout: Union[float, None] = None) -> "StreamShell":
@@ -107,7 +115,7 @@ class StreamShell:
 class ADBStreamShell_V1(StreamShell):
 
     def __call__(
-        self, cmdargs: Union[List[str]], stdout: IO = None, 
+        self, cmdargs: Union[List[str], str], stdout: IO = None, 
         stderr: IO = None, timeout: Union[float, None] = None
     ) -> "StreamShell":
         return self.shell_v1(cmdargs, stdout, stderr, timeout)
@@ -168,7 +176,7 @@ class ADBStreamShell_V2(StreamShell):
         self._exit_code = 255
 
     def __call__(
-        self, cmdargs: Union[List[str]], stdout: IO = None, 
+        self, cmdargs: Union[List[str], str], stdout: IO = None, 
         stderr: IO = None, timeout: Union[float, None] = None
     ) -> "StreamShell":
         return self.shell_v2(cmdargs, stdout, stderr, timeout)

kea2/bug_report_generator.py

@@ -94,7 +94,7 @@ class BugReportGenerator:
             with open(report_path, "w", encoding="utf-8") as f:
                 f.write(html_content)
 
-            logger.info(f"Bug report saved to: {report_path}")
+            logger.debug(f"Bug report saved to: {report_path}")
 
         except Exception as e:
             logger.error(f"Error generating bug report: {e}")

kea2/fastbotManager.py

@@ -1,5 +1,5 @@
-import subprocess
-import threading
+from retry import retry
+from retry.api import retry_call
 from dataclasses import asdict
 import requests
 from time import sleep
@@ -80,25 +80,18 @@ class FastbotManager:
         """
         check if the script driver and proxy server are alive.
         """
+        def _check_alive_request():
+            _http_request(dev=self.dev, device_port=8090, method="GET", path="/ping")
 
-        for _ in range(10):
-            sleep(2)
-            try:
-                _http_request(
-                    dev=self.dev,
-                    device_port=8090,
-                    method="GET",
-                    path="/ping",
-                )
-                return
-            except requests.ConnectionError:
-                logger.info("waiting for connection.")
-                pass
-        raise RuntimeError("Failed to connect fastbot")
+        try:
+            retry_call(_check_alive_request, tries=10, delay=2)
+        except requests.ConnectionError:
+            raise RuntimeError("Failed to connect fastbot")
 
     def request(self, method: str, path: str, data: Dict=None, timeout: int=10) -> HTTPResponse:
         return _http_request(self.dev, 8090, method, path, data, timeout)
 
+    @retry(Exception, tries=2, delay=2)
     def init(self, options: "Options", stamp):
         post_data = {
             "takeScreenshots": options.take_screenshots,
@@ -117,6 +110,7 @@ class FastbotManager:
         self._device_output_dir = re.match(r"outputDir:(.+)", r.text).group(1)
         print(f"[INFO] Fastbot initiated. outputDir: {r.text}", flush=True)
     
+    @retry(Exception, tries=2, delay=2)
     def stepMonkey(self, monkeyStepInfo):
         r = self.request(
             method="POST",
@@ -125,6 +119,7 @@ class FastbotManager:
         )
         return r.json()["result"]
 
+    @retry(Exception, tries=2, delay=2)
     def stopMonkey(self):
         """
         send a stop monkey request to the server.
@@ -136,6 +131,7 @@ class FastbotManager:
 
         print(f"[Server INFO] {r.text}", flush=True)
     
+    @retry(Exception, tries=2, delay=2)
     def logScript(self, execution_info: Dict):
         r = self.request(
             method="POST",
@@ -182,12 +178,7 @@ class FastbotManager:
         logger.info("Launching fastbot with shell command:\n{}".format(" ".join(full_cmd)))
         logger.info("Fastbot log will be saved to {}".format(outfile.name))
 
-        # stream = self.dev.shell(shell_command, encoding="utf-8", stream=True, timeout=float("inf"))
-        # process handler
         t = self.dev.stream_shell(shell_command, stdout=outfile, stderr=outfile)
-        # proc = subprocess.Popen(full_cmd, stdout=outfile, stderr=outfile)
-        # t = threading.Thread(target=self.close_on_exit, args=(proc, outfile), daemon=True)
-        # t.start()
         return t
 
     def close_on_exit(self, proc: ADBStreamShell_V2, f: IO):
@@ -203,6 +194,8 @@ class FastbotManager:
         return self.thread.poll()
 
     def start(self):
+        # kill the fastbot process if runing.
+        self.dev.kill_proc("com.android.commands.monkey")
         self.thread = self._activateFastbot()
 
     def join(self):

kea2/logWatcher.py

@@ -2,7 +2,8 @@ import re
 import os
 import threading
 import time
-from .utils import getLogger
+from typing import IO
+from kea2.utils import getLogger
 
 
 logger = getLogger(__name__)
@@ -20,47 +21,43 @@ def thread_excepthook(args):
 
 class LogWatcher:
 
-    def watcher(self, poll_interval=0.5):
-        self.buffer = ""
+    def watcher(self, poll_interval=3):
         self.last_pos = 0
 
-        while not self.end_flag:
-            self.read_log()
-            time.sleep(poll_interval)
+        with open(self.log_file, "r") as fp:
+            while not self.end_flag:
+                self.read_log(fp)
+                time.sleep(poll_interval)
+            
+            time.sleep(0.2)
+            self.read_log(fp)
         
-        time.sleep(0.2)
-        self.read_log()
-        
-    def read_log(self):
-        with open(self.log_file, 'r', encoding='utf-8') as f:
-            f.seek(self.last_pos)
-            new_data = f.read()
-            self.last_pos = f.tell()
-
-            if new_data:
-                self.buffer += new_data
-            self.parse_log()
-
-    def parse_log(self):
-        buffer = self.buffer
-        exception_match = PATTERN_EXCEPTION.search(buffer)
+    def read_log(self, f: IO):
+        f.seek(self.last_pos)
+        buffer = f.read()
+        self.last_pos = f.tell()
+
+        self.parse_log(buffer)
+
+    def parse_log(self, content):
+        exception_match = PATTERN_EXCEPTION.search(content)
         if exception_match:
             exception_body = exception_match.group(1).strip()
             if exception_body:
                 raise RuntimeError(
-                    "[Error] Execption while running fastbot:\n" + 
+                    "[Error] Fatal Execption while running fastbot:\n" + 
                     exception_body + 
                     "\nSee fastbot.log for details."
                 )
-        if self.end_flag:
-            statistic_match = PATTERN_STATISTIC.search(buffer)
-            if statistic_match:
-                statistic_body = statistic_match.group(1).strip()
-                if statistic_body:
-                    print(
-                        "[INFO] Fastbot exit:\n" + 
-                        statistic_body
-                    , flush=True)
+        
+        statistic_match = PATTERN_STATISTIC.search(content)
+        if statistic_match:
+            statistic_body = statistic_match.group(1).strip()
+            if statistic_body:
+                print(
+                    "[INFO] Fastbot exit:\n" + 
+                    statistic_body
+                , flush=True)
 
     def __init__(self, log_file):
         logger.info(f"Watching log: {log_file}")
@@ -79,4 +76,4 @@ class LogWatcher:
 
 
 if __name__ == "__main__":
-    LogWatcher("fastbot.log")
+    LogWatcher("/Users/atria/Desktop/coding/Kea2/output/res_2025062510_0420056539/fastbot_2025062510_0420056539.log")

kea2/templates/bug_report_template.html

@@ -696,6 +696,7 @@
                         x: {
                             type: 'linear',
                             beginAtZero: true,
+                            max: steps.length > 0 ? Math.max(...steps) : 10,
                             grid: {
                                 display: false
                             },
@@ -707,9 +708,12 @@
                                 }
                             },
                             ticks: {
-                                stepSize: Math.max(10, Math.ceil(Math.max(...steps) / 10)),
+                                stepSize: steps.length > 0 ? Math.max(1, Math.ceil(Math.max(...steps) / 10)) : 1,
                                 callback: function(value) {
-                                    return value;
+                                    if (Number.isInteger(value) && value <= (steps.length > 0 ? Math.max(...steps) : 10)) {
+                                        return value;
+                                    }
+                                    return null;
                                 }
                             }
                         },

{kea2_python-0.2.0.dist-info → kea2_python-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 0.2.0
+Version: 0.2.1
 Summary: A python library for supporting and customizing automated UI testing for mobile apps
 Author-email: Xixian Liang <xixian@stu.ecnu.edu.cn>
 Requires-Python: >=3.8

{kea2_python-0.2.0.dist-info → kea2_python-0.2.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
 kea2/__init__.py,sha256=JFJjqgf5KB4bXUFQ3upkEug0cFMFIk9p3OHV9vzulHw,75
 kea2/absDriver.py,sha256=NzmsLs1Ojz-yEXctGAqj7aKBwAQW19zd83l65RABCe8,1288
-kea2/adbUtils.py,sha256=1t5oxr3CVen2kn4ilPy7lZolnEDawVXAjfDwXJMjBIk,19532
-kea2/bug_report_generator.py,sha256=avpZgUywmUePO1_2dDXBgUkxAAa0gpiTpaDtyjInw7Q,20245
+kea2/adbUtils.py,sha256=9XwKDIzEDOQjOchPsZPPK6WDC0ojYNSvW0YvMfwAwQY,19842
+kea2/bug_report_generator.py,sha256=br0OkUDFmaJz0S7s-0uxbAPOFJYAlDjmG436dCwoDIo,20246
 kea2/cli.py,sha256=YgWOe5JB0_WBTKyBShBEymhLIqj6K5gNR4Aaj6Pbtn0,2796
-kea2/fastbotManager.py,sha256=DI5jtUEf2ro9I2MNKxw6Oh42nmEjcpLecEMj0IhKZGs,6974
+kea2/fastbotManager.py,sha256=dersx5sg1xW1z4nObwUBz5VzHQNi-ADHsAfhJMti8BU,6788
 kea2/keaUtils.py,sha256=yNuEIIWfxTBfApiasKy9eMD-iKeLLH0LKunZbuxL_j8,25595
 kea2/kea_launcher.py,sha256=eV8MvWWRwbhXJ2IaxjSIRL9ZyZF6OKlEeWzAfwkoXLg,5712
-kea2/logWatcher.py,sha256=qpIsflbP37eX5b4EaWnrqyPbGP9lzQhRr3ainGFfZeI,2211
+kea2/logWatcher.py,sha256=NL3HwscDgA4-vcUl0r0yYH1naUVv-_YA9LNA4b3VxNE,2178
 kea2/resultSyncer.py,sha256=9kb3H0Innwj7oPboDDTf97nbjam7EP6HYxywR9B8SvM,2437
 kea2/u2Driver.py,sha256=nRleo-NmKuqgY-_4aiPREDQ2Yw-9yawd9hdslD1RmE4,15539
 kea2/utils.py,sha256=ErMUCwKddA6xETE8xKFI281N6iiVzpDBEhfSZ_JFNGQ,1467
 kea2/assets/fastbot-thirdpart.jar,sha256=0SZ_OoZFWDGMnazgXKceHgKvXdUDoIa3Gb2bcifaikk,85664
 kea2/assets/framework.jar,sha256=rTluOJJKj2DFwh7ascXso1udYdWv00BxBwSQ3Vmv-fw,1149240
 kea2/assets/kea2-thirdpart.jar,sha256=HYdtG2gqDLuLb72dpK3lX-Y6QUNTrJ-bfQopU5aWpfo,359346
-kea2/assets/monkeyq.jar,sha256=EU8aF9S3N1SiZ_RGxP2etPeNBLr9tVPwj0XcCwGNcjc,111988
+kea2/assets/monkeyq.jar,sha256=TTptUo-B4VV9Q8AeQKSqi1KsyG3eY4iYYb0NZCc4yV4,112189
 kea2/assets/quicktest.py,sha256=TJj9GaRioFrijU9PMLpyZY8S07db67UZFBr5G-aQY80,3000
 kea2/assets/fastbot_configs/abl.strings,sha256=Rn8_YEbVGOJqndIY_-kWnR5NaoFI-cuB-ij10Ddhl90,75
 kea2/assets/fastbot_configs/awl.strings,sha256=-j4980GoWQxGOM9ijAwXPQmziCwFBZJFmuiv2tOEaYI,101
@@ -27,10 +27,10 @@ kea2/assets/fastbot_libs/arm64-v8a/libfastbot_native.so,sha256=tAFrG73pJi7XakRxS
 kea2/assets/fastbot_libs/armeabi-v7a/libfastbot_native.so,sha256=UV8bhaiPoPKdd3q0vj3kSZqPR9anllai_tz_2QkMMbQ,1335372
 kea2/assets/fastbot_libs/x86/libfastbot_native.so,sha256=k-aw1gEXRWMKZRNHIggKNuZy0wC1y2BnveJGEIO6rbo,2036856
 kea2/assets/fastbot_libs/x86_64/libfastbot_native.so,sha256=tiofhlf4uMQcU5WAvrdLgTBME0lb83hVUoGtTwxmE8A,2121416
-kea2/templates/bug_report_template.html,sha256=59KL5rRwGwKs7mNgtiWSSUD_NG_5Cu5Agq4QfydCLt8,37935
-kea2_python-0.2.0.dist-info/licenses/LICENSE,sha256=nM9PPjcsXVo5SzNsjRqWgA-gdJlwqZZcRDSC6Qf6bVE,2034
-kea2_python-0.2.0.dist-info/METADATA,sha256=zszS6ye6p4gYZLscTZdxah8GI3-dowxlEJNKAuRxijg,14023
-kea2_python-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kea2_python-0.2.0.dist-info/entry_points.txt,sha256=mFX06TyxXiUAJQ6JZn8QHzfn8n5R8_KJ5W-pTm_fRCA,39
-kea2_python-0.2.0.dist-info/top_level.txt,sha256=TsgNH4PQoNOVhegpO7AcjutMVWp6Z4KDL1pBH9FnMmk,5
-kea2_python-0.2.0.dist-info/RECORD,,
+kea2/templates/bug_report_template.html,sha256=hAg57OTUfScH9HJTwkBMI1HhVAcElMW8jO1eS6AE5rs,38249
+kea2_python-0.2.1.dist-info/licenses/LICENSE,sha256=nM9PPjcsXVo5SzNsjRqWgA-gdJlwqZZcRDSC6Qf6bVE,2034
+kea2_python-0.2.1.dist-info/METADATA,sha256=vKYdL6LnlhFM8HTB1rI45KsVRi-AHGaVn0AEgQe0Nm4,14023
+kea2_python-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kea2_python-0.2.1.dist-info/entry_points.txt,sha256=mFX06TyxXiUAJQ6JZn8QHzfn8n5R8_KJ5W-pTm_fRCA,39
+kea2_python-0.2.1.dist-info/top_level.txt,sha256=TsgNH4PQoNOVhegpO7AcjutMVWp6Z4KDL1pBH9FnMmk,5
+kea2_python-0.2.1.dist-info/RECORD,,