redisbench-admin 0.11.44__tar.gz → 0.11.66__tar.gz

{redisbench_admin-0.11.44 → redisbench_admin-0.11.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.44
+Version: 0.11.66
 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
@@ -13,14 +13,14 @@ 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: PyYAML (>=6.0.1,<7.0.0)
 Requires-Dist: boto3 (>=1.13.24,<2.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)
 Requires-Dist: jsonpath_ng (>=1.5.2,<2.0.0)
-Requires-Dist: matplotlib (>=3.1.2,<4.0.0)
+Requires-Dist: matplotlib (>=3.9.0,<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,<4.0.0)

{redisbench_admin-0.11.44 → redisbench_admin-0.11.66}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.44"
+version = "0.11.66"
 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"
@@ -22,7 +22,7 @@ jsonpath_ng = "^1.5.2"
 pysftp = "^0.2.9"
 python_terraform = "^0.10.1"
 GitPython = "^3.1.12"
-PyYAML = "^6.0"
+PyYAML = "^6.0.1"
 wget = "^3.2"
 pytablewriter = {extras = ["html"], version = "^0.64.1"}
 sshtunnel = "^0.4.0"
@@ -33,7 +33,7 @@ Flask-HTTPAuth = "^4.4.0"
 daemonize = "^2.5.0"
 pandas = "^2.1.2"
 numpy = "^2.0.0"
-matplotlib = "^3.1.2"
+matplotlib = "^3.9.0"
 psutil = "^5.6.6"
 Jinja2 = "^3.0.3"
 watchdog = "^2.1.6"
@@ -43,20 +43,15 @@ slack-bolt = "^1.13.0"
 certifi = ">=2021.10.8,<2025.0.0"
 pygithub = "^1.57"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 tox = ">=4.16.0"
 tox-docker = ">=5.0.0"
 docker = ">=7.1.0"
-pytest = "^4.6"
-pytest-cov = "^2.9.0"
+pytest = "^8.0.0"
+pytest-cov = "^6.0.0"
 codecov = "2.1.13"
 black = "24.3.0"
 flake8 = "^5.0.0"
-tox-poetry-installer = {extras = ["poetry"], version = "^0.10.3"}
-
-[tool.poetry.group.dev.dependencies]
-tox-poetry-installer = {extras = ["poetry"], version = "^0.10.3"}
-docker = "^7.1.0"
 
 [build-system]
 requires = ["poetry_core>=1.0.0"]

{redisbench_admin-0.11.44 → redisbench_admin-0.11.66}/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-0.11.44 → redisbench_admin-0.11.66}/redisbench_admin/environments/oss_cluster.py

@@ -201,7 +201,15 @@ def generate_cluster_redis_server_args(
     dbfilename = get_cluster_dbfilename(port)
 
     command = generate_common_server_args(
-        binary, daemonize, dbdir, dbfilename, enable_debug_command, ip, logfile, port
+        binary,
+        daemonize,
+        dbdir,
+        dbfilename,
+        enable_debug_command,
+        ip,
+        logfile,
+        port,
+        enable_redis_7_config_directives,
     )
     command.extend(
         [

{redisbench_admin-0.11.44 → redisbench_admin-0.11.66}/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-0.11.44 → redisbench_admin-0.11.66}/redisbench_admin/run/aibench_run_inference_redisai_vision/aibench_run_inference_redisai_vision.py

@@ -47,7 +47,8 @@ def extract_aibench_extra_links(benchmark_config, benchmark_tool):
     )
     queries_file_link = None
     for entry in benchmark_config["clientconfig"]:
-        if "parameters" in entry:
+        # Handle both dict and non-dict entries in the list
+        if isinstance(entry, dict) and "parameters" in entry:
             for parameter in entry["parameters"]:
                 if "file" in parameter:
                     queries_file_link = parameter["file"]

{redisbench_admin-0.11.44 → redisbench_admin-0.11.66}/redisbench_admin/run/args.py

@@ -23,6 +23,7 @@ DEFAULT_TRIGGERING_ENV = socket.gethostname()
 TRIGGERING_ENV = os.getenv("TRIGGERING_ENV", DEFAULT_TRIGGERING_ENV)
 ENV = os.getenv("ENV", "oss-standalone,oss-cluster")
 SETUP = os.getenv("SETUP", "")
+BENCHMARK = os.getenv("BENCHMARK", "")
 BENCHMARK_GLOB = os.getenv("BENCHMARK_GLOB", "*.yml")
 BENCHMARK_REGEX = os.getenv("BENCHMARK_REGEX", ".*")
 BENCHMARK_RUNNER_GROUP_TOTAL = int(os.getenv("BENCHMARK_RUNNER_GROUP_TOTAL", "1"))
@@ -37,6 +38,7 @@ GIT_BRANCH = os.getenv("GIT_BRANCH", None)
 GIT_REPO = os.getenv("GIT_REPO", None)
 PROFILERS_ENABLED = bool(int(os.getenv("PROFILE", 0)))
 COMMANDSTATS_ENABLED = bool(int(os.getenv("COMMANDSTATS_ENABLED", 1)))
+SEARCH_MEMORY_ENABLED = bool(int(os.getenv("SEARCH_MEMORY_ENABLED", 0)))
 PROFILERS = os.getenv("PROFILERS", PROFILERS_DEFAULT)
 MAX_PROFILERS_PER_TYPE = int(os.getenv("MAX_PROFILERS", 1))
 PROFILE_FREQ = os.getenv("PROFILE_FREQ", PROFILE_FREQ_DEFAULT)
@@ -48,7 +50,8 @@ ARCH_X86 = "x86_64"
 ARCH_ARM = "aarch64"
 VALID_ARCHS = [ARCH_X86, ARCH_ARM]
 ARCH = os.getenv("ARCH", ARCH_X86)
-
+if "x64" in ARCH:
+    ARCH = ARCH_X86
 
 def common_run_args(parser):
     parser.add_argument(
@@ -94,7 +97,7 @@ def common_run_args(parser):
     parser.add_argument(
         "--test",
         type=str,
-        default="",
+        default=BENCHMARK,
         help="specify a test to run. By default will run all of them.",
     )
     parser.add_argument(
@@ -201,6 +204,12 @@ def common_run_args(parser):
         default=COMMANDSTATS_ENABLED,
         help="Enables commandstats collection.",
     )
+    parser.add_argument(
+        "--collect_search_memory",
+        type=bool,
+        default=SEARCH_MEMORY_ENABLED,
+        help="Enables search memory collection.",
+    )
     parser.add_argument(
         "--allowed-envs",
         type=str,