redisbench-admin 0.11.49__py3-none-any.whl → 0.11.51__py3-none-any.whl

redisbench_admin/cli.py

@@ -36,15 +36,22 @@ LOG_FORMAT = "%(asctime)s %(levelname)-4s %(message)s"
 LOG_DATEFMT = "%Y-%m-%d %H:%M:%S"
 
 
-def populate_with_poetry_data():
+def populate_with_project_data():
     project_name = "redisbench-admin"
     project_version = __version__
     project_description = None
     try:
-        poetry_data = toml.load("pyproject.toml")["tool"]["poetry"]
-        project_name = poetry_data["name"]
-        project_version = poetry_data["version"]
-        project_description = poetry_data["description"]
+        pyproject_toml = toml.load("pyproject.toml")
+        if 'project' in pyproject_toml:
+            project_data = pyproject_toml["project"]
+            project_name = project_data["name"]
+            project_version = project_data["version"]
+            project_description = project_data.get("description")
+        else:
+            poetry_data = pyproject_toml["tool"]["poetry"]
+            project_name = poetry_data["name"]
+            project_version = poetry_data["version"]
+            project_description = poetry_data["description"]
     except FileNotFoundError:
         pass
 
@@ -59,7 +66,7 @@ def main():
         )
         sys.exit(1)
     requested_tool = sys.argv[1]
-    project_name, project_description, project_version = populate_with_poetry_data()
+    project_name, project_description, project_version = populate_with_project_data()
     parser = argparse.ArgumentParser(
         description=project_description,
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,

redisbench_admin/export/export.py

@@ -76,7 +76,6 @@ def export_command_logic(args, project_name, project_version):
                 exporter_timemetric_path,
                 _,
                 _,
-                _,
             ) = get_defaults(exporter_spec_file)
     arch = args.architecture
     logging.info("Using the following architecture on the timeseries: {}".format(arch))

redisbench_admin/profilers/daemon.py

@@ -16,7 +16,7 @@ import botocore
 import daemonize
 from flask import Flask, request
 
-from redisbench_admin.cli import populate_with_poetry_data
+from redisbench_admin.cli import populate_with_project_data
 from redisbench_admin.profilers.perf import Perf
 from redisbench_admin.profilers.perf_daemon_caller import PERF_DAEMON_LOGNAME
 from redisbench_admin.profilers.profilers_local import local_profilers_platform_checks
@@ -282,7 +282,7 @@ class PerfDaemon:
 
 
 def main():
-    _, project_description, project_version = populate_with_poetry_data()
+    _, project_description, project_version = populate_with_project_data()
     project_name = "perf-daemon"
     parser = argparse.ArgumentParser(
         description=project_description,

redisbench_admin/run/modules.py

@@ -48,82 +48,3 @@ def exists_check(error_message, local_module_file, status):
             "Confirmed that module artifact: '{}' exists!".format(local_module_file)
         )
     return error_message, status
-
-
-def redis_files_check(redis_server_binary_path, redis_conf_path):
-    """
-    Check if custom Redis server binary and config file paths exist.
-
-    Args:
-        redis_server_binary_path: Path to custom redis-server binary (can be None)
-        redis_conf_path: Path to custom redis.conf file (can be None)
-
-    Returns:
-        tuple: (status, error_message) where status is True if all files exist
-    """
-    status = True
-    error_message = ""
-
-    if redis_server_binary_path is not None:
-        # Convert relative paths to absolute paths
-        redis_server_binary_path = os.path.abspath(os.path.expanduser(redis_server_binary_path))
-        logging.info(
-            "Checking if custom Redis server binary {} exists...".format(redis_server_binary_path)
-        )
-        if not os.path.exists(redis_server_binary_path):
-            error_message = "Specified Redis server binary does not exist: {}".format(
-                redis_server_binary_path
-            )
-            logging.error(error_message)
-            status = False
-        elif not os.path.isfile(redis_server_binary_path):
-            error_message = "Specified Redis server binary path is not a file: {}".format(
-                redis_server_binary_path
-            )
-            logging.error(error_message)
-            status = False
-        elif not os.access(redis_server_binary_path, os.X_OK):
-            error_message = "Specified Redis server binary is not executable: {}".format(
-                redis_server_binary_path
-            )
-            logging.error(error_message)
-            status = False
-        else:
-            logging.info(
-                "✅ Confirmed that Redis server binary: '{}' exists and is executable!".format(
-                    redis_server_binary_path
-                )
-            )
-
-    if redis_conf_path is not None:
-        # Convert relative paths to absolute paths
-        redis_conf_path = os.path.abspath(os.path.expanduser(redis_conf_path))
-        logging.info(
-            "Checking if custom Redis config file {} exists...".format(redis_conf_path)
-        )
-        if not os.path.exists(redis_conf_path):
-            error_message = "Specified Redis config file does not exist: {}".format(
-                redis_conf_path
-            )
-            logging.error(error_message)
-            status = False
-        elif not os.path.isfile(redis_conf_path):
-            error_message = "Specified Redis config file path is not a file: {}".format(
-                redis_conf_path
-            )
-            logging.error(error_message)
-            status = False
-        elif not os.access(redis_conf_path, os.R_OK):
-            error_message = "Specified Redis config file is not readable: {}".format(
-                redis_conf_path
-            )
-            logging.error(error_message)
-            status = False
-        else:
-            logging.info(
-                "✅ Confirmed that Redis config file: '{}' exists and is readable!".format(
-                    redis_conf_path
-                )
-            )
-
-    return status, error_message

