atomgit 1.0.6__tar.gz → 1.0.8__tar.gz

{atomgit-1.0.6 → atomgit-1.0.8}/PKG-INFO

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

{atomgit-1.0.6 → atomgit-1.0.8}/__init__.py

@@ -8,7 +8,7 @@ AtomGit CLI - 基于Transformers和Hugging Face Hub的模型文件上传下载
 支持模型和数据集的上传、下载等操作。
 """
 
-__version__ = '1.0.6'
+__version__ = '1.0.8'
 __author__ = 'AtomGit CLI Team'
 __description__ = 'AtomGit模型文件上传下载CLI工具'
 

{atomgit-1.0.6 → atomgit-1.0.8}/atomgit.egg-info/PKG-INFO

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

{atomgit-1.0.6 → atomgit-1.0.8}/atomgit_hub.py

@@ -22,11 +22,14 @@ os.makedirs(cache_dir, exist_ok=True)
 os.environ["HF_HOME"] = cache_dir
 
 from huggingface_hub import snapshot_download as hf_snapshot_download
-from huggingface_hub import hf_hub_download, upload_folder as hf_upload_folder, create_repo
+from huggingface_hub import hf_hub_download, upload_file as hf_upload_file, upload_folder as hf_upload_folder, create_repo
 try:
     from .rate_limiter import install_hf_rate_limiter
 except ImportError:
-    from rate_limiter import install_hf_rate_limiter
+    try:
+        from rate_limiter import install_hf_rate_limiter
+    except ImportError:
+        from atomgit.rate_limiter import install_hf_rate_limiter
 
 install_hf_rate_limiter()
 
@@ -288,18 +291,21 @@ def upload_folder(
     upload_timeout: float = 300.0,
 ) -> str:
     """
-    上传文件夹到AtomGit Hub
-    
+    上传文件或文件夹到AtomGit Hub
+
+    自动判断传入路径是文件还是文件夹，两者都支持。
+
     参数:
-        folder_path (str 或 Path): 本地文件夹路径
+        folder_path (str 或 Path): 本地文件或文件夹路径
         repo_id (str): 仓库ID
         token (str, 可选): 认证token
         repo_type (str, 可选): 仓库类型
         revision (str, 可选): 分支名
         commit_message (str, 可选): 提交消息
         commit_description (str, 可选): 提交描述
-        path_in_repo (str, 可选): 在仓库中的路径，默认为根目录
-        ignore_patterns (List[str], 可选): 要忽略的文件模式
+        path_in_repo (str, 可选): 在仓库中的路径，默认为根目录。
+                                  若传入的是文件，文件名会自动拼接到该路径末尾。
+        ignore_patterns (List[str], 可选): 要忽略的文件模式（仅文件夹上传生效）
         upload_timeout (float, 可选): 上传超时时间（秒），默认60秒（1分钟）。
                                       对于大文件，服务器处理响应可能需要较长时间。
     
