locust 2.40.2.dev15__py3-none-any.whl → 2.40.3__py3-none-any.whl

locust/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.40.2.dev15'
-__version_tuple__ = version_tuple = (2, 40, 2, 'dev15')
+__version__ = version = '2.40.3'
+__version_tuple__ = version_tuple = (2, 40, 3)
 
 __commit_id__ = commit_id = None

locust/clients.py

@@ -233,7 +233,7 @@ class HttpSession(requests.Session):
         except (MissingSchema, InvalidSchema, InvalidURL):
             raise
         except RequestException as e:
-            return ResponseContextManager(e)
+            return ResponseContextManager(e)  # this is inconsistent, we should fix this some time
 
     def get(
         self, url: str | bytes, *, data: Any = None, json: Any = None, **kwargs: Unpack[RESTKwargs]
@@ -321,16 +321,23 @@ class ResponseContextManager(Response):
     """
 
     error: Exception | None = None
-    _manual_result: bool | Exception | None
+    _manual_result: bool | Exception | None = None
     _entered: bool
     _request_event: EventHook
     request_meta: Mapping[str, Any]
     _catch_response: bool
 
     def raise_for_status(self) -> None:
-        if self.error:
-            raise self.error
-        Response.raise_for_status(self)
+        """Wrapper around :py:meth:`Response.raise_for_status <requests.Response.raise_for_status>`
+        but also taking into account explicit failure()/success() calls.
+        """
+        __tracebackhide__ = True
+        if not self._manual_result:
+            if self.error:
+                raise self.error
+            Response.raise_for_status(self)
+        elif isinstance(self._manual_result, Exception):
+            raise self._manual_result
 
     def __init__(self, error: RequestException):
         """
@@ -340,6 +347,8 @@ class ResponseContextManager(Response):
         super().__init__()
         self.error = error
         self.status_code = 0
+        # this is a bit of an assumption but it is probably worth not to have to pass this around:
+        self._catch_response = True
         self.request = error.request  # type: ignore
 
     @classmethod

locust/contrib/fasthttp.py

@@ -161,7 +161,7 @@ class FastHttpSession:
         else:
             return f"{self.base_url}{path}"
 
-    def _send_request_safe_mode(self, method: str, url: str, **kwargs):
+    def _send_request_safe_mode(self, method: str, url: str, **kwargs) -> FastResponse:
         """
         Send an HTTP request, and catch any exception that might occur due to either
         connection problems, or invalid HTTP status codes
@@ -170,7 +170,9 @@ class FastHttpSession:
             return self.client.urlopen(url, method=method, **kwargs)
         except FAILURE_EXCEPTIONS as e:
             if hasattr(e, "response"):
-                r = e.response
+                # regular FastResponse object
+                resp = e.response
+                resp.error = e
             else:
                 req = self.client._make_request(
                     url,
@@ -179,9 +181,9 @@ class FastHttpSession:
                     payload=kwargs.get("payload"),
                     params=kwargs.get("params"),
                 )
-                r = ErrorResponse(url=url, request=req)
-            r.error = e
-            return r
+                # fake FastResponse object
+                resp = ErrorResponse(req, e)
+            return resp
 
     def request(
         self,
@@ -197,10 +199,9 @@ class FastHttpSession:
         allow_redirects: bool = True,
         context: dict = {},
         **kwargs,
-    ) -> ResponseContextManager | FastResponse:
+    ) -> ResponseContextManager:
         """
-        Send and HTTP request
-        Returns :py:class:`locust.contrib.fasthttp.FastResponse` object.
+        Send an HTTP request
 
         :param method: method for the new :class:`Request` object.
         :param url: path that will be concatenated with the base host URL that has been specified.
@@ -282,30 +283,31 @@ class FastHttpSession:
             except HTTPParseError as e:
                 request_meta["response_time"] = (time.perf_counter() - start_perf_counter) * 1000
                 request_meta["exception"] = e
-                self.request_event.fire(**request_meta)
-                return response
+                rcm = ResponseContextManager(response, self.request_event, request_meta, catch_response)
+                if not catch_response:
+                    rcm.__exit__(None, None, None)
+                return rcm
 
+        rcm = ResponseContextManager(response, self.request_event, request_meta, catch_response)
         # Record the consumed time
         # Note: This is intentionally placed after we record the content_size above, since
         # we'll then trigger fetching of the body (unless stream=True)
         request_meta["response_time"] = (time.perf_counter() - start_perf_counter) * 1000
 
-        if catch_response:
-            return ResponseContextManager(response, request_event=self.request_event, request_meta=request_meta)
-        else:
-            try:
-                response.raise_for_status()
-            except FAILURE_EXCEPTIONS as e:
-                request_meta["exception"] = e
+        try:
+            response.raise_for_status()
+        except FAILURE_EXCEPTIONS as e:
+            request_meta["exception"] = e  # type: ignore[assignment] # mypy, why are you so dumb..
 
-            self.request_event.fire(**request_meta)
-            return response
+        if not catch_response:  # if not using with-block, report the request immediately
+            rcm.__exit__(None, None, None)
+        return rcm
 
-    def delete(self, url: str, **kwargs: Unpack[RESTKwargs]) -> ResponseContextManager | FastResponse:
+    def delete(self, url: str, **kwargs: Unpack[RESTKwargs]) -> ResponseContextManager:
         """Sends a DELETE request"""
         return self.request("DELETE", url, **kwargs)
 
-    def get(self, url: str, **kwargs: Unpack[RESTKwargs]) -> ResponseContextManager | FastResponse:
+    def get(self, url: str, **kwargs: Unpack[RESTKwargs]) -> ResponseContextManager:
         """Sends a GET request"""
         return self.request("GET", url, **kwargs)
 
@@ -320,29 +322,25 @@ class FastHttpSession:
                 line, buffer = buffer.split("\n", 1)
                 yield line
 
-    def head(self, url: str, **kwargs: Unpack[RESTKwargs]) -> ResponseContextManager | FastResponse:
+    def head(self, url: str, **kwargs: Unpack[RESTKwargs]) -> ResponseContextManager:
         """Sends a HEAD request"""
         return self.request("HEAD", url, **kwargs)
 
-    def options(self, url: str, **kwargs: Unpack[RESTKwargs]) -> ResponseContextManager | FastResponse:
+    def options(self, url: str, **kwargs: Unpack[RESTKwargs]) -> ResponseContextManager:
         """Sends a OPTIONS request"""
         return self.request("OPTIONS", url, **kwargs)
 
-    def patch(
-        self, url: str, data: str | dict | None = None, **kwargs: Unpack[PatchKwargs]
-    ) -> ResponseContextManager | FastResponse:
+    def patch(self, url: str, data: str | dict | None = None, **kwargs: Unpack[PatchKwargs]) -> ResponseContextManager:
         """Sends a PATCH request"""
         return self.request("PATCH", url, data=data, **kwargs)
 
     def post(
         self, url: str, data: str | dict | None = None, json: Any = None, **kwargs: Unpack[PostKwargs]
-    ) -> ResponseContextManager | FastResponse:
+    ) -> ResponseContextManager:
         """Sends a POST request"""
         return self.request("POST", url, data=data, json=json, **kwargs)
 