redisbench_admin/run_async/benchmark.py

@@ -41,7 +41,6 @@ class BenchmarkClass:
             self.exporter_timemetric_path,
             self.default_specs,
             self.clusterconfig,
-            _,
         ) = prepare_benchmark_definitions(args)
 
     def populate_remote_envs_timeout(self):

redisbench_admin/run_local/run_local.py

@@ -149,7 +149,6 @@ def run_local_command_logic(args, project_name, project_version):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
-        _,
     ) = prepare_benchmark_definitions(args)
 
     return_code = 0

redisbench_admin/run_remote/args.py

@@ -148,7 +148,7 @@ def create_run_remote_arguments(parser):
         "--spin-test",
         default=False,
         action="store_true",
-        help="Setup standalone Redis server, run INFO SERVER, print output as markdown and exit (reads install_steps from defaults.yml)",
+        help="Setup standalone Redis server, run INFO SERVER, print output as markdown and exit",
     )
 
     return parser

redisbench_admin/run_remote/remote_db.py

@@ -105,8 +105,6 @@ def remote_db_spin(
     continue_on_module_check_error=False,
     keyspace_check_timeout=60,
     architecture="x86_64",
-    custom_redis_server_path=None,
-    custom_redis_conf_path=None,
 ):
     (
         _,
@@ -116,116 +114,6 @@ def remote_db_spin(
         modules_configuration_parameters_map,
     ) = extract_redis_dbconfig_parameters(benchmark_config, "dbconfig")
 
-    # 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
-        )
-
-    # Copy custom Redis files to remote host if provided
-    remote_redis_server_path = None
-    remote_redis_conf_path = None
-
-    if custom_redis_server_path or custom_redis_conf_path:
-        from redisbench_admin.utils.remote import copy_file_to_remote_setup
-        import os
-
-        if custom_redis_conf_path:
-            # Convert relative paths to absolute paths
-            custom_redis_conf_path = os.path.abspath(
-                os.path.expanduser(custom_redis_conf_path)
-            )
-
-            if not os.path.exists(custom_redis_conf_path):
-                logging.error(
-                    f"❌ Custom redis.conf file not found: {custom_redis_conf_path}"
-                )
-                return_code = 1
-                return (None, None, None, [], [], return_code, None, None)
-
-            remote_redis_conf_path = "/tmp/redis.conf"
-            logging.info(
-                f"📁 Copying custom redis.conf from {custom_redis_conf_path} to {remote_redis_conf_path}"
-            )
-
-            copy_result = copy_file_to_remote_setup(
-                server_public_ip,
-                username,
-                private_key,
-                custom_redis_conf_path,
-                remote_redis_conf_path,
-                None,
-                db_ssh_port,
-                False,  # don't continue on error
-            )
-
-            if not copy_result:
-                logging.error("❌ Failed to copy redis.conf to remote host")
-                return_code = 1
-                return (None, None, None, [], [], return_code, None, None)
-            else:
-                logging.info(
-                    f"✅ Successfully copied redis.conf to {remote_redis_conf_path}"
-                )
-
-        if custom_redis_server_path:
-            # Convert relative paths to absolute paths
-            custom_redis_server_path = os.path.abspath(
-                os.path.expanduser(custom_redis_server_path)
-            )
-
-            if not os.path.exists(custom_redis_server_path):
-                logging.error(
-                    f"❌ Custom redis-server binary not found: {custom_redis_server_path}"
-                )
-                return_code = 1
-                return (None, None, None, [], [], return_code, None, None)
-
-            remote_redis_server_path = "/tmp/redis-server"
-            logging.info(
-                f"📁 Copying custom redis-server binary from {custom_redis_server_path} to {remote_redis_server_path}"
-            )
-
-            copy_result = copy_file_to_remote_setup(
-                server_public_ip,
-                username,
-                private_key,
-                custom_redis_server_path,
-                remote_redis_server_path,
-                None,
-                db_ssh_port,
-                False,  # don't continue on error
-            )
-
-            if not copy_result:
-                logging.error("❌ Failed to copy redis-server binary to remote host")
-                return_code = 1
-                return (None, None, None, [], [], return_code, None, None)
-
-            # Make the binary executable
-            chmod_commands = [f"chmod +x {remote_redis_server_path}"]
-            chmod_results = execute_remote_commands(
-                server_public_ip, username, private_key, chmod_commands, db_ssh_port
-            )
-
-            recv_exit_status, stdout, stderr = chmod_results[0]
-            if recv_exit_status != 0:
-                logging.warning(
-                    f"⚠️ Failed to make redis-server binary executable: {stderr}"
-                )
-            else:
-                logging.info(
-                    f"✅ Successfully copied and made executable: {remote_redis_server_path}"
-                )
-
-    # Update the custom paths to use the remote paths
-    if remote_redis_server_path:
-        custom_redis_server_path = remote_redis_server_path
-    if remote_redis_conf_path:
-        custom_redis_conf_path = remote_redis_conf_path
-
     full_logfiles = []
     cluster_enabled = False
     if setup_type == "oss-cluster":
