htx-cli 0.1.3__tar.gz → 0.1.5__tar.gz

{htx_cli-0.1.3 → htx_cli-0.1.5}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: htx-cli
-Version: 0.1.3
+Version: 0.1.5
 Summary: htx-cli command-line client for the Disk backend API
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+Requires-Dist: qiniu<8,>=7.13
 Requires-Dist: rich<14,>=13.9
 Requires-Dist: requests<3,>=2.32
 
@@ -15,6 +16,7 @@ Requires-Dist: requests<3,>=2.32
 - Listing remote Disk directories
 - Uploading a local file into a remote Disk directory
 - Uploading a local directory recursively while recreating its folder structure remotely
+- Resumable multipart uploads with real remote-part progress
 
 ## Install
 
@@ -174,3 +176,9 @@ The CLI stores the backend JWT token and the last fetched user payload in:
 ```
 
 Use `--config` to point to a different state file.
+
+Multipart upload resume records are stored under:
+
+```text
+~/.config/htx-cli/upload-records/
+```

{htx_cli-0.1.3 → htx_cli-0.1.5}/README.md

@@ -6,6 +6,7 @@
 - Listing remote Disk directories
 - Uploading a local file into a remote Disk directory
 - Uploading a local directory recursively while recreating its folder structure remotely
+- Resumable multipart uploads with real remote-part progress
 
 ## Install
 
@@ -165,3 +166,9 @@ The CLI stores the backend JWT token and the last fetched user payload in:
 ```
 
 Use `--config` to point to a different state file.
+
+Multipart upload resume records are stored under:
+
+```text
+~/.config/htx-cli/upload-records/
+```

{htx_cli-0.1.3 → htx_cli-0.1.5}/pyproject.toml

@@ -4,11 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "htx-cli"
-version = "0.1.3"
+version = "0.1.5"
 description = "htx-cli command-line client for the Disk backend API"
 readme = "README.md"
 requires-python = ">=3.9"
 dependencies = [
+  "qiniu>=7.13,<8",
   "rich>=13.9,<14",
   "requests>=2.32,<3",
 ]

{htx_cli-0.1.3 → htx_cli-0.1.5}/src/disk_cli/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.1.3"
+__version__ = "0.1.5"

{htx_cli-0.1.3 → htx_cli-0.1.5}/src/disk_cli/api.py

@@ -4,9 +4,11 @@ from dataclasses import dataclass
 from pathlib import Path
 import time
 from typing import Any, Callable, Dict, Optional
-from urllib.parse import urljoin
+from urllib.parse import urljoin, urlparse
 
 import requests
+from qiniu import Auth
+from qiniu.services.storage.uploader import ResumeUploaderV2, UploadProgressRecorder
 
 from .config import DiskSettings
 
@@ -33,41 +35,11 @@ class UploadToken:
 
 
 ProgressCallback = Callable[[int, Optional[int]], None]
+UploadPhaseCallback = Callable[[str], None]
 MAX_RETRIES = 5
 RETRYABLE_STATUS_CODES = {429, 500, 502, 503, 504}
 
 
-class UploadMonitor:
-    def __init__(self, local_path: Path, callback: Optional[ProgressCallback] = None) -> None:
-        self.local_path = local_path
-        self.callback = callback
-        self.handle = local_path.open("rb")
-        self.total = local_path.stat().st_size
-        self.transferred = 0
-        if self.callback:
-            self.callback(0, self.total)
-
-    def read(self, size: int = -1) -> bytes:
-        chunk = self.handle.read(size)
-        if chunk:
-            self.transferred += len(chunk)
-            if self.callback:
-                self.callback(self.transferred, self.total)
-        return chunk
-
-    def close(self) -> None:
-        self.handle.close()
-
-    def __getattr__(self, item: str) -> Any:
-        return getattr(self.handle, item)
-
-    def __enter__(self) -> "UploadMonitor":
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
-        self.close()
-
-
 class DiskClient:
     def __init__(self, settings: DiskSettings, *, timeout: float = 30.0) -> None:
         self.settings = settings
