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

redisbench_admin/compare/compare.py

@@ -653,7 +653,7 @@ def get_by_strings(
         comparison_str = comparison_branch
 
     if baseline_tag is not None:
-        if comparison_covered:
+        if baseline_covered:
             logging.error(
                 "--baseline-branch and --baseline-tag are mutually exclusive. Pick one..."
             )
@@ -1043,9 +1043,9 @@ def get_v_pct_change_and_largest_var(
             if last_n < 0 or (last_n > 0 and len(comparison_values) < last_n):
                 comparison_values.append(tuple[1])
         comparison_df = pd.DataFrame(comparison_values)
-        comparison_median = float(comparison_df.median())
+        comparison_median = float(comparison_df.median().iloc[0])
         comparison_v = comparison_median
-        comparison_std = float(comparison_df.std())
+        comparison_std = float(comparison_df.std().iloc[0])
         if verbose:
             logging.info(
                 "comparison_datapoints: {} value: {}; std-dev: {}; median: {}".format(

redisbench_admin/run/common.py

@@ -484,6 +484,36 @@ def extract_test_feasible_setups(
         for setup_name in feasible_setups_list:
             if default_specs is not None:
                 feasible_setups_map[setup_name] = {}
+                #  spec:
+                #   setups:
+                #   - name: oss-standalone
+                #     type: oss-standalone
+                #     redis_topology:
+                #       primaries: 1
+                #       replicas: 1
+                #       placement: "sparse"
+                #     resources:
+                #       requests:
+                #         cpus: "2"
+                #         memory: "10g"
+                #   - name: oss-standalone-threads-6
+                #     type: oss-standalone
+                #     redis_topology:
+                #       primaries: 1
+                #       replicas: 1
+                #       placement: "sparse"
+                #     resources:
+                #       requests:
+                #         cpus: "2"
+                #         memory: "10g"
+                #     dbconfig:
+                #       module-configuration-parameters:
+                #         redisearch:
+                #           WORKERS: 6
+                #           MIN_OPERATION_WORKERS: 6
+                #         module-oss:
+                #           WORKERS: 6
+                #           MIN_OPERATION_WORKERS: 6
                 if "setups" in default_specs:
                     for setup in default_specs["setups"]:
                         if setup_name == setup["name"]:
@@ -515,7 +545,9 @@ def extract_test_feasible_setups(
                 feasible_setups_map[setup_name]
             )
         )
-
+    logging.info(
+        f"There a total of {len(feasible_setups_map.keys())} setups. Setups: {feasible_setups_map}"
+    )
     return feasible_setups_map
 
 

redisbench_admin/run/run.py

@@ -4,6 +4,7 @@
 #  All rights reserved.
 #
 import logging
+import copy
 
 from redisbench_admin.run.common import extract_test_feasible_setups
 from redisbench_admin.run_remote.consts import min_recommended_benchmark_duration
@@ -31,7 +32,7 @@ def calculate_client_tool_duration_and_check(
 
 
 def merge_dicts(dict1, dict2):
-    result = dict1.copy()  # Start with dict1's keys and values
+    result = copy.deepcopy(dict1)  # 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):
@@ -56,8 +57,15 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
             benchmark_runs_plan[benchmark_type] = {}
 
         # extract dataset-name
-        dbconfig_present, dataset_name, _, _, _ = extract_redis_dbconfig_parameters(
-            benchmark_config, "dbconfig"
+        (
+            benchmark_contains_dbconfig,
+            dataset_name,
+            _,
+            _,
+            _,
+        ) = extract_redis_dbconfig_parameters(benchmark_config, "dbconfig")
+        logging.info(
+            f"Benchmark contains specific dbconfig on test {test_name}: {benchmark_contains_dbconfig}"
         )
         if dataset_name is None:
             dataset_name = test_name
@@ -74,6 +82,14 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
         )
 
         for setup_name, setup_settings in test_setups.items():
+            test_benchmark_config = copy.deepcopy(benchmark_config)
+            setup_contains_dbconfig = False
+            if "dbconfig" in setup_settings:
+                setup_contains_dbconfig = True
+            logging.info(
+                f"setup ({setup_name}): {setup_settings}. contains dbconfig {setup_contains_dbconfig}"
+            )
+
             if setup_name not in benchmark_runs_plan[benchmark_type][dataset_name]:
                 benchmark_runs_plan[benchmark_type][dataset_name][setup_name] = {}
                 benchmark_runs_plan[benchmark_type][dataset_name][setup_name][
@@ -82,6 +98,7 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
                 benchmark_runs_plan[benchmark_type][dataset_name][setup_name][
                     "benchmarks"
                 ] = {}
+
             if (
                 test_name
                 in benchmark_runs_plan[benchmark_type][dataset_name][setup_name][
@@ -94,13 +111,25 @@ 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"]
+                # check if we need to merge dbconfigs from the setup defaults
+                if setup_contains_dbconfig:
+                    if "dbconfig" not in test_benchmark_config:
+                        test_benchmark_config["dbconfig"] = {}
+                    setup_dbconfig = setup_settings["dbconfig"]
+                    benchmark_dbconfig = test_benchmark_config["dbconfig"]
+                    logging.info(
+                        f"Merging setup dbconfig: {setup_dbconfig}, with benchmark dbconfig {test_benchmark_config}"
                     )
+                    final_db_config = merge_dicts(benchmark_dbconfig, setup_dbconfig)
+                    logging.info(f"FINAL DB CONFIG: {final_db_config}")
+                    test_benchmark_config["dbconfig"] = final_db_config
+
+                logging.info(
+                    f"final benchmark config for setup: {setup_name} and test: {test_name}. {test_benchmark_config}"
+                )
+                # add benchmark
                 benchmark_runs_plan[benchmark_type][dataset_name][setup_name][
                     "benchmarks"
-                ][test_name] = benchmark_config
+                ][test_name] = test_benchmark_config
 
     return benchmark_runs_plan

redisbench_admin/run_remote/run_remote.py

@@ -346,7 +346,10 @@ def run_remote_command_logic(args, project_name, project_version):
 
                 # map from setup name to overall target-tables ( if any target is defined )
                 overall_tables[setup_name] = {}
+                total_benchmarks = len(benchmarks_map.keys())
+                import tqdm
 
+                pbar = tqdm.tqdm(total=total_benchmarks, unit="benchmarks")
                 for test_name, benchmark_config in benchmarks_map.items():
                     if return_code != 0 and args.fail_fast:
                         logging.warning(
@@ -371,9 +374,7 @@ def run_remote_command_logic(args, project_name, project_version):
                             continue
                         remote_perf = None
                         logging.info(
-                            "Repetition {} of {}. Running test {}".format(
-                                repetition, BENCHMARK_REPETITIONS, test_name
-                            )
+                            f"Repetition {repetition} of {BENCHMARK_REPETITIONS}. Running test {test_name}. Total benchmarks {total_benchmarks}"
                         )
                         (
                             setup_name,
@@ -1092,6 +1093,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                     f"Test {test_name} does not have remote config. Skipping test."
                                 )
 
+                    pbar.update()
     if len(benchmark_artifacts_links) > 0:
         writer = MarkdownTableWriter(
             table_name=benchmark_artifacts_table_name,

redisbench_admin/run_remote/standalone.py

@@ -76,6 +76,7 @@ def remote_module_files_cp(
 ):
     remote_module_files = []
     if local_module_files is not None:
+        logging.info(f"local_module_files: {local_module_files}")
         for local_module_file in local_module_files:
             splitted_module_and_plugins = []
             if type(local_module_file) is str:
@@ -135,7 +136,10 @@ def remote_module_files_cp(
                 if pos > 1:
                     remote_module_files_in = remote_module_files_in + " "
                 remote_module_files_in = remote_module_files_in + remote_module_file
-        remote_module_files.append(remote_module_files_in)
+            logging.info(
+                f"appending to {remote_module_files} remote file {remote_module_files_in}"
+            )
+            remote_module_files.append(remote_module_files_in)
     logging.info(
         "There are a total of {} remote files {}".format(
             len(remote_module_files), remote_module_files

redisbench_admin/utils/benchmark_config.py

@@ -258,10 +258,12 @@ def extract_redis_dbconfig_parameters(benchmark_config, dbconfig_keyname):
                 cp = benchmark_config[dbconfig_keyname]["configuration-parameters"]
                 for k, v in cp.items():
                     redis_configuration_parameters[k] = v
-                if "dataset_load_timeout_secs" in cp:
-                    dataset_load_timeout_secs = cp["dataset_load_timeout_secs"]
-                if "dataset_name" in cp:
-                    dataset_name = cp["dataset_name"]
+            if "dataset_load_timeout_secs" in benchmark_config[dbconfig_keyname]:
+                dataset_load_timeout_secs = benchmark_config[dbconfig_keyname][
+                    "dataset_load_timeout_secs"
+                ]
+            if "dataset_name" in benchmark_config[dbconfig_keyname]:
+                dataset_name = benchmark_config[dbconfig_keyname]["dataset_name"]
 
     return (
         dbconfig_present,

redisbench_admin/utils/remote.py

@@ -544,11 +544,15 @@ def common_tf(branch, path, repo, temporary_dir=None, destroy=False):
         temporary_dir = tempfile.mkdtemp()
     if destroy is False:
         logging.info(
-            "Fetching infrastructure definition from git repo {}/{} (branch={}). Using local dir {} to store state".format(
+            "Fetching infrastructure definition from git repo {}{} (branch={}). Using local dir {} to store state".format(
                 repo, path, branch, temporary_dir
             )
         )
         git.Repo.clone_from(repo, temporary_dir, branch=branch, depth=1)
+        logging.info(f"ensuring folder exists: {temporary_dir}")
+        assert os.path.exists(temporary_dir) and os.path.isdir(
+            temporary_dir
+        ), f"Folder '{temporary_dir}' does not exist"
     terraform_working_dir = temporary_dir + path
     return terraform_working_dir
 
@@ -561,7 +565,7 @@ def check_remote_setup_spot_instance(
     contains_spot_instance = False
     for remote_setup_property in remote_setup_config:
         if "spot_instance" in remote_setup_property:
-            spot_path = "/terraform/" + remote_setup_property["spot_instance"]
+            spot_path = "terraform/" + remote_setup_property["spot_instance"]
             contains_spot_instance = True
             logging.info(f"Detected spot instance config. Setup path: {spot_path}")
 

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

@@ -1,20 +1,22 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.0
+Version: 0.11.3
 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.10.0,<4.0.0
+Requires-Python: >=3.9.0,<4.0.0
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: Flask (>=2.0.1,<3.0.0)
 Requires-Dist: Flask-HTTPAuth (>=4.4.0,<5.0.0)
 Requires-Dist: GitPython (>=3.1.12,<4.0.0)
 Requires-Dist: Jinja2 (>=3.0.3,<4.0.0)
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: boto3 (>=1.13.24,<2.0.0)
-Requires-Dist: certifi (>=2021.10.8,<2022.0.0)
+Requires-Dist: certifi (>=2021.10.8,<2025.0.0)
 Requires-Dist: daemonize (>=2.5.0,<3.0.0)
 Requires-Dist: flask-restx (>=0.5.1,<0.6.0)
 Requires-Dist: humanize (>=2.4.0,<3.0.0)
@@ -22,7 +24,7 @@ Requires-Dist: jsonpath_ng (>=1.5.2,<2.0.0)
 Requires-Dist: matplotlib (>=3.1.2,<4.0.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: paramiko (>=2.7.2,<4.0.0)
 Requires-Dist: psutil (>=5.6.6,<6.0.0)
 Requires-Dist: pyWorkFlow (>=0.0.2,<0.0.3)
 Requires-Dist: py_cpuinfo (>=5.0.0,<6.0.0)
@@ -156,6 +158,12 @@ To run a specific test:
 $ tox -- tests/test_redistimeseries.py
 ```
 
+To run a specific test with verbose logging:
+
+```sh
+# tox -- -vv --log-cli-level=INFO tests/test_run.py
+```
+
 ## License
 
 redisbench-admin is distributed under the BSD3 license - see [LICENSE](LICENSE)

{redisbench_admin-0.11.0.dist-info → redisbench_admin-0.11.3.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=ANCm4kKCR8IBBoeBRgsPOOYW2s5qJV1QVIIPcY-WNUk,37725
+redisbench_admin/compare/compare.py,sha256=iGf9zrtB3X0iEmVxd_lJZNUpDbH4w8bVH6N02ZZEyOU,37739
 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=DnGRG4wC04pU2CK4mIWG8VX7JuYFEwAL3TZvPa-Lu8M,26707
+redisbench_admin/run/common.py,sha256=MIuHUTpVX7G1JsO4TIfHraPQkxqOfMu04KvcJGBw-vI,28010
 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=QmsabKX1tgoHvAUlhUWEsvfjHJaZGVU-LVW3SKAtk2M,4274
+redisbench_admin/run/run.py,sha256=WIBc1q5198Ln3Elfgk6D1_ezuAKx5kM_xsxnxGe66-I,5586
 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
@@ -220,23 +220,23 @@ redisbench_admin/run_remote/remote_db.py,sha256=a1_fnLhsCGv_0HMBB91zscHTFcHwmab_
 redisbench_admin/run_remote/remote_env.py,sha256=fTZliXW7Cz0ztew7IR2BNlqLd_l4_p-5Oc6rX7T5EdI,4605
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
 redisbench_admin/run_remote/remote_helpers.py,sha256=gy10SuKheBiL568ldiOdJaHRPJ_J7DxH_uZpqgOuylo,9818
-redisbench_admin/run_remote/run_remote.py,sha256=3DD5vHz3CIP7Zk9OFRBlzNFjAo_ua-c-of7paaMxiIo,67436
-redisbench_admin/run_remote/standalone.py,sha256=vWmm0CdFtrasy-_1BDKO7I_gVPBjjiypv94_Fq2Sm7o,6660
+redisbench_admin/run_remote/run_remote.py,sha256=Y2EIiNzkktp_yu0CB3C8yjUXkbLBZSQ6RKGPJju7v0A,67599
+redisbench_admin/run_remote/standalone.py,sha256=jWL1yhkTYsSbXLzpqykFc2XE7t0uoGd-OU6C3MWvzL8,6861
 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=WDSCnfDQt753caZ-3pyXbpIaVcEoOi8NAb0FJ5rHH7k,21237
+redisbench_admin/utils/benchmark_config.py,sha256=bC2C6rnj89wkkSlOXyyfe0N15unn_M1t1zfskfVkb98,21387
 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=fVcFRmJcqVtado_fae_Idq_QQRTtCixMlT-hdH3zsgE,38928
+redisbench_admin/utils/remote.py,sha256=UH2F8cLoMKSXigpZpfNOqnWBVs2x3powmj0eiTSLhSg,39135
 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.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,,
+redisbench_admin-0.11.3.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.3.dist-info/METADATA,sha256=Bv2cCIczG0EyHajACJdt44hTX0Zfnj9ir6cP_fOB5nE,5437
+redisbench_admin-0.11.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.3.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.3.dist-info/RECORD,,

{redisbench_admin-0.11.0.dist-info → redisbench_admin-0.11.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.4.0
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any