locust 2.26.1.dev72__py3-none-any.whl → 2.27.1.dev7__py3-none-any.whl

locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.26.1.dev72'
-__version_tuple__ = version_tuple = (2, 26, 1, 'dev72')
+__version__ = version = '2.27.1.dev7'
+__version_tuple__ = version_tuple = (2, 27, 1, 'dev7')

locust/argument_parser.py

@@ -500,7 +500,7 @@ def setup_parser_arguments(parser):
         "--legacy-ui",
         default=False,
         action="store_true",
-        help="Use the legacy frontend for the web UI (deprecated, support will be removed soon)",
+        help=configargparse.SUPPRESS,
         env_var="LOCUST_LEGACY_UI",
     )
 

locust/env.py

@@ -166,7 +166,6 @@ class Environment:
         stats_csv_writer: StatsCSV | None = None,
         delayed_start=False,
         userclass_picker_is_active=False,
-        modern_ui=False,
     ) -> WebUI:
         """
         Creates a :class:`WebUI <locust.web.WebUI>` instance for this Environment and start running the web server
@@ -193,7 +192,6 @@ class Environment:
             stats_csv_writer=stats_csv_writer,
             delayed_start=delayed_start,
             userclass_picker_is_active=userclass_picker_is_active,
-            modern_ui=modern_ui,
         )
         return self.web_ui
 

locust/html.py

@@ -14,10 +14,13 @@ from .stats import sort_stats
 from .user.inspectuser import get_ratio
 
 PERCENTILES_FOR_HTML_REPORT = [0.50, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 1.0]
+ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
+BUILD_PATH = os.path.join(ROOT_PATH, "webui", "dist")
+STATIC_PATH = os.path.join(BUILD_PATH, "assets")
 
 
-def render_template(file, template_path, **kwargs):
-    env = Environment(loader=FileSystemLoader(template_path), extensions=["jinja2.ext.do"])
+def render_template(file, **kwargs):
+    env = Environment(loader=FileSystemLoader(BUILD_PATH), extensions=["jinja2.ext.do"])
     template = env.get_template(file)
     return template.render(**kwargs)
 
@@ -25,17 +28,8 @@ def render_template(file, template_path, **kwargs):
 def get_html_report(
     environment,
     show_download_link=True,
-    use_modern_ui=False,
     theme="",
 ):
-    root_path = os.path.dirname(os.path.abspath(__file__))
-    if use_modern_ui:
-        static_path = os.path.join(root_path, "webui", "dist", "assets")
-        template_path = os.path.join(root_path, "webui", "dist")
-    else:
-        static_path = os.path.join(root_path, "static")
-        template_path = os.path.join(root_path, "templates")
-
     stats = environment.runner.stats
 
     start_ts = stats.start_time
@@ -63,28 +57,15 @@ def get_html_report(
     history = stats.history
 
     static_js = []
-    if use_modern_ui:
-        js_files = [os.path.basename(filepath) for filepath in glob.glob(os.path.join(static_path, "*.js"))]
-    else:
-        js_files = ["jquery-1.11.3.min.js", "echarts.common.min.js", "vintage.js", "chart.js", "tasks.js"]
+    js_files = [os.path.basename(filepath) for filepath in glob.glob(os.path.join(STATIC_PATH, "*.js"))]
 
     for js_file in js_files:
-        path = os.path.join(static_path, js_file)
+        path = os.path.join(STATIC_PATH, js_file)
         static_js.append("// " + js_file + "\n")
         with open(path, encoding="utf8") as f:
             static_js.append(f.read())
         static_js.extend(["", ""])
 
-    if not use_modern_ui:
-        static_css = []
-        css_files = ["tables.css"]
-        for css_file in css_files:
-            path = os.path.join(static_path, "css", css_file)
-            static_css.append("/* " + css_file + " */")
-            with open(path, encoding="utf8") as f:
-                static_css.append(f.read())
-            static_css.extend(["", ""])
-
     is_distributed = isinstance(environment.runner, MasterRunner)
     user_spawned = (
         environment.runner.reported_user_classes_count if is_distributed else environment.runner.user_classes_count
@@ -98,60 +79,33 @@ def get_html_report(
         "total": get_ratio(environment.user_classes, user_spawned, True),
     }
 
-    if use_modern_ui:
-        res = render_template(
-            "report.html",
-            template_path,
-            template_args={
-                "is_report": True,
-                "requests_statistics": [stat.to_dict(escape_string_values=True) for stat in requests_statistics],
-                "failures_statistics": [stat.to_dict() for stat in failures_statistics],
-                "exceptions_statistics": [stat for stat in exceptions_statistics],
-                "response_time_statistics": [
-                    {
-                        "name": escape(stat.name),
-                        "method": escape(stat.method or ""),
-                        **{
-                            str(percentile): stat.get_response_time_percentile(percentile)
-                            for percentile in PERCENTILES_FOR_HTML_REPORT
-                        },
-                    }
-                    for stat in requests_statistics
-                ],
-                "start_time": start_time,
-                "end_time": end_time,
-                "host": escape(str(host)),
-                "history": history,
-                "show_download_link": show_download_link,
-                "locustfile": escape(str(environment.locustfile)),
-                "tasks": task_data,
-                "percentiles_to_chart": stats_module.MODERN_UI_PERCENTILES_TO_CHART,
-            },
-            theme=theme,
-            static_js="\n".join(static_js),
-        )
-    else:
-        res = render_template(
-            "report.html",
-            template_path,
-            int=int,
-            round=round,
-            escape=escape,
-            str=str,
-            requests_statistics=requests_statistics,
-            failures_statistics=failures_statistics,
-            exceptions_statistics=exceptions_statistics,
-            start_time=start_time,
-            end_time=end_time,
-            host=host,
-            history=history,
-            static_js="\n".join(static_js),
-            static_css="\n".join(static_css),
-            show_download_link=show_download_link,
-            locustfile=environment.locustfile,
-            tasks=dumps(task_data),
-            percentile1=stats_module.PERCENTILES_TO_CHART[0],
-            percentile2=stats_module.PERCENTILES_TO_CHART[1],
-        )
-
-    return res
+    return render_template(
+        "report.html",
+        template_args={
+            "is_report": True,
+            "requests_statistics": [stat.to_dict(escape_string_values=True) for stat in requests_statistics],
+            "failures_statistics": [stat.to_dict() for stat in failures_statistics],
+            "exceptions_statistics": [stat for stat in exceptions_statistics],
+            "response_time_statistics": [
+                {
+                    "name": escape(stat.name),
+                    "method": escape(stat.method or ""),
+                    **{
+                        str(percentile): stat.get_response_time_percentile(percentile)
+                        for percentile in PERCENTILES_FOR_HTML_REPORT
+                    },
+                }
+                for stat in requests_statistics
+            ],
+            "start_time": start_time,
+            "end_time": end_time,
+            "host": escape(str(host)),
+            "history": history,
+            "show_download_link": show_download_link,
+            "locustfile": escape(str(environment.locustfile)),
+            "tasks": task_data,
+            "percentiles_to_chart": stats_module.PERCENTILES_TO_CHART,
+        },
+        theme=theme,
+        static_js="\n".join(static_js),
+    )

locust/main.py

@@ -128,12 +128,8 @@ def main():
             available_user_classes[key] = value
             available_user_tasks[key] = value.tasks or {}
 
-    if len(stats.PERCENTILES_TO_CHART) != 2:
-        logging.error("stats.PERCENTILES_TO_CHART parameter should be 2 parameters \n")
-        sys.exit(1)
-
-    if len(stats.MODERN_UI_PERCENTILES_TO_CHART) > 6:
-        logging.error("stats.MODERN_UI_PERCENTILES_TO_CHART parameter should be a maximum of 6 parameters \n")
+    if len(stats.PERCENTILES_TO_CHART) > 6:
+        logging.error("stats.PERCENTILES_TO_CHART parameter should be a maximum of 6 parameters \n")
         sys.exit(1)
 
     def is_valid_percentile(parameter):
@@ -183,7 +179,8 @@ def main():
         options.spawn_rate = options.hatch_rate
 
     if options.legacy_ui:
-        sys.stderr.write("[DEPRECATED] The legacy UI is deprecated and will be removed soon\n")
+        sys.stderr.write("[REMOVED] The legacy UI has been removed. Remove this flag to use the new UI")
+        sys.exit(1)
 
     # setup logging
     if not options.skip_log_setup:
@@ -411,8 +408,8 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
         if options.worker:
             logger.error("The --master argument cannot be combined with --worker")
             sys.exit(-1)
-        if options.expect_workers_max_wait and not options.expect_workers:
-            logger.error("The --expect-workers-max-wait argument only makes sense when combined with --expect-workers")
+        if options.expect_workers < 1:
+            logger.error(f"Invalid --expect-workers argument ({options.expect_workers}), must be a positive number")
             sys.exit(-1)
         runner = environment.create_master_runner(
             master_bind_host=options.master_bind_host,
@@ -480,7 +477,6 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
             stats_csv_writer=stats_csv_writer,
             delayed_start=True,
             userclass_picker_is_active=options.class_picker,
-            modern_ui=not options.legacy_ui,
         )
     else:
         web_ui = None
@@ -654,8 +650,8 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
         logger.info("Got SIGTERM signal")
         shutdown()
 
-    def save_html_report(use_modern_ui=False):
-        html_report = get_html_report(environment, show_download_link=False, use_modern_ui=use_modern_ui)
+    def save_html_report():
+        html_report = get_html_report(environment, show_download_link=False)
         logger.info("writing html report to file: %s", options.html_file)
         with open(options.html_file, "w", encoding="utf-8") as file:
             file.write(html_report)
@@ -671,10 +667,10 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
 
         main_greenlet.join()
         if options.html_file:
-            save_html_report(not options.legacy_ui)
+            save_html_report()
     except KeyboardInterrupt:
         if options.html_file:
-            save_html_report(not options.legacy_ui)
+            save_html_report()
     except Exception:
         raise
     shutdown()

locust/stats.py

@@ -126,8 +126,7 @@ CachedResponseTimes = namedtuple("CachedResponseTimes", ["response_times", "num_
 PERCENTILES_TO_REPORT = [0.50, 0.66, 0.75, 0.80, 0.90, 0.95, 0.98, 0.99, 0.999, 0.9999, 1.0]
 
 PERCENTILES_TO_STATISTICS = [0.95, 0.99]
-PERCENTILES_TO_CHART = [0.50, 0.95]
-MODERN_UI_PERCENTILES_TO_CHART = [0.95]
+PERCENTILES_TO_CHART = [0.95]
 
 
 class RequestStatsAdditionError(Exception):
@@ -695,9 +694,7 @@ class StatsEntry:
             "current_rps": self.current_rps,
             "current_fail_per_sec": self.current_fail_per_sec,
             "median_response_time": self.median_response_time,
-            "ninetieth_response_time": self.get_response_time_percentile(0.9),  # for legacy ui
-            "ninety_ninth_response_time": self.get_response_time_percentile(0.99),  # for legacy ui
-            **response_time_percentiles,  # for modern ui
+            **response_time_percentiles,
             "avg_content_length": self.avg_content_length,
         }
 
@@ -920,7 +917,7 @@ def stats_history(runner: Runner) -> None:
             current_response_time_percentiles = {
                 f"response_time_percentile_{percentile}": stats.total.get_current_response_time_percentile(percentile)
                 or 0
-                for percentile in MODERN_UI_PERCENTILES_TO_CHART
+                for percentile in PERCENTILES_TO_CHART
             }
 
             r = {
@@ -928,10 +925,6 @@ def stats_history(runner: Runner) -> None:
                 "time": datetime.datetime.now(tz=datetime.timezone.utc).strftime("%H:%M:%S"),
                 "current_rps": stats.total.current_rps or 0,
                 "current_fail_per_sec": stats.total.current_fail_per_sec or 0,
-                "response_time_percentile_1": stats.total.get_current_response_time_percentile(PERCENTILES_TO_CHART[0])
-                or 0,
-                "response_time_percentile_2": stats.total.get_current_response_time_percentile(PERCENTILES_TO_CHART[1])
-                or 0,
                 "total_avg_response_time": stats.total.avg_response_time,
                 "user_count": runner.user_count or 0,
             }

locust/test/test_fasthttp.py

@@ -11,6 +11,7 @@ from tempfile import NamedTemporaryFile
 
 import gevent
 from geventhttpclient.client import HTTPClientPool
+from pyquery import PyQuery as pq
 
 from .testcases import LocustTestCase, WebserverTestCase
 from .util import create_tls_cert
@@ -777,7 +778,8 @@ class TestFastHttpSsl(LocustTestCase):
 
     def test_ssl_request_insecure(self):
         s = FastHttpSession(self.environment, "https://127.0.0.1:%i" % self.web_port, insecure=True, user=None)
-        r = s.get("/")
-        self.assertEqual(200, r.status_code)
-        self.assertIn("<title>Locust for None</title>", r.content.decode("utf-8"))
-        self.assertIn("<p>Script: <span>None</span></p>", r.text)
+        response = s.get("/")
+        d = pq(response.content.decode("utf-8"))
+
+        self.assertEqual(200, response.status_code)
+        self.assertIn('"users": null', str(d))

locust/test/test_main.py

@@ -219,9 +219,8 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
             content=textwrap.dedent(
                 """
             from locust import User, task, constant, events
