redisbench-admin 0.11.52__py3-none-any.whl → 0.11.54__py3-none-any.whl

redisbench_admin/run/aibench_run_inference_redisai_vision/aibench_run_inference_redisai_vision.py

@@ -46,9 +46,22 @@ def extract_aibench_extra_links(benchmark_config, benchmark_tool):
         + "tools/redisai/aibench/{}_linux_amd64".format(benchmark_tool)
     )
     queries_file_link = None
-    for entry in benchmark_config["clientconfig"]:
-        if "parameters" in entry:
-            for parameter in entry["parameters"]:
+
+    # Handle both dict and list formats for clientconfig
+    config_data = benchmark_config["clientconfig"]
+    if isinstance(config_data, dict):
+        # Dict format: check if "parameters" key exists directly
+        if "parameters" in config_data:
+            for parameter in config_data["parameters"]:
                 if "file" in parameter:
                     queries_file_link = parameter["file"]
+    elif isinstance(config_data, list):
+        # List format: iterate over entries
+        for entry in config_data:
+            # 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"]
+
     return queries_file_link, remote_tool_link, tool_link

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

@@ -67,9 +67,22 @@ def extract_ftsb_extra_links(
         + f"redisearch/tools/ftsb/{benchmark_tool}_linux_{arch_txt}"
     )
     queries_file_link = None
-    for entry in benchmark_config[config_key]:
-        if "parameters" in entry:
-            for parameter in entry["parameters"]:
+
+    # Handle both dict and list formats for config_key
+    config_data = benchmark_config[config_key]
+    if isinstance(config_data, dict):
+        # Dict format: check if "parameters" key exists directly
+        if "parameters" in config_data:
+            for parameter in config_data["parameters"]:
                 if "input" in parameter:
                     queries_file_link = parameter["input"]
+    elif isinstance(config_data, list):
+        # List format: iterate over entries
+        for entry in config_data:
+            # 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"]
+
     return queries_file_link, remote_tool_link, tool_link

redisbench_admin/run/tsbs_run_queries_redistimeseries/tsbs_run_queries_redistimeseries.py

@@ -69,9 +69,22 @@ def extract_remote_tool_extra_links(
         )
     )
     queries_file_link = None
-    for entry in benchmark_config[config_key]:
-        if "parameters" in entry:
-            for parameter in entry["parameters"]:
+
+    # Handle both dict and list formats for config_key
+    config_data = benchmark_config[config_key]
+    if isinstance(config_data, dict):
+        # Dict format: check if "parameters" key exists directly
+        if "parameters" in config_data:
+            for parameter in config_data["parameters"]:
                 if "file" in parameter:
                     queries_file_link = parameter["file"]
+    elif isinstance(config_data, list):
+        # List format: iterate over entries
+        for entry in config_data:
+            # 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"]
+
     return queries_file_link, remote_tool_link, tool_link

redisbench_admin/utils/benchmark_config.py

@@ -238,17 +238,19 @@ def extract_redis_dbconfig_parameters(benchmark_config, dbconfig_keyname):
         dbconfig_present = True
         if type(benchmark_config[dbconfig_keyname]) == list:
             for k in benchmark_config[dbconfig_keyname]:
-                if CONFIG_PARAMS_KEY in k:
-                    modules_configuration_parameters_map = k[CONFIG_PARAMS_KEY]
-                if "configuration-parameters" in k:
-                    cp = k["configuration-parameters"]
-                    for item in cp:
-                        for k, v in item.items():
-                            redis_configuration_parameters[k] = v
-                if "dataset_load_timeout_secs" in k:
-                    dataset_load_timeout_secs = k["dataset_load_timeout_secs"]
-                if "dataset_name" in k:
-                    dataset_name = k["dataset_name"]
+                # Handle both dict and non-dict entries in the list
+                if isinstance(k, dict):
+                    if CONFIG_PARAMS_KEY in k:
+                        modules_configuration_parameters_map = k[CONFIG_PARAMS_KEY]
+                    if "configuration-parameters" in k:
+                        cp = k["configuration-parameters"]
+                        for item in cp:
+                            for k, v in item.items():
+                                redis_configuration_parameters[k] = v
+                    if "dataset_load_timeout_secs" in k:
+                        dataset_load_timeout_secs = k["dataset_load_timeout_secs"]
+                    if "dataset_name" in k:
+                        dataset_name = k["dataset_name"]
         if type(benchmark_config[dbconfig_keyname]) == dict:
             if CONFIG_PARAMS_KEY in benchmark_config[dbconfig_keyname]:
                 modules_configuration_parameters_map = benchmark_config[

redisbench_admin/utils/utils.py

@@ -46,11 +46,26 @@ def redis_server_config_module_part(
 
     command.append("--loadmodule")
     command.extend(abs_splitted_module_and_plugins)
+    logging.info(
+        "Processing module config parameters. Module file: {}, Config map: {}".format(
+            local_module_file, modules_configuration_parameters_map
+        )
+    )
     for (
         module_config_modulename,
         module_config_dict,
     ) in modules_configuration_parameters_map.items():
+        logging.info(
+            "Checking if module config name '{}' is in module file '{}'".format(
+                module_config_modulename, local_module_file
+            )
+        )
         if module_config_modulename in local_module_file:
+            logging.info(
+                "Match found! Adding module config parameters: {}".format(
+                    module_config_dict
+                )
+            )
             for (
                 module_config_parameter_name,
                 module_config_parameter_value,
@@ -65,6 +80,12 @@ def redis_server_config_module_part(
                         module_config_parameter_value,
                     ]
                 )
+        else:
+            logging.info(
+                "No match - '{}' not found in '{}'".format(
+                    module_config_modulename, local_module_file
+                )
+            )
 
 
 def generate_common_server_args(

{redisbench_admin-0.11.52.dist-info → redisbench_admin-0.11.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.52
+Version: 0.11.54
 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.52.dist-info → redisbench_admin-0.11.54.dist-info}/RECORD

@@ -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=x6ZKF35PaxfInG5YcZg91vkYZQ3zFAygcgGTP-ajycc,2411
 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
@@ -176,9 +176,9 @@ redisbench_admin/run/ann/pkg/test/test-jaccard.py,sha256=oIhaQCQKrQokwv3fvgLSwPl
 redisbench_admin/run/ann/pkg/test/test-metrics.py,sha256=vJdS8Kuk8bAnpB65Uqb-9rUUI35XrHwaO3cNwKX5gxc,3057
 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=IX6Q28AvuYdZU_-9rG-tNKanp1F1kOeRQASAO_-oSsE,3074
 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
@@ -194,7 +194,7 @@ redisbench_admin/run/run.py,sha256=AwE4_qkejAXOcDVFmwHjVqYjqi1BFZKdGNrCKBHkAHI,6
 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=7aWnl_2ZMFreO5N1Sm_sm1JQJgzKfwECIrKn8eY6N0U,3006
 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
@@ -224,19 +224,19 @@ redisbench_admin/run_remote/run_remote.py,sha256=tZqCu1fTfB5gWooVIEsSDoaVfnVRfxe
 redisbench_admin/run_remote/standalone.py,sha256=OGau_7MpQihbn0U4qa0QmGZnwQ_gJhuxuWiQm9zpp7M,27970
 redisbench_admin/run_remote/terraform.py,sha256=vV3eWXNwj7vsnFNqUgCir5ueZS4VYopEyzWiTtoSq0Q,4018
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/utils/benchmark_config.py,sha256=bC2C6rnj89wkkSlOXyyfe0N15unn_M1t1zfskfVkb98,21387
+redisbench_admin/utils/benchmark_config.py,sha256=0r5YkBSvEardYkjGr7oANgFva1MixvQNOZaz9_KX-Io,21539
 redisbench_admin/utils/local.py,sha256=zUvyVI9LZMT3qyxs1pO3mXL6Bt_1z9EZUGppaRcWNRA,3890
 redisbench_admin/utils/redisearch.py,sha256=lchUEzpt0zB1rHwlDlw9LLifAnxFWcLP-PePw7TjL-0,1602
 redisbench_admin/utils/redisgraph_benchmark_go.py,sha256=os7EJt6kBxsFJLKkSoANbjMT7-cEq4-Ns-49alk2Tf8,2048
 redisbench_admin/utils/remote.py,sha256=RAQ2VxfmlK7swN7ujCuwSI2soGSycjnxbQw_IrLxIFE,42205
 redisbench_admin/utils/results.py,sha256=uKk3uNJ--bSXlUj_HGQ2OaV6MVqmXJVM8xTzFV6EOw4,3267
 redisbench_admin/utils/ssh.py,sha256=QW4AwlocMHJt05QMdN_4f8WeDmxiEwR80ny8VBThq6k,6533
-redisbench_admin/utils/utils.py,sha256=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6rTo,15085
+redisbench_admin/utils/utils.py,sha256=LPK835yatakrgdOXYiXhUiBrV4Sle7mrq2VIwrMsRZM,15829
 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.52.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.52.dist-info/METADATA,sha256=Dp8qszajJwGUM6Se9hf3HjcTbQ4AI6YLz0rZYqwFyVY,5596
-redisbench_admin-0.11.52.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.52.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.52.dist-info/RECORD,,
+redisbench_admin-0.11.54.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.54.dist-info/METADATA,sha256=4wbBYVIfuiR3cZ-D_FQ3bOdBOKgqcxhgUhjPqBaXKWM,5596
+redisbench_admin-0.11.54.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.54.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.54.dist-info/RECORD,,