locust-cloud 1.15.3__py3-none-any.whl → 1.16.1__py3-none-any.whl

locust_cloud/apisession.py

@@ -66,7 +66,7 @@ class ApiSession(requests.Session):
         self.headers["X-Client-Version"] = __version__
 
     def __configure_for_region(self, region: str) -> None:
-        self.__region = region
+        self.region = region
         self.api_url = get_api_url(region)
         self.__login_url = f"{self.api_url}/auth/login"
 
@@ -76,8 +76,6 @@ class ApiSession(requests.Session):
         if self.__expiry_time > time.time():
             return
 
-        logger.info(f"Authenticating ({self.__region}, v{__version__})")
-
         response = requests.post(
             self.__login_url,
             json={"user_sub_id": self.__sub, "refresh_token": self.__refresh_token},

locust_cloud/args.py

@@ -70,7 +70,7 @@ def transfer_encode(file_name: str, stream: IO[bytes]) -> dict[str, str]:
 def transfer_encoded_file(file_path: str) -> dict[str, str]:
     try:
         with open(file_path, "rb") as f:
-            return transfer_encode(file_path, f)
+            return transfer_encode(os.path.basename(file_path), f)
     except FileNotFoundError:
         raise ArgumentTypeError(f"File not found: {file_path}")
 

locust_cloud/cloud.py

@@ -1,6 +1,7 @@
 import logging
 import os
 import sys
+import time
 import webbrowser
 from threading import Thread
 
@@ -53,7 +54,7 @@ def main() -> None:
         sys.exit()
 
     try:
-        logger.info("Deploying load generators")
+        logger.info(f"Deploying ({session.region}, {__version__})")
         locust_env_variables = [
             {"name": env_variable, "value": os.environ[env_variable]}
             for env_variable in os.environ
@@ -91,11 +92,24 @@ def main() -> None:
         if options.extra_files:
             payload["extra_files"] = options.extra_files
 
-        try:
-            response = session.post("/deploy", json=payload)
-            js = response.json()
-        except requests.exceptions.RequestException as e:
-            logger.error(f"Failed to deploy the load generators: {e}")
+        for attempt in range(1, 16):
+            try:
+                response = session.post("/deploy", json=payload)
+                js = response.json()
+
+                if response.status_code != 202:
+                    # 202 means the stack is currently terminating, so we retry
+                    break
+
+                if attempt == 1:
+                    logger.info(js["message"])
+
+                time.sleep(2)
+            except requests.exceptions.RequestException as e:
+                logger.error(f"Failed to deploy the load generators: {e}")
+                sys.exit(1)
+        else:
+            logger.error("Your Locust instance is still running, run locust-cloud --delete")
             sys.exit(1)
 
         if response.status_code != 200:
@@ -165,6 +179,8 @@ def delete(session):
             logger.info(
                 f"Could not automatically tear down Locust Cloud: HTTP {response.status_code}/{response.reason} - Response: {response.text} - URL: {response.request.url}"
             )
+    except KeyboardInterrupt:
+        pass  # don't show nasty callstack
     except Exception as e:
         logger.error(f"Could not automatically tear down Locust Cloud: {e.__class__.__name__}:{e}")
 

{locust_cloud-1.15.3.dist-info → locust_cloud-1.16.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust-cloud
-Version: 1.15.3
+Version: 1.16.1
 Summary: Locust Cloud
 Project-URL: Homepage, https://locust.cloud
 Requires-Python: >=3.11

locust_cloud-1.16.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+locust_cloud/apisession.py,sha256=kCr271_l0IeMGw0L563mOecqPJj4OD9h2J3vxCM5zYQ,4015
+locust_cloud/args.py,sha256=4U_bZaEH1UJR8C7_bH_sX1DRB8m6WBcJh-ewhilFQX0,7118
+locust_cloud/cloud.py,sha256=kih2Qtddry0dxmGylxXQdrw4SPTwx6k6YN0ur3u47Qc,6144
+locust_cloud/common.py,sha256=cFrDVKpi9OEmH6giOuj9HoIUFSBArixNtNHzZIgDvPE,992
+locust_cloud/input_events.py,sha256=MyxccgboHByICuK6VpQCCJhZQqTZAacNmkSpw-gxBEw,3420
+locust_cloud/web_login.py,sha256=1j2AQoEM6XVSDtE1q0Ryrs4jFEx07r9IQfZCoFAQXJg,2400
+locust_cloud/websocket.py,sha256=9Q7nTFuAwVhgW74DlJNcHTZXOQ1drsXi8hX9ciZhWlQ,8998
+locust_cloud-1.16.1.dist-info/METADATA,sha256=4EHCv-Hpo9NR-IThvTMiJR9t5EWfdjARKBt2V2QApBQ,528
+locust_cloud-1.16.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+locust_cloud-1.16.1.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
+locust_cloud-1.16.1.dist-info/RECORD,,

locust_cloud-1.15.3.dist-info/RECORD

@@ -1,11 +0,0 @@
-locust_cloud/apisession.py,sha256=AoU0FGQbyH2qbaTmdyoIMBd_lwZimLtihK0gnpAV6c0,4091
-locust_cloud/args.py,sha256=1SaMQ16f_3vaNqnAbjFiBL-6ietp1-qfV2LUjBk6b8k,7100
-locust_cloud/cloud.py,sha256=OaUE0bnlRGgLTKhdDCMnonaT-h2pop_cAfcOFOLcwng,5581
-locust_cloud/common.py,sha256=cFrDVKpi9OEmH6giOuj9HoIUFSBArixNtNHzZIgDvPE,992
-locust_cloud/input_events.py,sha256=MyxccgboHByICuK6VpQCCJhZQqTZAacNmkSpw-gxBEw,3420
-locust_cloud/web_login.py,sha256=1j2AQoEM6XVSDtE1q0Ryrs4jFEx07r9IQfZCoFAQXJg,2400
-locust_cloud/websocket.py,sha256=9Q7nTFuAwVhgW74DlJNcHTZXOQ1drsXi8hX9ciZhWlQ,8998
-locust_cloud-1.15.3.dist-info/METADATA,sha256=pOgPOJAK1gl7bAYIq_JGG29atMHdiYIAzkCfa0YHDvg,528
-locust_cloud-1.15.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-locust_cloud-1.15.3.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
-locust_cloud-1.15.3.dist-info/RECORD,,