chore: update pyright

ckanext/files/cli/maintain.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from datetime import datetime, timezone
-
 import click
 import sqlalchemy as sa
 
@@ -11,10 +9,6 @@
 from ckanext.files import shared, utils
 
 
-def _now():
-    return datetime.now(timezone.utc)
-
-
 @click.group()
 def group():
     """Storage maintenance."""

ckanext/files/tests/test_utils.py

@@ -173,7 +173,7 @@ def test_str(self, faker: Faker):
         """Strings converted into Upload."""
         string = faker.pystr()
         with pytest.raises(TypeError):
-            utils.make_upload(string)  # type: ignore
+            utils.make_upload(string)
 
     def test_bytes(self, faker: Faker):
         """Bytes converted into Upload."""

ckanext/files/types.py

@@ -4,7 +4,11 @@
 
 from __future__ import annotations
 
-from typing import Any, Iterator, Literal, Protocol
+import tempfile
+from io import TextIOWrapper
+from typing import Any, BinaryIO, Iterator, Literal, Protocol, Union
+
+from werkzeug.datastructures import FileStorage
 
 from ckan.config.declaration import Declaration, Key
 from ckan.types import (
@@ -18,6 +22,15 @@
 
 AuthOperation = Literal["show", "update", "delete", "file_transfer"]
 
+Uploadable = Union[
+    FileStorage,
+    tempfile.SpooledTemporaryFile[Any],
+    TextIOWrapper,
+    bytes,
+    bytearray,
+    BinaryIO,
+]
+
 
 class UploadStream(Protocol):
     def read(self, size: Any = ..., /) -> bytes: ...

ckanext/files/utils.py

@@ -18,7 +18,7 @@
 import re
 import tempfile
 from io import BufferedReader, BytesIO, TextIOWrapper
-from typing import Any, BinaryIO, Callable, Generic, Iterable, TypeVar, cast
+from typing import Any, Callable, Generic, Iterable, TypeVar, cast
 
 import jwt
 import magic
@@ -306,15 +306,7 @@ def humanize_filesize(value: int | float) -> str:
 
 
 def make_upload(
-    value: (
-        FileStorage
-        | Upload
-        | tempfile.SpooledTemporaryFile[Any]
-        | TextIOWrapper
-        | bytes
-        | bytearray
-        | BinaryIO
-    ),
+    value: types.Uploadable | Upload,
 ) -> Upload:
     """Convert value into Upload object