locust 2.18.3.dev6__tar.gz → 2.18.4.dev3__tar.gz

{locust-2.18.3.dev6 → locust-2.18.4.dev3}/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Detailed changelog
 The most important changes can also be found in [the documentation](https://docs.locust.io/en/latest/changelog.html).
 
+## [2.18.3](https://github.com/locustio/locust/tree/2.18.3) (2023-11-12)
+
+[Full Changelog](https://github.com/locustio/locust/compare/2.18.2...2.18.3)
+
+**Closed issues:**
+
+- Add Modern UI HTML Report to --html Option [\#2458](https://github.com/locustio/locust/issues/2458)
+
+**Merged pull requests:**
+
+- List Andrew as maintainer of the Modern web UI [\#2460](https://github.com/locustio/locust/pull/2460) ([cyberw](https://github.com/cyberw))
+- Add Modern UI HTML Report to --html Option [\#2459](https://github.com/locustio/locust/pull/2459) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+- Modern UI: Add sorting to columns on statistics page and downloaded report [\#2453](https://github.com/locustio/locust/pull/2453) ([andrewbaldwin44](https://github.com/andrewbaldwin44))
+
 ## [2.18.2](https://github.com/locustio/locust/tree/2.18.2) (2023-11-10)
 
 [Full Changelog](https://github.com/locustio/locust/compare/2.18.1...2.18.2)

{locust-2.18.3.dev6/locust.egg-info → locust-2.18.4.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.18.3.dev6
+Version: 2.18.4.dev3
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://locust.io/

{locust-2.18.3.dev6 → locust-2.18.4.dev3}/docs/changelog.rst

@@ -4,9 +4,13 @@ Changelog Highlights
 
 For full details of the Locust changelog, please see https://github.com/locustio/locust/blob/master/CHANGELOG.md
 
+2.18.3
+======
+* Modern UI: Add sorting to columns on statistics page and downloaded report https://github.com/locustio/locust/pull/2453
+
 2.18.2
 ======
-* FastHttpUser: encoding return str when response is empty by https://github.com/locustio/locust/pull/2451
+* FastHttpUser: encoding return str when response is empty https://github.com/locustio/locust/pull/2451
 
 2.18.1
 ======

{locust-2.18.3.dev6 → locust-2.18.4.dev3}/docs/what-is-locust.rst

@@ -61,9 +61,9 @@ Previous versions of Locust used terminology borrowed from nature (swarming, hat
 Authors
 =======
 
-- `Jonatan Heyman <http://heyman.info>`_ (`@jonatanheyman <https://twitter.com/jonatanheyman>`_ on Twitter)
-- Lars Holmberg (`@cyberw <https://github.com/cyberw>`_ on Github)
-- Andrew Baldwin (`@andrewbaldwin44 <https://github.com/andrewbaldwin44>`_ on Github)
+- Jonatan Heyman (`@heyman <https://github.com/heyman>`_)
+- Lars Holmberg (`@cyberw <https://github.com/cyberw>`_)
+- Andrew Baldwin (`@andrewbaldwin44 <https://github.com/andrewbaldwin44>`_)
 - Carl Byström, Joakim Hamrén & Hugo Heyman
 
 Many thanks to our other great `contributors <https://github.com/locustio/locust/graphs/contributors>`_!

{locust-2.18.3.dev6 → locust-2.18.4.dev3}/locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.18.3.dev6'
-__version_tuple__ = version_tuple = (2, 18, 3, 'dev6')
+__version__ = version = '2.18.4.dev3'
+__version_tuple__ = version_tuple = (2, 18, 4, 'dev3')

{locust-2.18.3.dev6 → locust-2.18.4.dev3}/locust/html.py

@@ -10,26 +10,31 @@ from .user.inspectuser import get_ratio
 from html import escape
 from json import dumps
 from .runners import MasterRunner, STATE_STOPPED, STATE_STOPPING
-from flask import render_template as flask_render_template
 
 
 PERCENTILES_FOR_HTML_REPORT = [0.50, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 1.0]
 
 
-def render_template(file, **kwargs):
-    templates_path = os.path.join(pathlib.Path(__file__).parent.absolute(), "templates")
-    env = Environment(loader=FileSystemLoader(templates_path), extensions=["jinja2.ext.do"])
+def render_template(file, template_path, **kwargs):
+    env = Environment(loader=FileSystemLoader(template_path), extensions=["jinja2.ext.do"])
     template = env.get_template(file)
     return template.render(**kwargs)
 
 
 def get_html_report(
     environment,
-    static_path=os.path.join(os.path.dirname(__file__), "static"),
     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
@@ -94,8 +99,9 @@ def get_html_report(
     }
 
     if use_modern_ui:
-        res = flask_render_template(
+        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],
@@ -128,6 +134,7 @@ def get_html_report(
     else:
         res = render_template(
             "report.html",
+            template_path,
             int=int,
             round=round,
             escape=escape,

{locust-2.18.3.dev6 → locust-2.18.4.dev3}/locust/main.py

@@ -495,8 +495,8 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
         logger.info("Got SIGTERM signal")
         shutdown()
 
-    def save_html_report():
-        html_report = get_html_report(environment, show_download_link=False)
+    def save_html_report(use_modern_ui=False):
+        html_report = get_html_report(environment, show_download_link=False, use_modern_ui=use_modern_ui)
         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)
@@ -512,10 +512,10 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
 
         main_greenlet.join()
         if options.html_file:
-            save_html_report()
+            save_html_report(options.modern_ui)
     except KeyboardInterrupt:
         if options.html_file:
-            save_html_report()
+            save_html_report(options.modern_ui)
     except Exception:
         raise
     shutdown()

{locust-2.18.3.dev6 → locust-2.18.4.dev3}/locust/web.py

@@ -110,9 +110,9 @@ class WebUI:
         self.app = app
         app.jinja_env.add_extension("jinja2.ext.do")
         app.debug = True
-        self.root_path = os.path.dirname(os.path.abspath(__file__))
-        app.root_path = self.root_path
-        self.webui_build_path = f"{self.root_path}/webui/dist"
+        root_path = os.path.dirname(os.path.abspath(__file__))
+        app.root_path = root_path
+        self.webui_build_path = os.path.join(root_path, "webui", "dist")
         self.app.config["BASIC_AUTH_ENABLED"] = False
         self.auth: Optional[BasicAuth] = None
         self.greenlet: Optional[gevent.Greenlet] = None
@@ -144,9 +144,7 @@ class WebUI:
 
         @app.route("/assets/<path:path>")
         def send_assets(path):
-            webui_build_path = self.webui_build_path
-
-            return send_from_directory(f"{webui_build_path}/assets", path)
+            return send_from_directory(os.path.join(self.webui_build_path, "assets"), path)
 
         @app.route("/")
         @self.auth_required_if_enabled
@@ -287,16 +285,9 @@ class WebUI:
         @app.route("/stats/report")
         @self.auth_required_if_enabled
         def stats_report() -> Response:
-            if self.modern_ui:
-                self.set_static_modern_ui()
-                static_path = f"{self.webui_build_path}/assets"
-            else:
-                static_path = f"{self.root_path}/static"
-
             theme = request.args.get("theme", "")
             res = get_html_report(
                 self.environment,
-                static_path=static_path,
                 show_download_link=not request.args.get("download"),
                 use_modern_ui=self.modern_ui,
                 theme=theme,
@@ -542,7 +533,7 @@ class WebUI:
 
     def set_static_modern_ui(self):
         self.app.template_folder = self.webui_build_path
-        self.app.static_folder = f"{self.webui_build_path}/assets/"
+        self.app.static_folder = os.path.join(self.webui_build_path, "assets")
         self.app.static_url_path = "/assets/"
 
     def update_template_args(self):