refactor: more ruff fixes

Author: NTFSvolume

src/mega/api.py

@@ -38,10 +38,10 @@ def retry(
     exceptions: Sequence[type[Exception]] | type[Exception],
     attempts: int = 10,
     delay: float = 0.5,
-    min_delay: float = 2.0,
     max_delay: float = 30.0,
     backoff: int = 2,
 ) -> Callable[[Callable[_P, Coroutine[None, None, _R]]], Callable[_P, Coroutine[None, None, _R]]]:
+    min_delay: float = 2.0
     if not isinstance(exceptions, Sequence):
         exceptions = [exceptions]
 
@@ -198,7 +198,7 @@ async def _parse_response(response: aiohttp.ClientResponse) -> Any:
             if resp == -3:
                 msg = "Request failed, retrying"
                 logger.warning(msg)
-                raise RetryRequestError()
+                raise RetryRequestError
             raise RequestError(resp)
 
         return resp

src/mega/cli/__init__.py

@@ -46,7 +46,8 @@ def verbose(
     callback=verbose,
     help=(
         "CLI app for the [bold black]Mega.nz[/bold black] and [bold black]Transfer.it[/bold black].\n"
-        f"Set [bold green]{env.EMAIL.name}[/bold green] and [bold green]{env.PASSWORD.name}[/bold green] enviroment variables to use them as credentials for Mega"
+        f"Set [bold green]{env.EMAIL.name}[/bold green] and [bold green]{env.PASSWORD.name}[/bold green]\n"
+        "enviroment variables to use them as credentials for Mega"
     ),
     epilog=f"v{__version__}",
 )
@@ -82,8 +83,9 @@ async def download(url: str, output_dir: Path = CWD) -> None:
     async with connect() as mega:
         parsed_url = mega.parse_url(url)
         if parsed_url.is_folder:
-            return await download_folder(mega, url, output_dir)
-        await download_file(mega, url, output_dir)
+            await download_folder(mega, url, output_dir)
+        else:
+            await download_file(mega, url, output_dir)
 
 
 @app.command()

src/mega/download.py

