xiaoshiai-hub 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

xiaoshiai_hub/cli.py

@@ -1,5 +1,5 @@
 """
-小时 AI Hub SDK 命令行工具
+XiaoShi AI Hub SDK 命令行工具
 """
 
 import argparse
@@ -263,6 +263,248 @@ def cmd_whoami(args):
         return 1
 
 
+def _parse_repo_id(repo_id: str):
+    """解析仓库 ID，返回 (organization, repo_name)"""
+    parts = repo_id.split("/")
+    if len(parts) != 2:
+        raise ValueError(f"无效的仓库 ID: {repo_id}，格式应为: 组织/仓库名")
+    return parts[0], parts[1]
+
+
+def _get_client(args):
+    """创建 HubClient 实例"""
+    from xiaoshiai_hub.client import HubClient
+    token, username, password = get_auth(args)
+    return HubClient(
+        base_url=args.base_url,
+        username=username,
+        password=password,
+        token=token,
+    )
+
+
+def cmd_repo_create(args):
+    """处理 repo-create 命令"""
+    try:
+        org, repo_name = _parse_repo_id(args.repo_id)
+        client = _get_client(args)
+
+        # 解析 metadata
+        metadata = {}
+        if args.license:
+            metadata["license"] = args.license
+        if args.tasks:
+            metadata["tasks"] = args.tasks
+        if args.languages:
+            metadata["languages"] = args.languages
+        if args.tags:
+            metadata["tags"] = args.tags
+        if args.frameworks:
+            metadata["frameworks"] = args.frameworks
+
+        client.create_repository(
+            organization=org,
+            repo_type=args.repo_type,
+            repo_name=repo_name,
+            description=args.description,
+            visibility=args.visibility,
+            metadata=metadata if metadata else None,
+            base_model=args.base_model,
+            relationship=args.relationship,
+        )
+        print(f"仓库创建成功: {org}/{repo_name}")
+        return 0
+    except Exception as e:
+        print(f"错误: {e}", file=sys.stderr)
+        return 1
+
+
+def cmd_repo_update(args):
+    """处理 repo-update 命令"""
+    try:
+        org, repo_name = _parse_repo_id(args.repo_id)
+        client = _get_client(args)
+
+        # 先获取仓库当前信息
+        repo = client.get_repository_info(
+            organization=org,
+            repo_type=args.repo_type,
+            repo_name=repo_name,
+        )
+
+        # 使用现有值作为默认值，只更新用户指定的字段
+        description = args.description if args.description is not None else repo.description
+        visibility = args.visibility if args.visibility is not None else repo.visibility
+
+        # 合并 metadata：用户指定的覆盖现有的
+        metadata = dict(repo.metadata) if repo.metadata else {}
+        if args.license:
+            metadata["license"] = args.license
+        if args.tasks:
+            metadata["tasks"] = args.tasks
+        if args.languages:
+            metadata["languages"] = args.languages
+        if args.tags:
+            metadata["tags"] = args.tags
+        if args.frameworks:
+            metadata["frameworks"] = args.frameworks
+
+        # 处理 genealogy：用户指定的覆盖现有的
+        base_model = args.base_model
+        relationship = args.relationship
+        if repo.genealogy:
+            if base_model is None and 'baseModel' in repo.genealogy:
+                base_model = repo.genealogy['baseModel']
+            if relationship is None and 'relationship' in repo.genealogy:
+                relationship = repo.genealogy['relationship']
+
+        client.update_repository(
+            organization=org,
+            repo_type=args.repo_type,
+            repo_name=repo_name,
+            description=description,
+            visibility=visibility,
+            metadata=metadata if metadata else None,
+            annotations=repo.annotations,
+            base_model=base_model,
+            relationship=relationship,
+        )
+        print(f"仓库更新成功: {org}/{repo_name}")
+        return 0
+    except Exception as e:
+        print(f"错误: {e}", file=sys.stderr)
+        return 1
+
+
+def cmd_repo_delete(args):
+    """处理 repo-delete 命令"""
+    try:
+        org, repo_name = _parse_repo_id(args.repo_id)
+        client = _get_client(args)
+
+        # 确认删除
+        if not args.yes:
+            confirm = input(f"确定要删除仓库 {org}/{repo_name} 吗？此操作不可恢复！[y/N]: ")
+            if confirm.lower() != 'y':
+                print("已取消删除")
+                return 0
+
+        client.delete_repository(
+            organization=org,
+            repo_type=args.repo_type,
+            repo_name=repo_name,
+        )
+        print(f"仓库删除成功: {org}/{repo_name}")
+        return 0
+    except Exception as e:
+        print(f"错误: {e}", file=sys.stderr)
+        return 1
+
+
+def cmd_repo_info(args):
+    """处理 repo-info 命令"""
+    try:
+        org, repo_name = _parse_repo_id(args.repo_id)
+        client = _get_client(args)
+
+        repo = client.get_repository_info(
+            organization=org,
+            repo_type=args.repo_type,
+            repo_name=repo_name,
+        )
+        print(f"仓库名称: {repo.name}")
+        print(f"组织: {repo.organization}")
+        print(f"所有者: {repo.owner}")
+        print(f"创建者: {repo.creator}")
+        print(f"类型: {repo.type}")
+        print(f"可见性: {repo.visibility}")
+        if repo.description:
+            print(f"描述: {repo.description}")
+        if repo.genealogy:
+            print(f"模型血缘: {repo.genealogy}")
+        if repo.metadata:
+            print(f"元数据: {repo.metadata}")
+        if repo.annotations:
+            print(f"注解: {repo.annotations}")
+        return 0
+    except Exception as e:
+        print(f"错误: {e}", file=sys.stderr)
+        return 1
+
+
+def cmd_branch_create(args):
+    """处理 branch-create 命令"""
+    try:
+        org, repo_name = _parse_repo_id(args.repo_id)
+        client = _get_client(args)
+
+        client.create_branch(
+            organization=org,
+            repo_type=args.repo_type,
+            repo_name=repo_name,
+            branch_name=args.branch,
+            from_branch=args.from_branch,
+        )
+        print(f"分支创建成功: {args.branch}")
+        return 0
+    except Exception as e:
+        print(f"错误: {e}", file=sys.stderr)
+        return 1
+
+
+def cmd_branch_delete(args):
+    """处理 branch-delete 命令"""
+    try:
+        org, repo_name = _parse_repo_id(args.repo_id)
+        client = _get_client(args)
+
+        # 确认删除
+        if not args.yes:
+            confirm = input(f"确定要删除分支 {args.branch} 吗？[y/N]: ")
+            if confirm.lower() != 'y':
+                print("已取消删除")
+                return 0
+
+        client.delete_branch(
+            organization=org,
+            repo_type=args.repo_type,
+            repo_name=repo_name,
+            branch_name=args.branch,
+        )
+        print(f"分支删除成功: {args.branch}")
+        return 0
+    except Exception as e:
+        print(f"错误: {e}", file=sys.stderr)
+        return 1
+
+
+def cmd_branch_list(args):
+    """处理 branch-list 命令"""
+    try:
+        org, repo_name = _parse_repo_id(args.repo_id)
+        client = _get_client(args)
+
+        refs = client.get_repository_refs(
+            organization=org,
+            repo_type=args.repo_type,
+            repo_name=repo_name,
+        )
+
+        if not refs:
+            print("没有找到分支")
+            return 0
+
+        print(f"仓库 {org}/{repo_name} 的分支列表：")
+        for ref in refs:
+            commit_hash = ref.hash[:8] if ref.hash else 'N/A'
+            default_mark = " (默认)" if ref.is_default else ""
+            print(f"  - {ref.name} [{ref.type}] (commit: {commit_hash}){default_mark}")
+        return 0
+    except Exception as e:
+        print(f"错误: {e}", file=sys.stderr)
+        return 1
+
+
 def _add_common_args(parser):
     """添加通用参数"""
     parser.add_argument(
@@ -306,15 +548,14 @@ def create_parser():
     """创建命令行参数解析器"""
     parser = argparse.ArgumentParser(
         prog="moha",
-        description="小时 AI Hub 命令行工具 - 上传和下载模型及数据集",
+        description="晓石 AI Hub 命令行工具 - 模型及数据集管理",
     )
 
     subparsers = parser.add_subparsers(dest="command", help="可用命令")
 
     # ========== 上传文件夹命令 ==========
     upload_folder_parser = subparsers.add_parser(
-        "upload-folder",
-        aliases=["upload"],
+        "upload",
         help="上传文件夹到仓库",
     )
     upload_folder_parser.add_argument("folder", help="要上传的文件夹路径")
@@ -380,7 +621,6 @@ def create_parser():
     # ========== 下载仓库命令 ==========
     download_repo_parser = subparsers.add_parser(
         "download",
-        aliases=["download-repo"],
         help="下载整个仓库",
     )
     download_repo_parser.add_argument("repo_id", help="仓库 ID（格式: 组织/仓库名）")
@@ -490,6 +730,218 @@ def create_parser():
     )
     whoami_parser.set_defaults(func=cmd_whoami)
 