@@ -319,8 +207,6 @@ def remote_db_spin(
                     db_ssh_port,
                     modules_configuration_parameters_map,
                     redis_7,
-                    custom_redis_server_path,
-                    custom_redis_conf_path,
                 )
                 full_logfiles.append(full_logfile)
             local_redis_conn, ssh_tunnel = ssh_tunnel_redisconn(

redisbench_admin/run_remote/run_remote.py

@@ -4,7 +4,6 @@
 #  All rights reserved.
 #
 import logging
-import os
 import random
 import string
 import sys
@@ -35,7 +34,7 @@ from redisbench_admin.run.common import (
 )
 from redisbench_admin.run.git import git_vars_crosscheck
 from redisbench_admin.run.grafana import generate_artifacts_table_grafana_redis
-from redisbench_admin.run.modules import redis_modules_check, redis_files_check
+from redisbench_admin.run.modules import redis_modules_check
 from redisbench_admin.run.redistimeseries import (
     timeseries_test_sucess_flow,
     timeseries_test_failure_flow,
@@ -229,25 +228,6 @@ def run_remote_command_logic(args, project_name, project_version):
                 )
             )
 
-    # Validate Redis server binary and config file paths early
-    redis_files_check_status, redis_error_message = redis_files_check(
-        args.redis_server_binary, args.redis_conf
-    )
-    if redis_files_check_status is False:
-        if webhook_notifications_active:
-            failure_reason = redis_error_message
-            generate_failure_notification(
-                webhook_client_slack,
-                ci_job_name,
-                ci_job_link,
-                failure_reason,
-                tf_github_org,
-                tf_github_repo,
-                tf_github_branch,
-                None,
-            )
-        exit(1)
-
     common_properties_log(
         tf_bin_path,
         tf_github_actor,
@@ -290,31 +270,6 @@ def run_remote_command_logic(args, project_name, project_version):
             logging.error("❌ --spin-test requires server_public_ip in --inventory")
             exit(1)
 
-        # Load benchmark config from defaults.yml
-        benchmark_config = None
-
-        # Try to load defaults.yml
-        defaults_file = (
-            args.defaults_filename
-            if hasattr(args, "defaults_filename")
-            else "defaults.yml"
-        )
-        if os.path.exists(defaults_file):
-            try:
-                import yaml
-
-                with open(defaults_file, "r") as config_file:
-                    defaults_config = yaml.safe_load(config_file)
-                    if defaults_config:
-                        benchmark_config = defaults_config
-                        logging.info(f"📋 Loaded configuration from {defaults_file}")
-            except Exception as e:
-                logging.warning(f"⚠️ Failed to load defaults config: {e}")
-        else:
-            logging.info(
-                f"📋 No {defaults_file} found - proceeding without install_steps"
-            )
-
         # Run spin test
         success = spin_test_standalone_redis(
             server_public_ip=server_public_ip,
@@ -327,7 +282,6 @@ def run_remote_command_logic(args, project_name, project_version):
             modules_configuration_parameters_map=None,
             custom_redis_conf_path=args.redis_conf,
             custom_redis_server_path=args.redis_server_binary,
-            benchmark_config=benchmark_config,
         )
 
         exit(0 if success else 1)
@@ -339,7 +293,6 @@ def run_remote_command_logic(args, project_name, project_version):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
-        _,
     ) = prepare_benchmark_definitions(args)
 
     return_code = 0
