redisbench-admin 0.11.51__py3-none-any.whl → 0.11.53__py3-none-any.whl

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/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/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/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/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/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/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/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(

{redisbench_admin-0.11.51.dist-info → redisbench_admin-0.11.53.dist-info}/METADATA

@@ -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.dist-info → redisbench_admin-0.11.53.dist-info}/RECORD

@@ -1,5 +1,5 @@
 redisbench_admin/__init__.py,sha256=kLgzVDw4-frGXtbJH_WKiwWcXaUZYisYBKYYOeSJWvU,473
-redisbench_admin/cli.py,sha256=nJjxJVw9vdK6sHmY_0WsBaMx_zyvfKMWHb1-QItVJkY,8073
+redisbench_admin/cli.py,sha256=Kljn7e6zV8kCGRGSfZCf1SdHdvtW8d3kA5LwMba68Zw,8073
 redisbench_admin/commands/__init__.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/commands/commands.json.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/compare/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -45,7 +45,7 @@ redisbench_admin/profilers/stackcollapse-perf.pl,sha256=XStXxBheOVjJYdo9Gha0rf5P
 redisbench_admin/profilers/vtune.py,sha256=OMx5ABr5OtWeiqK0dTspdyeAfKlDEzhdXDKocDSa9xM,4618
 redisbench_admin/run/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/aibench_run_inference_redisai_vision/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run/aibench_run_inference_redisai_vision/aibench_run_inference_redisai_vision.py,sha256=eIZo1M_0mLIWHE31xbTS97KUw6MRo6QiPaN2Wcs71ds,1829
+redisbench_admin/run/aibench_run_inference_redisai_vision/aibench_run_inference_redisai_vision.py,sha256=03GDbZZSo21f9iBTcNTdBKQAfq_Ghd0zxr-KYe1QIMU,1917
 redisbench_admin/run/ann/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/ann/ann.py,sha256=h8VE7fouyNkpMSjNhgjkI_R-aWb-lKIKxvNZPOO8pFY,1288
 redisbench_admin/run/ann/pkg/.dockerignore,sha256=yn3THXBWZ1jBDf0_NJL-fy0M-mMx5APjSIfui_kuUNQ,13
@@ -174,11 +174,11 @@ redisbench_admin/run/ann/pkg/templates/summary.html,sha256=Y-jePm8EGM41ensKay18R
 redisbench_admin/run/ann/pkg/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 redisbench_admin/run/ann/pkg/test/test-jaccard.py,sha256=oIhaQCQKrQokwv3fvgLSwPlRwkY0MNppG9Fc08oS3ZI,462
 redisbench_admin/run/ann/pkg/test/test-metrics.py,sha256=vJdS8Kuk8bAnpB65Uqb-9rUUI35XrHwaO3cNwKX5gxc,3057
-redisbench_admin/run/args.py,sha256=tevHZrezJ4RreHp6K-MGHko3e1Gi_IdsS2Q0jD2ZSoU,8173
+redisbench_admin/run/args.py,sha256=4OJIj19fieEjvz7Xnk1rIjaa50R5Kv1IlyMyECHtj0Y,8219
 redisbench_admin/run/cluster.py,sha256=_Y6a8Dbu1cJ7OxhgymKQSZcCmV8cZ3UpGEWL6b6O84Y,6363
-redisbench_admin/run/common.py,sha256=5TAxmHbUti7S3nzPzn7f-L4ls6gpStU2C4yvkiii7m4,28410
+redisbench_admin/run/common.py,sha256=EagPTzgT3NgY1ZUg9lb5snhVGdumuxrD7-s2FloDakA,29236
 redisbench_admin/run/ftsb/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run/ftsb/ftsb.py,sha256=NP-K_hCEagmX5ayN0pQVtOdQxDTwgxKrnzz9_MLT9qQ,2492
