locust-cloud 1.20.7.dev3__py3-none-any.whl → 1.20.8.dev3__py3-none-any.whl

locust_cloud/args.py

@@ -4,7 +4,9 @@ import gzip
 import io
 import os
 import pathlib
+import shutil
 import sys
+import tempfile
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -61,6 +63,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 +104,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 +112,53 @@ 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)
+
+
+def flat_transfer_encoded_args_files(paths: list[pathlib.Path], to_file: str | None) -> dict[str, str]:
+    buffer = io.BytesIO()
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        tmp_path = pathlib.Path(tmpdir)
+
+        for src in paths:
+            src_path = pathlib.Path(src)
+            dest_path = tmp_path / src_path.name
+
+            if src_path.is_file():
+                shutil.copy(src_path, dest_path)
+            elif src_path.is_dir():
+                shutil.copytree(src_path, dest_path)
+            else:
+                print(f"Warning: {src} is not a valid file or directory")
+
+        # Create the zip archive
+        with ZipFile(buffer, "w") as zf:
+            for item in tmp_path.iterdir():
+                if item.is_file():
+                    zf.write(item, arcname=item.name)
+                elif item.is_dir():
+                    for root, _, files in os.walk(item):
+                        for file in files:
+                            file_path = pathlib.Path(root) / file
+                            arcname = file_path.relative_to(tmp_path)
+                            zf.write(file_path, arcname)
+
+    buffer.seek(0)
+    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)
+
+
+class MergeToTransferEncodedZipFlat(MergeToTransferEncodedZip):
+    def __call__(self, parser, namespace, values, option_string=None):
+        paths = cast(list[pathlib.Path], values)
+        value = flat_transfer_encoded_args_files(paths, option_string.lstrip("-"))
         setattr(namespace, self.dest, value)
 
 
@@ -163,6 +216,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=MergeToTransferEncodedZipFlat,
+    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/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.dev3.dist-info → locust_cloud-1.20.8.dev3.dist-info}/METADATA

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

{locust_cloud-1.20.7.dev3.dist-info → locust_cloud-1.20.8.dev3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 locust_cloud/__init__.py,sha256=6z2hE5rUP9WJyYgr-7XC2GhIV-05m8XxjOsnb8ae1WY,56
 locust_cloud/apisession.py,sha256=fz3mJsHbS-LdlVcuaJurf4_nq_Oa_XdBTZ7sVpux_mA,4376
-locust_cloud/args.py,sha256=KD2svA77-Dz98J7p-WiSr9wIiA7GJ2wCglIcFOccncs,7663
-locust_cloud/cloud.py,sha256=LFO_Ykst0bOBYPqfxS6ll7abAvCCqyUpD3ql4nem9ys,6264
+locust_cloud/args.py,sha256=_U2bxFu32H7SyGupzd_gNk9kud4pX0KRyOJUcZBzkVw,9944
+locust_cloud/cloud.py,sha256=DqIxLnbdoX6E266yXpXixI4OtyWT9m-vMzVuyI8t3X0,6363
 locust_cloud/common.py,sha256=GVKkWcbbqd9n8oU-fHZRVZw3jGtuIVGSCLD2ZizeEo0,1160
 locust_cloud/input_events.py,sha256=MyxccgboHByICuK6VpQCCJhZQqTZAacNmkSpw-gxBEw,3420
 locust_cloud/web_login.py,sha256=UTwuRJBCkdsGkzHmzwW_s03GKABR22gScq-nBMmqcag,2557
@@ -11,8 +11,8 @@ locust_cloud/docs/1-first-run.rst,sha256=Z34qKIxIniwCELeUmEQbNLsN7HWM5fq-a3Wc4fu
 locust_cloud/docs/2-examples.rst,sha256=uT-Byr4twmWakhMdHNqRvFP0f5hUxqrieBzxBHus51Y,9806
 locust_cloud/docs/locust-cloud.rst,sha256=q0WSBOJI0LR3zxuaE9Lor0_bzv4AOKr3aCz9VC6sIzs,137
 locust_cloud/docs/images/locust-cloud-screenshot.png,sha256=ag0IxBi-40VexC84MApol1GCgRCL2h-l8NQDTMaeTyE,477350
-locust_cloud-1.20.7.dev3.dist-info/METADATA,sha256=o8f2-_kxhqyAr0Gy1F7hyKqktAPtZKXOUixihOQkfAg,649
-locust_cloud-1.20.7.dev3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-locust_cloud-1.20.7.dev3.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
-locust_cloud-1.20.7.dev3.dist-info/licenses/LICENSE,sha256=Ow6fY6ta4KIjdlWalmxGvRP8yLmetvkbkl-SdHMjPIs,1093
-locust_cloud-1.20.7.dev3.dist-info/RECORD,,
+locust_cloud-1.20.8.dev3.dist-info/METADATA,sha256=W_5EtPjRGTXkihpk0emotGNoW-3I_H77piY5C9FF1mQ,649
+locust_cloud-1.20.8.dev3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+locust_cloud-1.20.8.dev3.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
+locust_cloud-1.20.8.dev3.dist-info/licenses/LICENSE,sha256=Ow6fY6ta4KIjdlWalmxGvRP8yLmetvkbkl-SdHMjPIs,1093
+locust_cloud-1.20.8.dev3.dist-info/RECORD,,