redisbench-admin 0.11.49__py3-none-any.whl → 0.11.50__py3-none-any.whl

redisbench_admin/compare/args.py

@@ -114,6 +114,26 @@ def create_compare_arguments(parser):
         type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
         default=START_TIME_NOW_UTC,
     )
+    parser.add_argument(
+        "--from-date-baseline",
+        type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
+        default=None,
+    )
+    parser.add_argument(
+        "--to-date-baseline",
+        type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
+        default=None,
+    )
+    parser.add_argument(
+        "--from-date-comparison",
+        type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
+        default=None,
+    )
+    parser.add_argument(
+        "--to-date-comparison",
+        type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
+        default=None,
+    )
     parser.add_argument(
         "--metric_mode",
         type=str,

redisbench_admin/compare/compare.py

@@ -314,6 +314,10 @@ def compare_command_logic(args, project_name, project_version):
         first_n_baseline,
         first_n_comparison,
         grafana_link_base,
+        args.from_date_baseline,
+        args.to_date_baseline,
+        args.from_date_comparison,
+        args.to_date_comparison,
     )
     comment_body = ""
     if total_comparison_points > 0:
@@ -593,24 +597,99 @@ def compute_regression_table(
     first_n_baseline=-1,
     first_n_comparison=-1,
     grafana_link_base=None,
+    from_date_baseline=None,
+    to_date_baseline=None,
+    from_date_comparison=None,
+    to_date_comparison=None,
 ):
     START_TIME_NOW_UTC, _, _ = get_start_time_vars()
     START_TIME_LAST_MONTH_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=31)
