locust-cloud 1.20.8.dev2__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
@@ -113,6 +115,39 @@ def transfer_encoded_args_files(paths: list[pathlib.Path], to_file: str | None)
     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)
@@ -120,6 +155,13 @@ class MergeToTransferEncodedZip(argparse.Action):
         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)
+
+
 cloud_parser = configargparse.ArgumentParser(add_help=False)
 cloud_parser.add_argument(
     "--login",
@@ -176,7 +218,7 @@ cloud_parser.add_argument(
 )
 cloud_parser.add_argument(
     "--extra-packages",
-    action=MergeToTransferEncodedZip,
+    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.",

{locust_cloud-1.20.8.dev2.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.8.dev2
+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.8.dev2.dist-info → locust_cloud-1.20.8.dev3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 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=XmIzg5wOF52g-f7sXe83NhyT0S_RGWKAmJO91D9IMD8,8380
+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
@@ -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.8.dev2.dist-info/METADATA,sha256=Z49Dl-x719zsGvfB3Mgfck8RjPfqpdOgxbXqtHOscmY,649
-locust_cloud-1.20.8.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-locust_cloud-1.20.8.dev2.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
-locust_cloud-1.20.8.dev2.dist-info/licenses/LICENSE,sha256=Ow6fY6ta4KIjdlWalmxGvRP8yLmetvkbkl-SdHMjPIs,1093
-locust_cloud-1.20.8.dev2.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,,