locust-cloud 1.1.1__py3-none-any.whl → 1.2.1__py3-none-any.whl

locust_cloud/cloud.py

@@ -6,6 +6,7 @@ import os
 import sys
 import time
 import tomllib
+from argparse import Namespace
 from collections import OrderedDict
 from datetime import UTC, datetime, timedelta
 from typing import IO, Any
@@ -82,6 +83,14 @@ parser.add_argument(
     help="The Python file or module that contains your test, e.g. 'my_test.py'. Defaults to 'locustfile.py'.",
     env_var="LOCUST_LOCUSTFILE",
 )
+parser.add_argument(
+    "-u",
+    "--users",
+    type=int,
+    default=1,
+    help="Number of users to launch. This is the same as the regular Locust argument, but also decides how many workers to launch by default.",
+    env_var="LOCUST_USERS",
+)
 parser.add_argument(
     "-r",
     "--requirements",
@@ -155,13 +164,16 @@ parser.add_argument(
 )
 parser.add_argument(
     "--workers",
-    type=str,
+    type=int,
     help="Number of workers to use for the deployment",
     env_var="LOCUST_CLOUD_WORKERS",
     default=None,
 )
 
 options, locust_options = parser.parse_known_args()
+options: Namespace
+locust_options: list
+
 logging.basicConfig(
     format="[LOCUST-CLOUD] %(levelname)s: %(message)s",
     level=options.loglevel.upper(),
@@ -178,8 +190,7 @@ logging.getLogger("urllib3").setLevel(logging.INFO)
 def main() -> None:
     s3_bucket = f"{options.kube_cluster_name}-{options.kube_namespace}"
     deployed_pods: list[Any] = []
-    worker_count = options.workers or math.ceil(locust_options.users / USERS_PER_WORKER)
-    worker_count = worker_count if worker_count > 2 else 2
+    worker_count: int = max(options.workers or math.ceil(options.users / USERS_PER_WORKER), 2)
 
     try:
         if not (
@@ -190,7 +201,7 @@ def main() -> None:
             )
             sys.exit(1)
 
-        logger.info(f"Logging you into Locust Cloud ({options.aws_region_name}, v{__version__})")
+        logger.info(f"Authenticating ({options.aws_region_name}, v{__version__})")
         logger.debug(f"Lambda url: {options.lambda_url}")
         credential_manager = CredentialManager(
             lambda_url=options.lambda_url,
@@ -252,6 +263,7 @@ def main() -> None:
         payload = {
             "locust_args": [
                 {"name": "LOCUST_LOCUSTFILE", "value": locustfile_url},
+                {"name": "LOCUST_USERS", "value": str(options.users)},
                 {"name": "LOCUST_REQUIREMENTS_URL", "value": requirements_url},
                 {"name": "LOCUST_FLAGS", "value": " ".join(locust_options)},
                 {"name": "LOCUST_WEB_HOST_DISPLAY_NAME", "value": "_____"},
@@ -268,6 +280,7 @@ def main() -> None:
             "AWS_SESSION_TOKEN": aws_session_token,
         }
         try:
+            # logger.info(payload) # might be useful when debugging sometimes
             response = requests.post(deploy_endpoint, json=payload, headers=headers)
         except requests.exceptions.RequestException as e:
             logger.error(f"Failed to deploy the load generators: {e}")

{locust_cloud-1.1.1.dist-info → locust_cloud-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: locust-cloud
-Version: 1.1.1
+Version: 1.2.1
 Summary: Locust Cloud
 Requires-Python: >=3.11
 Requires-Dist: blessed==1.20.0

{locust_cloud-1.1.1.dist-info → locust_cloud-1.2.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 locust_cloud/__init__.py,sha256=51wdjGT0nqS5dVuFVDMhthnPacrctteiCMrwRqaPaQg,1867
 locust_cloud/auth.py,sha256=2fcTIq0tYDckDsZZ7yFTHZn5nG7Ir1dlV1QIu_tp3JA,3164
-locust_cloud/cloud.py,sha256=dsWd66H2-xPX4A5f2lsXUzPaOaFFVQ6VXerNoLwDl4E,14660
+locust_cloud/cloud.py,sha256=gEiP2Lq7iQbWYiuuDbLmMgv5CUTUrYJ1uRzAgFv2cHw,15062
 locust_cloud/constants.py,sha256=YGgIEnaOT9cAA8F8a8Z8lOmlI78D2fXiVpP0RF213MA,167
 locust_cloud/credential_manager.py,sha256=JbuS22RTGAmngVB9DFLxHIgaonCSImemMGvtWnxBZRE,5515
 locust_cloud/timescale/exporter.py,sha256=j1K-czMUdOLFt5Sop0PTF6TL52vYdngEEI5OEM3Xl60,11128
@@ -15,7 +15,7 @@ locust_cloud/webui/vite.config.ts,sha256=cqxPMkbwEA3H9mGGbuPulQUhIHCosUqm_1usxzs
 locust_cloud/webui/yarn.lock,sha256=OgV48S7IOMpqldFPL5MFG1fjP8HTcDlFSFzMuRCkGWU,216596
 locust_cloud/webui/dist/index.html,sha256=aWAK1eKa4qBfhMonHNf2sHC6iY9RoTzNdvFcc33Wtp4,664
 locust_cloud/webui/dist/assets/index-BG65KOq7.js,sha256=vKgju6VqTxkI5yFtyDr6zGtb3D7V_AcVCYPDm4SeJos,2795922
-locust_cloud-1.1.1.dist-info/METADATA,sha256=elp0Ed2GG711cfPDWQADDtRK0Rr5mINTOCHi7jr8YlE,2188
-locust_cloud-1.1.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-locust_cloud-1.1.1.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
-locust_cloud-1.1.1.dist-info/RECORD,,
+locust_cloud-1.2.1.dist-info/METADATA,sha256=1DFZwFeySGGILvXwuXHtg1rbrnUbv7BQ6_07uoRgAF4,2188
+locust_cloud-1.2.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+locust_cloud-1.2.1.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
+locust_cloud-1.2.1.dist-info/RECORD,,