Handle server API differences in file response fields

Some FileSender servers (observed on AARNet's instance) return numeric
fields as strings and use 'puid' instead of 'uid' as the per-file upload
key. Cast size to int before arithmetic and resolve the key field from
whichever of uid/puid is present.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Robert Denham

filesender/api.py

@@ -99,6 +99,12 @@ def iter_files(paths: Iterable[Path], root: Optional[Path] = None) -> Iterable[T
                 # If this is a nested file, use the relative path from the root directory as the name
                 yield str(path.relative_to(root)), path
 
+def _file_key(file_info: response.File) -> str:
+    key = file_info.get("uid") or file_info.get("puid")  # type: ignore[typeddict-item]
+    if key is None:
+        raise Exception(f"File response for {file_info['name']!r} has neither 'uid' nor 'puid' field")
+    return key
+
 class EndpointHandler:
     base: str
 
@@ -292,7 +298,7 @@ async def update_file(
             self.http_client.build_request(
                 "PUT",
                 self.urls.file(file_info['id']),
-                params={"key": file_info["uid"]},
+                params={"key": _file_key(file_info)},
                 json=body,
             )
         )
@@ -322,7 +328,7 @@ async def _task_generator(chunk_size: int) -> AsyncIterator[Tuple[response.File,
             task_limit=self.concurrent_chunks
         )
        ).stream() as streamer:
-            async for _ in tqdm(streamer, total=math.ceil(file_info["size"] / self.chunk_size), desc=file_info["name"]): # type: ignore
+            async for _ in tqdm(streamer, total=math.ceil(int(file_info["size"]) / self.chunk_size), desc=file_info["name"]): # type: ignore
                 pass
 
     async def _upload_chunk(
@@ -338,7 +344,7 @@ async def _upload_chunk(
             self.http_client.build_request(
                 "PUT",
                 self.urls.chunk(file_info["id"], offset),
-                params={"key": file_info["uid"]},
+                params={"key": _file_key(file_info)},
                 content=chunk,
                 headers={
                     "Content-Type": "application/octet-stream",
@@ -430,7 +436,7 @@ async def download_file(
             file_path.parent.mkdir(parents=True, exist_ok=True)
             chunk_size = 8192
             chunk_size_mb = chunk_size / 1024 / 1024
-            with tqdm(desc=file_name, unit="MB", total=None if file_size is None else int(file_size / 1024 / 1024)) as progress:
+            with tqdm(desc=file_name, unit="MB", total=None if file_size is None else int(int(file_size) / 1024 / 1024)) as progress:
                 async with aiofiles.open(out_dir / file_name, "wb") as fp:
                     # We can't add the total here, because we don't know it: 
                     # https://github.com/filesender/filesender/issues/1555

filesender/response_types.py

@@ -1,10 +1,11 @@
 from typing import List
-from typing_extensions import TypedDict
+from typing_extensions import TypedDict, NotRequired
 
 class File(TypedDict):
     id: int
     transfer_id: int
-    uid: str
+    uid: NotRequired[str]   # older FileSender servers
+    puid: NotRequired[str]  # newer FileSender servers
     name: str
     size: int
     sha1: str

pyproject.toml

@@ -25,7 +25,8 @@ dependencies = [
     "cryptography",
     "typing_extensions",
     "tenacity",
-    "tqdm"
+    "tqdm",
+    "click>=8.1.8",
 ]
 
 [tool.setuptools.packages.find]