locust-cloud 1.20.7__tar.gz → 1.20.8.dev2__tar.gz

{locust_cloud-1.20.7 → locust_cloud-1.20.8.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust-cloud
-Version: 1.20.7
+Version: 1.20.8.dev2
 Summary: Locust Cloud
 Project-URL: homepage, https://locust.cloud
 Project-URL: repository, https://github.com/locustcloud/locust-cloud

{locust_cloud-1.20.7 → locust_cloud-1.20.8.dev2}/locust_cloud/args.py

@@ -61,6 +61,17 @@ def valid_extra_files_path(file_path: str) -> pathlib.Path:
     return p
 
 
+def valid_extra_packages_path(file_path: str) -> pathlib.Path:
+    p = pathlib.Path(file_path).resolve()
+
+    if not p.exists():
+        raise ArgumentTypeError(f"Path not found: {file_path}")
+    if p.is_file() and not (p.suffix == ".whl" or p.suffixes == [".tar", ".gz"]):
+        raise ArgumentTypeError(f"Invalid file suffix (must be '.whl' or '.tar.gz'): {file_path}")
+
+    return p
+
+
 def transfer_encode(file_name: str, stream: IO[bytes]) -> dict[str, str]:
     return {
         "filename": file_name,
@@ -91,7 +102,7 @@ def expanded(paths: list[pathlib.Path]) -> Generator[pathlib.Path, None, None]:
             yield path
 
 
-def transfer_encoded_extra_files(paths: list[pathlib.Path]) -> dict[str, str]:
+def transfer_encoded_args_files(paths: list[pathlib.Path], to_file: str | None) -> dict[str, str]:
     buffer = io.BytesIO()
 
     with ZipFile(buffer, "w") as zf:
@@ -99,13 +110,13 @@ def transfer_encoded_extra_files(paths: list[pathlib.Path]) -> dict[str, str]:
             zf.write(path.relative_to(CWD))
 
     buffer.seek(0)
-    return transfer_encode("extra-files.zip", buffer)
+    return transfer_encode(f"{to_file}.zip", buffer)
 
 
 class MergeToTransferEncodedZip(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
         paths = cast(list[pathlib.Path], values)
-        value = transfer_encoded_extra_files(paths)
+        value = transfer_encoded_args_files(paths, option_string.lstrip("-"))
         setattr(namespace, self.dest, value)
 
 
@@ -163,6 +174,13 @@ cloud_parser.add_argument(
     type=valid_extra_files_path,
     help="A list of extra files or directories to upload. Space-separated, e.g. `--extra-files testdata.csv *.py my-directory/`.",
 )
+cloud_parser.add_argument(
+    "--extra-packages",
+    action=MergeToTransferEncodedZip,
+    nargs="*",
+    type=valid_extra_packages_path,
+    help="A list of extra packages to upload. Space-separated whl/tar.gz files or directory packages to be installed when running locust.",
+)
 cloud_parser.add_argument(
     "--testrun-tags",
     nargs="*",

{locust_cloud-1.20.7 → locust_cloud-1.20.8.dev2}/locust_cloud/cloud.py

@@ -101,6 +101,9 @@ def main():
         if options.extra_files:
             payload["extra_files"] = options.extra_files
 
+        if options.extra_packages:
+            payload["extra_packages"] = options.extra_packages
+
         for attempt in range(1, 16):
             try:
                 response = session.post("/deploy", json=payload)

{locust_cloud-1.20.7 → locust_cloud-1.20.8.dev2}/tests/args_test.py

@@ -12,7 +12,7 @@ from locust_cloud.args import (
     expanded,
     pipe,
     transfer_encode,
-    transfer_encoded_extra_files,
+    transfer_encoded_args_files,
     transfer_encoded_file,
     valid_extra_files_path,
 )
@@ -63,8 +63,8 @@ def test_expanded():
     assert result == [pathlib.Path("locustfile.py"), pathlib.Path("testdata/extra.txt")]
 
 
-def test_transfer_encoded_extra_files():
-    result = transfer_encoded_extra_files([pathlib.Path("testdata").resolve()])
+def test_transfer_encoded_args_files():
+    result = transfer_encoded_args_files([pathlib.Path("testdata").resolve()], "extra-files")
     assert result["filename"] == "extra-files.zip"
 
     buffer = pipe(