-    if from_date is None:
-        from_date = START_TIME_LAST_MONTH_UTC
-    if to_date is None:
-        to_date = START_TIME_NOW_UTC
-    if from_ts_ms is None:
-        from_ts_ms = int(from_date.timestamp() * 1000)
-    if to_ts_ms is None:
-        to_ts_ms = int(to_date.timestamp() * 1000)
-    from_human_str = humanize.naturaltime(
-        dt.datetime.utcfromtimestamp(from_ts_ms / 1000)
-    )
-    to_human_str = humanize.naturaltime(dt.datetime.utcfromtimestamp(to_ts_ms / 1000))
-    logging.info(
-        "Using a time-delta from {} to {}".format(from_human_str, to_human_str)
-    )
+
+    # Handle separate baseline and comparison date ranges (takes precedence if defined)
+    if (
+        from_date_baseline is not None
+        or to_date_baseline is not None
+        or from_date_comparison is not None
+        or to_date_comparison is not None
+    ):
+        # Use separate date ranges for baseline and comparison
+        from_date_baseline = (
+            from_date_baseline
+            if from_date_baseline is not None
+            else START_TIME_LAST_MONTH_UTC
+        )
+        to_date_baseline = (
+            to_date_baseline if to_date_baseline is not None else START_TIME_NOW_UTC
+        )
+        from_date_comparison = (
+            from_date_comparison
+            if from_date_comparison is not None
+            else START_TIME_LAST_MONTH_UTC
+        )
+        to_date_comparison = (
+            to_date_comparison if to_date_comparison is not None else START_TIME_NOW_UTC
+        )
+
+        from_ts_ms_baseline = int(from_date_baseline.timestamp() * 1000)
+        to_ts_ms_baseline = int(to_date_baseline.timestamp() * 1000)
+        from_ts_ms_comparison = int(from_date_comparison.timestamp() * 1000)
+        to_ts_ms_comparison = int(to_date_comparison.timestamp() * 1000)
+
+        from_human_str_baseline = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(from_ts_ms_baseline / 1000)
+        )
+        to_human_str_baseline = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(to_ts_ms_baseline / 1000)
+        )
+        from_human_str_comparison = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(from_ts_ms_comparison / 1000)
+        )
+        to_human_str_comparison = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(to_ts_ms_comparison / 1000)
+        )
+
+        logging.info(
+            "Using separate time ranges - Baseline: {} to {}, Comparison: {} to {}".format(
+                from_human_str_baseline,
+                to_human_str_baseline,
+                from_human_str_comparison,
+                to_human_str_comparison,
+            )
+        )
+
+        # Use baseline range for legacy compatibility (will be overridden in data queries)
+        from_ts_ms = from_ts_ms_baseline
+        to_ts_ms = to_ts_ms_baseline
+
+        # Set legacy variables for table headers (show separate ranges info)
+        from_human_str = f"Baseline: {from_human_str_baseline} to {to_human_str_baseline}, Comparison: {from_human_str_comparison} to {to_human_str_comparison}"
+        to_human_str = to_human_str_baseline
+    else:
+        # Use legacy single date range for both baseline and comparison
+        if from_date is None:
+            from_date = START_TIME_LAST_MONTH_UTC
+        if to_date is None:
+            to_date = START_TIME_NOW_UTC
+        if from_ts_ms is None:
+            from_ts_ms = int(from_date.timestamp() * 1000)
+        if to_ts_ms is None:
+            to_ts_ms = int(to_date.timestamp() * 1000)
+
+        # Use same range for both baseline and comparison
+        from_ts_ms_baseline = from_ts_ms
+        to_ts_ms_baseline = to_ts_ms
+        from_ts_ms_comparison = from_ts_ms
+        to_ts_ms_comparison = to_ts_ms
+
+        from_human_str = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(from_ts_ms / 1000)
+        )
+        to_human_str = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(to_ts_ms / 1000)
+        )
+        logging.info(
+            "Using a time-delta from {} to {}".format(from_human_str, to_human_str)
+        )
     baseline_str, by_str_baseline, comparison_str, by_str_comparison = get_by_strings(
         baseline_branch,
         comparison_branch,
@@ -694,6 +773,10 @@ def compute_regression_table(
         comparison_tag,
         from_date,
         to_date,
+        from_ts_ms_baseline,
+        to_ts_ms_baseline,
+        from_ts_ms_comparison,
+        to_ts_ms_comparison,
     )
     logging.info(
         "Printing differential analysis between {} and {}".format(
@@ -944,7 +1027,56 @@ def from_rts_to_regression_table(
     comparison_tag=None,
     from_date=None,
     to_date=None,
+    from_ts_ms_baseline=None,
+    to_ts_ms_baseline=None,
+    from_ts_ms_comparison=None,
+    to_ts_ms_comparison=None,
 ):
+    # Use separate timestamp ranges if provided, otherwise use legacy single range
+    if (
+        from_ts_ms_baseline is not None
+        and to_ts_ms_baseline is not None
+        and from_ts_ms_comparison is not None
+        and to_ts_ms_comparison is not None
+    ):
+        # Use separate ranges for baseline and comparison
+        baseline_from_ts = from_ts_ms_baseline
+        baseline_to_ts = to_ts_ms_baseline
+        comparison_from_ts = from_ts_ms_comparison
+        comparison_to_ts = to_ts_ms_comparison
+        baseline_from_human = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(baseline_from_ts / 1000)
+        )
+        baseline_to_human = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(baseline_to_ts / 1000)
+        )
+        comparison_from_human = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(comparison_from_ts / 1000)
+        )
+        comparison_to_human = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(comparison_to_ts / 1000)
+        )
+        logging.info(
+            "Using separate timestamp ranges - Baseline: {} to {}, Comparison: {} to {}".format(
+                baseline_from_human, baseline_to_human, comparison_from_human, comparison_to_human
+            )
+        )
+    else:
+        # Use legacy single range for both
+        baseline_from_ts = from_ts_ms
+        baseline_to_ts = to_ts_ms
+        comparison_from_ts = from_ts_ms
+        comparison_to_ts = to_ts_ms
+        from_human = humanize.naturaltime(
+            dt.datetime.utcfromtimestamp(from_ts_ms / 1000)
+        )
+        to_human = humanize.naturaltime(dt.datetime.utcfromtimestamp(to_ts_ms / 1000))
+        logging.info(
+            "Using single timestamp range for both baseline and comparison: {} to {}".format(
+                from_human, to_human
+            )
+        )
+
     print_all = print_regressions_only is False and print_improvements_only is False
     table = []
     detected_regressions = []