-    def put(
-        self, url: str, data: str | dict | None = None, **kwargs: Unpack[PutKwargs]
-    ) -> ResponseContextManager | FastResponse:
+    def put(self, url: str, data: str | dict | None = None, **kwargs: Unpack[PutKwargs]) -> ResponseContextManager:
         """Sends a PUT request"""
         return self.request("PUT", url, data=data, **kwargs)
 
@@ -563,8 +561,8 @@ class FastResponse(CompatResponse):
 
     def raise_for_status(self):
         """Raise any connection errors that occurred during the request"""
-        if hasattr(self, "error") and self.error:
-            raise self.error
+        if error := getattr(self, "error", None):
+            raise error
 
     @property
     def status_code(self) -> int:
@@ -595,7 +593,7 @@ class FastResponse(CompatResponse):
         )
 
 
-class ErrorResponse:
+class ErrorResponse(FastResponse):  # we're really just pretending to be a FastResponse
     """
     This is used as a dummy response object when geventhttpclient raises an error
     that doesn't have a real Response object attached. E.g. a socket error or similar
@@ -608,9 +606,9 @@ class ErrorResponse:
     text: str | None = None
     request: CompatRequest
 
-    def __init__(self, url: str, request: CompatRequest):
-        self.url = url
+    def __init__(self, request: CompatRequest, error: Exception):
         self.request = request
+        self.error = error
 
     def raise_for_status(self):
         raise self.error
@@ -662,8 +660,10 @@ class ResponseContextManager(FastResponse):
     _manual_result = None
     _entered = False
 
-    def __init__(self, response, request_event, request_meta):
+    def __init__(self, response, request_event, request_meta, catch_response: bool):
         # copy data from response to this object
+        # I wanted to change this to the approach from the HttpUser's ResponseContentManager.from_request,
+        # but it was such a mess
         self.__dict__ = response.__dict__
         try:
             self._cached_content = response._cached_content
@@ -671,16 +671,20 @@ class ResponseContextManager(FastResponse):
             pass
         self._request_event = request_event
         self.request_meta = request_meta
+        self._catch_response = catch_response
 
     def __enter__(self):
+        if not self._catch_response:
+            raise LocustError("In order to use a with-block for requests, you must also pass catch_response=True")
         self._entered = True
         return self
 
     def __exit__(self, exc, value, traceback):
         # if the user has already manually marked this response as failure or success
-        # we can ignore the default behaviour of letting the response code determine the outcome
+        # we ignore the default behaviour of letting the response code determine the outcome
         if self._manual_result is not None:
             if self._manual_result is True:
+                self.request_meta["exception"] = None
                 self._report_request()
             elif isinstance(self._manual_result, Exception):
                 self.request_meta["exception"] = self._manual_result
@@ -743,6 +747,13 @@ class ResponseContextManager(FastResponse):
             exc = CatchResponseError(exc)
         self._manual_result = exc
 
+    def raise_for_status(self):
+        """Raise any connection errors that occurred during the request"""
+        if not self._manual_result:
+            super().raise_for_status()
+        elif isinstance(self._manual_result, Exception):
+            raise self._manual_result
+
 
 class RestResponseContextManager(ResponseContextManager):
     js: dict  # This is technically an Optional, but I dont want to force everyone to check it

locust/exception.py

@@ -28,6 +28,11 @@ class InterruptTaskSet(Exception):
 
 
 class StopUser(Exception):
+    """
+    This is only intended to be used internally in task.py.
+    Raising this in your locustfile in a full locust run may have unexpected results.
+    """
+
     pass
 
 

locust/user/users.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from locust.clients import HttpSession
-from locust.exception import LocustError, StopUser
+from locust.exception import CatchResponseError, LocustError, StopUser
 from locust.user.task import (
     LOCUST_STATE_RUNNING,
     LOCUST_STATE_STOPPING,
@@ -302,5 +302,7 @@ class PytestUser(User):
                     if isinstance(e, ValueError):  # things like MissingSchema etc, lets not catch that
                         raise
                     logger.debug("%s\n%s", e, traceback.format_exc())
+                except CatchResponseError as e:
+                    logger.debug("%s\n%s", e, traceback.format_exc())
                 except ConnectionError as e:
                     logger.debug("%s\n%s", e, traceback.format_exc())

{locust-2.40.2.dev15.dist-info → locust-2.40.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust
-Version: 2.40.2.dev15
+Version: 2.40.3
 Summary: Developer-friendly load testing framework
 Project-URL: homepage, https://locust.io/
 Project-URL: repository, https://github.com/locustio/locust
@@ -38,8 +38,7 @@ Requires-Dist: python-engineio>=4.12.2
 Requires-Dist: python-socketio[client]>=5.13.0
 Requires-Dist: pywin32; sys_platform == 'win32'
 Requires-Dist: pyzmq>=25.0.0
-Requires-Dist: requests>=2.26.0; python_version <= '3.11'
-Requires-Dist: requests>=2.32.2; python_version > '3.11'
+Requires-Dist: requests>=2.32.2
 Requires-Dist: setuptools>=70.0.0
 Requires-Dist: tomli>=1.1.0; python_version < '3.11'
 Requires-Dist: typing-extensions>=4.6.0; python_version < '3.12'

{locust-2.40.2.dev15.dist-info → locust-2.40.3.dist-info}/RECORD

@@ -1,13 +1,13 @@
 locust/__init__.py,sha256=HadpgGidiyCDPSKwkxrk1Qw6eB7dTmftNJVftuJzAiw,1876
 locust/__main__.py,sha256=vBQ82334kX06ImDbFlPFgiBRiLIinwNk3z8Khs6hd74,31
-locust/_version.py,sha256=1lUD_y3GdgwY5ZP5Qi49KZlF9bRAYb_27xyeCkXcsGk,721
+locust/_version.py,sha256=9cUTLUlZ2HRDSemp7LUnZcGlLE6k-NI6R1w4zxPE-bY,706
 locust/argument_parser.py,sha256=t6mAoK9u13DxC9UH-alVqS6fFABFTyNWSJG89yQ4QQQ,33056
-locust/clients.py,sha256=Gj1rD73_G7G7f6bi0plDiN-GIDPTBng8pBY21cFozQc,20219
+locust/clients.py,sha256=OfMTOT3LwijczdL3u6bpDwDNM2TDcPCIwXBelizPOyw,20776
 locust/debug.py,sha256=7CCm8bIg44uGH2wqBlo1rXBzV2VzwPicLxLewz8r5CQ,5099
 locust/dispatch.py,sha256=prdwtb9EoN4A9klgiKgWuwQmvFB8hEuFHOK6ot62AJI,16202
 locust/env.py,sha256=PypNHmEFBhGBk9dU6pZ2cL5L0TThYejaGWW16RO3ZNQ,13203
 locust/event.py,sha256=AWoeG2q11Vpupv1eW9Rf2N0EI4dDDAldKe6zY1ajC7I,8717
-locust/exception.py,sha256=jGgJ32ubuf4pWdlaVOkbh2Y0LlG0_DHi-lv3ib8ppOE,1791
+locust/exception.py,sha256=XCQyJj5XHvJPgTWGhzgjjavoqVdyF0tqG2wj6WzmXvo,1954
 locust/html.py,sha256=18LlaL-NEQdthXVdS16gRAd4SOpW_bowOJKyuLvWrCY,4043
 locust/input_events.py,sha256=lqLDB2Ax-OQ7-vtYNkGjySjfaWVobBzqf0GxRwjcLcQ,3323
 locust/log.py,sha256=5E2ZUOa3V4sfCqa-470Gle1Ik9L5nxYitsjEB9tRwE0,3455
@@ -18,7 +18,7 @@ locust/shape.py,sha256=t-lwBS8LOjWcKXNL7j2U3zroIXJ1b0fazUwpRYQOKXw,1973
 locust/stats.py,sha256=qyoSKT0i7RunLDj5pMGqizK1Sp8bcqUsXwh2m4_DpR8,47203
 locust/web.py,sha256=pLYuocmx9gifJ4vsVDgGDYIPkQhQxI7kKjxoXcUajqM,31865
 locust/contrib/__init__.py,sha256=LtZN7MczpIAbZkN7PT2h8W2wgb9nBl6cDXbFCVsV4fo,290
-locust/contrib/fasthttp.py,sha256=c8MznjqbtYTKZPc20OC4GCiaENDCJmmNSNuHqtMhh2Q,29883
+locust/contrib/fasthttp.py,sha256=Hz-DqTW2qxVWv-OWPIvEgX9CbAlcyPBlp0lAKcOjpbg,30721
 locust/contrib/milvus.py,sha256=YabgLd0lImzWupJFCm0OZAW-Nxeibwn91ldWpZ2irDo,12811
 locust/contrib/mongodb.py,sha256=1seUYgJOaNKwybYOP9PUEVhgl8hGy-G33f8lFj3R8W8,1246
 locust/contrib/oai.py,sha256=Ot3T8lp31ThckGbNps86oVvq6Vn845Eec0mxhDmONDE,2684
@@ -32,7 +32,7 @@ locust/user/inspectuser.py,sha256=KgrWHyE5jhK6or58R7soLRf-_st42AaQrR72qbiXw9E,26
 locust/user/markov_taskset.py,sha256=eESre6OacbP7nTzZFwxUe7TO4X4l7WqOAEETtDzsIfU,11784
 locust/user/sequential_taskset.py,sha256=SbrrGU9HV2nEWe6zQVtjymn8NgPISP7QSNoVdyoXjYg,2687
 locust/user/task.py,sha256=QnNDs8lEZGgMqBe8l_O4FKgn4WUL9r5WTRHWw88nO-w,17242
-locust/user/users.py,sha256=n2IE7MwIKj2JUgYU4_7Vv-cNk-NWDRhj62dQbxrGhIk,11204
+locust/user/users.py,sha256=7Au0F6MnqQYAiuHYcXaVsm-BEhyigBq8PiON6RJDfKM,11342
 locust/user/wait_time.py,sha256=bGRKMVx4lom75sX3POYJUa1CPeME2bEAXG6CEgxSO5U,2675
 locust/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 locust/util/cache.py,sha256=IxbpGawl0-hoWKvCrtksxjSLf2GbBBTVns06F7mFBkM,1062
@@ -56,8 +56,8 @@ locust/webui/dist/assets/terminal.gif,sha256=iw80LO2u0dnf4wpGfFJZauBeKTcSpw9iUfI
 locust/webui/dist/assets/testruns-dark.png,sha256=G4p2VZSBuuqF4neqUaPSshIp5OKQJ_Bvb69Luj6XuVs,125231
 locust/webui/dist/assets/testruns-light.png,sha256=JinGDiiBPOkhpfF-XCbmQqhRInqItrjrBTLKt5MlqVI,130301
 pytest_locust/plugin.py,sha256=WAyiRHLynXegbbX2DxIutPKO4PQRT6JdBFA7zbbaJgM,1469
-locust-2.40.2.dev15.dist-info/METADATA,sha256=Twi0mcXhfvVh7tKWHwHemQTdyVoDofdcAHnIYFD8JE0,9599
-locust-2.40.2.dev15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-locust-2.40.2.dev15.dist-info/entry_points.txt,sha256=0uIHcQ71R1qaWhM_sd8uBUCCJgp7gJfGHUVMnJeZfcY,86
-locust-2.40.2.dev15.dist-info/licenses/LICENSE,sha256=5hnz-Vpj0Z3kSCQl0LzV2hT1TLc4LHcbpBp3Cy-EuyM,1110
-locust-2.40.2.dev15.dist-info/RECORD,,
+locust-2.40.3.dist-info/METADATA,sha256=0TZx5QftsszuyRoq4P061KfB-h0Txp2sFmFKMx5xe6A,9510
+locust-2.40.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+locust-2.40.3.dist-info/entry_points.txt,sha256=0uIHcQ71R1qaWhM_sd8uBUCCJgp7gJfGHUVMnJeZfcY,86
+locust-2.40.3.dist-info/licenses/LICENSE,sha256=5hnz-Vpj0Z3kSCQl0LzV2hT1TLc4LHcbpBp3Cy-EuyM,1110
+locust-2.40.3.dist-info/RECORD,,