locust-cloud 1.26.4.dev1__tar.gz → 1.26.4.dev9__tar.gz

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/PKG-INFO

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

locust_cloud-1.26.4.dev1/locust_cloud/cloud.py → locust_cloud-1.26.4.dev9/locust_cloud/__init__.py

@@ -7,7 +7,6 @@ from argparse import ArgumentTypeError
 from threading import Thread
 
 import requests
-from locust_cloud.actions import delete
 from locust_cloud.apisession import ApiSession
 from locust_cloud.args import (
     combined_cloud_parser,
@@ -34,13 +33,6 @@ def configure_logging(loglevel: str) -> None:
     logging.getLogger("urllib3").setLevel(logging.INFO)
 
 
-def deprecated_main():
-    import sys
-
-    print("`locust-cloud` is deprecated; use `locust --cloud` instead.", file=sys.stderr)
-    return 1
-
-
 def main(locustfiles: list[str] | None = None):
     options, locust_options = combined_cloud_parser.parse_known_args()
 
@@ -175,7 +167,7 @@ def main(locustfiles: list[str] | None = None):
         if options.local_instance:
             os.system("pkill -TERM -f bootstrap")
         else:
-            delete(session)
+            session.teardown()
         try:
             websocket.wait(timeout=True)
         except (WebsocketTimeout, SessionMismatchError) as e:
@@ -183,7 +175,7 @@ def main(locustfiles: list[str] | None = None):
             return 1
     except WebsocketTimeout as e:
         logger.error(str(e))
-        delete(session)
+        session.teardown()
         return 1
     except SessionMismatchError as e:
         # In this case we do not trigger the teardown since the running instance is not ours
@@ -191,7 +183,7 @@ def main(locustfiles: list[str] | None = None):
         return 1
     except Exception as e:
         logger.exception(e)
-        delete(session)
+        session.teardown()
         return 1
     else:
-        delete(session)
+        session.teardown()

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/locust_cloud/apisession.py

@@ -110,3 +110,18 @@ class ApiSession(requests.Session):
     def request(self, method, url, *args, **kwargs) -> requests.Response:
         self.__ensure_valid_authorization_header()
         return super().request(method, f"{self.api_url}{url}", *args, **kwargs)
+
+    def teardown(self):
+        try:
+            logger.info("Tearing down Locust cloud...")
+            response = self.delete("/teardown")
+            if response.status_code == 200:
+                logger.debug(f"Response message from teardown: {response.json()['message']}")
+            else:
+                logger.info(
+                    f"Could not automatically tear down Locust Cloud: HTTP {response.status_code}/{response.reason} - Response: {response.text} - URL: {response.request.url}"
+                )
+        except KeyboardInterrupt:
+            pass  # don't show nasty callstack
+        except Exception as e:
+            logger.error(f"Could not automatically tear down Locust Cloud: {e.__class__.__name__}:{e}")

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/locust_cloud/args.py

@@ -3,15 +3,14 @@ import base64
 import gzip
 import io
 import os
-import pathlib
 import shutil
 import sys
 import tempfile
+from pathlib import Path
 
-from locust_cloud.actions import delete
 from locust_cloud.apisession import ApiSession
-from locust_cloud.common import CWD
-from locust_cloud.web_login import logout, web_login
+from locust_cloud.common import delete_cloud_config
+from locust_cloud.web_login import web_login
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -20,7 +19,7 @@ else:
 
 from argparse import ArgumentTypeError
 from collections import OrderedDict
-from collections.abc import Callable, Generator, Iterable
+from collections.abc import Generator, Iterable
 from typing import IO, Any, cast
 from zipfile import ZipFile
 
@@ -49,29 +48,22 @@ class LocustTomlConfigParser(configargparse.TomlConfigParser):
         return result
 
 
-def pipe(value: Any, *functions: Callable) -> Any:
-    for function in functions:
-        value = function(value)
-
-    return value
-
-
-def valid_project_path(path: str | pathlib.Path) -> pathlib.Path:
+def valid_project_path(path: str | Path) -> Path:
     try:
         # Expand '~' and eliminate '..', '.', and symlinks
-        p = pathlib.Path(path).expanduser().resolve(strict=True)
+        p = Path(path).expanduser().resolve(strict=True)
 
-        return p.relative_to(CWD)
+        return p.relative_to(Path.cwd())
     except FileNotFoundError:
         raise ArgumentTypeError(f"{path!r} does not exist")
     except OSError as exc:  # Bad characters, too long, etc
         raise ArgumentTypeError(f"{path!r} is not a valid path: {exc}")
     except ValueError:
-        raise ArgumentTypeError(f"{path!r} is not under current working directory: {CWD}")
+        raise ArgumentTypeError(f"{path!r} is not under current working directory: {Path.cwd()}")
 
 
-def valid_extra_packages_path(file_path: str) -> pathlib.Path:
-    p = pathlib.Path(file_path).resolve()
+def valid_extra_packages_path(file_path: str) -> Path:
+    p = Path(file_path).resolve()
 
     if not p.exists():
         raise ArgumentTypeError(f"Path not found: {file_path}")
@@ -84,12 +76,7 @@ def valid_extra_packages_path(file_path: str) -> pathlib.Path:
 def transfer_encode(file_name: str, stream: IO[bytes]) -> dict[str, str]:
     return {
         "filename": file_name,
-        "data": pipe(
-            stream.read(),
-            gzip.compress,
-            base64.b64encode,
-            bytes.decode,
-        ),
+        "data": bytes.decode(base64.b64encode(gzip.compress(stream.read()))),
     }
 
 
@@ -101,21 +88,21 @@ def transfer_encoded_file(file_path: str) -> dict[str, str]:
         raise ArgumentTypeError(f"File not found: {file_path}")
 
 
-def expanded(paths: Iterable[pathlib.Path], skip_folders: list[str] = []) -> Generator[pathlib.Path, None, None]:
+def expanded(paths: Iterable[Path], skip_folders: list[str] = []) -> Generator[Path, None, None]:
     for path in paths:
-        path = pathlib.Path(path)
+        path = Path(path)
 
         if path.is_dir():
             for root, _, file_names in os.walk(path):
                 if root.split("/")[-1] in skip_folders:
                     continue
                 for file_name in file_names:
-                    yield pathlib.Path(root) / file_name
+                    yield Path(root) / file_name
         else:
             yield path
 
 
-def zip_project_paths(paths: Iterable[pathlib.Path], to_file: str = "project"):
+def zip_project_paths(paths: Iterable[Path], to_file: str = "project"):
     buffer = io.BytesIO()
     skip_folders = ["__pycache__"]
 
@@ -127,14 +114,14 @@ def zip_project_paths(paths: Iterable[pathlib.Path], to_file: str = "project"):
     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]:
+def flat_transfer_encoded_args_files(paths: list[Path], to_file: str | None) -> dict[str, str]:
     buffer = io.BytesIO()
 
     with tempfile.TemporaryDirectory() as tmpdir:
-        tmp_path = pathlib.Path(tmpdir)
+        tmp_path = Path(tmpdir)
 
         for src in paths:
-            src_path = pathlib.Path(src)
+            src_path = Path(src)
             dest_path = tmp_path / src_path.name
 
             if src_path.is_file():
@@ -152,7 +139,7 @@ def flat_transfer_encoded_args_files(paths: list[pathlib.Path], to_file: str | N
                 elif item.is_dir():
                     for root, _, files in os.walk(item):
                         for file in files:
-                            file_path = pathlib.Path(root) / file
+                            file_path = Path(root) / file
                             arcname = file_path.relative_to(tmp_path)
                             zf.write(file_path, arcname)
 
@@ -162,7 +149,7 @@ def flat_transfer_encoded_args_files(paths: list[pathlib.Path], to_file: str | N
 
 class MergeToTransferEncodedZipFlat(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
-        paths = cast(list[pathlib.Path], values)
+        paths = cast(list[Path], values)
         value = flat_transfer_encoded_args_files(paths, option_string.lstrip("-"))
         setattr(namespace, self.dest, value)
 
@@ -175,14 +162,14 @@ class WebLogin(argparse.Action):
 
 class WebLogout(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
-        logout()
+        delete_cloud_config()
         parser.exit()
 
 
 class StackTeardown(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
         session = ApiSession(namespace.non_interactive)
-        delete(session)
+        session.teardown()
         parser.exit()
 
 

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/locust_cloud/common.py

@@ -8,9 +8,6 @@ import platformdirs
 
 __version__ = importlib.metadata.version("locust-cloud")
 
-CWD = pathlib.Path.cwd()
-
-
 VALID_REGIONS = ["us-east-1", "eu-north-1"]
 CLOUD_CONF_FILE = pathlib.Path(platformdirs.user_config_dir(appname="locust-cloud")) / "config"
 
@@ -45,5 +42,4 @@ def write_cloud_config(config: CloudConfig) -> None:
 
 
 def delete_cloud_config() -> None:
-    if CLOUD_CONF_FILE.exists():
-        CLOUD_CONF_FILE.unlink()
+    CLOUD_CONF_FILE.unlink(missing_ok=True)

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/locust_cloud/import_finder.py

@@ -4,8 +4,6 @@ import logging
 import site
 from pathlib import Path
 
-from locust_cloud.common import CWD
-
 logger = logging.getLogger(__name__)
 
 SITE_PACKAGES_PATHS = [Path(p) for p in [site.getusersitepackages(), *site.getsitepackages()]]
@@ -44,7 +42,7 @@ def get_imported_files(file_path: Path) -> set[Path]:
                 p = Path(spec.origin).resolve()
                 if (
                     p != current
-                    and p.is_relative_to(CWD)
+                    and p.is_relative_to(Path.cwd())
                     and all(parent not in SITE_PACKAGES_PATHS for parent in p.parents)
                     and all(parent not in imports for parent in p.parents)
                     and not "site-packages" in str(p)
@@ -61,4 +59,4 @@ def get_imported_files(file_path: Path) -> set[Path]:
             else:
                 pass  # logger.debug(f"Unable to find spec for module: {mod}")
 
-    return set([i.relative_to(CWD) for i in imports])
+    return set([i.relative_to(Path.cwd()) for i in imports])

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/locust_cloud/web_login.py

@@ -3,7 +3,7 @@ import time
 import webbrowser
 
 import requests
-from locust_cloud.common import VALID_REGIONS, CloudConfig, delete_cloud_config, get_api_url, write_cloud_config
+from locust_cloud.common import VALID_REGIONS, CloudConfig, get_api_url, write_cloud_config
 
 POLLING_FREQUENCY = 1
 
@@ -77,7 +77,3 @@ If the browser does not open or you wish to use a different device to authorize
         region=region,
     )
     write_cloud_config(config)
-
-
-def logout():
-    delete_cloud_config()

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/pyproject.toml

@@ -18,9 +18,6 @@ dependencies = [
 homepage = "https://locust.cloud"
 repository = "https://github.com/locustcloud/locust-cloud"
 
-[project.scripts]
-locust-cloud = "locust_cloud.cloud:deprecated_main"
-
 [build-system]
 requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/tests/args_test.py

@@ -1,17 +1,15 @@
 import base64
 import gzip
 import io
-import pathlib
 import tempfile
 from argparse import ArgumentTypeError
+from pathlib import Path
 from zipfile import ZipFile
 
 import pytest
 from locust_cloud.args import (
-    CWD,
     combined_cloud_parser,
     expanded,
-    pipe,
     transfer_encode,
     transfer_encoded_file,
     valid_project_path,
@@ -19,20 +17,14 @@ from locust_cloud.args import (
 )
 
 
-def test_pipe():
-    one = lambda x: x * 3
-    two = lambda x: x + 3
-    assert pipe(4, one, two) == 15
-
-
 def test_valid_project_path():
     with tempfile.NamedTemporaryFile() as tmp:
         with pytest.raises(ArgumentTypeError) as exception:
             valid_project_path(tmp.name)
 
-    assert str(exception.value) == f"'{tmp.name}' is not under current working directory: {CWD}"
+    assert str(exception.value) == f"'{tmp.name}' is not under current working directory: {Path.cwd()}"
 
-    bad_path = str(CWD / "does-not-exist")
+    bad_path = str(Path.cwd() / "does-not-exist")
 
     with pytest.raises(ArgumentTypeError) as exception:
         valid_project_path(bad_path)
@@ -45,12 +37,7 @@ def test_transfer_encode():
     data = b"pineapple"
     result = transfer_encode(file_name, io.BytesIO(data))
     assert file_name == result["filename"]
-    assert data == pipe(
-        result["data"],
-        str.encode,
-        base64.b64decode,
-        gzip.decompress,
-    )
+    assert data == gzip.decompress(base64.b64decode(str.encode(result["data"])))
 
 
 def test_transfer_encoded_file():
@@ -61,22 +48,14 @@ def test_transfer_encoded_file():
 
 
 def test_expanded():
-    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")]
+    result = list(expanded([Path("locustfile.py"), Path("testdata/extra-files")]))
+    assert result == [Path("locustfile.py"), Path("testdata/extra-files/extra.txt")]
 
 
 def test_project_zip():
-    result = zip_project_paths([pathlib.Path("testdata/extra-files")])
+    result = zip_project_paths([Path("testdata/extra-files")])
     assert result["filename"] == "project.zip"
-
-    buffer = pipe(
-        result["data"],
-        str.encode,
-        base64.b64decode,
-        gzip.decompress,
-        io.BytesIO,
-    )
-
+    buffer = io.BytesIO(gzip.decompress(base64.b64decode(str.encode(result["data"]))))
     with ZipFile(buffer) as zf:
         assert zf.namelist() == ["testdata/extra-files/extra.txt"]
 
@@ -86,7 +65,7 @@ def test_parser_extra_files(capsys):
         with tempfile.NamedTemporaryFile() as tmp:
             combined_cloud_parser.parse_known_args(f"locust-cloud --extra-files {tmp.name}")
 
-        expected = f"error: argument --extra-files: '{tmp.name}' is not under current working directory: {CWD}"
+        expected = f"error: argument --extra-files: '{tmp.name}' is not under current working directory: {Path.cwd()}"
         assert expected in capsys.readouterr().err
 
     with pytest.raises(SystemExit):

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/tests/cloud_test.py

@@ -34,10 +34,8 @@ def backup_cloud_config_file():
     finally:
         if do_backup:
             backup_file.rename(CLOUD_CONFIG_FILE)
-
-        else:  # was not there before the test, should not be there after
-            if CLOUD_CONFIG_FILE.exists():
-                CLOUD_CONFIG_FILE.unlink()
+        else:
+            locust_cloud.common.delete_cloud_config()
 
 
 def check_for_output(stream, regex, timeout=None) -> re.Match | None:
@@ -58,9 +56,7 @@ def check_for_output(stream, regex, timeout=None) -> re.Match | None:
 
 
 def test_cli_auth() -> None:
-    # Ensure there is no cloud config file by deleting it
-    if CLOUD_CONFIG_FILE.exists():
-        CLOUD_CONFIG_FILE.unlink()
+    locust_cloud.common.delete_cloud_config()
     assert not CLOUD_CONFIG_FILE.exists()
 
     env = {

{locust_cloud-1.26.4.dev1 → locust_cloud-1.26.4.dev9}/tests/import_finder_test.py

@@ -4,11 +4,11 @@ import textwrap
 from contextlib import contextmanager
 from pathlib import Path
 
-from locust_cloud.import_finder import CWD, get_imported_files
+from locust_cloud.import_finder import get_imported_files
 
 
 @contextmanager
-def temporary_file(content, dir=CWD, suffix=".py"):
+def temporary_file(content, dir=Path.cwd(), suffix=".py"):
     with tempfile.NamedTemporaryFile(dir=dir, suffix=suffix) as f:
         f.write(content.encode())
         f.seek(0)
@@ -16,7 +16,7 @@ def temporary_file(content, dir=CWD, suffix=".py"):
 
 
 def import_name(path):
-    return str(Path(path).relative_to(CWD)).removesuffix(".py")
+    return str(Path(path).relative_to(Path.cwd())).removesuffix(".py")
 
 
 def test_ignore_external_packages_imports():
@@ -35,7 +35,7 @@ def test_import_file():
     ) as to_import:
         with temporary_file(f"import {import_name(to_import)}\n") as f:
             imports = get_imported_files(Path(f))
-            assert imports == {Path(to_import).relative_to(CWD)}
+            assert imports == {Path(to_import).relative_to(Path.cwd())}
 
 
 def test_from_import_file():
@@ -48,7 +48,7 @@ def test_from_import_file():
         )
     ) as to_import:
         with temporary_file(f"from {import_name(to_import)} import foo") as f:
-            assert get_imported_files(Path(f)) == {Path(to_import).relative_to(CWD)}
+            assert get_imported_files(Path(f)) == {Path(to_import).relative_to(Path.cwd())}
 
 
 def test_all_imports():
@@ -69,7 +69,7 @@ def test_all_imports():
                 """
             )
         ) as f:
-            assert get_imported_files(Path(f)) == {Path(to_import).relative_to(CWD)}
+            assert get_imported_files(Path(f)) == {Path(to_import).relative_to(Path.cwd())}
 
 
 def test_second_level_imports():
@@ -89,7 +89,7 @@ def test_second_level_imports():
                 """
             )
         ) as f:
-            assert get_imported_files(Path(f)) == {Path(to_import).relative_to(CWD)}
+            assert get_imported_files(Path(f)) == {Path(to_import).relative_to(Path.cwd())}
 
 
 def test_recursive_imports():
@@ -104,13 +104,13 @@ def test_recursive_imports():
         with temporary_file(f"import {import_name(to_import_1)}") as to_import:
             with temporary_file(f"import {import_name(to_import)}") as f:
                 assert get_imported_files(Path(f)) == {
-                    Path(to_import).relative_to(CWD),
-                    Path(to_import_1).relative_to(CWD),
+                    Path(to_import).relative_to(Path.cwd()),
+                    Path(to_import_1).relative_to(Path.cwd()),
                 }
 
 
 def test_package_imports():
-    test_package = CWD / "test_package"
+    test_package = Path.cwd() / "test_package"
     test_package.mkdir()
 
     (test_package / "__init__.py").write_text(
@@ -132,15 +132,15 @@ def test_package_imports():
     )
     try:
         with temporary_file("import test_package") as f:
-            assert get_imported_files(Path(f)) == {test_package.relative_to(CWD)}
+            assert get_imported_files(Path(f)) == {test_package.relative_to(Path.cwd())}
 
         with temporary_file("import test_package.test") as f:
-            assert get_imported_files(Path(f)) == {(test_package / "test.py").relative_to(CWD)}
+            assert get_imported_files(Path(f)) == {(test_package / "test.py").relative_to(Path.cwd())}
 
         with temporary_file("from test_package import bar") as f:
-            assert get_imported_files(Path(f)) == {test_package.relative_to(CWD)}
+            assert get_imported_files(Path(f)) == {test_package.relative_to(Path.cwd())}
 
         with temporary_file("from test_package.test import bar") as f:
-            assert get_imported_files(Path(f)) == {(test_package / "test.py").relative_to(CWD)}
+            assert get_imported_files(Path(f)) == {(test_package / "test.py").relative_to(Path.cwd())}
     finally:
         shutil.rmtree(test_package, ignore_errors=True)

locust_cloud-1.26.4.dev1/locust_cloud/__init__.py

@@ -1,3 +0,0 @@
-from locust_cloud.cloud import main
-
-__all__ = ["main"]

locust_cloud-1.26.4.dev1/locust_cloud/actions.py

@@ -1,22 +0,0 @@
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-def delete(session):
-    try:
-        logger.info("Tearing down Locust cloud...")
-        response = session.delete(
-            "/teardown",
-        )
-
-        if response.status_code == 200:
-            logger.debug(f"Response message from teardown: {response.json()['message']}")
-        else:
-            logger.info(
-                f"Could not automatically tear down Locust Cloud: HTTP {response.status_code}/{response.reason} - Response: {response.text} - URL: {response.request.url}"
-            )
-    except KeyboardInterrupt:
-        pass  # don't show nasty callstack
-    except Exception as e:
-        logger.error(f"Could not automatically tear down Locust Cloud: {e.__class__.__name__}:{e}")