@@ -685,8 +638,6 @@ def run_remote_command_logic(args, project_name, project_version):
                                             continue_on_module_check_error,
                                             60,
                                             architecture,
-                                            args.redis_server_binary,
-                                            args.redis_conf,
                                         )
                                         if benchmark_type == "read-only":
                                             ro_benchmark_set(

redisbench_admin/run_remote/standalone.py

@@ -13,6 +13,7 @@ from redisbench_admin.utils.remote import (
 )
 from redisbench_admin.utils.ssh import SSHSession
 from redisbench_admin.utils.utils import redis_server_config_module_part
+import tempfile
 
 
 def ensure_redis_server_available(server_public_ip, username, private_key, port=22):
@@ -276,22 +277,9 @@ def spin_up_standalone_remote_redis(
     port=22,
     modules_configuration_parameters_map={},
     redis_7=True,
-    custom_redis_server_path=None,
-    custom_redis_conf_path=None,
 ):
-    # Ensure redis-server is available before trying to start it (only if not using custom binary)
-    if custom_redis_server_path is None:
-        ensure_redis_server_available(server_public_ip, username, private_key, port)
-    else:
-        logging.info(
-            "🔧 Using custom Redis binary - skipping system Redis installation"
-        )
-
-    # Log what paths we're using
-    logging.info("🔧 Redis command generation:")
-    logging.info(f"   - Custom server path: {custom_redis_server_path}")
-    logging.info(f"   - Custom config path: {custom_redis_conf_path}")
-    logging.info(f"   - Module files: {remote_module_files}")
+    # Ensure redis-server is available before trying to start it
+    ensure_redis_server_available(server_public_ip, username, private_key, port)
 
     full_logfile, initial_redis_cmd = generate_remote_standalone_redis_cmd(
         logfile,
@@ -300,8 +288,6 @@ def spin_up_standalone_remote_redis(
         temporary_dir,
         modules_configuration_parameters_map,
         redis_7,
-        custom_redis_server_path=custom_redis_server_path,
-        custom_redis_conf_path=custom_redis_conf_path,
     )
 
     # start redis-server
@@ -471,86 +457,6 @@ def generate_remote_standalone_redis_cmd(
     return full_logfile, initial_redis_cmd
 
 
-def execute_install_steps(
-    benchmark_config, server_public_ip, username, private_key, db_ssh_port
-):
-    """
-    Execute install_steps from dbconfig and clientconfig sections.
-
-    Args:
-        benchmark_config: The benchmark configuration dictionary
-        server_public_ip: IP address of the remote server
-        username: SSH username
-        private_key: Path to SSH private key
-        db_ssh_port: SSH port
-    """
-    install_commands = []
-
-    # Extract install_steps from dbconfig
-    if "dbconfig" in benchmark_config:
-        dbconfig = benchmark_config["dbconfig"]
-        if isinstance(dbconfig, list):
-            for config_item in dbconfig:
-                if "install_steps" in config_item:
-                    steps = config_item["install_steps"]
-                    if isinstance(steps, list):
-                        install_commands.extend(steps)
-                        logging.info(f"📦 Found {len(steps)} install steps in dbconfig")
-        elif isinstance(dbconfig, dict):
-            if "install_steps" in dbconfig:
-                steps = dbconfig["install_steps"]
-                if isinstance(steps, list):
-                    install_commands.extend(steps)
-                    logging.info(f"📦 Found {len(steps)} install steps in dbconfig")
-
-    # Extract install_steps from clientconfig
-    if "clientconfig" in benchmark_config:
-        clientconfig = benchmark_config["clientconfig"]
-        if isinstance(clientconfig, list):
-            for config_item in clientconfig:
-                if "install_steps" in config_item:
-                    steps = config_item["install_steps"]
-                    if isinstance(steps, list):
-                        install_commands.extend(steps)
-                        logging.info(
-                            f"📦 Found {len(steps)} install steps in clientconfig"
-                        )
-        elif isinstance(clientconfig, dict):
-            if "install_steps" in clientconfig:
-                steps = clientconfig["install_steps"]
-                if isinstance(steps, list):
-                    install_commands.extend(steps)
-                    logging.info(f"📦 Found {len(steps)} install steps in clientconfig")
-
-    # Execute all install commands
-    if install_commands:
-        logging.info(f"🔧 Executing {len(install_commands)} installation commands...")
-        for i, command in enumerate(install_commands, 1):
-            logging.info(f"📋 Step {i}/{len(install_commands)}: {command}")
-
-        install_result = execute_remote_commands(
-            server_public_ip, username, private_key, install_commands, db_ssh_port
-        )
-
-        # Check results
-        for i, (recv_exit_status, stdout, stderr) in enumerate(install_result):
-            if recv_exit_status != 0:
-                logging.warning(
-                    f"⚠️ Install step {i+1} returned exit code {recv_exit_status}"
-                )
-                logging.warning(f"Command: {install_commands[i]}")
-                if stderr:
-                    logging.warning(f"STDERR: {''.join(stderr).strip()}")
-                if stdout:
-                    logging.warning(f"STDOUT: {''.join(stdout).strip()}")
-            else:
-                logging.info(f"✅ Install step {i+1} completed successfully")
-
-        logging.info("🎯 All installation steps completed")
-    else:
-        logging.info("📦 No install_steps found in configuration")
-
-
 def spin_test_standalone_redis(
     server_public_ip,
     username,
@@ -562,7 +468,6 @@ def spin_test_standalone_redis(
     modules_configuration_parameters_map=None,
     custom_redis_conf_path=None,
     custom_redis_server_path=None,
-    benchmark_config=None,
 ):
     """
     Setup standalone Redis server, run INFO SERVER, print output as markdown and exit.
@@ -589,12 +494,6 @@ def spin_test_standalone_redis(
             server_public_ip, username, private_key, create_dir_commands, db_ssh_port
         )
 
-        # Execute install_steps from dbconfig and clientconfig if present
-        if benchmark_config is not None:
-            execute_install_steps(
-                benchmark_config, server_public_ip, username, private_key, db_ssh_port
-            )
-
         # Ensure Redis server is available (only if not using custom binary)
         if custom_redis_server_path is None:
             ensure_redis_server_available(
@@ -610,21 +509,14 @@ def spin_test_standalone_redis(
         remote_redis_server_path = None
 
         if custom_redis_conf_path:
-            # Convert relative paths to absolute paths
-            custom_redis_conf_path = os.path.abspath(
-                os.path.expanduser(custom_redis_conf_path)
-            )
-
             if not os.path.exists(custom_redis_conf_path):
                 logging.error(
                     f"❌ Custom redis.conf file not found: {custom_redis_conf_path}"
                 )
                 return False
 
-            remote_redis_conf_path = "/tmp/redis.conf"
-            logging.info(
-                f"📁 Copying custom redis.conf from {custom_redis_conf_path} to {remote_redis_conf_path}"
-            )
+            remote_redis_conf_path = f"{temporary_dir}/redis.conf"
+            logging.info(f"📁 Copying custom redis.conf to remote host...")
 
             copy_result = copy_file_to_remote_setup(
                 server_public_ip,
@@ -640,27 +532,16 @@ def spin_test_standalone_redis(
             if not copy_result:
                 logging.error("❌ Failed to copy redis.conf to remote host")
                 return False
-            else:
-                logging.info(
-                    f"✅ Successfully copied redis.conf to {remote_redis_conf_path}"
-                )
 
         if custom_redis_server_path:
-            # Convert relative paths to absolute paths
-            custom_redis_server_path = os.path.abspath(
-                os.path.expanduser(custom_redis_server_path)
-            )
-
             if not os.path.exists(custom_redis_server_path):
                 logging.error(
                     f"❌ Custom redis-server binary not found: {custom_redis_server_path}"
                 )
                 return False
 
-            remote_redis_server_path = "/tmp/redis-server"
-            logging.info(
-                f"📁 Copying custom redis-server binary from {custom_redis_server_path} to {remote_redis_server_path}"
-            )
+            remote_redis_server_path = f"{temporary_dir}/redis-server"
+            logging.info(f"📁 Copying custom redis-server binary to remote host...")
 
             copy_result = copy_file_to_remote_setup(
                 server_public_ip,
@@ -689,9 +570,7 @@ def spin_test_standalone_redis(
                     f"⚠️ Failed to make redis-server binary executable: {stderr}"
                 )
             else:
-                logging.info(
-                    f"✅ Successfully copied and made executable: {remote_redis_server_path}"
-                )
+                logging.info("✅ Redis-server binary made executable")
 
         # Copy modules if provided
         remote_module_files = None
@@ -718,14 +597,7 @@ def spin_test_standalone_redis(
 
         # Generate Redis startup command
         logfile = "redis-spin-test.log"
-
-        # Log what paths we're using
-        logging.info("🔧 Redis command generation:")
-        logging.info(f"   - Custom server path: {remote_redis_server_path}")
-        logging.info(f"   - Custom config path: {remote_redis_conf_path}")
-        logging.info(f"   - Module files: {remote_module_files}")
-
-        _, redis_cmd = generate_remote_standalone_redis_cmd(
+        full_logfile, redis_cmd = generate_remote_standalone_redis_cmd(
             logfile,
             redis_configuration_parameters,
             remote_module_files,
@@ -817,8 +689,8 @@ def spin_test_standalone_redis(
             "Disk Space",
         ]
 
-        for label, (recv_exit_status, stdout, stderr) in zip(
-            system_labels, system_results
+        for i, (label, (recv_exit_status, stdout, stderr)) in enumerate(
+            zip(system_labels, system_results)
         ):
             if recv_exit_status == 0 and stdout:
                 output = "".join(stdout).strip()

redisbench_admin/utils/benchmark_config.py

@@ -75,12 +75,11 @@ def prepare_benchmark_definitions(args):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
-        default_dbconfig,
     ) = get_defaults(defaults_filename)
     for usecase_filename in files:
         with open(usecase_filename, "r", encoding="utf8") as stream:
             test_result, benchmark_config, test_name = get_final_benchmark_config(
-                default_kpis, default_remote, stream, usecase_filename, default_dbconfig
+                default_kpis, default_remote, stream, usecase_filename
             )
             result &= test_result
             if test_result:
@@ -92,7 +91,6 @@ def prepare_benchmark_definitions(args):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
-        default_dbconfig,
     )
 
 
@@ -118,7 +116,6 @@ def get_defaults(defaults_filename):
     default_remote = None
     default_specs = None
     cluster_config = None
-    default_dbconfig = None
     if os.path.exists(defaults_filename):
         with open(defaults_filename, "r") as stream:
             logging.info(
@@ -131,7 +128,6 @@ def get_defaults(defaults_filename):
                 exporter_timemetric_path,
                 default_specs,
                 cluster_config,
-                default_dbconfig,
             ) = process_default_yaml_properties_file(
                 default_kpis,
                 default_remote,
@@ -147,13 +143,10 @@ def get_defaults(defaults_filename):
         exporter_timemetric_path,
         default_specs,
         cluster_config,
-        default_dbconfig,
     )
 
 
-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):
     result = False
     benchmark_config = None
     test_name = None
@@ -170,12 +163,6 @@ def get_final_benchmark_config(
             merge_default_and_specific_properties_dict_type(
                 benchmark_config, default_remote, kpis_keyname, usecase_filename
             )
-        # Merge dbconfig from defaults
-        dbconfig_keyname = "dbconfig"
-        if default_dbconfig is not None:
-            merge_dbconfig_properties(
-                benchmark_config, default_dbconfig, dbconfig_keyname, usecase_filename
-            )
         test_name = benchmark_config["name"]
         result = True
     except Exception as e:
@@ -189,56 +176,6 @@ def get_final_benchmark_config(
     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
 ):
@@ -348,7 +285,6 @@ def process_default_yaml_properties_file(
     default_config = yaml.safe_load(stream)
     default_specs = None
     cluster_config = None
-    default_dbconfig = None
     default_metrics, exporter_timemetric_path = extract_exporter_metrics(default_config)
     if "remote" in default_config:
         logging.info(
@@ -364,13 +300,6 @@ def process_default_yaml_properties_file(
             )
         )
         default_kpis = default_config["kpis"]
-    if "dbconfig" in default_config:
-        logging.info(
-            "Loading default DBCONFIG specifications from file: {}".format(
-                defaults_filename
-            )
-        )
-        default_dbconfig = default_config["dbconfig"]
     if "spec" in default_config:
         logging.info(
             "Loading default setup SPECs from file: {}".format(defaults_filename)
@@ -390,7 +319,6 @@ def process_default_yaml_properties_file(
         exporter_timemetric_path,
         default_specs,
         cluster_config,
-        default_dbconfig,
     )
 
 

redisbench_admin/utils/remote.py

@@ -57,46 +57,8 @@ def get_git_root(path):
 
 def view_bar_simple(a, b):
     res = a / int(b) * 100
-    # Only update progress every 5% to reduce output frequency
-    if not hasattr(view_bar_simple, "last_percent"):
-        view_bar_simple.last_percent = 0
-
-    if res - view_bar_simple.last_percent >= 5.0 or res >= 100.0:
-        sys.stdout.write("\r    Complete percent: %.2f %%" % res)
-        sys.stdout.flush()
-        view_bar_simple.last_percent = res
-
-
-class ProgressCallback:
-    """A more configurable progress callback for file transfers"""
-
-    def __init__(self, update_threshold=5.0, show_bytes=False):
-        """
-        Args:
-            update_threshold: Minimum percentage change before showing update (default: 5.0%)
-            show_bytes: Whether to show bytes transferred (default: False)
-        """
-        self.last_percent = 0
-        self.update_threshold = update_threshold
-        self.show_bytes = show_bytes
-
-    def __call__(self, transferred, total):
-        percent = (transferred / total) * 100
-
-        if (
-            percent - self.last_percent >= self.update_threshold
-            or percent >= 100.0
-            or self.last_percent == 0
-        ):
-
-            if self.show_bytes:
-                sys.stdout.write(
-                    f"\r    Progress: {percent:.1f}% ({transferred}/{total} bytes)"
-                )
-            else:
-                sys.stdout.write(f"\r    Complete percent: {percent:.2f}%%")
-            sys.stdout.flush()
-            self.last_percent = percent
+    sys.stdout.write("\r    Complete percent: %.2f %%" % res)
+    sys.stdout.flush()
 
 
 def copy_file_to_remote_setup(

{redisbench_admin-0.11.49.dist-info → redisbench_admin-0.11.51.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 redisbench_admin/__init__.py,sha256=kLgzVDw4-frGXtbJH_WKiwWcXaUZYisYBKYYOeSJWvU,473
-redisbench_admin/cli.py,sha256=LAS5qnqScXKhxHYfXWB0mvAYaUYrSurIwadhexEa9g4,7740
+redisbench_admin/cli.py,sha256=nJjxJVw9vdK6sHmY_0WsBaMx_zyvfKMWHb1-QItVJkY,8073
 redisbench_admin/commands/__init__.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/commands/commands.json.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/compare/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -15,7 +15,7 @@ redisbench_admin/export/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8z
 redisbench_admin/export/args.py,sha256=v_WjJCNz_LeIFMNwSN6XwRmvSx1K2ys8XS1gK50EM_4,3508
 redisbench_admin/export/common/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/export/common/common.py,sha256=LnvXjMLlJRzMTxiFIjrfRFfDx9JJm88OZHu7lnTOpFA,4331
-redisbench_admin/export/export.py,sha256=E_suYdkQopVn6HGYMUGl0OvzKlaWcQbemFzdFxSwKy4,11293
+redisbench_admin/export/export.py,sha256=u00NjaCbWhCJ319leVlP4ZkqiqZt5FN4Gbag4Poo23M,11274
 redisbench_admin/export/google_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/export/google_benchmark/google_benchmark_json_format.py,sha256=OuMaMmmma5VvXA0rcLIQSMxIq81oa5I3xYDFhbWj-IA,1804
 redisbench_admin/export/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -33,7 +33,7 @@ redisbench_admin/grafana_api/app.py,sha256=F4bw7ToO9bHB6mj6y9EhiTBxSNzFBHJfWJT7A
 redisbench_admin/grafana_api/args.py,sha256=7chFoUcTASHsSYLgzGWH6VEP_gtdnvK3AgLC_sR4D6o,1212
 redisbench_admin/grafana_api/grafana_api.py,sha256=dG17GCYmWRILmy7h3-OiBeGzuNGnRGUv-jqR-7MRiws,1613
 redisbench_admin/profilers/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/profilers/daemon.py,sha256=Y4ZbbH-cRHJk9cvpsb60UZFq_HVHWXtatb7T2vtlRKo,12973
+redisbench_admin/profilers/daemon.py,sha256=xm1P5c0Lv91kllT4DRLDJH4azGuPHtnpgNeGjC6ecpc,12975
 redisbench_admin/profilers/flamegraph.pl,sha256=Za5XE-1gb_U-nzqwoyRwfe1TB182c64gITa-2klWTTA,35898
 redisbench_admin/profilers/perf.py,sha256=HtzzMVsXEJa1H7tOAfKlbFYDn2KnxAG_IU9yKPKZB7w,27772
 redisbench_admin/profilers/perf_daemon_caller.py,sha256=nD97cXmX3JytyafvNMmhUBq40uYrf6vtjdJ1TXZbvVY,4948
@@ -184,7 +184,7 @@ redisbench_admin/run/grafana.py,sha256=iMDgMyJKinpZMTD43rZ1IcRGkadjFjCxaB48mYWkv
 redisbench_admin/run/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/memtier_benchmark/memtier_benchmark.py,sha256=wTd2olovvFBZ98mOSr6DM5BJsdaiuPteEZzBqeSgbkE,4246
 redisbench_admin/run/metrics.py,sha256=8EQdcZbCiFB_kIR1WtUQNOPV8y74bZ8Dj51Cv0aR4nk,7556
-redisbench_admin/run/modules.py,sha256=ZMV8IKJAzkSqxIk8vDQq-sOYn2fE1Que6w7I9D4P9xQ,4773
+redisbench_admin/run/modules.py,sha256=9To85oDw2tmUNmTDxOgvKls_46oZRcd2cCt6xNjIWiA,1691
 redisbench_admin/run/redis_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/redis_benchmark/redis_benchmark.py,sha256=e-Az2uTlt3z2W4uzlUsdxeT8GITpxpGb-Mjb6JxrSWc,6848
 redisbench_admin/run/redisgraph_benchmark_go/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -200,7 +200,7 @@ redisbench_admin/run/ycsb/ycsb.py,sha256=cs5saVH7C4YpDvzhoa15PwEho59qTVR1E90v_FY
 redisbench_admin/run_async/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run_async/async_env.py,sha256=tE1turaaZNHfOaSpGxh62EJWp88zoQFUf3sMbaS7JRA,2408
 redisbench_admin/run_async/async_terraform.py,sha256=ngOQnECUuC20pZwiJItaiBnzlwT2DiKciPTHtqLURe4,11299
-redisbench_admin/run_async/benchmark.py,sha256=ea1V_lNYzsa4EXbh0_Ecsf3IFPlnNzo29Pdho35BgLg,1645
+redisbench_admin/run_async/benchmark.py,sha256=S-dsaWGjgsPQxj8sXAACnbtNw5zlJnRFoo53ULbrMEY,1630
 redisbench_admin/run_async/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/run_async/render_files.py,sha256=NMagmx-2hsMET_XN8tkmQz55g-azqW7SjAqaq4GL8F0,2676
 redisbench_admin/run_async/run_async.py,sha256=g2ZOQqj9vXZYaRyNpJZtgfYyY9tMuRmEv3Hh3qWOUs8,14525
@@ -209,34 +209,34 @@ redisbench_admin/run_local/args.py,sha256=LPpqtx1cH1dkkeHjYlaFnAp_TijxnzPZFO2CmY
 redisbench_admin/run_local/local_client.py,sha256=gwawMDOBrf7m--uyxu8kMZC5LBiLjbUBSKvzVOdOAas,124
 redisbench_admin/run_local/local_db.py,sha256=9vINqKOs-wDMFEuEHT0I8KO9YnEo_h4NWNk5da3LwSY,7518
 redisbench_admin/run_local/local_helpers.py,sha256=JyqLW2-Sbm35BXjxxfOB1yK7ADdLfcVrq08NLNdIwac,7026
-redisbench_admin/run_local/run_local.py,sha256=OrzfzCvOcQ1JLGfNZcChE1SsQCUDMHctzOHNF6a-xtA,34845
+redisbench_admin/run_local/run_local.py,sha256=QHnGfVAaVuct7t0WrWyQpbirC3MWX7fQF5-kXU_pJBs,34834
 redisbench_admin/run_remote/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run_remote/args.py,sha256=P7azI3m5jJJBovD9rLCvFWjVNveMcu7FVZbEUjdDn0c,4866
+redisbench_admin/run_remote/args.py,sha256=Ef32mg1yNYYHL5g59SzIWZqFB__RNLLriPqiucVyoNg,4826
 redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhqpi4AL0RQ,386
 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=VNsJmJf7803gsCd_lhwCb37V-xd_mC25TdDMiB3diW8,18972
+redisbench_admin/run_remote/remote_db.py,sha256=EEDeiOZk-godr5EINscEkOJLGWUN3gFfH6RaBzAKbak,14566
 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
-redisbench_admin/run_remote/run_remote.py,sha256=c5utaihKGY42nBTPFraIkW0yYRDHzf1LxsBgCJfNJP4,77264
-redisbench_admin/run_remote/standalone.py,sha256=dEidNJIprjRiFQqAAM-drYsks2ZZLjRKLs0Y4bfKe-w,33338
+redisbench_admin/run_remote/run_remote.py,sha256=tZqCu1fTfB5gWooVIEsSDoaVfnVRfxeCpn-RLmYI3IM,75476
+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=71n2gm8ObeCBzNWQ0MLO7zRjIvmIzg7xuSE2-CZygcw,23869
+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=ewjSUX8xsQYolzVPXfaA7y1PWGWL7emwG4W9jspn14Y,43547
+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/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.49.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.49.dist-info/METADATA,sha256=MvW4DsC1oIANjXhnvv5FF6O0HCL_POECirbx8tRDM14,5596
-redisbench_admin-0.11.49.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.49.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.49.dist-info/RECORD,,
+redisbench_admin-0.11.51.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.51.dist-info/METADATA,sha256=s_FfOPCdXONq0UaPdnaTg_mkhJChk3X9XECkYrzpf4w,5596
+redisbench_admin-0.11.51.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.51.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.51.dist-info/RECORD,,