@@ -1045,7 +1177,7 @@ def from_rts_to_regression_table(
         try:
             for ts_name_baseline in baseline_timeseries:
                 datapoints_inner = rts.ts().revrange(
-                    ts_name_baseline, from_ts_ms, to_ts_ms
+                    ts_name_baseline, baseline_from_ts, baseline_to_ts
                 )
                 baseline_datapoints.extend(datapoints_inner)
             (
@@ -1064,7 +1196,7 @@ def from_rts_to_regression_table(
             )
             for ts_name_comparison in comparison_timeseries:
                 datapoints_inner = rts.ts().revrange(
-                    ts_name_comparison, from_ts_ms, to_ts_ms
+                    ts_name_comparison, comparison_from_ts, comparison_to_ts
                 )
                 comparison_datapoints.extend(datapoints_inner)
 
@@ -1533,9 +1665,11 @@ def check_client_side_latency(
             comparison_ts = comparison_client_ts[0]
 
             # Get client-side latency data
-            baseline_client_data = rts.ts().revrange(baseline_ts, from_ts_ms, to_ts_ms)
+            baseline_client_data = rts.ts().revrange(
+                baseline_ts, baseline_from_ts, baseline_to_ts
+            )
             comparison_client_data = rts.ts().revrange(
-                comparison_ts, from_ts_ms, to_ts_ms
+                comparison_ts, comparison_from_ts, comparison_to_ts
             )
 
             if len(baseline_client_data) == 0 or len(comparison_client_data) == 0:
@@ -1878,11 +2012,15 @@ def perform_variance_and_p99_analysis(
             comparison_p99_data = []
 
             for ts_name in baseline_ts_list:
-                datapoints = rts.ts().revrange(ts_name, from_ts_ms, to_ts_ms)
+                datapoints = rts.ts().revrange(
+                    ts_name, baseline_from_ts, baseline_to_ts
+                )
                 baseline_p99_data.extend(datapoints)
 
             for ts_name in comparison_ts_list:
-                datapoints = rts.ts().revrange(ts_name, from_ts_ms, to_ts_ms)
+                datapoints = rts.ts().revrange(
+                    ts_name, comparison_from_ts, comparison_to_ts
+                )
                 comparison_p99_data.extend(datapoints)
 
             if len(baseline_p99_data) < 3 or len(comparison_p99_data) < 3:
@@ -2230,11 +2368,15 @@ def check_latency_for_unstable_throughput(
             comparison_latency_data = []
 
             for ts_name in baseline_ts_list:
-                datapoints = rts.ts().revrange(ts_name, from_ts_ms, to_ts_ms)
+                datapoints = rts.ts().revrange(
+                    ts_name, baseline_from_ts, baseline_to_ts
+                )
                 baseline_latency_data.extend(datapoints)
 
             for ts_name in comparison_ts_list:
-                datapoints = rts.ts().revrange(ts_name, from_ts_ms, to_ts_ms)
+                datapoints = rts.ts().revrange(
+                    ts_name, comparison_from_ts, comparison_to_ts
+                )
                 comparison_latency_data.extend(datapoints)
 
             if len(baseline_latency_data) == 0 or len(comparison_latency_data) == 0:

redisbench_admin/run/modules.py

@@ -66,9 +66,13 @@ def redis_files_check(redis_server_binary_path, redis_conf_path):
 
     if redis_server_binary_path is not None:
         # Convert relative paths to absolute paths
-        redis_server_binary_path = os.path.abspath(os.path.expanduser(redis_server_binary_path))
+        redis_server_binary_path = os.path.abspath(
+            os.path.expanduser(redis_server_binary_path)
+        )
         logging.info(
-            "Checking if custom Redis server binary {} exists...".format(redis_server_binary_path)
+            "Checking if custom Redis server binary {} exists...".format(
+                redis_server_binary_path
+            )
         )
         if not os.path.exists(redis_server_binary_path):
             error_message = "Specified Redis server binary does not exist: {}".format(
@@ -77,14 +81,18 @@ def redis_files_check(redis_server_binary_path, redis_conf_path):
             logging.error(error_message)
             status = False
         elif not os.path.isfile(redis_server_binary_path):
-            error_message = "Specified Redis server binary path is not a file: {}".format(
-                redis_server_binary_path
+            error_message = (
+                "Specified Redis server binary path is not a file: {}".format(
+                    redis_server_binary_path
+                )
             )
             logging.error(error_message)
             status = False
         elif not os.access(redis_server_binary_path, os.X_OK):
-            error_message = "Specified Redis server binary is not executable: {}".format(
-                redis_server_binary_path
+            error_message = (
+                "Specified Redis server binary is not executable: {}".format(
+                    redis_server_binary_path
+                )
             )
             logging.error(error_message)
             status = False

{redisbench_admin-0.11.49.dist-info → redisbench_admin-0.11.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.49
+Version: 0.11.50
 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

{redisbench_admin-0.11.49.dist-info → redisbench_admin-0.11.50.dist-info}/RECORD

@@ -3,8 +3,8 @@ redisbench_admin/cli.py,sha256=LAS5qnqScXKhxHYfXWB0mvAYaUYrSurIwadhexEa9g4,7740
 redisbench_admin/commands/__init__.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/commands/commands.json.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/compare/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/compare/args.py,sha256=rOP8td_GYPYsZiYN4olyYmUsku-oizggEZNRTB_fVro,6336
-redisbench_admin/compare/compare.py,sha256=NvC7RbQUJUKlPdJQj9TjUmk2k8UtiA9wnZWNDV7IM_Q,103315
+redisbench_admin/compare/args.py,sha256=BPLdYSBTk7DUMPjqsCxiHlaTMSUuTH2Lc60WdECDZ-g,6940
+redisbench_admin/compare/compare.py,sha256=FdweCQkXSabUzhv6y3HVwoE_JwAKUIc1Pc3hC8Hwhoo,108833
 redisbench_admin/deploy/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/deploy/args.py,sha256=neLUcQqI__HkJItkQg2C293hl5g3yHG40t171r7-E5Y,1732
 redisbench_admin/deploy/deploy.py,sha256=MtfJbsL97DLrbBYut6zRCzyEMebX4xWoZE-m4-JDRB8,3885
@@ -184,7 +184,7 @@ redisbench_admin/run/grafana.py,sha256=iMDgMyJKinpZMTD43rZ1IcRGkadjFjCxaB48mYWkv
 redisbench_admin/run/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/memtier_benchmark/memtier_benchmark.py,sha256=wTd2olovvFBZ98mOSr6DM5BJsdaiuPteEZzBqeSgbkE,4246
 redisbench_admin/run/metrics.py,sha256=8EQdcZbCiFB_kIR1WtUQNOPV8y74bZ8Dj51Cv0aR4nk,7556
-redisbench_admin/run/modules.py,sha256=ZMV8IKJAzkSqxIk8vDQq-sOYn2fE1Que6w7I9D4P9xQ,4773
+redisbench_admin/run/modules.py,sha256=NehcSl3mVLeZ5H_x2thgYTYa5SOc5KSH8HDO2MCdb14,4905
 redisbench_admin/run/redis_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/redis_benchmark/redis_benchmark.py,sha256=e-Az2uTlt3z2W4uzlUsdxeT8GITpxpGb-Mjb6JxrSWc,6848
 redisbench_admin/run/redisgraph_benchmark_go/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -235,8 +235,8 @@ redisbench_admin/utils/utils.py,sha256=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6r
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=0wWYge3x_OMxWrzazNhJif2NK4tKsI963HVZqjczRag,6189
-redisbench_admin-0.11.49.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.49.dist-info/METADATA,sha256=MvW4DsC1oIANjXhnvv5FF6O0HCL_POECirbx8tRDM14,5596
-redisbench_admin-0.11.49.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.49.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.49.dist-info/RECORD,,
+redisbench_admin-0.11.50.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.50.dist-info/METADATA,sha256=v3BjufPIxSYH3J9AsIzQ5lsr5i2QEnFvv6yY1ZFxkNY,5596
+redisbench_admin-0.11.50.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.50.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.50.dist-info/RECORD,,