@@ -310,6 +316,7 @@ def upload_folder(
         >>> upload_folder("./my-model/", "username/repo-name")
         >>> upload_folder("./data/", "username/repo", path_in_repo="datasets/")
         >>> upload_folder("./big-files/", "username/repo", upload_timeout=1200.0)  # 20分钟超时
+        >>> upload_folder("./weights.pth", "username/repo", path_in_repo="checkpoints/")  # 上传单个文件
     """
     # 标准化仓库ID
     normalized_repo_id = _normalize_repo_id(repo_id)
@@ -318,10 +325,10 @@ def upload_folder(
     folder_path = Path(folder_path)
     
     if not folder_path.exists():
-        raise FileNotFoundError(f"文件夹不存在: {folder_path}")
-    
-    if not folder_path.is_dir():
-        raise NotADirectoryError(f"路径不是目录: {folder_path}")
+        raise FileNotFoundError(f"路径不存在: {folder_path}")
+
+    if not folder_path.is_file() and not folder_path.is_dir():
+        raise ValueError(f"路径既不是文件也不是目录: {folder_path}")
     
     # 如果没有提供token，尝试使用保存的token
     if token is None:
@@ -329,36 +336,62 @@ def upload_folder(
         if token is None:
             raise Exception("上传需要认证token，请先使用 'atomgit login' 登录，或提供token参数。")
     
-    # 直接使用原始目录，或者创建临时目录来重新组织结构
+    # 使用 Monkey Patch 方式临时修改 huggingface_hub 的默认超时配置
+    from huggingface_hub import constants as hf_constants
     import tempfile
     import shutil
 
-    if path_in_repo == "./" or path_in_repo == "." or path_in_repo == "":
-        # 如果要上传到根目录，直接使用源文件夹
-        upload_path = str(folder_path)
-    else:
-        # 如果要上传到特定路径，需要重新组织目录结构
-        with tempfile.TemporaryDirectory() as temp_dir:
-            temp_path = Path(temp_dir)
-            
-            # 创建目标路径
-            target_path = temp_path / path_in_repo.strip('./')
-            target_path.parent.mkdir(parents=True, exist_ok=True)
-            
-            # 复制整个目录树
-            shutil.copytree(folder_path, target_path, dirs_exist_ok=True)
-            
-            upload_path = str(temp_path)
-    # 使用 Monkey Patch 方式临时修改 huggingface_hub 的默认超时配置
-    from huggingface_hub import constants as hf_constants
-    
     # 保存原始超时配置
     original_timeout = hf_constants.DEFAULT_REQUEST_TIMEOUT
-    
+
     # 临时修改超时配置
     hf_constants.DEFAULT_REQUEST_TIMEOUT = upload_timeout
-    
+
+    temp_dir = None
     try:
+        # 上传单个文件
+        if folder_path.is_file():
+            # path_in_repo 按目录语义处理（与文件夹分支一致，去掉首尾 ./ 和 /），
+            # 文件名自动拼接到末尾
+            clean_path = path_in_repo.strip().strip("./")
+            if not clean_path:
+                target_path = folder_path.name
+            else:
+                target_path = clean_path + "/" + folder_path.name
+            commit_msg = commit_message or f"Upload file {folder_path.name}"
+            result = hf_upload_file(
+                repo_id=normalized_repo_id,
+                path_or_fileobj=str(folder_path),
+                path_in_repo=target_path,
+                token=token,
+                commit_message=commit_msg
+            )
+            return result
+
+        # 上传文件夹：直接使用原始目录，或者创建临时目录来重新组织结构
+        if path_in_repo == "./" or path_in_repo == "." or path_in_repo == "":
+            # 如果要上传到根目录，直接使用源文件夹
+            upload_path = str(folder_path)
+        else:
+            # 如果要上传到特定路径，需要重新组织目录结构。
+            # 注意：不能提前退出 with TemporaryDirectory()，否则上传时临时目录已被删除。
+            temp_dir = tempfile.mkdtemp(prefix="atomgit_upload_")
+            try:
+                temp_path = Path(temp_dir)
+
+                # 创建目标路径
+                target_path = temp_path / path_in_repo.strip('./')
+                target_path.parent.mkdir(parents=True, exist_ok=True)
+
+                # 复制整个目录树
+                shutil.copytree(folder_path, target_path, dirs_exist_ok=True)
+
+            except Exception:
+                shutil.rmtree(temp_dir, ignore_errors=True)
+                raise
+
+            upload_path = str(temp_path)
+
         # 使用huggingface_hub的upload_folder上传
         commit_msg = commit_message or f"Upload folder {folder_path.name}"
         result = hf_upload_folder(
@@ -367,7 +400,7 @@ def upload_folder(
             token=token,
             commit_message=commit_msg
         )
-        
+
         return result
 
     except Exception as e:
@@ -378,6 +411,12 @@ def upload_folder(
             raise Exception(f"仓库不存在：{repo_id}")
         else:
             raise Exception(f"上传失败：{error_msg}")
+    finally:
+        # 恢复原始超时配置
+        hf_constants.DEFAULT_REQUEST_TIMEOUT = original_timeout
+        # 清理临时目录（仅重新组织目录结构时创建）
+        if temp_dir is not None:
+            shutil.rmtree(temp_dir, ignore_errors=True)
 
 
 def create_repository(

{atomgit-1.0.6 → atomgit-1.0.8}/cli.py

@@ -39,7 +39,7 @@ except ImportError:
 
 
 @click.group()
-@click.version_option(version='1.0.6')
+@click.version_option(version='1.0.8')
 def cli():
     """AtomGit CLI - 基于Transformers和Hugging Face Hub的AtomGit平台模型文件上传下载工具"""
     pass

{atomgit-1.0.6 → atomgit-1.0.8}/setup.py

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