locust 2.37.1.dev2__py3-none-any.whl → 2.37.2__py3-none-any.whl

locust/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.37.1.dev2'
-__version_tuple__ = version_tuple = (2, 37, 1, 'dev2')
+__version__ = version = '2.37.2'
+__version_tuple__ = version_tuple = (2, 37, 2)

locust/argument_parser.py

@@ -773,12 +773,6 @@ Typically ONLY these options (and --locustfile) need to be specified on workers,
         action="store_true",
         help="Prints the final stats in JSON format to stdout. Useful for parsing the results in other programs/scripts. Use together with --headless and --skip-log for an output only with the json data.",
     )
-    stats_group.add_argument(
-        "--json-file",
-        metavar="<filename>",
-        dest="json_file",
-        help="Prints the final stats in JSON format to file path specified.",
-    )
 
     log_group = parser.add_argument_group("Logging options")
     log_group.add_argument(

locust/input_events.py

@@ -99,9 +99,8 @@ def input_listener(key_to_func_map: dict[str, Callable]):
     def input_listener_func():
         try:
             poller = get_poller()
-        except InitError:
-            # This is a bit chatty, even for debug. Uncomment it if you're having problems with keyboard events
-            # logging.debug(e)
+        except InitError as e:
+            logging.debug(e)
             return
 
         try:

locust/main.py

@@ -640,8 +640,6 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
             runner.quit()
         if options.json:
             stats.print_stats_json(runner.stats)
-        if options.json_file:
-            stats.save_stats_json(runner.stats, options.json_file)
         elif not isinstance(runner, locust.runners.WorkerRunner):
             stats.print_stats(runner.stats, current=False)
             stats.print_percentile_stats(runner.stats)

locust/stats.py

@@ -820,11 +820,6 @@ def print_stats_json(stats: RequestStats) -> None:
     print(json.dumps(stats.serialize_stats(), indent=4))
 
 
-def save_stats_json(stats: RequestStats, filename: str) -> None:
-    with open(f"{filename}.json", "w") as _:
-        json.dumps(stats.serialize_stats(), indent=4)
-
-
 def get_stats_summary(stats: RequestStats, current=True) -> list[str]:
     """
     stats summary will be returned as list of string

locust/web.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import csv
+import itertools
 import json
 import logging
 import mimetypes
@@ -8,7 +9,6 @@ import os.path
 from functools import wraps
 from html import escape
 from io import StringIO
-from itertools import chain
 from json import dumps
 from typing import TYPE_CHECKING, Any, TypedDict
 
@@ -456,18 +456,17 @@ class WebUI:
 
                 return jsonify(report)
 
-            for s in chain(stats.sort_stats(environment.runner.stats.entries), [environment.runner.stats.total]):
-                _stats.append(s.to_dict())
-
-            errors = [e.serialize() for e in environment.runner.errors.values()]
-
             # Truncate the total number of stats and errors displayed since a large number of rows will cause the app
             # to render extremely slowly. Aggregate stats should be preserved.
-            truncated_stats = _stats[:500]
-            if len(_stats) > 500:
-                truncated_stats += [_stats[-1]]
+            _stats.extend(
+                stat.to_dict() for stat in itertools.islice(stats.sort_stats(environment.runner.stats.entries), 500)
+            )
+            _stats.append(environment.runner.stats.total.to_dict())
+
+            errors = [e.serialize() for e in itertools.islice(environment.runner.errors.values(), 500)]
+
+            report = {"stats": _stats, "errors": errors}
 
-            report = {"stats": truncated_stats, "errors": errors[:500]}
             total_stats = _stats[-1]
 
             if _stats:
@@ -495,6 +494,7 @@ class WebUI:
                     )
 
                 report["workers"] = workers
+                report["worker_count"] = environment.runner.worker_count
 
             report["state"] = environment.runner.state
             report["user_count"] = environment.runner.user_count
@@ -564,6 +564,7 @@ class WebUI:
             )
 
         @app_blueprint.route("/user", methods=["POST"])
+        @self.auth_required_if_enabled
         def update_user():
             assert request.method == "POST"
 
@@ -572,6 +573,15 @@ class WebUI:
 
             return {}, 201
 
+        @app_blueprint.route("/worker-count")
+        @self.auth_required_if_enabled
+        def get_worker_count():
+            return {
+                "worker_count": self.environment.runner.worker_count
+                if isinstance(self.environment.runner, MasterRunner)
+                else 0
+            }
+
         app.register_blueprint(app_blueprint)
 
     @property