Update admin_routes.py

admin_routes.py

@@ -15,13 +15,14 @@ from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 from pydantic import BaseModel, Field
 import httpx
 
-from utils import verify_token, create_token
+from utils import verify_token, create_token, get_current_timestamp
 from config_provider import ConfigProvider
 from logger import log_info, log_error, log_warning, log_debug
 from exceptions import (
     RaceConditionError, ValidationError, ResourceNotFoundError,
     AuthenticationError, AuthorizationError, DuplicateResourceError
 )
+from config_models import VersionConfig, IntentConfig, LLMConfiguration
 
 # ===================== Constants & Config =====================
 security = HTTPBearer()
@@ -170,11 +171,25 @@ async def change_password(
     if not user:
         raise HTTPException(status_code=404, detail="User not found")
     
-    # Verify current password
-    if not bcrypt.checkpw(request.current_password.encode('utf-8'), user.password_hash.encode('utf-8')):
+    # Verify current password - Try both bcrypt and SHA256 for backward compatibility
+    password_valid = False
+    
+    # First try bcrypt (new format)
+    try:
+        if user.password_hash.startswith("$2b$") or user.password_hash.startswith("$2a$"):
+            password_valid = bcrypt.checkpw(request.current_password.encode('utf-8'), user.password_hash.encode('utf-8'))
+    except:
+        pass
+    
+    # If not valid, try SHA256 (old format)
+    if not password_valid:
+        sha256_hash = hashlib.sha256(request.current_password.encode('utf-8')).hexdigest()
+        password_valid = (user.password_hash == sha256_hash)
+    
+    if not password_valid:
         raise HTTPException(status_code=401, detail="Current password is incorrect")
     
-    # Generate new password hash
+    # Generate new password hash (always use bcrypt for new passwords)
     salt = bcrypt.gensalt()
     new_hash = bcrypt.hashpw(request.new_password.encode('utf-8'), salt)
     
@@ -182,8 +197,8 @@ async def change_password(
     user.password_hash = new_hash.decode('utf-8')
     user.salt = salt.decode('utf-8')
     
-    # Save configuration
-    cfg.save()
+    # Save configuration via ConfigProvider
+    ConfigProvider.save(cfg, username)
     
     log_info(f"✅ Password changed for user '{username}'")
     return {"success": True}
@@ -520,6 +535,137 @@ async def toggle_project(project_id: int, username: str = Depends(verify_token))
     log_info(f"✅ Project {'enabled' if enabled else 'disabled'} by {username}")
     return {"enabled": enabled}
 
+# ===================== Import/Export Endpoints =====================
+@router.get("/projects/{project_id}/export")
+async def export_project(
+    project_id: int,
+    username: str = Depends(verify_token)
+):
+    """Export project as JSON"""
+    try:
+        project = ConfigProvider.get_project(project_id)
+        if not project:
+            raise HTTPException(status_code=404, detail="Project not found")
+        
+        # Prepare export data
+        export_data = {
+            "name": project.name,
+            "caption": project.caption,
+            "icon": project.icon,
+            "description": project.description,
+            "default_locale": project.default_locale,
+            "supported_locales": project.supported_locales,
+            "timezone": project.timezone,
+            "region": project.region,
+            "versions": []
+        }
+        
+        # Add versions (only non-deleted)
+        for version in project.versions:
+            if not getattr(version, 'deleted', False):
+                version_data = {
+                    "caption": version.caption,
+                    "description": getattr(version, 'description', ''),
+                    "general_prompt": version.general_prompt,
+                    "welcome_prompt": getattr(version, 'welcome_prompt', None),
+                    "llm": version.llm.model_dump() if version.llm else {},
+                    "intents": [intent.model_dump() for intent in version.intents]
+                }
+                export_data["versions"].append(version_data)
+        
+        log_info(f"✅ Project '{project.name}' exported by {username}")
+        
+        return export_data
+        
+    except Exception as e:
+        log_error(f"❌ Error exporting project {project_id}", e)
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.post("/projects/import")
+async def import_project(
+    project_data: dict = Body(...),
+    username: str = Depends(verify_token)
+):
+    """Import project from JSON"""
+    try:
+        # Validate required fields
+        if not project_data.get('name'):
+            raise HTTPException(status_code=400, detail="Project name is required")
+        
+        # Check for duplicate name
+        cfg = ConfigProvider.get()
+        if any(p.name == project_data['name'] for p in cfg.projects if not p.deleted):
+            # Generate unique name
+            base_name = project_data['name']
+            counter = 1
+            while any(p.name == f"{base_name}_{counter}" for p in cfg.projects if not p.deleted):
+                counter += 1
+            project_data['name'] = f"{base_name}_{counter}"
+            log_info(f"🔄 Project name changed to '{project_data['name']}' to avoid duplicate")
+        
+        # Create project
+        new_project_data = {
+            "name": project_data['name'],
+            "caption": project_data.get('caption', project_data['name']),
+            "icon": project_data.get('icon', 'folder'),
+            "description": project_data.get('description', ''),
+            "default_locale": project_data.get('default_locale', 'tr'),
+            "supported_locales": project_data.get('supported_locales', ['tr']),
+            "timezone": project_data.get('timezone', 'Europe/Istanbul'),
+            "region": project_data.get('region', 'tr-TR')
+        }
+        
+        # Create project
+        new_project = ConfigProvider.create_project(new_project_data, username)
+        
+        # Import versions
+        if 'versions' in project_data and project_data['versions']:
+            # Remove the initial version that was auto-created
+            if new_project.versions:
+                new_project.versions.clear()
+            
+            # Add imported versions
+            for idx, version_data in enumerate(project_data['versions']):
+                version = VersionConfig(
+                    no=idx + 1,
+                    caption=version_data.get('caption', f'Version {idx + 1}'),
+                    description=version_data.get('description', ''),
+                    published=False,  # Imported versions are unpublished
+                    deleted=False,
+                    general_prompt=version_data.get('general_prompt', ''),
+                    welcome_prompt=version_data.get('welcome_prompt'),
+                    llm=LLMConfiguration(**version_data.get('llm', {
+                        'repo_id': '',
+                        'generation_config': {
+                            'max_new_tokens': 512,
+                            'temperature': 0.7,
+                            'top_p': 0.9
+                        },
+                        'use_fine_tune': False,
+                        'fine_tune_zip': ''
+                    })),
+                    intents=[IntentConfig(**intent) for intent in version_data.get('intents', [])],
+                    created_date=get_current_timestamp(),
+                    created_by=username
+                )
+                new_project.versions.append(version)
+            
+            # Update version counter
+            new_project.version_id_counter = len(new_project.versions) + 1
+            
+            # Save updated project
+            ConfigProvider.save(cfg, username)
+        
+        log_info(f"✅ Project '{new_project.name}' imported by {username}")
+        
+        return {"success": True, "project_id": new_project.id, "project_name": new_project.name}
+        
+    except DuplicateResourceError as e:
+        raise HTTPException(status_code=409, detail=str(e))
+    except Exception as e:
+        log_error(f"❌ Error importing project", e)
+        raise HTTPException(status_code=500, detail=str(e))
+
 # ===================== Version Endpoints =====================
 @router.get("/projects/{project_id}/versions")
 async def list_versions(