redisbench-admin 0.11.52__tar.gz → 0.11.54__tar.gz

{redisbench_admin-0.11.52 → redisbench_admin-0.11.54}/PKG-INFO

@@ -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 → redisbench_admin-0.11.54}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.52"
+version = "0.11.54"
 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.52 → redisbench_admin-0.11.54}/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-0.11.52 → redisbench_admin-0.11.54}/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.52 → redisbench_admin-0.11.54}/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-0.11.52 → redisbench_admin-0.11.54}/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-0.11.52 → redisbench_admin-0.11.54}/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-0.11.52 → redisbench_admin-0.11.54}/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(