+    # ========== 创建仓库命令 ==========
+    repo_create_parser = subparsers.add_parser(
+        "repo-create",
+        help="创建仓库",
+    )
+    repo_create_parser.add_argument("repo_id", help="仓库 ID（格式: 组织/仓库名）")
+    repo_create_parser.add_argument(
+        "--repo-type", "-t",
+        default="models",
+        choices=["models", "datasets"],
+        help="仓库类型（默认: models）",
+    )
+    repo_create_parser.add_argument(
+        "--description", "-d",
+        help="仓库描述",
+    )
+    repo_create_parser.add_argument(
+        "--visibility", "-v",
+        default="internal",
+        choices=["public", "internal", "private"],
+        help="可见性（默认: internal）",
+    )
+    repo_create_parser.add_argument(
+        "--license",
+        action="append",
+        help="许可证（可多次指定）",
+    )
+    repo_create_parser.add_argument(
+        "--tasks",
+        action="append",
+        help="任务类型（可多次指定）",
+    )
+    repo_create_parser.add_argument(
+        "--languages",
+        action="append",
+        help="语言（可多次指定）",
+    )
+    repo_create_parser.add_argument(
+        "--tags",
+        action="append",
+        help="标签（可多次指定）",
+    )
+    repo_create_parser.add_argument(
+        "--frameworks",
+        action="append",
+        help="框架（可多次指定）",
+    )
+    repo_create_parser.add_argument(
+        "--base-model",
+        action="append",
+        help="基础模型（可多次指定，格式: 组织/模型名）",
+    )
+    repo_create_parser.add_argument(
+        "--relationship",
+        choices=["adapter", "finetune", "quantized", "merge", "repackage"],
+        help="与基础模型的关系",
+    )
+    _add_common_args(repo_create_parser)
+    repo_create_parser.set_defaults(func=cmd_repo_create)
+
+    # ========== 更新仓库命令 ==========
+    repo_update_parser = subparsers.add_parser(
+        "repo-update",
+        help="更新仓库",
+    )
+    repo_update_parser.add_argument("repo_id", help="仓库 ID（格式: 组织/仓库名）")
+    repo_update_parser.add_argument(
+        "--repo-type", "-t",
+        default="models",
+        choices=["models", "datasets"],
+        help="仓库类型（默认: models）",
+    )
+    repo_update_parser.add_argument(
+        "--description", "-d",
+        help="仓库描述",
+    )
+    repo_update_parser.add_argument(
+        "--visibility", "-v",
+        choices=["public", "internal", "private"],
+        help="可见性",
+    )
+    repo_update_parser.add_argument(
+        "--license",
+        action="append",
+        help="许可证（可多次指定）",
+    )
+    repo_update_parser.add_argument(
+        "--tasks",
+        action="append",
+        help="任务类型（可多次指定）",
+    )
+    repo_update_parser.add_argument(
+        "--languages",
+        action="append",
+        help="语言（可多次指定）",
+    )
+    repo_update_parser.add_argument(
+        "--tags",
+        action="append",
+        help="标签（可多次指定）",
+    )
+    repo_update_parser.add_argument(
+        "--frameworks",
+        action="append",
+        help="框架（可多次指定）",
+    )
+    repo_update_parser.add_argument(
+        "--base-model",
+        action="append",
+        help="基础模型（可多次指定，格式: 组织/模型名）",
+    )
+    repo_update_parser.add_argument(
+        "--relationship",
+        choices=["adapter", "finetune", "quantized", "merge", "repackage"],
+        help="与基础模型的关系",
+    )
+    _add_common_args(repo_update_parser)
+    repo_update_parser.set_defaults(func=cmd_repo_update)
+
+    # ========== 删除仓库命令 ==========
+    repo_delete_parser = subparsers.add_parser(
+        "repo-delete",
+        help="删除仓库",
+    )
+    repo_delete_parser.add_argument("repo_id", help="仓库 ID（格式: 组织/仓库名）")
+    repo_delete_parser.add_argument(
+        "--repo-type", "-t",
+        default="models",
+        choices=["models", "datasets"],
+        help="仓库类型（默认: models）",
+    )
+    repo_delete_parser.add_argument(
+        "--yes", "-y",
+        action="store_true",
+        help="跳过确认提示",
+    )
+    _add_common_args(repo_delete_parser)
+    repo_delete_parser.set_defaults(func=cmd_repo_delete)
+
+    # ========== 查看仓库信息命令 ==========
+    repo_info_parser = subparsers.add_parser(
+        "repo-info",
+        help="查看仓库信息",
+    )
+    repo_info_parser.add_argument("repo_id", help="仓库 ID（格式: 组织/仓库名）")
+    repo_info_parser.add_argument(
+        "--repo-type", "-t",
+        default="models",
+        choices=["models", "datasets"],
+        help="仓库类型（默认: models）",
+    )
+    _add_common_args(repo_info_parser)
+    repo_info_parser.set_defaults(func=cmd_repo_info)
+
+    # ========== 创建分支命令 ==========
+    branch_create_parser = subparsers.add_parser(
+        "branch-create",
+        help="创建分支",
+    )
+    branch_create_parser.add_argument("repo_id", help="仓库 ID（格式: 组织/仓库名）")
+    branch_create_parser.add_argument("branch", help="要创建的分支名称")
+    branch_create_parser.add_argument(
+        "--from", "-f",
+        dest="from_branch",
+        default="main",
+        help="基于哪个分支创建（默认: main）",
+    )
+    branch_create_parser.add_argument(
+        "--repo-type", "-t",
+        default="models",
+        choices=["models", "datasets"],
+        help="仓库类型（默认: models）",
+    )
+    _add_common_args(branch_create_parser)
+    branch_create_parser.set_defaults(func=cmd_branch_create)
+
+    # ========== 删除分支命令 ==========
+    branch_delete_parser = subparsers.add_parser(
+        "branch-delete",
+        help="删除分支",
+    )
+    branch_delete_parser.add_argument("repo_id", help="仓库 ID（格式: 组织/仓库名）")
+    branch_delete_parser.add_argument("branch", help="要删除的分支名称")
+    branch_delete_parser.add_argument(
+        "--repo-type", "-t",
+        default="models",
+        choices=["models", "datasets"],
+        help="仓库类型（默认: models）",
+    )
+    branch_delete_parser.add_argument(
+        "--yes", "-y",
+        action="store_true",
+        help="跳过确认提示",
+    )
+    _add_common_args(branch_delete_parser)
+    branch_delete_parser.set_defaults(func=cmd_branch_delete)
+
+    # ========== 列出分支命令 ==========
+    branch_list_parser = subparsers.add_parser(
+        "branch-list",
+        help="列出仓库的所有分支",
+    )
+    branch_list_parser.add_argument("repo_id", help="仓库 ID（格式: 组织/仓库名）")
+    branch_list_parser.add_argument(
+        "--repo-type", "-t",
+        default="models",
+        choices=["models", "datasets"],
+        help="仓库类型（默认: models）",
+    )
+    _add_common_args(branch_list_parser)
+    branch_list_parser.set_defaults(func=cmd_branch_list)
+
     return parser
 
 

