xiaoshiai-hub 0.1.3__py3-none-any.whl → 1.0.1__py3-none-any.whl

xiaoshiai_hub/__init__.py

@@ -2,6 +2,7 @@
 XiaoShi AI Hub Python SDK
 
 A Python library for interacting with XiaoShi AI Hub repositories.
+Encryption is handled by xpai-enc package (https://github.com/poxiaoyun/xpai-enc).
 """
 
 from .client import HubClient, DEFAULT_BASE_URL
@@ -14,7 +15,6 @@ from .exceptions import (
     RepositoryNotFoundError,
     FileNotFoundError,
     AuthenticationError,
-    EncryptionError,
 )
 from .types import (
     Repository,
@@ -30,54 +30,29 @@ try:
         upload_folder,
         UploadError,
     )
-    _upload_available = True
 except ImportError:
-    _upload_available = False
     upload_file = None
     upload_folder = None
     UploadError = None
 
-# Encryption functionality
-try:
-    from .encryption import (
-        EncryptionAlgorithm,
-        encrypt_file,
-        decrypt_file,
-    )
-    _encryption_available = True
-except ImportError:
-    _encryption_available = False
-    EncryptionAlgorithm = None
-    encrypt_file = None
-    decrypt_file = None
-
-__version__ = "0.1.0"
+__version__ = "1.0.1"
 
 __all__ = [
     # Client
     "HubClient",
     "DEFAULT_BASE_URL",
-    # Download
     "moha_hub_download",
     "snapshot_download",
-    # Upload
     "upload_file",
     "upload_folder",
-    # Exceptions
     "HubException",
     "RepositoryNotFoundError",
     "FileNotFoundError",
     "AuthenticationError",
-    "EncryptionError",
     "UploadError",
-    # Types
     "Repository",
     "Ref",
     "GitContent",
     "Commit",
-    # Encryption
-    "EncryptionAlgorithm",
-    "encrypt_file",
-    "decrypt_file",
 ]
 

xiaoshiai_hub/client.py

@@ -19,13 +19,13 @@ from .exceptions import (
     HTTPError,
     RepositoryNotFoundError,
 )
-from .types import EncryptionMetadata, Repository, Ref, GitContent
+from .types import  Repository, Ref, GitContent
 
 
 # 默认基础 URL，可通过环境变量 MOHA_ENDPOINT 覆盖
 DEFAULT_BASE_URL = os.environ.get(
     "MOHA_ENDPOINT",
-    "https://rune-api.develop.xiaoshiai.cn/moha"
+    "https://rune-api.develop.xiaoshiai.cn/"
 )
 
 
@@ -85,60 +85,6 @@ class HubClient:
             return response
         except requests.RequestException as e:
             raise HTTPError(f"Request failed: {str(e)}")
-        
-    def get_moha_encryption(
-        self,
-        organization: str,
-        repo_type: str,
-        repo_name: str,
-        reference: str,
-    ) -> Optional[EncryptionMetadata]:
-        """
-        Get .moha_encryption file content from the repository.
-
-        Args:
-            organization: Organization name
-            repo_type: Repository type ("models" or "datasets")
-            repo_name: Repository name
-            reference: Branch/tag/commit reference
-
-        Returns:
-            Encryption metadata if the repository has encrypted files, None otherwise
-
-        Raises:
-            AuthenticationError: If authentication fails
-            RepositoryNotFoundError: If the repository is not found
-            HTTPError: If the request fails
-        """
-        url = f"{self.base_url}/v1/organizations/{organization}/{repo_type}/{repo_name}/encryption/{reference}"
-        response = self._make_request("GET", url)
-        if response.status_code == 204 or not response.content:
-            return None
-        try:
-            data = response.json()
-        except ValueError:
-            return None
-        if not data:
-            return None
-
-        from datetime import datetime
-        files = None
-        if 'files' in data and data['files']:
-            from .types import FileEncryptionMetadata
-            files = [
-                FileEncryptionMetadata(
-                    path=f.get('path', ''),
-                    algorithm=f.get('algorithm', ''),
-                    encryptedHash=f.get('encryptedHash', ''),
-                    encryptedSize=f.get('encryptedSize', 0),
-                )
-                for f in data['files']
-            ]
-        return EncryptionMetadata(
-            version=data.get('version', '1.0'),
-            createAt=datetime.fromisoformat(data['createAt'].replace('Z', '+00:00')) if 'createAt' in data else datetime.now(),
-            files=files,
-        )
     
     def get_repository_info(
         self,
@@ -351,9 +297,16 @@ class HubClient:
             with open(local_path, 'wb') as f:
                 for chunk in response.iter_content(chunk_size=8192):
                     if chunk:
-                        f.write(chunk)
+                        # Ensure chunk is bytes for type safety
+                        if isinstance(chunk, str):
+                            chunk_bytes = chunk.encode('utf-8')
+                        elif isinstance(chunk, bytes):
+                            chunk_bytes = chunk
+                        else:
+                            chunk_bytes = bytes(chunk)
+                        f.write(chunk_bytes)
                         if progress_bar is not None:
-                            progress_bar.update(len(chunk))
+                            progress_bar.update(len(chunk_bytes))
         finally:
             if progress_bar is not None:
                 progress_bar.close()

xiaoshiai_hub/download.py

@@ -14,30 +14,7 @@ except ImportError:
 
 from .client import HubClient, DEFAULT_BASE_URL
 from .types import GitContent
-from .exceptions import EncryptionError, RepositoryNotFoundError
-
-
-def _should_decrypt_file(filename: str, decryption_exclude: Optional[List[str]] = None) -> bool:
-    """
-    Check if a file should be decrypted based on exclude patterns.
-
-    Args:
-        filename: Name of the file
-        decryption_exclude: List of patterns to exclude from decryption
-
-    Returns:
-        True if the file should be decrypted
-    """
-    import fnmatch
-
-    if not decryption_exclude:
-        return True
-
-    for pattern in decryption_exclude:
-        if fnmatch.fnmatch(filename, pattern):
-            return False
-
-    return True
+from .exceptions import RepositoryNotFoundError
 
 
 def _match_pattern(name: str, pattern: str) -> bool:
@@ -160,11 +137,7 @@ def _download_repository_recursively(
     local_dir: str,
     allow_patterns: Optional[List[str]] = None,
     ignore_patterns: Optional[List[str]] = None,
-    verbose: bool = True,
     progress_bar = None,
-    encryption_metadata = None,
-    decryption_key: Optional[Union[str, bytes]] = None,
-    decryption_algorithm: Optional[str] = None,
 ) -> None:
     """
     Recursively download repository contents.
@@ -179,12 +152,7 @@ def _download_repository_recursively(
         local_dir: Local directory to save files
         allow_patterns: Patterns to allow
         ignore_patterns: Patterns to ignore
-        verbose: Print progress messages
         progress_bar: Optional tqdm progress bar for overall progress
-        encryption_metadata: Encryption metadata from .moha_encryption file
-        decryption_key: Key to decrypt files
-        decryption_exclude: Patterns to exclude from decryption
-        decryption_algorithm: Algorithm to use for decryption
     """
     content = client.get_repository_content(
         organization=organization,
@@ -200,9 +168,7 @@ def _download_repository_recursively(
             if entry.type == "file":
                 # 检查文件是否应该被下载
                 if _should_download_file(entry.path, allow_patterns, ignore_patterns):
-                    if verbose and progress_bar is None:
-                        print(f"Downloading file: {entry.path}")
-
+                    print(f"Downloading file: {entry.path}")
                     local_path = os.path.join(local_dir, entry.path)
 
                     # Update progress bar description if available
@@ -218,54 +184,14 @@ def _download_repository_recursively(
                         local_path=local_path,
                         show_progress=progress_bar is None,  # Show individual progress only if no overall progress
                     )
-                    file_is_encrypted = False
-                    file_encryption_algorithm = None
-                    if encryption_metadata and encryption_metadata.files:
-                        for file_meta in encryption_metadata.files:
-                            if file_meta.path == entry.path:
-                                file_is_encrypted = True
-                                file_encryption_algorithm = file_meta.algorithm
-                                break
-
-                    if file_is_encrypted:
-                        if not decryption_key:
-                            raise EncryptionError(
-                                f"File '{entry.path}' is encrypted, but no decryption_key was provided. "
-                                "Please provide a decryption_key parameter."
-                            )
-                        if not decryption_algorithm:
-                            raise EncryptionError(
-                                f"File '{entry.path}' is encrypted, but no decryption_algorithm was provided. "
-                                f"The file was encrypted with '{file_encryption_algorithm}'. "
-                                "Please provide a decryption_algorithm parameter."
-                            )
-                        if decryption_algorithm != file_encryption_algorithm:
-                            raise EncryptionError(
-                                f"File '{entry.path}' is encrypted with '{file_encryption_algorithm}', "
-                                f"but decryption_algorithm '{decryption_algorithm}' was provided. "
-                                "Please use the correct decryption algorithm."
-                            )
-                        if verbose and progress_bar is None:
-                            print(f"Decrypting file: {entry.path}")
-                        from .encryption import EncryptionAlgorithm, decrypt_file as decrypt_file_func
-                        try:
-                            algorithm = EncryptionAlgorithm(decryption_algorithm)
-                        except ValueError:
-                            raise EncryptionError(
-                                f"Invalid decryption algorithm: {decryption_algorithm}. "
-                                f"Supported algorithms: {', '.join([a.value for a in EncryptionAlgorithm])}"
-                            )
-                        decrypt_file_func(Path(local_path), decryption_key, algorithm)
-                    
+
                     if progress_bar is not None:
                         progress_bar.update(1)
                 else:
-                    if verbose and progress_bar is None:
-                        print(f"Skipping file: {entry.path}")
+                    print(f"Skipping file: {entry.path}")
 
             elif entry.type == "dir":
-                if verbose and progress_bar is None:
-                    print(f"Entering directory: {entry.path}")
+                print(f"Entering directory: {entry.path}")
                 # 递归下载
                 _download_repository_recursively(
                     client=client,
@@ -277,15 +203,10 @@ def _download_repository_recursively(
                     local_dir=local_dir,
                     allow_patterns=allow_patterns,
                     ignore_patterns=ignore_patterns,
-                    verbose=verbose,
                     progress_bar=progress_bar,
-                    encryption_metadata=encryption_metadata,
-                    decryption_key=decryption_key,
-                    decryption_algorithm=decryption_algorithm,
                 )
             else:
-                if verbose and progress_bar is None:
-                    print(f"Skipping {entry.type}: {entry.path}")
+                print(f"Skipping {entry.type}: {entry.path}")
 
 
 def moha_hub_download(
@@ -300,49 +221,37 @@ def moha_hub_download(
     password: Optional[str] = None,
     token: Optional[str] = None,
     show_progress: bool = True,
-    decryption_key: Optional[Union[str, bytes]] = None,
-    decryption_algorithm: Optional[str] = None,
-) -> str:
+) -> Union[str, bytes]:
     """
     Download a single file from a repository.
 
     Similar to huggingface_hub.hf_hub_download().
 
+    Note: This function does not support decryption. If you need to download encrypted files,
+    use xpai-enc CLI tool to decrypt them after download.
+
     Args:
         repo_id: Repository ID in the format "organization/repo_name"
         filename: Path to the file in the repository
         repo_type: Type of repository ("models" or "datasets")
         revision: Branch/tag/commit to download from (default: main branch)
-        cache_dir: Directory to cache downloaded files
         local_dir: Directory to save the file (if not using cache)
         base_url: Base URL of the Hub API (default: from MOHA_ENDPOINT env var)
         username: Username for authentication
         password: Password for authentication
         token: Token for authentication
         show_progress: Whether to show download progress bar
-        decryption_key: Key to decrypt the file if repository is encrypted (string for symmetric, PEM for asymmetric)
-        decryption_algorithm: Decryption algorithm to use (default: 'aes-256-cbc')
-            - Symmetric: 'aes-256-cbc', 'aes-256-gcm'
-            - Asymmetric: 'rsa-oaep', 'rsa-pkcs1v15' (requires RSA private key in PEM format)
 
     Returns:
-        Path to the downloaded file
+        File path (str) or file content (bytes) based on return_content parameter
 
     Example:
-        >>> file_path = hf_hub_download(
+        >>> file_path = moha_hub_download(
         ...     repo_id="demo/demo",
         ...     filename="data/config.yaml",
         ...     username="your-username",
         ...     password="your-password",
         ... )
-
-        >>> # Download from encrypted repository
-        >>> file_path = hf_hub_download(
-        ...     repo_id="demo/encrypted-model",
-        ...     filename="model.bin",
-        ...     decryption_key="my-secret-key",
-        ...     token="your-token",
-        ... )
     """
     parts = repo_id.split('/')
     if len(parts) != 2:
@@ -358,46 +267,6 @@ def moha_hub_download(
     if revision is None:
         revision = client.get_default_branch(organization, repo_type, repo_name)
 
-    # 获取加密元数据
-    encryption_metadata = client.get_moha_encryption(
-        organization=organization,
-        repo_type=repo_type,
-        repo_name=repo_name,
-        reference=revision,
-    )
-
-    # 文件加密标识
-    file_is_encrypted = False
-    file_encryption_algorithm = None
-    # 查询文件是否加密
-    if encryption_metadata and encryption_metadata.files:
-        for file_meta in encryption_metadata.files:
-            if file_meta.path == filename:
-                file_is_encrypted = True
-                file_encryption_algorithm = file_meta.algorithm
-                break
-
-    # 如果该文件加密了，检查解密参数
-    if file_is_encrypted:
-        if not decryption_key:
-            raise EncryptionError(
-                f"File '{filename}' is encrypted, but no decryption_key was provided. "
-                "Please provide a decryption_key parameter."
-            )
-
-        if not decryption_algorithm:
-            raise EncryptionError(
-                f"File '{filename}' is encrypted, but no decryption_algorithm was provided. "
-                f"The file was encrypted with '{file_encryption_algorithm}'. "
-                "Please provide a decryption_algorithm parameter."
-            )
-
-        if decryption_algorithm != file_encryption_algorithm:
-            raise EncryptionError(
-                f"File '{filename}' is encrypted with '{file_encryption_algorithm}', "
-                f"but decryption_algorithm '{decryption_algorithm}' was provided. "
-                "Please use the correct decryption algorithm."
-            )
     if local_dir:
         local_path = os.path.join(local_dir, filename)
     else:
@@ -413,20 +282,6 @@ def moha_hub_download(
         local_path=local_path,
         show_progress=show_progress,
     )
-
-    # 解密文件
-    if file_is_encrypted and decryption_key:
-        from .encryption import EncryptionAlgorithm, decrypt_file as decrypt_file_func
-        try:
-            algorithm = EncryptionAlgorithm(decryption_algorithm)
-        except ValueError:
-            raise EncryptionError(
-                f"Invalid decryption algorithm: {decryption_algorithm}. "
-                f"Supported algorithms: {', '.join([a.value for a in EncryptionAlgorithm])}"
-            )
-
-        decrypt_file_func(Path(local_path), decryption_key, algorithm)
-
     return local_path
 
 
@@ -441,16 +296,16 @@ def snapshot_download(
     username: Optional[str] = None,
     password: Optional[str] = None,
     token: Optional[str] = None,
-    verbose: bool = True,
     show_progress: bool = True,
-    decryption_key: Optional[Union[str, bytes]] = None,
-    decryption_algorithm: Optional[str] = None,
 ) -> str:
     """
     Download an entire repository snapshot.
 
     Similar to huggingface_hub.snapshot_download().
 
+    Note: This function does not support decryption. If you need to download encrypted repositories,
+    use xpai-enc CLI tool to decrypt them after download.
+
     Args:
         repo_id: Repository ID in the format "organization/repo_name"
         repo_type: Type of repository ("models" or "datasets")
@@ -462,12 +317,7 @@ def snapshot_download(
         username: Username for authentication
         password: Password for authentication
         token: Token for authentication
-        verbose: Print progress messages
         show_progress: Whether to show overall progress bar
-        decryption_key: Key to decrypt files if repository is encrypted (string for symmetric, PEM for asymmetric)
-        decryption_algorithm: Decryption algorithm to use (default: 'aes-256-cbc')
-            - Symmetric: 'aes-256-cbc', 'aes-256-gcm'
-            - Asymmetric: 'rsa-oaep', 'rsa-pkcs1v15' (requires RSA private key in PEM format)
 
     Returns:
         Path to the downloaded repository
@@ -481,15 +331,6 @@ def snapshot_download(
         ...     username="your-username",
         ...     password="your-password",
         ... )
-
-        >>> # Download from encrypted repository
-        >>> repo_path = snapshot_download(
-        ...     repo_id="demo/encrypted-model",
-        ...     repo_type="models",
-        ...     decryption_key="my-secret-key",
-        ...     decryption_exclude=["README.md", "*.txt"],  # Don't decrypt these files
-        ...     token="your-token",
-        ... )
     """
     parts = repo_id.split('/')
     if len(parts) != 2:
@@ -509,16 +350,6 @@ def snapshot_download(
     )
     if revision is None:
         revision = client.get_default_branch(organization, repo_type, repo_name)
-    encryption_metadata = client.get_moha_encryption(
-        organization=organization,
-        repo_type=repo_type,
-        repo_name=repo_name,
-        reference=revision,
-    )
-
-    if encryption_metadata and encryption_metadata.files:
-        if verbose:
-            print(f"Repository has {len(encryption_metadata.files)} encrypted file(s). Files will be decrypted after download.")
 
     # Determine local directory
     if local_dir:
@@ -527,16 +358,8 @@ def snapshot_download(
         # Default to downloads directory
         download_dir = f"./downloads/{organization}_{repo_type}_{repo_name}"
 
-    if verbose and not show_progress:
-        print(f"Downloading repository: {repo_id}")
-        print(f"Repository type: {repo_type}")
-        print(f"Revision: {revision}")
-        print(f"Destination: {download_dir}")
-
     progress_bar = None
     if show_progress and tqdm is not None:
-        if verbose:
-            print(f"Fetching repository info...")
         # 计算需要下载的文件总数
         total_files = _count_files_to_download(
             client=client,
@@ -569,17 +392,13 @@ def snapshot_download(
             local_dir=download_dir,
             allow_patterns=allow_patterns,
             ignore_patterns=ignore_patterns,
-            verbose=verbose,
             progress_bar=progress_bar,
-            encryption_metadata=encryption_metadata,
-            decryption_key=decryption_key,
-            decryption_algorithm=decryption_algorithm,
         )
     finally:
         if progress_bar is not None:
             progress_bar.close()
 
-    if verbose and not show_progress:
+    if show_progress:
         print(f"Download completed to: {download_dir}")
 
     # Add download count
@@ -591,8 +410,10 @@ def snapshot_download(
         )
     except Exception as e:
         # Don't fail the download if adding count fails
-        if verbose:
-            print(f"Warning: Failed to add download count: {e}")
+        print(f"Warning: Failed to add download count: {e}")
 
     return download_dir
 
+
+
+

xiaoshiai_hub/exceptions.py

@@ -26,12 +26,8 @@ class AuthenticationError(HubException):
 class HTTPError(HubException):
     """Raised when an HTTP error occurs."""
 
-    def __init__(self, message: str, status_code: int = None):
+    def __init__(self, message: str, status_code: int | None = None):
         super().__init__(message)
         self.status_code = status_code
 
 
-class EncryptionError(HubException):
-    """Raised when encryption is required but not provided or encryption fails."""
-    pass
-

xiaoshiai_hub/types.py

@@ -18,22 +18,6 @@ class Repository:
     annotations: Dict[str, str] = field(default_factory=dict)  # Repository annotations/metadata
 
 
-@dataclass
-class FileEncryptionMetadata:
-    """Encryption metadata for a file."""
-    path: str
-    algorithm: str
-    encryptedHash: str
-    encryptedSize: int
-
-@dataclass
-class EncryptionMetadata:
-    """Encryption metadata for a repository."""
-    version: str
-    createAt: datetime
-    files: Optional[List[FileEncryptionMetadata]] = None
-
-
 
 @dataclass
 class Signature: