locust-cloud 1.20.8.dev2__tar.gz → 1.20.8.dev3__tar.gz

{locust_cloud-1.20.8.dev2 → locust_cloud-1.20.8.dev3}/.github/workflows/daily-check.yml

@@ -35,11 +35,13 @@ jobs:
       # any local changes would make hatch-vcs set a "local version" (+dev0...), so we ignore any uv.lock updates:
       - run: git update-index --assume-unchanged uv.lock
       - run: uv run locust-cloud --help
-      - run: uv run locust-cloud --image-tag master --profile status-checker --mock-server --autostart --autoquit 0 --run-time 1m --loglevel DEBUG --extra-files testdata |& tee output.txt
+      - run: uv run locust-cloud --image-tag master --profile status-checker --mock-server --autostart --autoquit 0 --run-time 1m --loglevel DEBUG --extra-files testdata/extra-files --extra-packages testdata/extra-package |& tee output.txt
       # check ok exit
       - run: grep -m 1 '(exit code 0)' output.txt
       # check extra files specified were available
       - run: "grep -m 1 -- '--extra-files verification: pineapple' output.txt"
+      # check extra package were successfully installed
+      - run: "grep -m 1 -- 'Hello from the example package!' output.txt"
       # check for errors
       - run: bash -ec "! grep Traceback output.txt"
       - run: bash -ec "! grep ERROR output.txt"

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

@@ -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 → locust_cloud-1.20.8.dev3}/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 → locust_cloud-1.20.8.dev3}/locustfile.py

@@ -23,10 +23,15 @@ class MyUser(FastHttpUser):
                 resp.failure("orderId missing")
 
 
-extra = pathlib.Path("testdata/extra.txt")
+extra = pathlib.Path("testdata/extra-files/extra.txt")
 if extra.exists():
     print("--extra-files verification:", extra.read_text())
 
 
+import example  # type: ignore
+
+example.hello()
+
+
 if __name__ == "__main__":
     run_single_user(MyUser)

locust_cloud-1.20.8.dev3/testdata/extra-package/example/__init__.py

@@ -0,0 +1,2 @@
+def hello():
+    print("Hello from the example package!")

locust_cloud-1.20.8.dev3/testdata/extra-package/setup.py

@@ -0,0 +1,8 @@
+from setuptools import find_packages, setup
+
+setup(
+    name="example",
+    version="0.1",
+    packages=find_packages(),
+    install_requires=[],
+)

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

@@ -59,12 +59,12 @@ def test_transfer_encoded_file():
 
 
 def test_expanded():
-    result = list(expanded([pathlib.Path("locustfile.py"), pathlib.Path("testdata")]))
-    assert result == [pathlib.Path("locustfile.py"), pathlib.Path("testdata/extra.txt")]
+    result = list(expanded([pathlib.Path("locustfile.py"), pathlib.Path("testdata/extra-files")]))
+    assert result == [pathlib.Path("locustfile.py"), pathlib.Path("testdata/extra-files/extra.txt")]
 
 
 def test_transfer_encoded_args_files():
-    result = transfer_encoded_args_files([pathlib.Path("testdata").resolve()], "extra-files")
+    result = transfer_encoded_args_files([pathlib.Path("testdata/extra-files").resolve()], "extra-files")
     assert result["filename"] == "extra-files.zip"
 
     buffer = pipe(
@@ -76,7 +76,7 @@ def test_transfer_encoded_args_files():
     )
 
     with ZipFile(buffer) as zf:
-        assert zf.namelist() == ["testdata/extra.txt"]
+        assert zf.namelist() == ["testdata/extra-files/extra.txt"]
 
 
 def test_parser_locustfile(capsys):
@@ -86,8 +86,8 @@ def test_parser_locustfile(capsys):
     expected = "error: argument -f/--locustfile: File not found: does-not-exist"
     assert expected in capsys.readouterr().err
 
-    options, _ = combined_cloud_parser.parse_known_args("locust-cloud --locustfile testdata/extra.txt")
-    assert options.locustfile == transfer_encoded_file("testdata/extra.txt")
+    options, _ = combined_cloud_parser.parse_known_args("locust-cloud --locustfile testdata/extra-files/extra.txt")
+    assert options.locustfile == transfer_encoded_file("testdata/extra-files/extra.txt")
 
 
 def test_parser_extra_files(capsys):
@@ -103,7 +103,7 @@ def test_parser_extra_files(capsys):
     expected = "error: argument --extra-files: File not found: does-not-exist"
     assert expected in capsys.readouterr().err
 
-    options, _ = combined_cloud_parser.parse_known_args("locust-cloud --extra-files testdata")
+    options, _ = combined_cloud_parser.parse_known_args("locust-cloud --extra-files testdata/extra-files")
     assert options.extra_files["filename"] == "extra-files.zip"
     buffer = pipe(
         options.extra_files["data"],
@@ -114,7 +114,7 @@ def test_parser_extra_files(capsys):
     )
 
     with ZipFile(buffer) as zf:
-        assert zf.namelist() == ["testdata/extra.txt"]
+        assert zf.namelist() == ["testdata/extra-files/extra.txt"]
 
 
 def test_parser_loglevel(capsys):