xiaoshiai_hub/client.py

@@ -110,8 +110,186 @@ class HubClient:
         url = f"{self.base_url}/moha/v1/organizations/{organization}/{repo_type}/{repo_name}/encryption/set"
         response = self._make_request("PUT", url)
         if response.status_code != 200:
-            raise HTTPError(f"Failed to set repository encrypted flag: {response.text}")    
+            raise HTTPError(f"Failed to set repository encrypted flag: {response.text}")
+
+    # 创建分支
+    def create_branch(
+        self,
+        organization: str,
+        repo_type: str,
+        repo_name: str,
+        branch_name: str,
+        from_branch: str,
+    ) -> None:
+        """
+        创建新分支。如果分支已存在，则直接返回。
+
+        Args:
+            organization: 组织名称
+            repo_type: 仓库类型 ("models" 或 "datasets")
+            repo_name: 仓库名称
+            branch_name: 要创建的分支名称
+            from_branch: 基于哪个分支创建
+        """
+        # 先检查分支是否已存在
+        refs = self.get_repository_refs(organization, repo_type, repo_name)
+        for ref in refs:
+            if ref.name == branch_name:
+                # 分支已存在，直接返回
+                return
+
+        # 分支不存在，创建新分支
+        url = f"{self.base_url}/moha/v1/organizations/{organization}/{repo_type}/{repo_name}/refs/{branch_name}"
+        body = {
+            "base": from_branch,
+        }
+        response = self._make_request("POST", url, json=body)
+        if response.status_code != 200:
+            raise HTTPError(f"Failed to create branch: {response.text}")
+
+    # 删除分支
+    def delete_branch(
+        self,
+        organization: str,
+        repo_type: str,
+        repo_name: str,
+        branch_name: str,
+    ) -> None:
+        """
+        删除分支。如果分支不存在，则直接返回。
+
+        Args:
+            organization: 组织名称
+            repo_type: 仓库类型 ("models" 或 "datasets")
+            repo_name: 仓库名称
+            branch_name: 要删除的分支名称
+        """
+        # 先检查分支是否存在
+        refs = self.get_repository_refs(organization, repo_type, repo_name)
+        branch_exists = False
+        for ref in refs:
+            if ref.name == branch_name:
+                branch_exists = True
+                break
+
+        if not branch_exists:
+            # 分支不存在，直接返回
+            return
+
+        # 分支存在，删除它
+        url = f"{self.base_url}/moha/v1/organizations/{organization}/{repo_type}/{repo_name}/refs/{branch_name}"
+        response = self._make_request("DELETE", url)
+        if response.status_code != 200:
+            raise HTTPError(f"Failed to delete branch: {response.text}")
+
+
+    # 更新仓库,先获取仓库信息，然后更新
+    def update_repository(
+        self,
+        organization: str,
+        repo_type: str,
+        repo_name: str,
+        description: Optional[str] = None,
+        visibility: str = "internal",
+        annotations: Optional[Dict[str, str]] = None,
+        metadata: Optional[Dict[str, List[str]]] = None,
+        base_model: Optional[List[str]] = None,
+        relationship: Optional[str] = None,
+    ) -> None:
+        """Update repository information."""
+        url = f"{self.base_url}/moha/v1/organizations/{organization}/{repo_type}/{repo_name}"
+        body: Dict = {
+            "name": repo_name,
+            "organization": organization,
+            "type": repo_type,
+        }
+        if annotations:
+            body["annotations"] = annotations
+        if description:
+            body["description"] = description
+        if visibility:
+            body["visibility"] = visibility
+        if metadata:
+            body["metadata"] = metadata
+        if base_model or relationship:
+            body["requestgenealogy"] = {}
+            if base_model:
+                body["requestgenealogy"]["baseModel"] = base_model
+            if relationship:
+                body["requestgenealogy"]["relationship"] = relationship
+        response = self._make_request("PUT", url, json=body)
+        if response.status_code != 200:
+            raise HTTPError(f"Failed to update repository: {response.text}")    
     
