Update metadata structure

utils/file_utils.py

@@ -2,6 +2,7 @@ import os
 import hashlib
 import json
 from typing import Dict, Optional
+from .models import LoraMetadata
 
 async def calculate_sha256(file_path: str) -> str:
     """Calculate SHA256 hash of a file"""
@@ -11,35 +12,39 @@ async def calculate_sha256(file_path: str) -> str:
             sha256_hash.update(byte_block)
     return sha256_hash.hexdigest()
 
-async def get_file_info(file_path: str) -> Dict:
-    """Get basic file information"""
-    return {
-        "name": os.path.splitext(os.path.basename(file_path))[0],
-        "file_path": file_path,
-        "size": os.path.getsize(file_path),
-        "modified": os.path.getmtime(file_path),
-        "sha256": await calculate_sha256(file_path)
-    }
+async def get_file_info(file_path: str) -> LoraMetadata:
+    """Get basic file information as LoraMetadata object"""
+    return LoraMetadata(
+        file_name=os.path.splitext(os.path.basename(file_path))[0],
+        model_name=os.path.splitext(os.path.basename(file_path))[0],
+        file_path=file_path,
+        size=os.path.getsize(file_path),
+        modified=os.path.getmtime(file_path),
+        sha256=await calculate_sha256(file_path),
+        base_model="Unknown",  # Will be updated later
+        preview_url="",
+    )
 
-async def save_metadata(file_path: str, metadata: Dict) -> None:
+async def save_metadata(file_path: str, metadata: LoraMetadata) -> None:
     """Save metadata to .metadata.json file"""
     metadata_path = f"{os.path.splitext(file_path)[0]}.metadata.json"
     try:
         with open(metadata_path, 'w', encoding='utf-8') as f:
-            json.dump(metadata, f, indent=2, ensure_ascii=False)
+            json.dump(metadata.to_dict(), f, indent=2, ensure_ascii=False)
     except Exception as e:
         print(f"Error saving metadata to {metadata_path}: {str(e)}")
 
-async def load_metadata(file_path: str) -> Dict:
+async def load_metadata(file_path: str) -> Optional[LoraMetadata]:
     """Load metadata from .metadata.json file"""
     metadata_path = f"{os.path.splitext(file_path)[0]}.metadata.json"
     try:
         if os.path.exists(metadata_path):
             with open(metadata_path, 'r', encoding='utf-8') as f:
-                return json.load(f)
+                data = json.load(f)
+                return LoraMetadata.from_dict(data)
     except Exception as e:
         print(f"Error loading metadata from {metadata_path}: {str(e)}")
-    return {}
+    return None
 
 async def update_civitai_metadata(file_path: str, civitai_data: Dict) -> None:
     """Update metadata file with Civitai data"""