atomgit 1.0.10__tar.gz → 1.0.12__tar.gz

{atomgit-1.0.10 → atomgit-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atomgit
-Version: 1.0.10
+Version: 1.0.12
 Summary: AtomGit模型文件上传下载CLI工具
 Home-page: https://atomgit.com/gitcode-ai/atomgit_cli
 Author: AtomGit CLI Team

{atomgit-1.0.10 → atomgit-1.0.12}/api.py

@@ -15,7 +15,12 @@ os.makedirs(cache_dir, exist_ok=True)
 os.environ["HF_HOME"] = cache_dir
 
 
-from huggingface_hub import hf_hub_download, upload_folder, create_repo, snapshot_download, constants as hf_constants
+from huggingface_hub import hf_hub_download, upload_folder, create_repo, constants as hf_constants
+
+try:
+    from . import atomgit_hub
+except ImportError:
+    import atomgit_hub
 
 try:
     from .rate_limiter import install_hf_rate_limiter
@@ -62,53 +67,6 @@ class HuggingFaceAPI:
         # 二层或单层格式直接返回
         return repo_id
 
-    def _probe_once(self, probe_id: str, token: Optional[str] = None):
-        """探测一次仓库是否可访问，返回 (可访问, 原因)。
-
-        原因取值：ok / not_found / unauthorized / status=<code> / 探测失败
-        """
-        endpoint = os.environ.get("HF_ENDPOINT", "https://hub.atomgit.com").rstrip("/")
-        headers = {"User-Agent": "atomgit-cli"}
-        if token:
-            headers["Authorization"] = f"Bearer {token}"
-
-        status = None
-        # 默认分支可能是 main 或 master，404 时再试另一个
-        for revision in ("main", "master"):
-            request = urllib.request.Request(
-                f"{endpoint}/api/models/{probe_id}/revision/{revision}", headers=headers
-            )
-            try:
-                with urllib.request.urlopen(request, timeout=15):
-                    return True, "ok"
-            except urllib.error.HTTPError as e:
-                status = e.code
-                if status != 404:
-                    break
-            except Exception as e:
-                # 网络抖动不阻断下载，交给 SDK 自己重试
-                return True, f"探测失败: {e}"
-        if status == 404:
-            return False, "not_found"
-        if status in (401, 403):
-            return False, "unauthorized"
-        return True, f"status={status}"
-
-    def _remote_repo_accessible(self, repo_id: str, token: Optional[str] = None):
-        """确认远端仓库真的可访问。
-
-        huggingface_hub 的 snapshot_download 在远端 404 且 local_dir 已存在时，
-        会打印 "Returning existing local_dir ..." 并正常返回，
-        导致"下载不存在的仓库"被误报成功，所以下载前先探测一次。
-        """
-        accessible, reason = self._probe_once(repo_id, None)
-        if accessible or reason == "not_found":
-            return accessible, reason
-        # 匿名探测失败时，若本地有令牌就再用令牌试一次
-        if token:
-            return self._probe_once(repo_id, token)
-        return accessible, reason
-    
     def login(self, token: str) -> bool:
         """登录验证"""
         if not token or len(token) < 10:
@@ -262,20 +220,8 @@ class HuggingFaceAPI:
     def download_repo(self, repo_id: str, local_path: Path = None, force_download: bool = False) -> bool:
         """下载仓库 - 使用Hugging Face Hub SDK，支持公开仓库无需token和断点续传"""
         try:
-            # 标准化仓库ID（处理三层格式）
+            # repo_id 交给 atomgit_hub 归一化（三层 -> dash），探测也在那边完成
             normalized_repo_id = self._normalize_repo_id(repo_id)
-
-            # 远端不可访问且本地目录已存在时，SDK 会静默回退到本地目录并正常返回，
-            # 会把"上次残留"误报成下载成功，所以先探测远端仓库是否真的存在
-            credentials = config.get_credentials()
-            accessible, reason = self._remote_repo_accessible(
-                normalized_repo_id, credentials['token'] if credentials else None)
-            if not accessible:
-                if reason == "unauthorized":
-                    print(f"❌ 仓库无权访问（令牌无效或权限不足）: {repo_id}")
-                else:
-                    print(f"❌ 仓库不存在: {repo_id}")
-                return False
             
             if local_path is None:
                 local_path = Path.cwd() / repo_id.split('/')[-1]
@@ -283,14 +229,16 @@ class HuggingFaceAPI:
             # 创建本地目录
             local_path.mkdir(parents=True, exist_ok=True)
             
-            # 首先尝试不使用token下载（适用于公开仓库）
             credentials = config.get_credentials()
             try:
-                snapshot_download(
-                    repo_id=normalized_repo_id,
+                # 复用 atomgit_hub：内部会先探测仓库可访问性，令牌无效但仓库公开时自动降级匿名，
+                # 避免 huggingface_hub 在 403/404 时静默回退本地目录导致假成功
+                atomgit_hub.snapshot_download(
+                    repo_id=repo_id,
                     local_dir=str(local_path),
-                    force_download=force_download,  # 根据用户选择决定是否强制下载
-                    token=credentials['token'] if credentials and 'token' in credentials else None
+                    force_download=force_download,
+                    token=credentials['token'] if credentials and 'token' in credentials else None,
+                    max_workers=8,
                 )
                 print(f"✅ 仓库下载成功")
                 return True
@@ -314,7 +262,12 @@ class HuggingFaceAPI:
             
             # 创建本地目录
             local_path.mkdir(parents=True, exist_ok=True)
-            
+
+            # 先探测文件是否存在，给出准确提示（避免把 404 报成网络/缓存故障）
+            if atomgit_hub._file_http_status(normalized_repo_id, filename) == 404:
+                print(f"文件不存在：{repo_id}/{filename}（revision: main，HTTP 404）。请检查文件路径或版本。")
+                return False
+
             # 首先尝试不使用token下载（适用于公开仓库）
             try:
                 hf_hub_download(

{atomgit-1.0.10 → atomgit-1.0.12}/atomgit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atomgit
-Version: 1.0.10
+Version: 1.0.12
 Summary: AtomGit模型文件上传下载CLI工具
 Home-page: https://atomgit.com/gitcode-ai/atomgit_cli
 Author: AtomGit CLI Team

{atomgit-1.0.10 → atomgit-1.0.12}/atomgit_hub.py

@@ -161,6 +161,29 @@ def _probe_repo(repo_id: str, token: Optional[str] = None) -> Optional[str]:
     return None
 
 
+def _file_http_status(repo_id: str, filename: str, revision: Optional[str] = None,
+                      token: Optional[str] = None) -> Optional[int]:
+    """探测单个文件的可访问性，返回 HTTP 状态码；网络异常返回 None。"""
+    endpoint = os.environ.get("HF_ENDPOINT", "https://hub.atomgit.com").rstrip("/")
+    rev = revision or "main"
+    headers = {"User-Agent": "atomgit-cli"}
+    if token:
+        headers["Authorization"] = f"Bearer {token}"
+    # 注意：HF 兼容的 resolve 路由是 /{namespace}/{repo}/resolve/...，不带 /api/models 前缀
+    request = urllib.request.Request(
+        f"{endpoint}/{repo_id}/resolve/{rev}/{urllib.parse.quote(filename, safe='/')}",
+        headers=headers,
+        method="HEAD",
+    )
+    try:
+        with urllib.request.urlopen(request, timeout=15):
+            return 200
+    except urllib.error.HTTPError as e:
+        return e.code
+    except Exception:
+        return None
+
+
 def snapshot_download(
     repo_id: str,
     revision: Optional[str] = None,
@@ -360,10 +383,25 @@ def download_file(
         return result
     except Exception as e:
         error_msg = str(e)
+        rev = revision or "main"
+        # huggingface_hub 常把“文件不存在”报成缓存/网络故障（LocalEntryNotFoundError），
+        # 这里用一次 HEAD 请求还原真实状态码，给出准确提示
+        status = _file_http_status(normalized_repo_id, filename, revision, token)
+        if status == 404:
+            raise Exception(
+                f"文件不存在：{repo_id}/{filename}（revision: {rev}，HTTP 404）。请检查文件路径或版本。"
+            )
+        if status in (401, 403):
+            raise Exception(
+                f"认证失败：{repo_id}/{filename}（revision: {rev}，HTTP {status}）。"
+                "请检查 token 是否有效，或是否拥有该仓库权限。"
+            )
         if "401" in error_msg or "403" in error_msg:
             raise Exception(f"认证失败：{error_msg}")
         elif "404" in error_msg:
-            raise Exception(f"文件不存在：{repo_id}/{filename}")
+            raise Exception(
+                f"文件不存在：{repo_id}/{filename}（revision: {rev}，HTTP 404）。请检查文件路径或版本。"
+            )
         else:
             raise Exception(f"下载失败：{error_msg}")
 

{atomgit-1.0.10 → atomgit-1.0.12}/setup.py

@@ -31,7 +31,7 @@ def read_requirements():
 
 setup(
     name='atomgit',
-    version='1.0.10',
+    version='1.0.12',
     author='AtomGit CLI Team',
     author_email='sa@atomgit.com',
     description='AtomGit模型文件上传下载CLI工具',