redisbench-admin 0.11.51__tar.gz → 0.11.53__tar.gz

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.51
+Version: 0.11.53
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.51"
+version = "0.11.53"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/redisbench_admin/cli.py

@@ -42,7 +42,7 @@ def populate_with_project_data():
     project_description = None
     try:
         pyproject_toml = toml.load("pyproject.toml")
-        if 'project' in pyproject_toml:
+        if "project" in pyproject_toml:
             project_data = pyproject_toml["project"]
             project_name = project_data["name"]
             project_version = project_data["version"]

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/redisbench_admin/run/aibench_run_inference_redisai_vision/aibench_run_inference_redisai_vision.py

@@ -47,7 +47,8 @@ def extract_aibench_extra_links(benchmark_config, benchmark_tool):
     )
     queries_file_link = None
     for entry in benchmark_config["clientconfig"]:
-        if "parameters" in entry:
+        # Handle both dict and non-dict entries in the list
+        if isinstance(entry, dict) and "parameters" in entry:
             for parameter in entry["parameters"]:
                 if "file" in parameter:
                     queries_file_link = parameter["file"]

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/redisbench_admin/run/args.py

@@ -23,6 +23,7 @@ DEFAULT_TRIGGERING_ENV = socket.gethostname()
 TRIGGERING_ENV = os.getenv("TRIGGERING_ENV", DEFAULT_TRIGGERING_ENV)
 ENV = os.getenv("ENV", "oss-standalone,oss-cluster")
 SETUP = os.getenv("SETUP", "")
+BENCHMARK = os.getenv("BENCHMARK", "")
 BENCHMARK_GLOB = os.getenv("BENCHMARK_GLOB", "*.yml")
 BENCHMARK_REGEX = os.getenv("BENCHMARK_REGEX", ".*")
 BENCHMARK_RUNNER_GROUP_TOTAL = int(os.getenv("BENCHMARK_RUNNER_GROUP_TOTAL", "1"))
@@ -94,7 +95,7 @@ def common_run_args(parser):
     parser.add_argument(
         "--test",
         type=str,
-        default="",
+        default=BENCHMARK,
         help="specify a test to run. By default will run all of them.",
     )
     parser.add_argument(

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/redisbench_admin/run/common.py

@@ -404,9 +404,17 @@ def get_start_time_vars(start_time=None):
 def check_dbconfig_tool_requirement(benchmark_config, dbconfig_keyname="dbconfig"):
     required = False
     if dbconfig_keyname in benchmark_config:
-        for k in benchmark_config[dbconfig_keyname]:
-            if "tool" in k:
+        dbconfig = benchmark_config[dbconfig_keyname]
+        # Handle both dict and list formats
+        if isinstance(dbconfig, dict):
+            # New format: dbconfig is a dict
+            if "tool" in dbconfig:
                 required = True
+        elif isinstance(dbconfig, list):
+            # Old format: dbconfig is a list of dicts
+            for k in dbconfig:
+                if isinstance(k, dict) and "tool" in k:
+                    required = True
     return required
 
 
@@ -418,7 +426,8 @@ def check_dbconfig_keyspacelen_requirement(
     if dbconfig_keyname in benchmark_config:
         if type(benchmark_config[dbconfig_keyname]) == list:
             for k in benchmark_config[dbconfig_keyname]:
-                if "check" in k:
+                # Handle both dict and non-dict entries in the list
+                if isinstance(k, dict) and "check" in k:
                     if "keyspacelen" in k["check"]:
                         required = True
                         keyspacelen = int(k["check"]["keyspacelen"])
@@ -436,9 +445,17 @@ def execute_init_commands(benchmark_config, r, dbconfig_keyname="dbconfig"):
     cmds = None
     res = 0
     if dbconfig_keyname in benchmark_config:
-        for k in benchmark_config[dbconfig_keyname]:
-            if "init_commands" in k:
-                cmds = k["init_commands"]
+        dbconfig = benchmark_config[dbconfig_keyname]
+        # Handle both dict and list formats
+        if isinstance(dbconfig, dict):
+            # New format: dbconfig is a dict
+            if "init_commands" in dbconfig:
+                cmds = dbconfig["init_commands"]
+        elif isinstance(dbconfig, list):
+            # Old format: dbconfig is a list of dicts
+            for k in dbconfig:
+                if isinstance(k, dict) and "init_commands" in k:
+                    cmds = k["init_commands"]
     if cmds is not None:
         for cmd in cmds:
             is_array = False

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/redisbench_admin/run/ftsb/ftsb.py

@@ -68,7 +68,8 @@ def extract_ftsb_extra_links(
     )
     queries_file_link = None
     for entry in benchmark_config[config_key]:
-        if "parameters" in entry:
+        # Handle both dict and non-dict entries in the list
+        if isinstance(entry, dict) and "parameters" in entry:
             for parameter in entry["parameters"]:
                 if "input" in parameter:
                     queries_file_link = parameter["input"]

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/redisbench_admin/run/run.py

@@ -117,6 +117,15 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
                         test_benchmark_config["dbconfig"] = {}
                     setup_dbconfig = setup_settings["dbconfig"]
                     benchmark_dbconfig = test_benchmark_config["dbconfig"]
+
+                    # Handle legacy list format - convert to dict by merging all entries
+                    if isinstance(benchmark_dbconfig, list):
+                        converted_dbconfig = {}
+                        for entry in benchmark_dbconfig:
+                            if isinstance(entry, dict):
+                                converted_dbconfig.update(entry)
+                        benchmark_dbconfig = converted_dbconfig
+
                     logging.info(
                         f"Merging setup dbconfig: {setup_dbconfig}, with benchmark dbconfig {test_benchmark_config}"
                     )

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/redisbench_admin/run/tsbs_run_queries_redistimeseries/tsbs_run_queries_redistimeseries.py

@@ -70,7 +70,8 @@ def extract_remote_tool_extra_links(
     )
     queries_file_link = None
     for entry in benchmark_config[config_key]:
-        if "parameters" in entry:
+        # Handle both dict and non-dict entries in the list
+        if isinstance(entry, dict) and "parameters" in entry:
             for parameter in entry["parameters"]:
                 if "file" in parameter:
                     queries_file_link = parameter["file"]

{redisbench_admin-0.11.51 → redisbench_admin-0.11.53}/redisbench_admin/run_local/run_local.py

@@ -307,9 +307,10 @@ def run_local_command_logic(args, project_name, project_version):
                                     None,
                                     args.password,
                                 )
+                                # get the pids
                                 redis_pids = [
-                                    redis_process.pid
-                                    for redis_process in redis_processes
+                                    redis_conn.info("server")["process_id"]
+                                    for redis_conn in redis_conns
                                 ]
                                 # start the profile
                                 (
@@ -556,6 +557,14 @@ def run_local_command_logic(args, project_name, project_version):
                                             "Keeping environment and topology active upon request."
                                         )
 
+                            except KeyboardInterrupt:
+                                logging.critical(
+                                    "Detected Keyboard interrupt...Tearing down and exiting!"
+                                )
+                                teardown_local_setup(
+                                    redis_conns, redis_processes, setup_name
+                                )
+                                exit(1)
                             except:
                                 return_code |= 1
                                 logging.critical(