-            from locust.stats import PERCENTILES_TO_CHART
-            PERCENTILES_TO_CHART[0] = 0.9
-            PERCENTILES_TO_CHART[1] = 0.4
+            from locust import stats
+            stats.PERCENTILES_TO_CHART = [0.9, 0.4]
             class TestUser(User):
                 wait_time = constant(3)
                 @task
@@ -274,8 +273,8 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
             content=textwrap.dedent(
                 """
             from locust import User, task, constant, events
-            from locust.stats import PERCENTILES_TO_CHART
-            PERCENTILES_TO_CHART[0] = 1.2
+            from locust import stats
+            stats.PERCENTILES_TO_CHART  = [1.2]
             class TestUser(User):
                 wait_time = constant(3)
                 @task
@@ -728,7 +727,6 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
                     "locust",
                     "-f",
                     mocked.file_path,
-                    "--legacy-ui",
                     "--web-port",
                     str(port),
                     "--autostart",
@@ -795,7 +793,6 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
                         "locust",
                         "-f",
                         f"{mocked1.file_path},{mocked2}",
-                        "--legacy-ui",
                         "--web-port",
                         str(port),
                         "--autostart",
@@ -1115,7 +1112,6 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
                             "locust",
                             "-f",
                             mocked.file_path,
-                            "--legacy-ui",
                             "--host",
                             "https://test.com/",
                             "--run-time",
@@ -1138,16 +1134,11 @@ class StandaloneIntegrationTests(ProcessIntegrationTest):
 
         # make sure title appears in the report
         _, locustfile = os.path.split(mocked.file_path)
-        self.assertIn(f"<title>Test Report for {locustfile}</title>", html_report_content)
-        self.assertIn(f"<p>Script: <span>{locustfile}</span></p>", html_report_content)
+        self.assertIn(locustfile, html_report_content)
 
         # make sure host appears in the report
         self.assertIn("https://test.com/", html_report_content)
-
-        # make sure the charts container appears in the report
-        self.assertIn("charts-container", html_report_content)
-
-        self.assertNotIn("Download the Report", html_report_content, "Download report link found in HTML content")
+        self.assertIn('"show_download_link": false', html_report_content)
 
     def test_run_with_userclass_picker(self):
         with temporary_file(content=MOCK_LOCUSTFILE_CONTENT_A) as file1: