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

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

@@ -1,7 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: redisbench-admin
-Version: 0.11.66
+Version: 0.11.68
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
+License-File: LICENSE
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com
 Requires-Python: >=3.10.0,<4.0.0
@@ -9,6 +10,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.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)

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.66"
+version = "0.11.68"
 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"

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

@@ -53,6 +53,7 @@ ARCH = os.getenv("ARCH", ARCH_X86)
 if "x64" in ARCH:
     ARCH = ARCH_X86
 
+
 def common_run_args(parser):
     parser.add_argument(
         "--architecture",

{redisbench_admin-0.11.66 → redisbench_admin-0.11.68}/redisbench_admin/run/cluster.py

@@ -166,9 +166,7 @@ def spin_up_redis_cluster_remote_redis(
         else:
             full_command = " ".join(command)
         logging.error(
-            "Remote primary shard {} command: {}".format(
-                master_shard_id, full_command
-            )
+            "Remote primary shard {} command: {}".format(master_shard_id, full_command)
         )
         logfiles.append(logfile)
         redis_process_commands.append(full_command)

{redisbench_admin-0.11.66 → redisbench_admin-0.11.68}/redisbench_admin/run_remote/remote_db.py

@@ -155,7 +155,9 @@ def remote_db_spin(
                 username,
                 continue_on_module_check_error,
             )
-            logging.info("Extra library files copied successfully (not passed to redis-server)")
+            logging.info(
+                "Extra library files copied successfully (not passed to redis-server)"
+            )
     # setup Redis
     redis_setup_result = True
     redis_conns = []

{redisbench_admin-0.11.66 → redisbench_admin-0.11.68}/redisbench_admin/run_remote/remote_helpers.py

@@ -71,11 +71,15 @@ def ensure_aws_cli_available(client_public_ip, username, private_key, client_ssh
                 "curl 'https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip' -o 'awscliv2.zip'",
                 "unzip -q awscliv2.zip",
                 "sudo ./aws/install",
-                "rm -rf awscliv2.zip aws/"
+                "rm -rf awscliv2.zip aws/",
             ]
 
             install_result = execute_remote_commands(
-                client_public_ip, username, private_key, install_commands, client_ssh_port
+                client_public_ip,
+                username,
+                private_key,
+                install_commands,
+                client_ssh_port,
             )
 
             # Check if installation was successful
@@ -249,6 +253,7 @@ def remote_tool_pre_bench_step(
         )
     logging.info("Finished up remote tool {} requirements".format(benchmark_tool))
 
+
 def _setup_remote_benchmark_tool_requirements(
     client_public_ip,
     username,
@@ -261,22 +266,33 @@ def _setup_remote_benchmark_tool_requirements(
 ):
     commands = [
         "wget {} -q -O {}".format(tool_link, remote_tool_link),
-        "chmod 755 {}".format(remote_tool_link)
+        "chmod 755 {}".format(remote_tool_link),
     ]
 
     # detect if queries_file_link is a s3 URI or http one and act accordingly (use aws cli or wget)
     if queries_file_link is not None:
-      if queries_file_link.startswith("s3://"):
-          ensure_aws_cli_available(client_public_ip, username, private_key, client_ssh_port)
-          commands.append(
-              "timeout 600 aws s3 cp {} {} --no-sign-request --cli-read-timeout 300".format(queries_file_link, remote_input_file)
-          )
-      else:
-          commands.append("wget {} -q -O {}".format(queries_file_link, remote_input_file))
+        if queries_file_link.startswith("s3://"):
+            ensure_aws_cli_available(
+                client_public_ip, username, private_key, client_ssh_port
+            )
+            commands.append(
+                "timeout 600 aws s3 cp {} {} --no-sign-request --cli-read-timeout 300".format(
+                    queries_file_link, remote_input_file
+                )
+            )
+        else:
+            commands.append(
+                "wget {} -q -O {}".format(queries_file_link, remote_input_file)
+            )
     else:
         logging.info("No queries file link provided. Skipping download.")
     execute_remote_commands(
-        client_public_ip, username, private_key, commands, client_ssh_port, limit_output_print=True,
+        client_public_ip,
+        username,
+        private_key,
+        commands,
+        client_ssh_port,
+        limit_output_print=True,
     )
 
 

{redisbench_admin-0.11.66 → redisbench_admin-0.11.68}/redisbench_admin/run_remote/run_remote.py

@@ -89,15 +89,14 @@ STALL_INFO_DAYS = 7
 EXPIRE_TIME_SECS_PROFILE_KEYS = 60 * 60 * 24 * STALL_INFO_DAYS
 EXPIRE_TIME_MSECS_PROFILE_KEYS = EXPIRE_TIME_SECS_PROFILE_KEYS * 1000
 
+
 def ensure_mixed_types_first(benchmark_runs_plan):
     """
     Returns an iterator over (benchmark_type, bench_by_dataset_map) tuples,
     ensuring that 'mixed' benchmark types are processed before others.
     """
-    return sorted(
-        benchmark_runs_plan.items(),
-        key=lambda x: (x[0] != "mixed", x[0])
-    )
+    return sorted(benchmark_runs_plan.items(), key=lambda x: (x[0] != "mixed", x[0]))
+
 
 def is_important_data(tf_github_branch, artifact_version):
     return True
@@ -405,7 +404,9 @@ def run_remote_command_logic(args, project_name, project_version):
     ts_key_full_price = f"ts:{tf_triggering_env}:tests:full_price"
     ts_key_architecture = f"ts:{tf_triggering_env}:tests:arch:{architecture}"
     reuse_mixed = False
-    for benchmark_type, bench_by_dataset_map in ensure_mixed_types_first(benchmark_runs_plan):
+    for benchmark_type, bench_by_dataset_map in ensure_mixed_types_first(
+        benchmark_runs_plan
+    ):
         if benchmark_type == "mixed" and "read-only" in benchmark_runs_plan:
             reuse_mixed = True
         if return_code != 0 and args.fail_fast:
@@ -439,8 +440,10 @@ def run_remote_command_logic(args, project_name, project_version):
 
                 setup_settings = setup_details["setup_settings"]
                 benchmarks_map = setup_details["benchmarks"]
+                if 'env' not in setup_details:
+                    setup_details["env"] = None
                 # we start with an empty per bench-type/setup-name
-                if not reuse_mixed:
+                if not reuse_mixed or "env" not in setup_details:
                     logging.info(
                         "Given we are not reusing a mixed setup we will reset the setup details."
                     )
@@ -597,7 +600,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                         "Starting common steps to cluster and standalone..."
                                     )
                                     full_logfiles = []
-                                    if setup_details["env"] is None:
+                                    if setup_details.get("env", None) is None:
                                         if skip_remote_db_setup is False:
                                             # ensure /tmp folder is free of benchmark data from previous runs
                                             remote_tmpdir_prune(
@@ -1112,7 +1115,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                                     )
                                                 )
 
-                                        if setup_details["env"] is None:
+                                        if setup_details.get("env", None) is None:
                                             if (
                                                 keep_env_and_topo is False
                                                 and skip_remote_db_setup is False

{redisbench_admin-0.11.66 → redisbench_admin-0.11.68}/redisbench_admin/run_remote/standalone.py

@@ -701,7 +701,9 @@ def spin_test_standalone_redis(
                     create_module_dir_commands,
                     db_ssh_port,
                 )
-            logging.info(f"📁 Copying {len(extra_libs)} extra library files to remote...")
+            logging.info(
+                f"📁 Copying {len(extra_libs)} extra library files to remote..."
+            )
             # Copy extra libs but discard result (not passed to redis-server)
             remote_module_files_cp(
                 extra_libs,
@@ -720,7 +722,9 @@ def spin_test_standalone_redis(
                 server_public_ip, username, private_key, remote_symlinks, db_ssh_port
             )
             if not symlink_success:
-                logging.warning("⚠️ Some symlinks failed to create, continuing anyway...")
+                logging.warning(
+                    "⚠️ Some symlinks failed to create, continuing anyway..."
+                )
 
         # Generate Redis startup command
         logfile = "redis-spin-test.log"

{redisbench_admin-0.11.66 → redisbench_admin-0.11.68}/redisbench_admin/utils/benchmark_config.py

@@ -209,7 +209,9 @@ def merge_default_and_specific_properties_dict_type(
                         use_case_specific_properties.append(default_property)
                         logging.info(
                             "Adding a default '{}' property ({}) given the file {} did not have the specific property".format(
-                                propertygroup_keyname, default_property, usecase_filename
+                                propertygroup_keyname,
+                                default_property,
+                                usecase_filename,
                             )
                         )
                         break
@@ -228,7 +230,9 @@ def merge_default_and_specific_properties_dict_type(
                 for usecase_kpi in use_case_specific_properties:
                     usecase_rule, usecase_details = list(usecase_kpi.items())[0]
                     usecase_condition = list(usecase_details.values())[0]
-                    usecase_comparison_key = "{}{}".format(usecase_rule, usecase_condition)
+                    usecase_comparison_key = "{}{}".format(
+                        usecase_rule, usecase_condition
+                    )
                     if comparison_key == usecase_comparison_key:
                         found = True
                 if found:

{redisbench_admin-0.11.66 → redisbench_admin-0.11.68}/redisbench_admin/utils/local.py

@@ -83,9 +83,11 @@ def check_if_needs_remote_fetch(
                 )
             )
             if property.startswith("s3://"):
-              logging.error("Unexpected s3 URL. It should have already been downloaded. Skipping...")
+                logging.error(
+                    "Unexpected s3 URL. It should have already been downloaded. Skipping..."
+                )
             else:
-              wget.download(property, full_path)
+                wget.download(property, full_path)
         else:
             logging.info(
                 "Reusing cached remote file (located at {} ).".format(full_path)

{redisbench_admin-0.11.66 → redisbench_admin-0.11.68}/redisbench_admin/utils/remote.py

@@ -151,7 +151,13 @@ def fetch_file_from_remote_setup(
 
 
 def execute_remote_commands(
-    server_public_ip, username, private_key, commands, port, get_pty=False, limit_output_print=False,
+    server_public_ip,
+    username,
+    private_key,
+    commands,
+    port,
+    get_pty=False,
+    limit_output_print=False,
 ):
     res = []
     c = connect_remote_ssh(port, private_key, server_public_ip, username)
@@ -163,20 +169,20 @@ def execute_remote_commands(
         stderr = stderr.readlines()
         if recv_exit_status != 0:
             if not limit_output_print:
-              logging.warning(
-                  "Exit status: {} for command {}.\n\tSTDERR: {}\n\tSTDOUT: {}".format(
-                      recv_exit_status, command, stdout, stderr
-                  )
-              )
+                logging.warning(
+                    "Exit status: {} for command {}.\n\tSTDERR: {}\n\tSTDOUT: {}".format(
+                        recv_exit_status, command, stdout, stderr
+                    )
+                )
             else:
-              # Take first 10 lines, truncate each to 200 chars to avoid huge logs
-              stdout_limited = [line[:100] for line in stdout[:10]]
-              stderr_limited = [line[:100] for line in stderr[:10]]
-              logging.info(
-                  "Exit status: {} for command {}.\n\tSTDERR: {}\n\tSTDOUT: {}".format(
-                      recv_exit_status, command, stderr_limited, stdout_limited
-                  )
-              )
+                # Take first 10 lines, truncate each to 200 chars to avoid huge logs
+                stdout_limited = [line[:100] for line in stdout[:10]]
+                stderr_limited = [line[:100] for line in stderr[:10]]
+                logging.info(
+                    "Exit status: {} for command {}.\n\tSTDERR: {}\n\tSTDOUT: {}".format(
+                        recv_exit_status, command, stderr_limited, stdout_limited
+                    )
+                )
         res.append([recv_exit_status, stdout, stderr])
     c.close()
     return res
@@ -316,25 +322,67 @@ def setup_remote_environment(
     ):
         logging.warning("Destroying previous setup")
         tf.destroy()
-    return_code, stdout, stderr = tf.apply(
-        skip_plan=True,
-        capture_output=False,
-        refresh=True,
-        var={
-            "github_sha": tf_github_sha,
-            "github_actor": tf_github_actor,
-            "setup_name": tf_setup_name,
-            "github_org": tf_github_org,
-            "Project": tf_github_org,
-            "project": tf_github_org,
-            "Environment": tf_github_org,
-            "environment": tf_github_org,
-            "github_repo": tf_github_repo,
-            "triggering_env": tf_triggering_env,
-            "timeout_secs": tf_timeout_secs,
-        },
-        raise_on_error=True,
-    )
+
+    # Capture output to provide better error messages
+    try:
+        return_code, stdout, stderr = tf.apply(
+            skip_plan=True,
+            capture_output=True,  # Changed to True to capture error details
+            refresh=True,
+            var={
+                "github_sha": tf_github_sha,
+                "github_actor": tf_github_actor,
+                "setup_name": tf_setup_name,
+                "github_org": tf_github_org,
+                "Project": tf_github_org,
+                "project": tf_github_org,
+                "Environment": tf_github_org,
+                "environment": tf_github_org,
+                "github_repo": tf_github_repo,
+                "triggering_env": tf_triggering_env,
+                "timeout_secs": tf_timeout_secs,
+            },
+            raise_on_error=True,
+        )
+        # Log successful output for debugging
+        if stdout:
+            logging.info(f"Terraform apply stdout:\n{stdout}")
+        if stderr:
+            logging.warning(f"Terraform apply stderr:\n{stderr}")
+    except Exception as e:
+        # Provide detailed error information
+        logging.error("=" * 80)
+        logging.error("TERRAFORM APPLY FAILED")
+        logging.error("=" * 80)
+        logging.error(f"Error type: {type(e).__name__}")
+        logging.error(f"Error message: {str(e)}")
+
+        # Try to get the terraform command details
+        try:
+            if hasattr(e, "cmd"):
+                logging.error(f"Failed command: {e.cmd}")
+            if hasattr(e, "returncode"):
+                logging.error(f"Return code: {e.returncode}")
+            if hasattr(e, "stdout") and e.stdout:
+                logging.error(f"STDOUT:\n{e.stdout}")
+            if hasattr(e, "stderr") and e.stderr:
+                logging.error(f"STDERR:\n{e.stderr}")
+        except:
+            pass
+
+        logging.error("=" * 80)
+        logging.error(f"Terraform setup details:")
+        logging.error(f"  - Setup name: {tf_setup_name}")
+        logging.error(f"  - GitHub org: {tf_github_org}")
+        logging.error(f"  - GitHub repo: {tf_github_repo}")
+        logging.error(f"  - GitHub SHA: {tf_github_sha}")
+        logging.error(f"  - Triggering env: {tf_triggering_env}")
+        logging.error(f"  - Timeout: {tf_timeout_secs}s")
+        logging.error("=" * 80)
+
+        # Re-raise the exception with more context
+        raise
+
     infra_wait_secs = 60
     logging.warning(f"Infra ready wait... for {infra_wait_secs} secs")
     time.sleep(infra_wait_secs)

redisbench_admin-0.11.66/redisbench_admin/run/ann/pkg/.dockerignore

@@ -1,2 +0,0 @@
-data
-results

redisbench_admin-0.11.66/redisbench_admin/run/ann/pkg/.git

@@ -1 +0,0 @@
-gitdir: ../../../../.git/modules/redisbench_admin/run/ann/pkg

redisbench_admin-0.11.66/redisbench_admin/run/ann/pkg/.github/workflows/benchmarks.yml

@@ -1,100 +0,0 @@
-name: ANN benchmarks
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        include:
-          - library: annoy
-            dataset: random-xs-20-angular
-          - library: dolphinn
-            dataset: random-xs-20-angular
-          - library: faiss
-            dataset: random-xs-20-angular
-          - library: flann
-            dataset: random-xs-20-angular
-          - library: kgraph
-            dataset: random-xs-20-angular
-          - library: milvus
-            dataset: random-xs-20-angular
-          - library: mrpt
-            dataset: random-xs-20-angular
-          - library: n2
-            dataset: random-xs-20-angular
-          - library: nearpy
-            dataset: random-xs-20-angular
-          - library: ngt
-            dataset: random-xs-20-angular
-          - library: nmslib
-            dataset: random-xs-20-angular
-          - library: hnswlib
-            dataset: random-xs-20-angular
-          - library: puffinn
-            dataset: random-xs-20-angular
-          - library: pynndescent
-            dataset: random-xs-20-angular
-          - library: rpforest
-            dataset: random-xs-20-angular
-          - library: sklearn
-            dataset: random-xs-20-angular
-          - library: sptag
-            dataset: random-xs-20-angular
-          - library: mih
-            dataset: random-xs-16-hamming
-          - library: datasketch
-            dataset: random-s-jaccard
-          - library: scann
-            dataset: random-xs-20-angular
-          - library: elasticsearch
-            dataset: random-xs-20-angular
-          - library: elastiknn
-            dataset: random-xs-20-angular
-          - library: opensearchknn
-            dataset: random-xs-20-angular
-          - library: diskann
-            dataset: random-xs-20-angular
-          - library: puffinn
-            dataset: random-s-jaccard
-          - library: pynndescent
-            dataset: random-s-jaccard
-          - library: vespa
-            dataset: random-xs-20-angular
-          - library: scipy
-            dataset: random-xs-20-angular
-          - library: vald
-            dataset: random-xs-20-angular
-      fail-fast: false
-
-    steps:
-    - uses: actions/checkout@v2 # Pull the repository
-
-    - name: Install various apt packages
-      run: sudo apt-get install -y libhdf5-dev python3-numpy python3-scipy python3-matplotlib python3-sklearn
-
-    - name: Install dependencies
-      run: |
-        pip3 install -r requirements.txt
-        python3 install.py
-
-      env:
-        LIBRARY: ${{ matrix.library }}
-        DATASET: ${{ matrix.dataset }}
-    
-    - name: Run the benchmark
-      run: |
-        python3 run.py --docker-tag ann-benchmarks-${LIBRARY} --max-n-algorithms 5 --dataset $DATASET --run-disabled --timeout 300
-        python3 run.py --docker-tag ann-benchmarks-${LIBRARY} --max-n-algorithms 5 --dataset $DATASET --run-disabled --batch --timeout 300
-        sudo chmod -R 777 results/
-        python3 plot.py --dataset $DATASET --output plot.png
-        python3 plot.py --dataset $DATASET --output plot-batch.png --batch
-        python3 -m unittest test/test-metrics.py
-        python3 -m unittest test/test-jaccard.py
-        python3 create_website.py --outputdir . --scatter --latex
-
-      env:
-        LIBRARY: ${{ matrix.library }}
-        DATASET: ${{ matrix.dataset }}

redisbench_admin-0.11.66/redisbench_admin/run/ann/pkg/.gitignore

@@ -1,21 +0,0 @@
-.DS_Store
-*.pyc
-*.o
-protocol/c/fr-*
-
-install/*.txt
-install/*.yaml
-install/lib-*/
-data/*
-*.class
-
-*.log
-
-results/*
-!results/*.png
-website
-
-venv
-
-.idea
-.vscode

redisbench_admin-0.11.66/redisbench_admin/run/ann/pkg/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Erik Bernhardsson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.