@@ -88,13 +60,17 @@ class DiskClient:
                 f"Server returned a non-JSON response (HTTP {response.status_code})."
             ) from exc
 
+        return self._unwrap_payload(payload, status_code=response.status_code)
+
+    @staticmethod
+    def _unwrap_payload(payload: Any, *, status_code: Optional[int] = None) -> Any:
         if not isinstance(payload, dict) or "code" not in payload:
             return payload
 
         if payload.get("code") != 0:
             raise DiskAPIError(
                 payload.get("msg") or "The Disk API request failed.",
-                status_code=response.status_code,
+                status_code=status_code,
                 identifier=payload.get("identifier"),
                 debug_msg=payload.get("debug_msg"),
             )
@@ -254,6 +230,27 @@ class DiskClient:
     def delete_resource(self, res_str_id: str) -> None:
         self.request("DELETE", f"/api/res/{res_str_id}")
 
+    def _is_backend_json_api_response(
+        self,
+        response: requests.Response,
+        *,
+        requested_url: str,
+    ) -> bool:
+        content_type = response.headers.get("content-type", "").lower()
+        if "application/json" not in content_type:
+            return False
+
+        content_disposition = response.headers.get("content-disposition", "").lower()
+        if "attachment" in content_disposition or "filename=" in content_disposition:
+            return False
+
+        final_url = urlparse(response.url)
+        backend_url = urlparse(self.settings.backend_url)
+        requested = urlparse(requested_url)
+        if (final_url.scheme, final_url.netloc) != (backend_url.scheme, backend_url.netloc):
+            return False
+        return final_url.path.rstrip("/") == requested.path.rstrip("/")
+
     def download_resource(
         self,
         res_str_id: str,
@@ -274,10 +271,6 @@ class DiskClient:
                     stream=True,
                     allow_redirects=True,
                 )
-                content_type = response.headers.get("content-type", "")
-                if "application/json" in content_type:
-                    self._unwrap_response(response)
-                    raise DiskAPIError("Download endpoint returned JSON instead of file content.")
                 try:
                     response.raise_for_status()
                 except requests.HTTPError as exc:
@@ -286,6 +279,12 @@ class DiskClient:
                         status_code=response.status_code,
                     ) from exc
 
+                if self._is_backend_json_api_response(response, requested_url=url):
+                    self._unwrap_response(response)
+                    raise DiskAPIError(
+                        "Download endpoint returned JSON metadata instead of file content."
+                    )
+
                 total_header = response.headers.get("content-length")
                 total = int(total_header) if total_header and total_header.isdigit() else None
                 if progress_callback:
@@ -336,18 +335,71 @@ class DiskClient:
         local_path: Path,
         *,
         progress_callback: Optional[ProgressCallback] = None,
+        phase_callback: Optional[UploadPhaseCallback] = None,
     ) -> Dict[str, Any]:
         last_error: Optional[Exception] = None
+        file_size = local_path.stat().st_size
+        bucket_name = Auth.get_bucket_name(upload.upload_token)
+        if not bucket_name:
+            raise DiskAPIError("Upload token does not contain a valid bucket name.")
+
         for attempt in range(1, MAX_RETRIES + 1):
             try:
-                with UploadMonitor(local_path, progress_callback) as handle:
-                    body = self._request_once(
-                        "POST",
-                        self.settings.qiniu_upload_url,
-                        include_auth=False,
-                        data={"key": upload.key, "token": upload.upload_token},
-                        files={"file": (local_path.name, handle)},
+                self.settings.upload_record_dir.mkdir(parents=True, exist_ok=True)
+                recorder = UploadProgressRecorder(str(self.settings.upload_record_dir))
+                uploader = ResumeUploaderV2(
+                    bucket_name,
+                    part_size=4 * 1024 * 1024,
+                    progress_handler=progress_callback,
+                    upload_progress_recorder=recorder,
+                )
+
+                context, resp = uploader.initial_parts(
+                    up_token=upload.upload_token,
+                    key=upload.key,
+                    file_path=str(local_path),
+                    file_name=local_path.name,
+                )
+                if resp is not None and not resp.ok():
+                    raise DiskAPIError(
+                        f"Failed to initialize multipart upload: {resp.error}",
+                        status_code=resp.status_code,
+                        debug_msg=resp.text_body,
+                    )
+
+                with local_path.open("rb") as file_handle:
+                    _, resp = uploader.upload_parts(
+                        up_token=upload.upload_token,
+                        data=file_handle,
+                        data_size=file_size,
+                        context=context,
+                        key=upload.key,
+                        file_name=local_path.name,
+                    )
+                if resp is not None and not resp.ok():
+                    raise DiskAPIError(
+                        f"Failed while uploading file parts: {resp.error}",
+                        status_code=resp.status_code,
+                        debug_msg=resp.text_body,
+                    )
+
+                if phase_callback:
+                    phase_callback("finalizing")
+
+                body, resp = uploader.complete_parts(
+                    up_token=upload.upload_token,
+                    data_size=file_size,
+                    context=context,
+                    key=upload.key,
+                    file_name=local_path.name,
+                )
+                if resp is not None and not resp.ok():
+                    raise DiskAPIError(
+                        f"Failed to finalize multipart upload: {resp.error}",
+                        status_code=resp.status_code,
+                        debug_msg=resp.text_body,
                     )
+                body = self._unwrap_payload(body, status_code=resp.status_code if resp is not None else None)
                 if not isinstance(body, dict):
                     raise DiskAPIError("Upload endpoint returned an unexpected payload.")
                 return body

{htx_cli-0.1.3 → htx_cli-0.1.5}/src/disk_cli/cli.py

@@ -439,7 +439,16 @@ def upload_file_to_remote(ctx: CommandContext, local_path: Path, parent_id: str)
         def on_progress(transferred: int, callback_total: Optional[int]) -> None:
             progress.update(task_id, completed=transferred, total=callback_total or total)
 
-        uploaded = ctx.client.upload_file(upload_token, local_path, progress_callback=on_progress)
+        def on_phase(phase: str) -> None:
+            if phase == "finalizing":
+                progress.update(task_id, completed=total, total=total, description=f"Finalizing {local_path.name}")
+
+        uploaded = ctx.client.upload_file(
+            upload_token,
+            local_path,
+            progress_callback=on_progress,
+            phase_callback=on_phase,
+        )
     print_success(
         f"uploaded {local_path.name} -> {uploaded['rname']} ({format_resource_ref(uploaded['res_str_id'])})"
     )

{htx_cli-0.1.3 → htx_cli-0.1.5}/src/disk_cli/config.py

@@ -10,9 +10,9 @@ from urllib.parse import urlencode
 
 DEFAULT_APP_ID = "R41nXZEw"
 DEFAULT_BACKEND_URL = "https://disk.6-79.cn"
-DEFAULT_QINIU_UPLOAD_URL = "https://up.qiniup.com"
 DEFAULT_SSO_URL = "https://qt.6-79.cn/oauth/"
 DEFAULT_STATE_PATH = Path.home() / ".config" / "htx-cli" / "state.json"
+DEFAULT_UPLOAD_RECORD_DIR = Path.home() / ".config" / "htx-cli" / "upload-records"
 LEGACY_STATE_PATH = Path.home() / ".config" / "disk-cli" / "state.json"
 DEFAULT_QT_COMMAND = "qt"
 
@@ -22,11 +22,15 @@ class DiskSettings:
     backend_url: str = field(default_factory=lambda: os.getenv("DISK_BACKEND_URL", DEFAULT_BACKEND_URL))
     sso_url: str = field(default_factory=lambda: os.getenv("DISK_SSO_URL", DEFAULT_SSO_URL))
     sso_app_id: str = field(default_factory=lambda: os.getenv("DISK_SSO_APP_ID", DEFAULT_APP_ID))
-    qiniu_upload_url: str = field(default_factory=lambda: os.getenv("DISK_QINIU_UPLOAD_URL", DEFAULT_QINIU_UPLOAD_URL))
     qt_command: str = field(default_factory=lambda: os.getenv("DISK_QT_COMMAND", DEFAULT_QT_COMMAND))
     token: Optional[str] = None
     user: Optional[Dict[str, Any]] = None
     state_path: Path = DEFAULT_STATE_PATH
+    upload_record_dir: Path = field(
+        default_factory=lambda: Path(
+            os.getenv("DISK_UPLOAD_RECORD_DIR", str(DEFAULT_UPLOAD_RECORD_DIR))
+        ).expanduser()
+    )
 
     @classmethod
     def load(cls, state_path: Optional[Path] = None) -> "DiskSettings":
@@ -41,20 +45,23 @@ class DiskSettings:
             backend_url=data.get("backend_url", os.getenv("DISK_BACKEND_URL", DEFAULT_BACKEND_URL)),
             sso_url=data.get("sso_url", os.getenv("DISK_SSO_URL", DEFAULT_SSO_URL)),
             sso_app_id=data.get("sso_app_id", os.getenv("DISK_SSO_APP_ID", DEFAULT_APP_ID)),
-            qiniu_upload_url=data.get(
-                "qiniu_upload_url",
-                os.getenv("DISK_QINIU_UPLOAD_URL", DEFAULT_QINIU_UPLOAD_URL),
-            ),
             qt_command=data.get("qt_command", os.getenv("DISK_QT_COMMAND", DEFAULT_QT_COMMAND)),
             token=data.get("token"),
             user=data.get("user"),
             state_path=resolved_path,
+            upload_record_dir=Path(
+                data.get(
+                    "upload_record_dir",
+                    os.getenv("DISK_UPLOAD_RECORD_DIR", str(DEFAULT_UPLOAD_RECORD_DIR)),
+                )
+            ).expanduser(),
         )
 
     def save(self) -> None:
         self.state_path.parent.mkdir(parents=True, exist_ok=True)
         payload = asdict(self)
         payload["state_path"] = str(self.state_path)