+redisbench_admin/run/ftsb/ftsb.py,sha256=MnviWzIxMPxAw__R1lQT6tTsH7nP7t5ejCXrALm2MUw,2580
 redisbench_admin/run/git.py,sha256=6UYGcTN0MPzf4QDVoJnFkou0yZasLF6jLG7f0zoySq8,3064
 redisbench_admin/run/grafana.py,sha256=iMDgMyJKinpZMTD43rZ1IcRGkadjFjCxaB48mYWkvG4,9421
 redisbench_admin/run/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -190,11 +190,11 @@ redisbench_admin/run/redis_benchmark/redis_benchmark.py,sha256=e-Az2uTlt3z2W4uzl
 redisbench_admin/run/redisgraph_benchmark_go/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/redisgraph_benchmark_go/redisgraph_benchmark_go.py,sha256=DijIoWr73e2t7Zy-UmODzC51IjUh6hH5I0LaPRJW4Vk,2241
 redisbench_admin/run/redistimeseries.py,sha256=x3PA7QoHXu53zs5v0ekK2sVmUnA9_ZF2JxgCDf1Mui4,21331
-redisbench_admin/run/run.py,sha256=mbP9A01dU-ITLhoEfWbVWskxe0YhIeU5iRerNIJVF74,5588
+redisbench_admin/run/run.py,sha256=AwE4_qkejAXOcDVFmwHjVqYjqi1BFZKdGNrCKBHkAHI,6030
 redisbench_admin/run/s3.py,sha256=pXQXZ1rrwDCWeBegGR4aKzbKqWWwMrmqvIjFxEB3bh4,442
 redisbench_admin/run/ssh.py,sha256=gRW6ROoTKlaxLKhS5tM-Ejjd6zk2iO1KN9dzBzw7GOk,2835
 redisbench_admin/run/tsbs_run_queries_redistimeseries/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run/tsbs_run_queries_redistimeseries/tsbs_run_queries_redistimeseries.py,sha256=9JWh23vG_4pNZuv6-kVk7_5C6qJ2ZOBWv53LxGMKXgs,2426
+redisbench_admin/run/tsbs_run_queries_redistimeseries/tsbs_run_queries_redistimeseries.py,sha256=CfXcoLS25pEkhGtka82JwgDZVPV4w2lU_VhI-reH5h4,2514
 redisbench_admin/run/ycsb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 redisbench_admin/run/ycsb/ycsb.py,sha256=cs5saVH7C4YpDvzhoa15PwEho59qTVR1E90v_FYjMVw,6873
 redisbench_admin/run_async/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -209,7 +209,7 @@ redisbench_admin/run_local/args.py,sha256=LPpqtx1cH1dkkeHjYlaFnAp_TijxnzPZFO2CmY
 redisbench_admin/run_local/local_client.py,sha256=gwawMDOBrf7m--uyxu8kMZC5LBiLjbUBSKvzVOdOAas,124
 redisbench_admin/run_local/local_db.py,sha256=9vINqKOs-wDMFEuEHT0I8KO9YnEo_h4NWNk5da3LwSY,7518
 redisbench_admin/run_local/local_helpers.py,sha256=JyqLW2-Sbm35BXjxxfOB1yK7ADdLfcVrq08NLNdIwac,7026
-redisbench_admin/run_local/run_local.py,sha256=QHnGfVAaVuct7t0WrWyQpbirC3MWX7fQF5-kXU_pJBs,34834
+redisbench_admin/run_local/run_local.py,sha256=TIGhSp4UaVZtoUxKMwS4BMeE7dNQJm9ODBtsDjcGrbI,35333
 redisbench_admin/run_remote/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run_remote/args.py,sha256=Ef32mg1yNYYHL5g59SzIWZqFB__RNLLriPqiucVyoNg,4826
 redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhqpi4AL0RQ,386
@@ -235,8 +235,8 @@ redisbench_admin/utils/utils.py,sha256=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6r
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=0wWYge3x_OMxWrzazNhJif2NK4tKsI963HVZqjczRag,6189
-redisbench_admin-0.11.51.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.51.dist-info/METADATA,sha256=s_FfOPCdXONq0UaPdnaTg_mkhJChk3X9XECkYrzpf4w,5596
-redisbench_admin-0.11.51.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.51.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.51.dist-info/RECORD,,
+redisbench_admin-0.11.53.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.53.dist-info/METADATA,sha256=iq1YAIae4VhPOdP0aFLlMFeNQhqhJcrGySUx-IzAz7U,5596
+redisbench_admin-0.11.53.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.53.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.53.dist-info/RECORD,,