xiaoshiai-hub 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

xiaoshiai_hub/__init__.py

@@ -6,7 +6,7 @@ A Python library for interacting with XiaoShi AI Hub repositories.
 
 from .client import HubClient, DEFAULT_BASE_URL
 from .download import (
-    hf_hub_download,
+    moha_hub_download,
     snapshot_download,
 )
 from .exceptions import (
@@ -14,6 +14,7 @@ from .exceptions import (
     RepositoryNotFoundError,
     FileNotFoundError,
     AuthenticationError,
+    EncryptionError,
 )
 from .types import (
     Repository,
@@ -22,20 +23,61 @@ from .types import (
     Commit,
 )
 
-__version__ = "0.2.0"
+# Upload functionality (requires GitPython)
+try:
+    from .upload import (
+        upload_file,
+        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"
 
 __all__ = [
+    # Client
     "HubClient",
     "DEFAULT_BASE_URL",
-    "hf_hub_download",
+    # 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

@@ -3,10 +3,9 @@ XiaoShi AI Hub Client
 """
 
 import base64
-import json
 import os
 from typing import List, Optional
-from urllib.parse import urljoin
+
 
 import requests
 
@@ -20,13 +19,13 @@ from .exceptions import (
     HTTPError,
     RepositoryNotFoundError,
 )
-from .types import Repository, Ref, GitContent
+from .types import EncryptionMetadata, Repository, Ref, GitContent
 
 
 # 默认基础 URL，可通过环境变量 MOHA_ENDPOINT 覆盖
 DEFAULT_BASE_URL = os.environ.get(
     "MOHA_ENDPOINT",
-    "https://rune.develop.xiaoshiai.cn/api/moha"
+    "https://rune-api.develop.xiaoshiai.cn/moha"
 )
 
 
@@ -86,6 +85,60 @@ 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,
@@ -95,25 +148,36 @@ class HubClient:
     ) -> Repository:
         """
         Get repository information.
-        
+
         Args:
             organization: Organization name
             repo_type: Repository type ("models" or "datasets")
             repo_name: Repository name
-            
+
         Returns:
             Repository information
         """
-        url = f"{self.base_url}/organizations/{organization}/{repo_type}/{repo_name}"
+        url = f"{self.base_url}/v1/organizations/{organization}/{repo_type}/{repo_name}"
         response = self._make_request("GET", url)
         data = response.json()
-        
+
+        # Parse annotations if present
+        annotations = {}
+        if 'annotations' in data and isinstance(data['annotations'], dict):
+            annotations = data['annotations']
+
+        # Parse metadata if present
+        metadata = {}
+        if 'metadata' in data and isinstance(data['metadata'], dict):
+            metadata = data['metadata']
+
         return Repository(
             name=data.get('name', repo_name),
             organization=organization,
             type=repo_type,
-            default_branch=data.get('defaultBranch'),
             description=data.get('description'),
+            metadata=metadata,
+            annotations=annotations,
         )
     
     def get_repository_refs(
@@ -124,31 +188,53 @@ class HubClient:
     ) -> List[Ref]:
         """
         Get repository references (branches and tags).
-        
+
         Args:
             organization: Organization name
             repo_type: Repository type ("models" or "datasets")
             repo_name: Repository name
-            
+
         Returns:
             List of references
         """
-        url = f"{self.base_url}/organizations/{organization}/{repo_type}/{repo_name}/refs"
+        url = f"{self.base_url}/v1/organizations/{organization}/{repo_type}/{repo_name}/refs"
         response = self._make_request("GET", url)
         data = response.json()
-        
+
         refs = []
         for ref_data in data:
             refs.append(Ref(
                 name=ref_data.get('name', ''),
                 ref=ref_data.get('ref', ''),
-                fully_name=ref_data.get('fullyName', ''),
                 type=ref_data.get('type', ''),
                 hash=ref_data.get('hash', ''),
                 is_default=ref_data.get('isDefault', False),
             ))
-        
+
         return refs
+
+    def get_default_branch(
+        self,
+        organization: str,
+        repo_type: str,
+        repo_name: str,
+    ) -> str:
+        """
+        Get the default branch name for a repository.
+
+        Args:
+            organization: Organization name
+            repo_type: Repository type ("models" or "datasets")
+            repo_name: Repository name
+
+        Returns:
+            Default branch name (defaults to "main" if not found)
+        """
+        refs = self.get_repository_refs(organization, repo_type, repo_name)
+        for ref in refs:
+            if ref.is_default and ref.type == "branch":
+                return ref.name
+        return "main"
     
     def get_repository_content(
         self,
@@ -172,9 +258,9 @@ class HubClient:
             Git content information
         """
         if path:
-            url = f"{self.base_url}/organizations/{organization}/{repo_type}/{repo_name}/contents/{branch}/{path}"
+            url = f"{self.base_url}/v1/organizations/{organization}/{repo_type}/{repo_name}/contents/{branch}/{path}"
         else:
-            url = f"{self.base_url}/organizations/{organization}/{repo_type}/{repo_name}/contents/{branch}"
+            url = f"{self.base_url}/v1/organizations/{organization}/{repo_type}/{repo_name}/contents/{branch}"
         
         response = self._make_request("GET", url)
         data = response.json()
@@ -199,6 +285,21 @@ class HubClient:
             entries=entries,
         )
     
+    def add_download_count(self, organization: str, repo_type: str, repo_name: str) -> None:
+        """
+        Add download count for a repository.
+        
+        Args:
+            organization: Organization name
+            repo_type: Repository type ("models" or "datasets")
+            repo_name: Repository name
+        """
+        url = f"{self.base_url}/v1/organizations/{organization}/{repo_type}/{repo_name}/downloads"
+        response = self._make_request("POST", url)
+        # 检查http code
+        if response.status_code != 200:
+            raise HTTPError(f"Failed to add download count: {response.text}")
+    
     def download_file(
         self,
         organization: str,
@@ -221,7 +322,7 @@ class HubClient:
             local_path: Local path to save the file
             show_progress: Whether to show download progress bar
         """
-        url = f"{self.base_url}/organizations/{organization}/{repo_type}/{repo_name}/resolve/{branch}/{file_path}"
+        url = f"{self.base_url}/v1/organizations/{organization}/{repo_type}/{repo_name}/resolve/{branch}/{file_path}"
         response = self._make_request("GET", url, stream=True)
 
         # Get file size from headers