redisbench-admin 0.10.28__py3-none-any.whl → 0.11.0__py3-none-any.whl

redisbench_admin/compare/compare.py

@@ -722,7 +722,6 @@ def from_rts_to_regression_table(
     total_comparison_points = 0
     noise_waterline = 3
     progress = tqdm(unit="benchmark time-series", total=len(test_names))
-    at_comparison = 0
     for test_name in test_names:
         multi_value_baseline = check_multi_value_filter(baseline_str)
         multi_value_comparison = check_multi_value_filter(comparison_str)

redisbench_admin/run/common.py

@@ -489,15 +489,30 @@ def extract_test_feasible_setups(
                         if setup_name == setup["name"]:
                             feasible_setups_map[setup_name] = setup
     if len(feasible_setups_map.keys()) == 0 and backwards_compatible:
-        feasible_setups_map["oss-standalone"] = {
-            "name": "oss-standalone",
-            "type": "oss-standalone",
+        setup_name = "oss-standalone"
+        setup_type = "oss-standalone"
+        OVERRIDE_SETUP_TYPE = os.getenv("OVERRIDE_SETUP_TYPE", None)
+        if OVERRIDE_SETUP_TYPE is not None:
+            logging.info(
+                f"Overriding SETUP_TYPE with {OVERRIDE_SETUP_TYPE} (original value was {setup_type})"
+            )
+            setup_type = OVERRIDE_SETUP_TYPE
+        OVERRIDE_SETUP_NAME = os.getenv("OVERRIDE_SETUP_NAME", None)
+        if OVERRIDE_SETUP_NAME is not None:
+            logging.info(
+                f"Overriding SETUP_NAME with {OVERRIDE_SETUP_NAME} (original value was {setup_name})"
+            )
+            setup_name = OVERRIDE_SETUP_NAME
+
+        feasible_setups_map[setup_name] = {
+            "name": setup_name,
+            "type": setup_type,
             "redis_topology": {"primaries": 1, "replicas": 0},
             "resources": {"requests": {"cpu": "1000m"}, "limits": {"cpu": "2000m"}},
         }
         logging.info(
             "Using a backwards compatible 'oss-standalone' setup, with settings: {}".format(
-                feasible_setups_map["oss-standalone"]
+                feasible_setups_map[setup_name]
             )
         )
 

redisbench_admin/run/run.py

@@ -30,6 +30,20 @@ def calculate_client_tool_duration_and_check(
     return benchmark_duration_seconds
 
 
+def merge_dicts(dict1, dict2):
+    result = dict1.copy()  # Start with dict1's keys and values
+    for key, value in dict2.items():
+        if key in result:
+            if isinstance(result[key], dict) and isinstance(value, dict):
+                # Recursively merge nested dictionaries
+                result[key] = merge_dicts(result[key], value)
+            # If it's not a dict, we keep the value from dict1 (result)
+        else:
+            result[key] = value
+    print(f"merging dict1 {dict1} with with dict2 {dict2}. final {result}")
+    return result
+
+
 def define_benchmark_plan(benchmark_definitions, default_specs):
     benchmark_runs_plan = {}
     for test_name, benchmark_config in benchmark_definitions.items():
@@ -80,6 +94,11 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
                     )
                 )
             else:
+                # add benchmark
+                if "dbconfig" in setup_settings:
+                    benchmark_config["dbconfig"] = merge_dicts(
+                        benchmark_config["dbconfig"], setup_settings["dbconfig"]
+                    )
                 benchmark_runs_plan[benchmark_type][dataset_name][setup_name][
                     "benchmarks"
                 ][test_name] = benchmark_config

redisbench_admin/run_local/run_local.py

@@ -65,9 +65,7 @@ from redisbench_admin.utils.benchmark_config import (
 from redisbench_admin.utils.local import (
     get_local_run_full_filename,
 )
-from redisbench_admin.utils.remote import (
-    extract_git_vars,
-)
+
 from redisbench_admin.utils.results import post_process_benchmark_results
 
 import threading

redisbench_admin/utils/benchmark_config.py

@@ -17,6 +17,8 @@ from redisbench_admin.utils.remote import (
     fetch_remote_id_from_config,
 )
 
+CONFIG_PARAMS_KEY = "module-configuration-parameters"
+
 
 def parse_exporter_metrics_definition(
     benchmark_config: dict, configkey: str = "redistimeseries"
@@ -226,6 +228,7 @@ def merge_default_and_specific_properties_dict_type(
 
 
 def extract_redis_dbconfig_parameters(benchmark_config, dbconfig_keyname):
+
     redis_configuration_parameters = {}
     modules_configuration_parameters_map = {}
     dataset_load_timeout_secs = 120
@@ -235,10 +238,8 @@ 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 "module-configuration-parameters" in k:
-                    modules_configuration_parameters_map = k[
-                        "module-configuration-parameters"
-                    ]
+                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:
@@ -249,10 +250,10 @@ def extract_redis_dbconfig_parameters(benchmark_config, dbconfig_keyname):
                 if "dataset_name" in k:
                     dataset_name = k["dataset_name"]
         if type(benchmark_config[dbconfig_keyname]) == dict:
-            if "module-configuration-parameters" in benchmark_config[dbconfig_keyname]:
+            if CONFIG_PARAMS_KEY in benchmark_config[dbconfig_keyname]:
                 modules_configuration_parameters_map = benchmark_config[
                     dbconfig_keyname
-                ]["module-configuration-parameters"]
+                ][CONFIG_PARAMS_KEY]
             if "configuration-parameters" in benchmark_config[dbconfig_keyname]:
                 cp = benchmark_config[dbconfig_keyname]["configuration-parameters"]
                 for k, v in cp.items():

redisbench_admin/utils/remote.py

@@ -638,6 +638,14 @@ def push_data_to_redistimeseries(rts, time_series_dict: dict, expire_msecs=0):
 
 def exporter_create_ts(rts, time_series, timeseries_name):
     updated_create = False
+    final_labels = {}
+    for label_name, value in time_series["labels"].items():
+        if value is not None:
+            final_labels[label_name] = value
+        else:
+            logging.warning(f"The label {label_name} value was None. skipping it...")
+
+    time_series["labels"] = final_labels
     try:
         if rts.exists(timeseries_name):
             updated_create = check_rts_labels(rts, time_series, timeseries_name)
@@ -647,11 +655,22 @@ def exporter_create_ts(rts, time_series, timeseries_name):
                     timeseries_name, time_series["labels"]
                 )
             )
+
             rts.ts().create(
                 timeseries_name, labels=time_series["labels"], chunk_size=128
             )
             updated_create = True
-
+    except redis.exceptions.DataError as e:
+        logging.error(
+            "While creating timeseries named {} with the following labels: {} this error ocurred: {}".format(
+                timeseries_name, time_series["labels"], e.__str__()
+            )
+        )
+        raise Exception(
+            "While creating timeseries named {} with the following labels: {} this error ocurred: {}".format(
+                timeseries_name, time_series["labels"], e.__str__()
+            )
+        )
     except redis.exceptions.ResponseError as e:
         if "already exists" in e.__str__():
             updated_create = check_rts_labels(rts, time_series, timeseries_name)

{redisbench_admin-0.10.28.dist-info → redisbench_admin-0.11.0.dist-info}/METADATA

@@ -1,14 +1,11 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.10.28
+Version: 0.11.0
 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
-Requires-Python: >=3.7.0,<4.0.0
+Requires-Python: >=3.10.0,<4.0.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: Flask (>=2.0.1,<3.0.0)
@@ -23,7 +20,8 @@ Requires-Dist: flask-restx (>=0.5.1,<0.6.0)
 Requires-Dist: humanize (>=2.4.0,<3.0.0)
 Requires-Dist: jsonpath_ng (>=1.5.2,<2.0.0)
 Requires-Dist: matplotlib (>=3.1.2,<4.0.0)
-Requires-Dist: pandas (>=1.0,<2.0)
+Requires-Dist: numpy (>=2.0.0,<3.0.0)
+Requires-Dist: pandas (>=2.1.2,<3.0.0)
 Requires-Dist: paramiko (>=2.7.2,<3.0.0)
 Requires-Dist: psutil (>=5.6.6,<6.0.0)
 Requires-Dist: pyWorkFlow (>=0.0.2,<0.0.3)
@@ -33,7 +31,7 @@ Requires-Dist: pysftp (>=0.2.9,<0.3.0)
 Requires-Dist: pytablewriter[html] (>=0.64.1,<0.65.0)
 Requires-Dist: python_terraform (>=0.10.1,<0.11.0)
 Requires-Dist: redis (>=4.2.2,<5.0.0)
-Requires-Dist: requests (>=2.23.0,<3.0.0)
+Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: slack-bolt (>=1.13.0,<2.0.0)
 Requires-Dist: slack-sdk (>=3.15.2,<4.0.0)
 Requires-Dist: sshtunnel (>=0.4.0,<0.5.0)

{redisbench_admin-0.10.28.dist-info → redisbench_admin-0.11.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ redisbench_admin/commands/__init__.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGK
 redisbench_admin/commands/commands.json.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/compare/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/compare/args.py,sha256=10zbiT8roeTGnAubvoVFZTbJNbVxuRaRPtCKjxV8iNE,5226
-redisbench_admin/compare/compare.py,sha256=-m6yor7d1z3Lv-kOf36G0qt0P9EyoiTqM-ZD0oEhLJ0,37747
+redisbench_admin/compare/compare.py,sha256=ANCm4kKCR8IBBoeBRgsPOOYW2s5qJV1QVIIPcY-WNUk,37725
 redisbench_admin/deploy/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/deploy/args.py,sha256=neLUcQqI__HkJItkQg2C293hl5g3yHG40t171r7-E5Y,1732
 redisbench_admin/deploy/deploy.py,sha256=c1srxDMaUHuyh6wGdgLqzTz3ljZFtGqiumtAmguVyuk,3791
@@ -176,7 +176,7 @@ 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=Sspv4eusQs9HMVMIyv_hB9vQ3S_s0lHYGAL1gPb2WGM,7864
 redisbench_admin/run/cluster.py,sha256=QuptSW-IhdyFIoQ3hzY613jtQWxBrVIlgc8OarcEK20,6072
-redisbench_admin/run/common.py,sha256=NbgPqEWDEe4S4LSEbM6tnjGunrTqCLYcwV-2mVJlY7Y,26054
+redisbench_admin/run/common.py,sha256=DnGRG4wC04pU2CK4mIWG8VX7JuYFEwAL3TZvPa-Lu8M,26707
 redisbench_admin/run/ftsb/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/ftsb/ftsb.py,sha256=plP-yxjMvvy-gITlXpuXJcyrPHfDoYYI8JRwTe5kK4M,2388
 redisbench_admin/run/git.py,sha256=6UYGcTN0MPzf4QDVoJnFkou0yZasLF6jLG7f0zoySq8,3064
@@ -190,7 +190,7 @@ 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=Yc8WcRS13EuASVBQAMkj_v8-Uks6HXebMsuPEWT0GVk,3462
+redisbench_admin/run/run.py,sha256=QmsabKX1tgoHvAUlhUWEsvfjHJaZGVU-LVW3SKAtk2M,4274
 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
@@ -209,7 +209,7 @@ redisbench_admin/run_local/args.py,sha256=VkIDvdTW-cRl-ncOkcK8-8MdCbq-qyipGQFugh
 redisbench_admin/run_local/local_client.py,sha256=gwawMDOBrf7m--uyxu8kMZC5LBiLjbUBSKvzVOdOAas,124
 redisbench_admin/run_local/local_db.py,sha256=Xh7xyZaSyhmRXKyMsbKqO9aLUikf-EXGha3K1h9yL2M,7396
 redisbench_admin/run_local/local_helpers.py,sha256=JyqLW2-Sbm35BXjxxfOB1yK7ADdLfcVrq08NLNdIwac,7026
-redisbench_admin/run_local/run_local.py,sha256=bbMVm-8d-UFidq1DzQw3I1XOeQItGMIsvvVFm3r-q8c,30937
+redisbench_admin/run_local/run_local.py,sha256=tueVqiqApQx2b0Dq6GJ84jr7WYRVKvJ7r2QCzlfY3aw,30870
 redisbench_admin/run_remote/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run_remote/args.py,sha256=vhV87avBwXL8c2QLqrAkIyWD53MYhN06F-3wRv3l5xE,3829
 redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhqpi4AL0RQ,386
@@ -224,19 +224,19 @@ redisbench_admin/run_remote/run_remote.py,sha256=3DD5vHz3CIP7Zk9OFRBlzNFjAo_ua-c
 redisbench_admin/run_remote/standalone.py,sha256=vWmm0CdFtrasy-_1BDKO7I_gVPBjjiypv94_Fq2Sm7o,6660
 redisbench_admin/run_remote/terraform.py,sha256=zD2gGuOmnTex6Dt2lhdAtNn21iL6sykPPXI10jJaim4,3945
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/utils/benchmark_config.py,sha256=bvhqKFENdDXpSZvF41EDUwMMhJJ4WQf7DS2BHn8hOz0,21291
+redisbench_admin/utils/benchmark_config.py,sha256=WDSCnfDQt753caZ-3pyXbpIaVcEoOi8NAb0FJ5rHH7k,21237
 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=sCGQxRdXsAlCBWDBDOGg0wg3buPfmsBpDVE7dibRxqg,38133
+redisbench_admin/utils/remote.py,sha256=fVcFRmJcqVtado_fae_Idq_QQRTtCixMlT-hdH3zsgE,38928
 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=FLDjhGkW0PWwcu_nlTnIW6aZtHzJGz4LIwvu1CpCajw,14160
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=jFGtm5ktjKuXKWvH7lnmf3pp-ch1WBJUOomXILJMDAg,6158
-redisbench_admin-0.10.28.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.10.28.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.10.28.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-redisbench_admin-0.10.28.dist-info/METADATA,sha256=A7x_oHH4TOD4DCFSppQ0Jmy6G03hnaUfoCsMaW6ZmX4,5336
-redisbench_admin-0.10.28.dist-info/RECORD,,
+redisbench_admin-0.11.0.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.0.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.0.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+redisbench_admin-0.11.0.dist-info/METADATA,sha256=0wjKQ0FTYoIMTVzJF2mYxOpiRY3GS144AHcSSYSb6f4,5228
+redisbench_admin-0.11.0.dist-info/RECORD,,