locust 2.46.1.dev14__tar.gz → 2.46.2__tar.gz

{locust-2.46.1.dev14 → locust-2.46.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: locust
-Version: 2.46.1.dev14
+Version: 2.46.2
 Summary: Developer-friendly load testing framework
-Project-URL: homepage, https://locust.io/
-Project-URL: repository, https://github.com/locustio/locust
-Project-URL: documentation, https://docs.locust.io/
+Project-URL: Homepage, https://locust.cloud/
+Project-URL: Repository, https://github.com/locustio/locust
+Project-URL: Documentation, https://docs.locust.io/
 Author: Jonatan Heyman, Lars Holmberg
 Maintainer: Lars Holmberg, Jonatan Heyman, Andrew Baldwin
 License: MIT
@@ -39,7 +39,6 @@ Requires-Dist: python-socketio[client]>=5.13.0
 Requires-Dist: pywin32; sys_platform == 'win32'
 Requires-Dist: pyzmq>=25.0.0
 Requires-Dist: requests>=2.32.2
-Requires-Dist: tomli>=1.1.0; python_version < '3.11'
 Requires-Dist: typing-extensions>=4.6.0; python_version < '3.12'
 Requires-Dist: werkzeug>=2.0.0
 Provides-Extra: dns

{locust-2.46.1.dev14 → locust-2.46.2}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.46.1.dev14'
-__version_tuple__ = version_tuple = (2, 46, 1, 'dev14')
+__version__ = version = '2.46.2'
+__version_tuple__ = version_tuple = (2, 46, 2)
 
 __commit_id__ = commit_id = None

{locust-2.46.1.dev14 → locust-2.46.2}/locust/stats.py

@@ -113,7 +113,7 @@ response time percentile
 """
 CURRENT_RESPONSE_TIME_PERCENTILE_WINDOW = 10
 
-CachedResponseTimes = namedtuple("CachedResponseTimes", ["response_times", "num_requests"])
+CachedResponseTimes = namedtuple("CachedResponseTimes", ["response_times", "num_requests", "num_none_requests"])
 
 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]
 
@@ -298,7 +298,7 @@ class StatsEntry:
     Represents a single stats entry (name and method)
     """
 
-    def __init__(self, stats: RequestStats | None, name: str, method: str, use_response_times_cache: bool = False):
+    def __init__(self, stats: RequestStats, name: str, method: str, use_response_times_cache: bool = False):
         self.stats = stats
         self.name = name
         """ Name (URL) of this stats entry """
@@ -450,7 +450,7 @@ class StatsEntry:
 
     @property
     def current_rps(self) -> float:
-        if self.stats is None or self.stats.last_request_timestamp is None:
+        if self.stats.last_request_timestamp is None:
             return 0
         slice_start_time = max(int(self.stats.last_request_timestamp) - 12, int(self.stats.start_time or 0))
 
@@ -543,9 +543,9 @@ class StatsEntry:
         return cast(StatsEntryDict, {key: getattr(self, key, None) for key in StatsEntryDict.__annotations__.keys()})
 
     @classmethod
-    def unserialize(cls, data: StatsEntryDict) -> StatsEntry:
+    def unserialize(cls, data: StatsEntryDict, stats: RequestStats) -> StatsEntry:
         """Return the unserialzed version of the specified dict"""
-        obj = cls(None, data["name"], data["method"])
+        obj = cls(stats, data["name"], data["method"])
         valid_keys = StatsEntryDict.__annotations__.keys()
 
         for key, value in data.items():
@@ -604,7 +604,11 @@ class StatsEntry:
 
         Percent specified in range: 0.0 - 1.0
         """
-        return calculate_response_time_percentile(self.response_times, self.num_requests, percent)
+        # response_times only holds non-None samples, so None (async) requests
+        # must be excluded from the denominator, just like in avg/median
+        return calculate_response_time_percentile(
+            self.response_times, self.num_requests - self.num_none_requests, percent
+        )
 
     def get_current_response_time_percentile(self, percent: float) -> int | None:
         """
@@ -644,7 +648,7 @@ class StatsEntry:
             # for that timeframe
             return calculate_response_time_percentile(
                 diff_response_time_dicts(self.response_times, cached.response_times),
-                self.num_requests - cached.num_requests,
+                (self.num_requests - self.num_none_requests) - (cached.num_requests - cached.num_none_requests),
                 percent,
             )
         # if time was not in response times cache window
@@ -669,6 +673,7 @@ class StatsEntry:
         self.response_times_cache[t] = CachedResponseTimes(
             response_times=copy(self.response_times),
             num_requests=self.num_requests,
+            num_none_requests=self.num_none_requests,
         )
 
         # We'll use a cache size of CURRENT_RESPONSE_TIME_PERCENTILE_WINDOW + 10 since - in the extreme case -
@@ -830,7 +835,7 @@ def setup_distributed_stats_event_listeners(events: Events, stats: RequestStats)
 
     def on_worker_report(client_id: str, data: dict[str, Any]) -> None:
         for stats_data in data["stats"]:
-            entry = StatsEntry.unserialize(stats_data)
+            entry = StatsEntry.unserialize(stats_data, stats)
             request_key = (entry.name, entry.method)
             if request_key not in stats.entries:
                 stats.entries[request_key] = StatsEntry(stats, entry.name, entry.method, use_response_times_cache=True)
@@ -851,7 +856,7 @@ def setup_distributed_stats_event_listeners(events: Events, stats: RequestStats)
                         incoming_last if existing.last_seen is None else max(existing.last_seen, incoming_last)
                     )
 
-        stats.total.extend(StatsEntry.unserialize(data["stats_total"]))
+        stats.total.extend(StatsEntry.unserialize(data["stats_total"], stats))
 
     events.report_to_master.add_listener(on_report_to_master)
     events.worker_report.add_listener(on_worker_report)

{locust-2.46.1.dev14 → locust-2.46.2}/pyproject.toml

@@ -40,7 +40,6 @@ dependencies = [
     "pyzmq>=25.0.0",
     "geventhttpclient>=2.3.1",
     "configargparse>=1.7.1",
-    "tomli>=1.1.0; python_version < '3.11'",
     "typing_extensions>=4.6.0; python_version < '3.12'",
     "psutil>=5.9.1",
     "Flask-Login>=0.6.3",
@@ -66,9 +65,9 @@ otel = [
 qdrant = ["qdrant-client>=1.16.2"]
 
 [project.urls]
-homepage = "https://locust.io/"
-repository = "https://github.com/locustio/locust"
-documentation = "https://docs.locust.io/"
+Homepage = "https://locust.cloud/"
+Repository = "https://github.com/locustio/locust"
+Documentation = "https://docs.locust.io/"
 
 [tool.uv]
 default-groups = ["build", "test", "lint"]
@@ -76,7 +75,7 @@ default-groups = ["build", "test", "lint"]
 [dependency-groups]
 build = ["hatch==1.16.5", "hatch-vcs>=0.4.0"]
 test = [
-    "cryptography>=43.0.1,<47.0.0",
+    "cryptography>=43.0.1,<49.0.0",
     "pyquery>=2.0.0,<3.0.0",
     "retry>=0.9.2,<1.0.0",
 ]
@@ -203,7 +202,7 @@ reportOptionalMemberAccess = "none"
 [tool.hatch.envs.hatch-test]
 default-args = ["locust/test"]
 dependencies = [
-    "cryptography>=43.0.1,<47.0.0",
+    "cryptography>=43.0.1,<49.0.0",
     "pyquery>=2.0.1,<3.0.0",
     "pytest>=8.3.3,<10",
     "retry>=0.9.2,<1.0.0",