+        payload["upload_record_dir"] = str(self.upload_record_dir)
         self.state_path.write_text(
             json.dumps(payload, ensure_ascii=False, indent=2) + "\n",
             encoding="utf-8",

{htx_cli-0.1.3 → htx_cli-0.1.5}/src/htx_cli.egg-info/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: htx-cli
-Version: 0.1.3
+Version: 0.1.5
 Summary: htx-cli command-line client for the Disk backend API
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
+Requires-Dist: qiniu<8,>=7.13
 Requires-Dist: rich<14,>=13.9
 Requires-Dist: requests<3,>=2.32
 
@@ -15,6 +16,7 @@ Requires-Dist: requests<3,>=2.32
 - Listing remote Disk directories
 - Uploading a local file into a remote Disk directory
 - Uploading a local directory recursively while recreating its folder structure remotely
+- Resumable multipart uploads with real remote-part progress
 
 ## Install
 
@@ -174,3 +176,9 @@ The CLI stores the backend JWT token and the last fetched user payload in:
 ```
 
 Use `--config` to point to a different state file.
+
+Multipart upload resume records are stored under:
+
+```text
+~/.config/htx-cli/upload-records/
+```

{htx_cli-0.1.3 → htx_cli-0.1.5}/src/htx_cli.egg-info/requires.txt

@@ -1,2 +1,3 @@
+qiniu<8,>=7.13
 rich<14,>=13.9
 requests<3,>=2.32