redisbench-admin 0.10.28__tar.gz → 0.11.0__tar.gz

{redisbench_admin-0.10.28 → redisbench_admin-0.11.0}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.10.28"
+version = "0.11.0"
 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"
@@ -10,9 +10,9 @@ redisbench-admin = "redisbench_admin.cli:main"
 perf-daemon = "redisbench_admin.profilers.daemon:main"
 
 [tool.poetry.dependencies]
-python = "^3.7.0"
+python = "^3.10.0"
 humanize = "^2.4.0"
-requests = "^2.23.0"
+requests = "^2.32.3"
 py_cpuinfo = "^5.0.0"
 boto3 = "^1.13.24"
 tqdm = "^4.46.1"
@@ -31,7 +31,8 @@ Flask = "^2.0.1"
 flask-restx = "^0.5.1"
 Flask-HTTPAuth = "^4.4.0"
 daemonize = "^2.5.0"
-pandas = "^1.0"
+pandas = "^2.1.2"
+numpy = "^2.0.0"
 matplotlib = "^3.1.2"
 psutil = "^5.6.6"
 Jinja2 = "^3.0.3"
@@ -45,10 +46,10 @@ pygithub = "^1.57"
 [tool.poetry.dev-dependencies]
 pytest = "^4.6"
 pytest-cov = "^2.9.0"
-codecov = "^2.1.4"
+codecov = "2.1.13"
 black = "22.3.0"
 flake8 = "^5.0.0"
-tox-poetry-installer = {extras = ["poetry"], version = "^0.8.1"}
+tox-poetry-installer = {extras = ["poetry"], version = "^0.10.3"}
 
 [build-system]
 requires = ["poetry_core>=1.0.0"]

{redisbench_admin-0.10.28 → redisbench_admin-0.11.0}/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-0.10.28 → redisbench_admin-0.11.0}/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-0.10.28 → redisbench_admin-0.11.0}/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-0.10.28 → redisbench_admin-0.11.0}/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-0.10.28 → redisbench_admin-0.11.0}/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-0.10.28 → redisbench_admin-0.11.0}/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 → redisbench_admin-0.11.0}/setup.py

@@ -57,7 +57,8 @@ install_requires = \
  'humanize>=2.4.0,<3.0.0',
  'jsonpath_ng>=1.5.2,<2.0.0',
  'matplotlib>=3.1.2,<4.0.0',
- 'pandas>=1.0,<2.0',
+ 'numpy>=2.0.0,<3.0.0',
+ 'pandas>=2.1.2,<3.0.0',
  'paramiko>=2.7.2,<3.0.0',
  'psutil>=5.6.6,<6.0.0',
  'pyWorkFlow>=0.0.2,<0.0.3',
@@ -67,7 +68,7 @@ install_requires = \
  'pytablewriter[html]>=0.64.1,<0.65.0',
  'python_terraform>=0.10.1,<0.11.0',
  'redis>=4.2.2,<5.0.0',
- 'requests>=2.23.0,<3.0.0',
+ 'requests>=2.32.3,<3.0.0',
  'slack-bolt>=1.13.0,<2.0.0',
  'slack-sdk>=3.15.2,<4.0.0',
  'sshtunnel>=0.4.0,<0.5.0',
