fixes per flake linter

Author: fcostaoliveira

poetry.lock

@@ -6,7 +6,7 @@ authors = ["filipecosta90 <[email protected]>","Redis Performance Group <
 readme = "Readme.md"
 
 [tool.poetry.dependencies]
-python = ">=3.8.1,<4.0"
+python = "^3.10.0"
 Flask = "^2.0.3"
 flask-restx = "^0.5.0"
 redis = "^4.2.0"
@@ -15,22 +15,29 @@ argparse = "^1.4.0"
 Flask-HTTPAuth = "^4.4.0"
 PyYAML = "^6.0"
 docker = "^7.1.0"
-redisbench-admin = "^0.9.23"
+redisbench-admin = "^0.11.1"
 psutil = "^5.9.4"
 PyGithub = "^1.55"
 GitPython = "^3.1.20"
 semver = "^2.13.0"
 node-semver = "^0.8.1"
 typed-ast = "^1.5.0"
 oyaml = "^1.0"
+pandas = "^2.1.2"
+numpy = "^2.0.0"
 
+jsonpath-ng = "^1.6.1"
 [tool.poetry.dev-dependencies]
 pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 black = "22.10.0"
 flake8 = "^6.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"]
 build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -17,7 +17,6 @@
 import redis
 from packaging import version
 import time