@@ -99,7 +99,8 @@ async def stream(stream: aiohttp.StreamReader, output_path: Path, file_size: int
 
 @contextlib.asynccontextmanager
 async def _new_temp_download(output_path: Path) -> AsyncGenerator[IO[bytes]]:
-    # We need NamedTemporaryFile to not delete on file.close() but on context exit, which is not supported until python 3.12
+    # We need the file to not be delete on file.close() but on context exit,
+    # But NamedTemporaryFile does not supports this until python 3.12
     temp_file = await asyncio.to_thread(tempfile.NamedTemporaryFile, prefix="mega_py_", delete=False)
     logger.debug(f'Created temp file "{temp_file.name!s}" for "{output_path!s}"')
     try:

src/mega/progress/__init__.py

@@ -3,16 +3,14 @@
 import asyncio
 import contextlib
 from contextvars import ContextVar
-from typing import TYPE_CHECKING, Any, Literal, Protocol, TypeAlias, TypeVar
+from typing import TYPE_CHECKING, Any, Literal, Protocol, TypeAlias
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Generator
     from types import TracebackType
 
     from rich.progress import Progress
 
-    _T = TypeVar("_T")
-
     ProgressHook: TypeAlias = Callable[[float], None]
 
     class ProgressHookContext(Protocol):

src/mega/utils.py

@@ -74,12 +74,12 @@ def log() -> Generator[None, float]:
         kind = "downloaded" if download else "uploaded"
         human_total = ByteSize(file_size).human_readable()
         last_log_size = 0
-        _50MB = 1024 * 1024 * 50
+        _50mb = 1024 * 1024 * 50
         while True:
             chunk_size: float = yield
             bytes_uploaded += chunk_size
             ratio: float = (bytes_uploaded / file_size) * 100
-            if ratio >= threshold or (bytes_uploaded - last_log_size) > _50MB:
+            if ratio >= threshold or (bytes_uploaded - last_log_size) > _50mb:
                 human_progress = ByteSize(bytes_uploaded).human_readable()
                 threshold = ((ratio // 10) + 1) * 10
                 last_log_size = bytes_uploaded

src/mega/vault.py

@@ -17,8 +17,8 @@
 class MegaVault:
     master_key: tuple[int, ...] = ()
 
-    # This is a mapping of owner (user_id) to shared keys. An special owner "EXP" is used for exported (AKA public) file/folders
     shared_keys: dict[UserID, SharedKeys] = dataclasses.field(default_factory=dict, repr=False)
+    # An special owner "EXP" is used for exported (AKA public) file/folders
 
     def __getitem__(self, node: Node) -> tuple[tuple[int, ...], tuple[int, ...] | None]:
         return self.get_keys(node)

tests/test_chunker.py

@@ -4,7 +4,7 @@
 
 
 @pytest.mark.parametrize(
-    "file_size, exp_result",
+    ("file_size", "exp_result"),
     [
         (
             0,

tests/test_crypto.py

@@ -6,7 +6,7 @@
 
 
 @pytest.mark.parametrize(
-    "attrs, key, expected_output",
+    ("attrs", "key", "expected_output"),
     [
         (
             b'\xb6E[\xe6K\xbd\xf9\t\x95\x1d\xcb\xe9\xa3N\x13 \xbb\xf3\x15\xf9H\xb7\x11\xe8\xec\\\x92"\x1d\xb45ia\xaf\x89v\xa5\xab\xd3\xb1\xa8Y\xbb\xe0\x81g\x8e\x19\x1b\xf5b\xa8\x1f`\x9d\x05b<\x13\x7fM\x07\xe0\xea',
@@ -24,7 +24,7 @@ def test_decrypt_attr(attrs: bytes, key: tuple[int, ...], expected_output: dict[
 
 
 @pytest.mark.parametrize(
-    "blob,expected",
+    ("blob", "expected"),
     [
         (b"\x00\x00\x00", 0),
         (b"\x00\x08\xff", 255),
@@ -36,7 +36,7 @@ def test_mpi(blob: bytes, expected: int) -> None:
 
 
 @pytest.mark.parametrize(
-    "input,expected",
+    ("input", "expected"),
     [
         (
             "1:192:1769956228:atNinVpwMnq2sgu6r3UXgd6TSZFJyi2GwOO_OC7hcUJTpKfMMJmKKPrAgxp8F5xj",

tests/test_errors.py

@@ -4,7 +4,7 @@
 
 
 @pytest.mark.parametrize(
-    "code, exp_message",
+    ("code", "exp_message"),
     [(code, f"{desc[0]}, {desc[1]}") for code, desc in _CODE_TO_DESCRIPTIONS.items()],
 )
 def test_request_error(code: int, exp_message: str) -> None:

tests/test_mega.py

@@ -13,7 +13,7 @@
 from mega.api import MegaAPI
 from mega.client import MegaNzClient
 from mega.data_structures import AccountBalance, AccountStats, Node, NodeType, StorageQuota
-from mega.errors import MultipleNodesFoundError, RequestError, RetryRequestError
+from mega.errors import MultipleNodesFoundError, RequestError, RetryRequestError, ValidationError
 from mega.filesystem import UserFileSystem
 from mega.utils import setup_logger, str_utc_now
 
@@ -50,15 +50,15 @@ async def connect_to_mega(folder_name: str, http_client: aiohttp.ClientSession)
 
 
 @pytest.fixture
-async def folder(mega: MegaNzClient, folder_name: str) -> AsyncGenerator[Node]:
+async def folder(mega: MegaNzClient, folder_name: str) -> Node:
     node = await mega.find(folder_name)
     assert node
     assert node.type is NodeType.FOLDER
     return node
 
 
 @pytest.fixture
-async def uploaded_file(mega: MegaNzClient, folder_name: str, folder: Node) -> AsyncGenerator[Node]:
+async def uploaded_file(mega: MegaNzClient, folder_name: str, folder: Node) -> Node:
     await mega.upload(TEST_FILE, folder.id)
     path = f"{folder_name}/{TEST_FILE.name}"
     node = await mega.find(path)
@@ -252,7 +252,7 @@ async def test_upload_and_download(mega: MegaNzClient, tmp_path: Path, folder_na
     output_path = await mega.download(node, tmp_path)
     assert output_path.parent == tmp_path
     assert output_path.is_file()
-    assert output_path.read_text() == TEST_FILE.read_text()
+    assert output_path.read_text() == await asyncio.to_thread(TEST_FILE.read_text)
 
 
 async def test_empty_trash(mega: MegaNzClient) -> None:
@@ -271,7 +271,7 @@ async def test_remove_contact(mega: MegaNzClient) -> None:
 
 
 @pytest.mark.parametrize(
-    "url, expected",
+    ("url", "expected"),
     [
         (
             "https://mega.nz/#!Ue5VRSIQ!kC2E4a4JwfWWCWYNJovGFHlbz8FN-ISsBAGPzvTjT6k",
@@ -294,14 +294,14 @@ def test_parse_url(url: str, expected: tuple[str, str]) -> None:
     ],
 )
 def test_parse_file_url_raise_value_error_for_file_urls(url: str) -> None:
-    with pytest.raises(ValueError) as e:
+    with pytest.raises(ValidationError) as e:
         MegaNzClient.parse_file_url(url)
 
     assert "This is a folder URL" in str(e)
 
 
 @pytest.mark.parametrize(
-    "url, expected",
+    ("url", "expected"),
     [
         (
             "https://mega.nz/#F!Ue5VRSIQ!kC2E4a4JwfWWCWYNJovGFHlbz8FN-ISsBAGPzvTjT6k",
@@ -332,7 +332,7 @@ def test_parse_folder_url(url: str, expected: tuple[str, str]) -> None:
     ],
 )
 def test_parse_folder_url_raise_value_error_for_file_urls(url: str) -> None:
-    with pytest.raises(ValueError) as e:
+    with pytest.raises(ValidationError) as e:
         MegaNzClient.parse_folder_url(url)
 
     assert "This is a file URL" in str(e)
@@ -358,7 +358,7 @@ async def test_when_api_returns_negative_3_raise_retry_error(self, value: Any) -
             await MegaAPI._parse_response(self._fake_resp(value))
 
     @pytest.mark.parametrize(
-        "value, expected",
+        ("value", "expected"),
         [
             ({"a": "b"}, {"a": "b"}),
             (["a", "b"], ["a", "b"]),