@@ -82,7 +83,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'redisbench-admin',
-    'version': '0.10.28',
+    'version': '0.11.0',
     'description': 'Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).',
     'long_description': '[![codecov](https://codecov.io/gh/redis-performance/redisbench-admin/branch/master/graph/badge.svg)](https://codecov.io/gh/redis-performance/redisbench-admin)\n![Actions](https://github.com/redis-performance/redisbench-admin/workflows/Run%20Tests/badge.svg?branch=master)\n![Actions](https://badge.fury.io/py/redisbench-admin.svg)\n\n# [redisbench-admin](https://github.com/redis-performance/redisbench-admin)\n\nRedis benchmark run helper can help you with the following tasks:\n\n- Setup abd teardown of benchmarking infrastructure specified\n  on [redis-performance/testing-infrastructure](https://github.com/redis-performance/testing-infrastructure)\n- Setup and teardown of an Redis and Redis Modules DBs for benchmarking\n- Management of benchmark data and specifications across different setups\n- Running benchmarks and recording results\n- Exporting performance results in several formats (CSV, RedisTimeSeries, JSON)\n- Finding on-cpu, off-cpu, io, and threading performance problems by attaching profiling tools/probers ( perf (a.k.a. perf_events), bpf tooling, vtune )\n- **[SOON]** Finding performance problems by attaching telemetry probes\n\nCurrent supported benchmark tools:\n\n- [redis-benchmark](https://github.com/redis/redis)\n- [memtier_benchmark](https://github.com/RedisLabs/memtier_benchmark)\n- [redis-benchmark-go](https://github.com/redis-performance/redis-benchmark-go)\n- [YCSB](https://github.com/RediSearch/YCSB)\n- [tsbs](https://github.com/RedisTimeSeries/tsbs)\n- [redisgraph-benchmark-go](https://github.com/RedisGraph/redisgraph-benchmark-go)\n- [ftsb_redisearch](https://github.com/RediSearch/ftsb)\n- [ann-benchmarks](https://github.com/RedisAI/ann-benchmarks)\n\n## Installation\n\nInstallation is done using pip, the package installer for Python, in the following manner:\n\n```bash\npython3 -m pip install redisbench-admin\n```\n\n## Profiler daemon\n\nYou can use the profiler daemon by itself in the following manner. \nOn the target machine do as follow:\n\n```bash\npip3 install --upgrade pip\npip3 install redisbench-admin --ignore-installed PyYAML\n\n# install perf\napt install linux-tools-common linux-tools-generic linux-tools-`uname -r` -y\n\n# ensure perf is working\nperf --version\n\n# install awscli\nsnap install aws-cli --classic\n\n\n# configure aws\naws configure\n\n# start the perf-daemon\nperf-daemon start\nWARNING:root:Unable to detected github_actor. caught the following error: No section: \'user\'\nWritting log to /tmp/perf-daemon.log\nStarting perf-daemon. PID file /tmp/perfdaemon.pid. Daemon workdir: /root/RedisGraph\n\n# check daemon is working appropriatelly\ncurl localhost:5000/ping\n\n# start a profile\ncurl -X POST localhost:5000/profiler/perf/start/<pid to profile>\n\n# stop a profile\ncurl -X POST -d \'{"aws_access_key_id":$AWS_ACCESS_KEY_ID,"aws_secret_access_key":$AWS_SECRET_ACCESS_KEY}\' localhost:5000/profiler/perf/stop/<pid to profile>\n```\n\n\n## Development\n\n1. Install [pypoetry](https://python-poetry.org/) to manage your dependencies and trigger tooling.\n```sh\npip install poetry\n```\n\n2. Installing dependencies from lock file\n\n```\npoetry install\n```\n\n### Running formaters\n\n```sh\npoetry run black .\n```\n\n\n### Running linters\n\n```sh\npoetry run flake8\n```\n\n\n### Running tests\n\nA test suite is provided, and can be run with:\n\n```sh\n$ tox\n```\n\nTo run a specific test:\n```sh\n$ tox -- tests/test_redistimeseries.py\n```\n\n## License\n\nredisbench-admin is distributed under the BSD3 license - see [LICENSE](LICENSE)\n',
     'author': 'filipecosta90',
@@ -94,7 +95,7 @@ setup_kwargs = {
     'package_data': package_data,
     'install_requires': install_requires,
     'entry_points': entry_points,
-    'python_requires': '>=3.7.0,<4.0.0',
+    'python_requires': '>=3.10.0,<4.0.0',
 }