+    # 删除仓库
+    def delete_repository(
+        self,
+        organization: str,
+        repo_type: str,
+        repo_name: str,
+    ) -> None:
+        """Delete repository."""
+        url = f"{self.base_url}/moha/v1/organizations/{organization}/{repo_type}/{repo_name}"
+        response = self._make_request("DELETE", url)
+        if response.status_code != 200:
+            raise HTTPError(f"Failed to delete repository: {response.text}")
+
+    # 创建仓库
+    def create_repository(
+        self,
+        organization: str,
+        repo_type: str,
+        repo_name: str,
+        description: Optional[str] = None,
+        visibility: str = "internal",
+        metadata: Optional[Dict[str, List[str]]] = None,
+        base_model: Optional[List[str]] = None,
+        relationship: Optional[str] = None,
+    ) -> None:
+        """
+        创建新仓库。
+
+        Args:
+            organization: 组织名称
+            repo_type: 仓库类型 ("models" 或 "datasets")
+            repo_name: 仓库名称
+            description: 仓库描述
+            visibility: 可见性 ("public", "internal", "private")
+            metadata: 元数据，包含 license, tasks, languages, tags, frameworks 等
+            annotations: 注解
+            base_model: 基础模型列表 (如 ["demo/yyyy"])
+            relationship: 与基础模型的关系 ("adapter", "finetune", "quantized", "merge", "repackage" 等)
+
+        Returns:
+            创建的仓库信息
+        """
+        url = f"{self.base_url}/moha/v1/organizations/{organization}/{repo_type}"
+
+        # 构建请求体
+        body: Dict = {
+            "name": repo_name,
+            "organization": organization,
+            "visibility": visibility,
+        }
+
+        if description:
+            body["description"] = description
+        if metadata:
+            body["metadata"] = metadata
+
+        # 构建 genealogy（模型谱系）
+        if base_model or relationship:
+            body["requestgenealogy"] = {}
+            if base_model:
+                body["requestgenealogy"]["baseModel"] = base_model
+            if relationship:
+                body["requestgenealogy"]["relationship"] = relationship
+
+        response = self._make_request("POST", url, json=body)
+        if response.status_code != 200:
+            raise HTTPError(f"Failed to create repository: {response.text}")
+        
+    # 获取仓库信息
     def get_repository_info(
         self,
         organization: str,
@@ -143,15 +321,25 @@ class HubClient:
         if 'metadata' in data and isinstance(data['metadata'], dict):
             metadata = data['metadata']
 
+        # Parse genealogy if present
+        genealogy: Optional[Dict] = None
+        if 'genealogy' in data and isinstance(data['genealogy'], dict):
+            genealogy = data['genealogy']
+
         return Repository(
             name=data.get('name', repo_name),
-            organization=organization,
-            type=repo_type,
+            organization=data.get('organization', organization),
+            owner=data.get('owner', ''),
+            creator=data.get('creator', ''),
+            type=data.get('type', repo_type),
+            visibility=data.get('visibility', 'internal'),
+            genealogy=genealogy,
             description=data.get('description'),
             metadata=metadata,
             annotations=annotations,
         )
     
+    # 获取仓库的所有分支
     def get_repository_refs(
         self,
         organization: str,

xiaoshiai_hub/types.py

@@ -12,7 +12,11 @@ class Repository:
     """Repository information."""
     name: str
     organization: str
+    owner: str
+    creator: str
     type: str  # "models" or "datasets"
+    visibility: str
+    genealogy: Optional[Dict] = None
     description: Optional[str] = None
     metadata: Dict[str, List[str]] = field(default_factory=dict)  # Repository metadata
     annotations: Dict[str, str] = field(default_factory=dict)  # Repository annotations/metadata

xiaoshiai_hub/upload.py

@@ -70,55 +70,91 @@ def _calculate_file_sha256(file_path: Path) -> str:
     return sha256_hash.hexdigest()
 
 
-class _TqdmUploadWrapper:
-    """Wrapper to add tqdm progress bar to file upload."""
+class _ProgressFileReader:
+    """
+    文件读取器，跟踪实际网络上传进度。
+
+    通过分块读取文件并在每次 read() 调用后更新进度条，
+    配合 requests 的流式上传，确保进度条反映实际网络传输进度。
+    """
 
-    def __init__(self, file_obj, total_size, desc=None):
-        self.file_obj = file_obj
-        self.total_size = total_size
+    def __init__(self, file_path: Path, chunk_size: int = 8192, desc: Optional[str] = None):
+        self.file_path = file_path
+        self.file_size = file_path.stat().st_size
+        self.chunk_size = chunk_size
+        self.file_obj = open(file_path, 'rb')
+        self.bytes_read = 0
         self.pbar = None
         if tqdm:
             self.pbar = tqdm(
-                total=total_size,
+                total=self.file_size,
                 unit='B',
                 unit_scale=True,
                 unit_divisor=1024,
                 desc=desc,
             )
 
-    def read(self, size=-1):
-        """Read data and update progress bar."""
+    def read(self, size: int = -1) -> bytes:
+        """读取数据并更新进度条。"""
+        if size == -1:
+            size = self.chunk_size
         data = self.file_obj.read(size)
-        if self.pbar is not None and data:
-            self.pbar.update(len(data))
+        if data:
+            self.bytes_read += len(data)
+            if self.pbar is not None:
+                self.pbar.update(len(data))
         return data
 
-    def __enter__(self):
+    def __len__(self) -> int:
+        """返回文件大小，供 requests 设置 Content-Length。"""
+        return self.file_size
+
+    def __iter__(self):
+        """迭代器，用于流式上传。"""
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):  # type: ignore[no-untyped-def]
-        del exc_type, exc_val, exc_tb  # Unused but required by context manager protocol
+    def __next__(self) -> bytes:
+        data = self.read(self.chunk_size)
+        if data:
+            return data
+        raise StopIteration
+
+    def close(self):
         if self.pbar is not None:
             self.pbar.close()
         self.file_obj.close()
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        del exc_type, exc_val, exc_tb
+        self.close()
+
 
 def _upload_file_with_progress(
     upload_url: str,
     file_path: Path,
     desc: Optional[str] = None,
+    chunk_size: int = 1024 * 1024,  # 1MB chunks
 ) -> None:
-    """Upload file to URL with progress bar."""
+    """
+    上传文件到 URL 并显示真实的网络传输进度。
+
+    使用分块流式上传，进度条反映实际发送到服务器的字节数。
+    """
     file_size = file_path.stat().st_size
 
-    with open(file_path, 'rb') as f:
-        with _TqdmUploadWrapper(f, file_size, desc=desc) as wrapped_file:
-            upload_response = requests.put(
-                upload_url,
-                data=wrapped_file,
-                headers={'Content-Type': 'application/octet-stream'}
-            )
-            upload_response.raise_for_status()
+    with _ProgressFileReader(file_path, chunk_size=chunk_size, desc=desc) as reader:
+        upload_response = requests.put(
+            upload_url,
+            data=reader,
+            headers={
+                'Content-Type': 'application/octet-stream',
+                'Content-Length': str(file_size),
+            }
+        )
+        upload_response.raise_for_status()
 
 
 def _encrypt_file_if_needed(

{xiaoshiai_hub-1.1.2.dist-info → xiaoshiai_hub-1.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xiaoshiai-hub
-Version: 1.1.2
+Version: 1.1.3
 Summary: Python SDK for XiaoShi AI Hub - Upload, download, and manage AI models and datasets with xpai-enc encryption support
 Home-page: https://github.com/poxiaoyun/moha-sdk
 Author: XiaoShi AI
@@ -244,20 +244,53 @@ client = HubClient(
     password="your-password",
 )
 
+# 创建仓库
+repo = client.create_repository(
+    organization="demo",
+    repo_type="models",
+    repo_name="my-model",
+    description="我的模型",
+    visibility="internal",
+    metadata={
+        "license": ["apache-2.0"],
+        "frameworks": ["transformers"],
+    },
+)
+print(f"仓库已创建: {repo.name}")
+
 # 获取仓库信息
 repo_info = client.get_repository_info("demo", "models", "my-model")
 print(f"仓库名称: {repo_info.name}")
 print(f"组织: {repo_info.organization}")
+print(f"所有者: {repo_info.owner}")
+print(f"可见性: {repo_info.visibility}")
+
+# 更新仓库
+client.update_repository(
+    organization="demo",
+    repo_type="models",
+    repo_name="my-model",
+    description="更新后的描述",
+)
 
 # 列出分支
-branches = client.list_branches("demo", "models", "my-model")
-for branch in branches:
-    print(f"分支: {branch.name} (commit: {branch.commit_sha})")
+refs = client.get_repository_refs("demo", "models", "my-model")
+for ref in refs:
+    print(f"分支: {ref.name} (commit: {ref.hash[:8]})")
+
+# 创建分支（幂等操作，已存在则直接返回）
+client.create_branch("demo", "models", "my-model", "dev", "main")
+
+# 删除分支（幂等操作，不存在则直接返回）
+client.delete_branch("demo", "models", "my-model", "dev")
 
 # 浏览仓库内容
 content = client.get_repository_content("demo", "models", "my-model", "main")
 for entry in content.entries:
     print(f"{entry.type}: {entry.name}")
+
+# 删除仓库
+client.delete_repository("demo", "models", "my-model")
 ```
 
 ## 🔐 加密功能
@@ -343,7 +376,7 @@ export MOHA_ENCRYPTION_PASSWORD="your-encryption-password"
 
 ## 🖥️ 命令行工具 (CLI)
 
-SDK 提供了 `moha` 命令行工具，支持常见的上传下载操作。
+SDK 提供了 `moha` 命令行工具，支持登录认证、仓库管理、分支管理、上传下载等操作。
 
 ### 基本用法
 
@@ -351,6 +384,75 @@ SDK 提供了 `moha` 命令行工具，支持常见的上传下载操作。
 moha --help
 ```
 
+### 登录认证
+
+```bash
+# 登录（交互式输入用户名和密码）
+moha login
+
+# 直接指定用户名和密码
+moha login --username your-username --password your-password
+
+# 查看当前登录状态
+moha whoami
+
+# 退出登录
+moha logout
+```
+
+登录后，Token 会保存到 `~/.moha/token.json`，后续命令无需重复输入认证信息。
+
+### 仓库管理
+
+```bash
+# 创建仓库
+moha repo-create org/my-model \
+    --description "我的模型" \
+    --visibility internal \
+    --license apache-2.0 \
+    --tasks text-generation \
+    --frameworks transformers
+
+# 创建数据集仓库
+moha repo-create org/my-dataset \
+    --repo-type datasets \
+    --description "我的数据集" \
+    --visibility private
+
+# 查看仓库信息
+moha repo-info org/my-model
+
+# 更新仓库信息
+moha repo-update org/my-model \
+    --description "更新后的描述" \
+    --tags production
+
+# 删除仓库（需要确认）
+moha repo-delete org/my-model
+
+# 跳过确认直接删除
+moha repo-delete org/my-model -y
+```
+
+### 分支管理
+
+```bash
+# 列出仓库的所有分支
+moha branch-list org/my-model
+
+# 创建分支（基于 main 分支）
+moha branch-create org/my-model dev
+
+# 创建分支（基于指定分支）
+moha branch-create org/my-model feature --from dev
+
+# 删除分支
+moha branch-delete org/my-model dev
+
+# 跳过确认直接删除
+moha branch-delete org/my-model dev -y
+```
+
 ### 上传文件夹
 
 ```bash
@@ -444,16 +546,42 @@ moha download-file org/my-model model.safetensors \
     --password your-password
 ```
 
+### CLI 命令列表
+
+| 命令 | 说明 |
+|------|------|
+| `moha login` | 登录并保存 Token |
+| `moha logout` | 退出登录并删除 Token |
+| `moha whoami` | 查看当前登录状态 |
+| `moha repo-create` | 创建仓库 |
+| `moha repo-update` | 更新仓库 |
+| `moha repo-delete` | 删除仓库 |
+| `moha repo-info` | 查看仓库信息 |
+| `moha branch-create` | 创建分支 |
+| `moha branch-delete` | 删除分支 |
+| `moha branch-list` | 列出仓库的所有分支 |
+| `moha upload` | 上传文件夹到仓库 |
+| `moha upload-file` | 上传单个文件到仓库 |
+| `moha download` | 下载整个仓库 |
+| `moha download-file` | 从仓库下载单个文件 |
+
 ### CLI 参数说明
 
+#### 通用参数
+
 | 参数 | 说明 | 适用命令 |
 |------|------|----------|
-| `--repo-type, -t` | 仓库类型：`models` 或 `datasets`（默认：models） | 所有 |
-| `--revision, -r` | 分支/标签/提交（默认：main） | 所有 |
+| `--repo-type, -t` | 仓库类型：`models` 或 `datasets`（默认：models） | 大部分命令 |
 | `--base-url` | API 基础 URL（默认：环境变量 MOHA_ENDPOINT） | 所有 |
 | `--token` | 认证令牌 | 所有 |
 | `--username` | 用户名 | 所有 |
 | `--password` | 密码 | 所有 |
+
+#### 上传/下载参数
+
+| 参数 | 说明 | 适用命令 |
+|------|------|----------|
+| `--revision, -r` | 分支/标签/提交（默认：main） | upload, download |
 | `--message, -m` | 提交消息 | upload, upload-file |
 | `--ignore, -i` | 忽略模式（可多次使用） | upload, download |
 | `--include` | 包含模式（可多次使用） | download |
@@ -465,6 +593,28 @@ moha download-file org/my-model model.safetensors \
 | `--local-dir, -o` | 本地保存目录 | download, download-file |
 | `--quiet, -q` | 禁用进度条 | download, download-file |
 
+#### 仓库管理参数
+
+| 参数 | 说明 | 适用命令 |
+|------|------|----------|
+| `--description, -d` | 仓库描述 | repo-create, repo-update |
+| `--visibility, -v` | 可见性：`public`、`internal`、`private` | repo-create, repo-update |
+| `--license` | 许可证（可多次使用） | repo-create, repo-update |
+| `--tasks` | 任务类型（可多次使用） | repo-create, repo-update |
+| `--languages` | 语言（可多次使用） | repo-create, repo-update |
+| `--tags` | 标签（可多次使用） | repo-create, repo-update |
+| `--frameworks` | 框架（可多次使用） | repo-create, repo-update |
+| `--base-model` | 基础模型（可多次使用） | repo-create, repo-update |
+| `--relationship` | 与基础模型的关系 | repo-create, repo-update |
+| `--yes, -y` | 跳过确认提示 | repo-delete, branch-delete |
+
+#### 分支管理参数
+
+| 参数 | 说明 | 适用命令 |
+|------|------|----------|
+| `--from, -f` | 基于哪个分支创建（默认：main） | branch-create |
+| `--yes, -y` | 跳过确认提示 | branch-delete |
+
 ### 使用环境变量
 
 可以通过环境变量设置认证信息，避免每次输入：

xiaoshiai_hub-1.1.3.dist-info/RECORD

@@ -0,0 +1,15 @@
+xiaoshiai_hub/__init__.py,sha256=2hnhTGad1GPTzRstfwZhAF2204Pl2VF8YHD8HQkAYGY,1469
+xiaoshiai_hub/auth.py,sha256=Pv0P6f76flOefYmALyehuMu2Klyc-u_gtXlJYJR4eMY,4105
+xiaoshiai_hub/cli.py,sha256=E2xWvybOz6Tr8bSk8pp-QZVHoCyQfnmCYg7442aq4-Y,29790
+xiaoshiai_hub/client.py,sha256=3ASE_KuV-S0CmDvutvmMpY3GU2Hdrui2WAfwHs3iEkw,18775
+xiaoshiai_hub/download.py,sha256=9Uido7cJjGVd6ERDKu_xNMPliarPdZVVb8hkLgYfFcU,13613
+xiaoshiai_hub/envelope_crypto.py,sha256=zjrt5fc3ya86Y4N7_4OI5_NnmFpQ5HiHgoP31ioJRmw,8235
+xiaoshiai_hub/exceptions.py,sha256=24QzgHWq_4bes07UkC3vGi2oT8SMH6Xu4FNlKt52QHo,672
+xiaoshiai_hub/types.py,sha256=-h8EctZo_bRJALufjSTaxIWf2bqHz2ZDCy3SCPfucHs,2004
+xiaoshiai_hub/upload.py,sha256=GKlnsxsIVuLhCWpymupya74TNgTP0s8T-gKTOR-RMgw,22371
+xiaoshiai_hub-1.1.3.dist-info/licenses/LICENSE,sha256=tS28u6VpvqNisRWGeufp-XYQc6p194vOGARl3OIjidA,9110
+xiaoshiai_hub-1.1.3.dist-info/METADATA,sha256=RCvKnYGmiU5upd5HXYkK0RzitGZT-Wsjvw_6CDoBa8M,21630
+xiaoshiai_hub-1.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xiaoshiai_hub-1.1.3.dist-info/entry_points.txt,sha256=fVh_IA1mbRWl7LEd4-RhENMaspSBa4Hxbsg8_HDWc6Y,48
+xiaoshiai_hub-1.1.3.dist-info/top_level.txt,sha256=9AQDFb5Xn7RLQPdbk1aA0QpntbKhlhlT6Z_g-zUBtlM,14
+xiaoshiai_hub-1.1.3.dist-info/RECORD,,

xiaoshiai_hub-1.1.2.dist-info/RECORD

@@ -1,15 +0,0 @@
-xiaoshiai_hub/__init__.py,sha256=2hnhTGad1GPTzRstfwZhAF2204Pl2VF8YHD8HQkAYGY,1469
-xiaoshiai_hub/auth.py,sha256=Pv0P6f76flOefYmALyehuMu2Klyc-u_gtXlJYJR4eMY,4105
-xiaoshiai_hub/cli.py,sha256=lBmIKlxmDk74WYttDCqF5fAuIKjvcIlETipWLyBUP4U,15292
-xiaoshiai_hub/client.py,sha256=Ikq-eJz1kA5KA0_PbzAKhmnPOpZT_AubRIefcCOZYBk,12113
-xiaoshiai_hub/download.py,sha256=9Uido7cJjGVd6ERDKu_xNMPliarPdZVVb8hkLgYfFcU,13613
-xiaoshiai_hub/envelope_crypto.py,sha256=zjrt5fc3ya86Y4N7_4OI5_NnmFpQ5HiHgoP31ioJRmw,8235
-xiaoshiai_hub/exceptions.py,sha256=24QzgHWq_4bes07UkC3vGi2oT8SMH6Xu4FNlKt52QHo,672
-xiaoshiai_hub/types.py,sha256=ZC5elxqles8_ODl-fCSssOzm9q8_KjA9mGpiGgObgls,1915
-xiaoshiai_hub/upload.py,sha256=Hb9KX-87YP7HyskHbQCtfgn11ARzzKzPX_i-fhRtZ0E,21372
-xiaoshiai_hub-1.1.2.dist-info/licenses/LICENSE,sha256=tS28u6VpvqNisRWGeufp-XYQc6p194vOGARl3OIjidA,9110
-xiaoshiai_hub-1.1.2.dist-info/METADATA,sha256=QEUR27oyHBY2bm-CIseIRQZzYFzWgtoMORZExQQeAEo,17454
-xiaoshiai_hub-1.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xiaoshiai_hub-1.1.2.dist-info/entry_points.txt,sha256=fVh_IA1mbRWl7LEd4-RhENMaspSBa4Hxbsg8_HDWc6Y,48
-xiaoshiai_hub-1.1.2.dist-info/top_level.txt,sha256=9AQDFb5Xn7RLQPdbk1aA0QpntbKhlhlT6Z_g-zUBtlM,14
-xiaoshiai_hub-1.1.2.dist-info/RECORD,,