redisbench-admin 0.11.44__py3-none-any.whl → 0.11.46__py3-none-any.whl

redisbench_admin/run_remote/remote_db.py

@@ -118,6 +118,7 @@ def remote_db_spin(
 
     # Execute install_steps from dbconfig and clientconfig if present
     from redisbench_admin.run_remote.standalone import execute_install_steps
+
     if benchmark_config is not None:
         execute_install_steps(
             benchmark_config, server_public_ip, username, private_key, db_ssh_port

redisbench_admin/utils/benchmark_config.py

@@ -150,7 +150,9 @@ def get_defaults(defaults_filename):
     )
 
 
-def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_filename, default_dbconfig=None):
+def get_final_benchmark_config(
+    default_kpis, default_remote, stream, usecase_filename, default_dbconfig=None
+):
     result = False
     benchmark_config = None
     test_name = None
@@ -170,7 +172,7 @@ def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_fil
         # Merge dbconfig from defaults
         dbconfig_keyname = "dbconfig"
         if default_dbconfig is not None:
-            merge_default_and_specific_properties_dict_type(
+            merge_dbconfig_properties(
                 benchmark_config, default_dbconfig, dbconfig_keyname, usecase_filename
             )
         test_name = benchmark_config["name"]
@@ -186,6 +188,56 @@ def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_fil
     return result, benchmark_config, test_name
 
 
+def merge_dbconfig_properties(
+    benchmark_config, default_dbconfig, dbconfig_keyname, usecase_filename
+):
+    """
+    Merge dbconfig properties from defaults with benchmark-specific dbconfig.
+    Handles both list and dict formats for dbconfig sections.
+    """
+    if dbconfig_keyname not in benchmark_config:
+        # No local dbconfig, use defaults entirely
+        benchmark_config[dbconfig_keyname] = default_dbconfig
+        logging.info(
+            f"Using exclusively default '{dbconfig_keyname}' properties from {usecase_filename}"
+        )
+    else:
+        # Merge defaults with local dbconfig
+        local_dbconfig = benchmark_config[dbconfig_keyname]
+
+        # Convert both to list format for consistent merging
+        if isinstance(default_dbconfig, dict):
+            default_list = [default_dbconfig]
+        else:
+            default_list = default_dbconfig
+
+        if isinstance(local_dbconfig, dict):
+            local_list = [local_dbconfig]
+        else:
+            local_list = local_dbconfig
+
+        # Merge: defaults first, then local (local takes precedence for conflicts)
+        merged_list = []
+
+        # Add all default items
+        for item in default_list:
+            merged_list.append(item)
+
+        # Add local items
+        for item in local_list:
+            merged_list.append(item)
+
+        # Convert back to original format if local was dict
+        if isinstance(local_dbconfig, dict) and len(merged_list) == 1:
+            benchmark_config[dbconfig_keyname] = merged_list[0]
+        else:
+            benchmark_config[dbconfig_keyname] = merged_list
+
+        logging.info(
+            f"Merged default and local '{dbconfig_keyname}' properties for {usecase_filename}"
+        )
+
+
 def merge_default_and_specific_properties_dict_type(
     benchmark_config, default_properties, propertygroup_keyname, usecase_filename
 ):

{redisbench_admin-0.11.44.dist-info → redisbench_admin-0.11.46.dist-info}/METADATA

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

@@ -216,7 +216,7 @@ redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhq
 redisbench_admin/run_remote/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/run_remote/notifications.py,sha256=-W9fLaftEFNfplBl2clHk37jbYxliDbHftQ62khN31k,2157
 redisbench_admin/run_remote/remote_client.py,sha256=rRmDro1weto01wzqYpId8NMPoizEzSyudXBCjYrBVMs,14128
-redisbench_admin/run_remote/remote_db.py,sha256=atHs0QCoGKw2aJMNrYvFUSBW3789F6ZQWbTAgbzEgJc,15033
+redisbench_admin/run_remote/remote_db.py,sha256=LjN24dISrXdJeNovP4KZfC1Xi-prDMfYb7MiwZWrxOA,15034
 redisbench_admin/run_remote/remote_env.py,sha256=Ux_0QT1unNRlKl3cakzjG5Px1uuxOOfBoF_pnalx_T8,4936
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
 redisbench_admin/run_remote/remote_helpers.py,sha256=skWeGyDJBmyx_UwUekT3N3_nOJvF2-Hvu-E7vKlO9gg,10598
@@ -224,7 +224,7 @@ redisbench_admin/run_remote/run_remote.py,sha256=dAR2HRA6pl4jFdRM6YF1iAsLfuy1TZ8
 redisbench_admin/run_remote/standalone.py,sha256=NF8Az9ZJfdRk6aP5_t8MxraUkpGRU_OYae3w93NngiA,32885
 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=MLszNOBS_a1LWf9uge7ugAosE6Uej5lPRMBEqndvDmI,22123
+redisbench_admin/utils/benchmark_config.py,sha256=e1rvziZpI_8_vC4RKL5Rbwv1A4DKOXiv7xbFTrrAy88,23843
 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
@@ -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.44.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.44.dist-info/METADATA,sha256=jpLHzNuadbzVa7qFDcFA-bHUeRf5CBGDMiqCZKolHlw,5596
-redisbench_admin-0.11.44.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.44.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.44.dist-info/RECORD,,
+redisbench_admin-0.11.46.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.46.dist-info/METADATA,sha256=k4Y3_EPcMPHVDlqK7o7kcf4xE2P9H_gN_4CIkgkc0P4,5596
+redisbench_admin-0.11.46.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.46.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.46.dist-info/RECORD,,