Kea2-python 1.2.1__tar.gz → 1.2.2__tar.gz

{kea2_python-1.2.1 → kea2_python-1.2.2}/Kea2_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 1.2.1
+Version: 1.2.2
 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-1.2.1 → kea2_python-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Kea2-python
-Version: 1.2.1
+Version: 1.2.2
 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-1.2.1 → kea2_python-1.2.2}/kea2/cli.py

@@ -108,89 +108,6 @@ def cmd_merge(args):
         logger.error(f"Error during merge operation: {e}")
 
 
-def cmd_mergefbm(args):
-    """Merge all FBM files in the specified folder and its subfolders using sum mode"""
-    from .fbm_parser import FBMMerger
-    import glob
-    import shutil
-    
-    try:
-        # Validate input path
-        input_path = Path(args.path).resolve()
-        if not input_path.exists():
-            logger.error(f"Input directory does not exist: {input_path}")
-            return
-        if not input_path.is_dir():
-            logger.error(f"Input path is not a directory: {input_path}")
-            return
-
-        # Find all FBM files in the directory and its subdirectories
-        fbm_files = glob.glob(str(input_path / "**" / "*.fbm"), recursive=True)
-        
-        if not fbm_files:
-            logger.error(f"No FBM files found in {input_path} or its subdirectories")
-            return
-        
-        logger.debug(f"Found {len(fbm_files)} FBM files to merge:")
-        for fbm_file in fbm_files:
-            logger.debug(f"  - {fbm_file}")
-        
-        # Set default output file if not provided
-        if not args.output:
-            output_file = input_path / "merged.fbm"
-        else:
-            output_file = Path(args.output).resolve()
-        
-        # Initialize merger
-        merger = FBMMerger()
-        
-        # Handle different cases
-        if len(fbm_files) == 1:
-            # Only one file, just copy it to output
-            shutil.copyfile(fbm_files[0], output_file)
-            logger.info(f"Only one FBM file found, copied to {output_file}")
-        else:
-            # Merge files iteratively: start with the first file and merge with each subsequent file
-            # Create a temporary file for the intermediate merged result
-            temp_output = input_path / f".tmp_merged.fbm"
-            
-            # Start with the first file as the initial merged result
-            shutil.copyfile(fbm_files[0], temp_output)
-            
-            # Iterate through the remaining files and merge them one by one
-            for i in range(1, len(fbm_files)):
-                current_file = fbm_files[i]
-                next_temp = input_path / f".tmp_merged_{i}.fbm"
-                
-                logger.debug(f"Merging {temp_output} and {current_file} into {next_temp}")
-                success = merger.merge(str(temp_output), str(current_file), str(next_temp), merge_mode='sum')
-                
-                if not success:
-                    logger.error(f"Failed to merge {temp_output} and {current_file}")
-                    # Clean up temporary files
-                    for f in [temp_output, next_temp]:
-                        if f.exists() and f.name.startswith(".tmp_"):
-                            f.unlink()
-                    return
-                
-                # Remove the previous temporary file and update to the new one
-                temp_output.unlink()
-                temp_output = next_temp
-            
-            # Move the final merged file to the output location
-            if temp_output != output_file:
-                temp_output.replace(output_file)
-        
-        print(f"✅ All FBM files merged successfully!", flush=True)
-        print(f"📊 Merged FBM file: {output_file}", flush=True)
-        print(f"📈 Merged {len(fbm_files)} FBM files", flush=True)
-        
-    except Exception as e:
-        logger.error(f"Error during FBM merge operation: {e}")
-        import traceback
-        logger.debug(traceback.format_exc())
-
-
 def cmd_run(args):
     base_dir = getProjectRoot()
     if base_dir is None:
@@ -251,28 +168,7 @@ _commands = [
                 help="Output directory for merged report (optional)"
             )
         ]
-    ),
-    dict(
-        action=cmd_mergefbm,
-        command="mergefbm",
-        help="merge all FBM files in the specified folder and its subfolders using sum mode",
-        flags=[
-            dict(
-                name=["path"],
-                args=["-p", "--path"],
-                type=str,
-                required=True,
-                help="Path to the folder containing FBM files to merge"
-            ),
-            dict(
-                name=["output"],
-                args=["-o", "--output"],
-                type=str,
-                required=False,
-                help="Output file path for merged FBM file (optional, default: merged.fbm in the input folder)"
-            )
-        ]
-    )
+     )
 ]
 
 

{kea2_python-1.2.1 → kea2_python-1.2.2}/kea2/fastbotManager.py

@@ -189,7 +189,7 @@ class FastbotManager:
             "exec", "app_process",
             "/system/bin", "com.android.commands.monkey.Monkey",
             "--agent-u2",
-            "reuseq",
+            self.options.fastbot_agent,
             "--running-minutes", f"{self.options.running_mins}",
             "--throttle", f"{self.options.throttle}",
             "--output-directory", f"{self.options.device_output_root}/output_{self.options.log_stamp}",

{kea2_python-1.2.1 → kea2_python-1.2.2}/kea2/keaUtils.py

@@ -141,6 +141,8 @@ class Options:
     act_whitelist_file: str = None
     # Activity BlackList File
     act_blacklist_file: str = None
+    # Fastbot Agent
+    fastbot_agent: Literal["double-sarsa", "sarsa"] = "double-sarsa"
     # propertytest sub-commands args (eg. discover -s xxx -p xxx)
     propertytest_args: List[str] = None
     # period (N steps) to restart the app under test

{kea2_python-1.2.1 → kea2_python-1.2.2}/kea2/kea_launcher.py

@@ -162,6 +162,16 @@ def _set_runner_parser(subparsers: "argparse._SubParsersAction[argparse.Argument
         help="(Experimental) FBM merge at startup. When enabled, pull FBM(s) from the device at startup, merge them with local PC FBM data.",
     )
 
+    parser.add_argument(
+        "--fastbot-agent",
+        dest="fastbot_agent",
+        type=str,
+        choices=["double-sarsa", "sarsa"],
+        required=False,
+        default="double-sarsa",
+        help="Fastbot agent strategy.",
+    )
+
 
     parser.add_argument(
         "--act-whitelist-file",
@@ -301,6 +311,7 @@ def run(args=None) -> ReturnCode:
         unittest_args=args.unittest_args,
         extra_args=args.extra,
         merge_fbm=args.merge_fbm,
+        fastbot_agent=args.fastbot_agent,
     )
 
 

{kea2_python-1.2.1 → kea2_python-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Kea2-python"
-version = "1.2.1"
+version = "1.2.2"
 description = "A python library for supporting and customizing automated UI testing for mobile apps"
 readme = "README.md"
 requires-python = ">=3.8"