ann-benchmarks support (#296)

* Added ann-benchmark runner

* Updated gitmodules

Author: filipecosta90

.flake8

@@ -10,4 +10,5 @@ exclude =
     *.egg-info,
     .nox,
     .pytest_cache,
-    .mypy_cache
+    .mypy_cache,
+    redisbench_admin/run/ann/pkg/

.github/workflows/publish-pypi.yml

@@ -33,6 +33,10 @@ jobs:
           poetry config virtualenvs.in-project false
           poetry config virtualenvs.path ~/.virtualenvs
 
+      - name: Set Submodules
+        run: |
+          git submodule update --init --recursive
+
       - name: Install Dependencies
         run: poetry install
         if: steps.cache.outputs.cache-hit != 'true'

.github/workflows/tox.yml

@@ -34,6 +34,10 @@ jobs:
       run: |
         pip3 install black coverage flake8 tox tox-docker tox-poetry
 
+    - name: Set Submodules
+      run: |
+        git submodule update --init --recursive
+
     - name: Install Redis
       run: |
         sudo add-apt-repository ppa:redislabs/redis

.gitignore

@@ -1,5 +1,8 @@
 # redisbench-admin related inputs/outputs
 
+redisbench_admin/run/ann/pkg/
+
+
 *.json
 *.tar.gz
 *.csv

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "redisbench_admin/run/ann/pkg"]
+	path = redisbench_admin/run/ann/pkg
+	url = https://github.com/RedisAI/ann-benchmarks

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.6.26"
+version = "0.6.27"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"
@@ -14,12 +14,10 @@ python = "^3.6.1"
 humanize = "^2.4.0"
 requests = "^2.23.0"
 py_cpuinfo = "^5.0.0"
-redis = "^3.5.3"
+redis = "^4.1.4"
 boto3 = "^1.13.24"
 tqdm = "^4.46.1"
 toml = "^0.10.1"
-redistimeseries = "^1.4.3"
-redis-py-cluster = "^2.1.0"
 paramiko = "^2.7.2"
 jsonpath_ng = "^1.5.2"
 pysftp = "^0.2.9"

pyproject.toml

@@ -11,7 +11,7 @@
 import datetime as dt
 
 from redisbench_admin.utils.remote import get_overall_dashboard_keynames
-from redistimeseries.client import Client
+
 
 from redisbench_admin.utils.utils import get_ts_metric_name
 
@@ -29,13 +29,13 @@ def compare_command_logic(args, project_name, project_version):
             args.redistimeseries_port,
         )
     )
-    rts = Client(
+    rts = redis.Redis(
         host=args.redistimeseries_host,
         port=args.redistimeseries_port,
         password=args.redistimeseries_pass,
         username=args.redistimeseries_user,
     )
-    rts.redis.ping()
+    rts.ping()
 
     tf_github_org = args.github_org
     tf_github_repo = args.github_repo
@@ -108,7 +108,7 @@ def compare_command_logic(args, project_name, project_version):
     ) = get_overall_dashboard_keynames(tf_github_org, tf_github_repo, tf_triggering_env)
     test_names = []
     try:
-        test_names = rts.redis.smembers(testcases_setname)
+        test_names = rts.smembers(testcases_setname)
         test_names = list(test_names)
         test_names.sort()
     except redis.exceptions.ResponseError as e:

redisbench_admin/compare/compare.py

@@ -44,7 +44,7 @@ def spin_up_local_redis_cluster(
             )
         )
         redis_process = subprocess.Popen(command)
-        r = redis.StrictRedis(port=shard_port)
+        r = redis.Redis(port=shard_port)
         result = wait_for_conn(r, dataset_load_timeout_secs)
         if result is True:
             logging.info("Redis available. pid={}".format(redis_process.pid))
@@ -164,7 +164,7 @@ def generate_cluster_redis_server_args(
         "--cluster-config-file",
         "cluster-node-port-{}.config".format(port),
         "--save",
-        '""',
+        "''",
         "--cluster-announce-ip",
         "{}".format(ip),
         "--port",

redisbench_admin/environments/oss_cluster.py

@@ -36,7 +36,7 @@ def spin_up_local_redis(
         )
     )
     redis_process = subprocess.Popen(command)
-    result = wait_for_conn(redis.StrictRedis(port=port), dataset_load_timeout_secs)
+    result = wait_for_conn(redis.Redis(port=port), dataset_load_timeout_secs)
     if result is True:
         logging.info("Redis available")
     return [redis_process]
@@ -54,7 +54,7 @@ def generate_standalone_redis_server_args(
     command = [
         binary,
         "--save",
-        '""',
+        "",
         "--port",
         "{}".format(port),
         "--dir",