-from github import Github
 
 
 from redis_benchmarks_specification.__common__.github import (

redis_benchmarks_specification/__cli__/cli.py

@@ -24,9 +24,7 @@ def generate_build_started_pr_comment(
     tests_priority_upper_limit,
     tests_regexp,
 ):
-    comment_body = (
-        f"### CE Performance Automation : step 1 of 2 (build) STARTING...\n\n"
-    )
+    comment_body = "### CE Performance Automation : step 1 of 2 (build) STARTING...\n\n"
     comment_body += (
         "This comment was automatically generated given a benchmark was triggered.\n"
     )
@@ -38,7 +36,7 @@ def generate_build_started_pr_comment(
     comment_body += f"   - git branch: {git_branch}\n"
     comment_body += f"   - commit date and time: {commit_datetime}\n"
     comment_body += f"   - commit summary: {commit_summary}\n"
-    comment_body += f"   - test filters:\n"
+    comment_body += "   - test filters:\n"
     comment_body += (
         f"       - command priority lower limit: {tests_priority_lower_limit}\n"
     )
@@ -64,7 +62,7 @@ def generate_build_finished_pr_comment(
     build_duration_seconds,
 ):
     build_duration_seconds = int(build_duration_seconds)
-    comment_body = f"### CE Performance Automation : step 1 of 2 (build) DONE.\n\n"
+    comment_body = "### CE Performance Automation : step 1 of 2 (build) DONE.\n\n"
     comment_body += (
         "This comment was automatically generated given a benchmark was triggered.\n"
     )
@@ -76,7 +74,7 @@ def generate_build_finished_pr_comment(
     comment_body += f"   - git branch: {git_branch}\n"
     comment_body += f"   - commit date and time: {commit_datetime}\n"
     comment_body += f"   - commit summary: {commit_summary}\n"
-    comment_body += f"   - test filters:\n"
+    comment_body += "   - test filters:\n"
     comment_body += (
         f"       - command priority lower limit: {tests_priority_lower_limit}\n"
     )
@@ -197,12 +195,10 @@ def update_comment_if_needed(
                 )
             )
         if user_input.lower() == "y" or auto_approve:
-            print("Updating comment {}".format(regression_comment.html_url))
-            regression_comment.edit(comment_body)
             html_url = regression_comment.html_url
-            print(
-                "Updated comment. Access it via {}".format(regression_comment.html_url)
-            )
+            print("Updating comment {}".format(html_url))
+            regression_comment.edit(comment_body)
+            print("Updated comment. Access it via {}".format(html_url))
 
 
 def check_benchmark_build_comment(comments):

redis_benchmarks_specification/__common__/github.py

@@ -4,10 +4,10 @@
 #  All rights reserved.
 #
 import datetime
-
+import logging
+from tqdm import tqdm
 import redis
 from jsonpath_ng.parser import JsonPathParser
-from jsonpath_ng.jsonpath import *
 
 
 def parse(string):
@@ -437,45 +437,6 @@ def extract_perversion_timeseries_from_results(
     return True, branch_time_series_dict, target_tables
 
 
-def extract_perbranch_timeseries_from_results(
-    datapoints_timestamp: int,
-    metrics: list,
-    results_dict: dict,
-    tf_github_branch: str,
-    tf_github_org: str,
-    tf_github_repo: str,
-    deployment_name: str,
-    deployment_type: str,
-    test_name: str,
-    tf_triggering_env: str,
-    metadata_tags={},
-    build_variant_name=None,
-    running_platform=None,
-    testcase_metric_context_paths=[],
-):
-    break_by_key = "branch"
-    break_by_str = "by.{}".format(break_by_key)
-    (branch_time_series_dict, target_tables) = common_timeseries_extraction(
-        break_by_key,
-        break_by_str,
-        datapoints_timestamp,
-        deployment_name,
-        deployment_type,
-        metrics,
-        tf_github_branch,
-        results_dict,
-        test_name,
-        tf_github_org,
-        tf_github_repo,
-        tf_triggering_env,
-        metadata_tags,
-        build_variant_name,
-        running_platform,
-        testcase_metric_context_paths,
-    )
-    return True, branch_time_series_dict, target_tables
-
-
 def push_data_to_redistimeseries(rts, time_series_dict: dict, expire_msecs=0):
     datapoint_errors = 0
     datapoint_inserts = 0

redis_benchmarks_specification/__common__/timeseries.py

@@ -248,7 +248,6 @@ def compare_command_logic(args, project_name, project_version):
     testname_regex = args.testname_regex
     auto_approve = args.auto_approve
     running_platform = args.running_platform
-    grafana_base_dashboard = args.grafana_base_dashboard
 
     if running_platform is not None:
         logging.info(

redis_benchmarks_specification/__compare__/compare.py

@@ -382,6 +382,7 @@ def delete_temporary_files(
     defaults_filename = args.defaults_filename
     override_test_runs = args.override_test_runs
     (
+        _,
         _,
         default_metrics,
         _,
@@ -396,7 +397,7 @@ def delete_temporary_files(
 
         with open(test_file, "r") as stream:
             _, benchmark_config, test_name = get_final_benchmark_config(
-                None, stream, ""
+                None, None, stream, ""
             )
 
             if tls_enabled:
@@ -410,6 +411,7 @@ def delete_temporary_files(
             for topology_spec_name in benchmark_config["redis-topologies"]:
                 test_result = False
                 benchmark_tool_global = ""
+                full_result_path = None
                 try:
                     current_cpu_pos = args.cpuset_start_pos
                     temporary_dir_client = tempfile.mkdtemp(dir=home)

redis_benchmarks_specification/__runner__/runner.py

@@ -1,5 +1,4 @@
 import argparse
-import datetime
 import os
 from redis_benchmarks_specification.__common__.env import (
     MACHINE_CPU_COUNT,
@@ -20,10 +19,6 @@
     PROFILERS_DEFAULT,
     ALLOWED_PROFILERS,
 )
-from redis_benchmarks_specification.__compare__.args import (
-    START_TIME_NOW_UTC,
-    START_TIME_LAST_SIX_MONTHS_UTC,
-)
 
 PERFORMANCE_GH_TOKEN = os.getenv("PERFORMANCE_GH_TOKEN", None)
 

redis_benchmarks_specification/__self_contained_coordinator__/args.py

@@ -120,6 +120,7 @@ def process_self_contained_coordinator_stream(
     stream_id = "n/a"
     overall_result = False
     total_test_suite_runs = 0
+    full_result_path = None
     try:
         stream_id, testDetails = newTestInfo[0][1][0]
         stream_id = stream_id.decode()
@@ -163,7 +164,7 @@ def process_self_contained_coordinator_stream(
 
                 with open(test_file, "r") as stream:
                     result, benchmark_config, test_name = get_final_benchmark_config(
-                        None, stream, ""
+                        None, None, stream, ""
                     )
                     if result is False:
                         logging.error(

redis_benchmarks_specification/__self_contained_coordinator__/runners.py

@@ -230,6 +230,7 @@ def main():
 
     defaults_filename = args.defaults_filename
     (
+        _,
         _,
         default_metrics,
         _,
@@ -639,7 +640,7 @@ def process_self_contained_coordinator_stream(
                     {stream_id: stream_time_ms},
                 )
                 logging.info(
-                    f"Added stream with id {stream_id} to zset {zset_running_platform_benchmarks}"
+                    f"Added stream with id {stream_id} to zset {zset_running_platform_benchmarks}. res={res}"
                 )
 
                 stream_test_list_pending = f"ci.benchmarks.redis/ci/redis/redis:benchmarks:{stream_id}:{running_platform}:tests_pending"
@@ -662,7 +663,7 @@ def process_self_contained_coordinator_stream(
                             _,
                             benchmark_config,
                             test_name,
-                        ) = get_final_benchmark_config(None, stream, "")
+                        ) = get_final_benchmark_config(None, None, stream, "")
                     github_event_conn.lpush(stream_test_list_pending, test_name)
                     github_event_conn.expire(
                         stream_test_list_pending, REDIS_BINS_EXPIRE_SECS
@@ -705,7 +706,7 @@ def process_self_contained_coordinator_stream(
                             _,
                             benchmark_config,
                             test_name,
-                        ) = get_final_benchmark_config(None, stream, "")
+                        ) = get_final_benchmark_config(None, None, stream, "")
                         github_event_conn.lrem(stream_test_list_pending, 1, test_name)
                         github_event_conn.lpush(stream_test_list_running, test_name)
                         github_event_conn.expire(
@@ -1303,9 +1304,7 @@ def process_self_contained_coordinator_stream(
                             tf_github_repo,
                             verbose,
                         )
-                        logging.info(
-                            f"Preparing regression info for the data available"
-                        )
+                        logging.info("Preparing regression info for the data available")
                         print_improvements_only = False
                         print_regressions_only = False
                         skip_unstable = False
@@ -1452,7 +1451,7 @@ def filter_test_files(
                 result,
                 benchmark_config,
                 test_name,
-            ) = get_final_benchmark_config(None, stream, "")
+            ) = get_final_benchmark_config(None, None, stream, "")
             if result is False:
                 logging.error(
                     "Skipping {} given there were errors while calling get_final_benchmark_config()".format(