Update admin_routes.py

admin_routes.py

@@ -453,24 +453,35 @@ async def update_project(
     update: ProjectUpdate,
     username: str = Depends(verify_token)
 ):
-    """Update project"""
-    # Validate supported locales
-    from locale_manager import LocaleManager
-    
-    invalid_locales = LocaleManager.validate_project_languages(update.supported_locales)
-    if invalid_locales:
-        available_locales = LocaleManager.get_available_locales_with_names()
-        available_codes = [locale['code'] for locale in available_locales]
+    """Update existing project with race condition handling"""
+    try:
+        # Optimistic locking kontrolü
+        result = ConfigProvider.update_project(
+            project_id, 
+            update.model_dump(),
+            username,
+            expected_last_update=update.last_update_date
+        )
+        
+        log_info(f"✅ Project {project_id} updated by {username}")
+        return result
+        
+    except RaceConditionError as e:
+        log_warning(f"⚠️ Race condition detected for project {project_id}")
         raise HTTPException(
-            status_code=400,
-            detail=f"Unsupported locales: {', '.join(invalid_locales)}. Available locales: {', '.join(available_codes)}"
+            status_code=409,
+            detail={
+                "message": e.message,
+                "last_update_user": e.last_update_user,
+                "last_update_date": e.last_update_date,
+                "type": "race_condition"
+            }
         )
-    
-    # Update via ConfigProvider
-    updated_project = ConfigProvider.update_project(project_id, update.model_dump(), username)
-    
-    log_info(f"✅ Project '{updated_project.name}' updated by {username}")
-    return updated_project.model_dump()
+    except ResourceNotFoundError:
+        raise HTTPException(status_code=404, detail="Project not found")
+    except Exception as e:
+        log_error(f"❌ Error updating project {project_id}", e)
+        raise HTTPException(status_code=500, detail=str(e))
 
 @router.delete("/projects/{project_id}")
 async def delete_project(project_id: int, username: str = Depends(verify_token)):
@@ -525,14 +536,54 @@ async def update_version(
     project_id: int,
     version_id: int,
     update: VersionUpdate,
+    force: bool = Query(default=False, description="Force update despite conflicts"),
     username: str = Depends(verify_token)
 ):
-    """Update version"""
-    updated_version = ConfigProvider.update_version(project_id, version_id, update.model_dump(), username)
-    
-    log_info(f"✅ Version {version_id} updated for project {project_id} by {username}")
-    return updated_version.model_dump()
-
+    """Update version with race condition handling"""
+    try:
+        # Force parametresi kontrolü
+        if force:
+            log_warning(f"⚠️ Force update requested for version {version_id} by {username}")
+        
+        result = ConfigProvider.update_version(
+            project_id,
+            version_id,
+            update.model_dump(),
+            username,
+            expected_last_update=update.last_update_date if not force else None
+        )
+        
+        log_info(f"✅ Version {version_id} updated by {username}")
+        return result
+        
+    except RaceConditionError as e:
+        if force:
+            # Force modunda race condition'ı yoksay
+            result = ConfigProvider.update_version(
+                project_id,
+                version_id,
+                update.model_dump(),
+                username,
+                expected_last_update=None
+            )
+            return result
+        else:
+            log_warning(f"⚠️ Race condition detected for version {version_id}")
+            raise HTTPException(
+                status_code=409,
+                detail={
+                    "message": e.message,
+                    "last_update_user": e.last_update_user,
+                    "last_update_date": e.last_update_date,
+                    "type": "race_condition"
+                }
+            )
+    except ResourceNotFoundError:
+        raise HTTPException(status_code=404, detail="Version not found")
+    except Exception as e:
+        log_error(f"❌ Error updating version {version_id}", e)
+        raise HTTPException(status_code=500, detail=str(e))
+        
 @router.post("/projects/{project_id}/versions/{version_id}/publish")
 async def publish_version(
     project_id: int,
@@ -691,11 +742,34 @@ async def update_api(
     update: APIUpdate,
     username: str = Depends(verify_token)
 ):
-    """Update API"""
-    updated_api = ConfigProvider.update_api(api_name, update.model_dump(), username)
-    
-    log_info(f"✅ API '{api_name}' updated by {username}")
-    return updated_api.model_dump()
+    """Update API configuration with race condition handling"""
+    try:
+        result = ConfigProvider.update_api(
+            api_name,
+            update.model_dump(),
+            username,
+            expected_last_update=update.last_update_date
+        )
+        
+        log_info(f"✅ API '{api_name}' updated by {username}")
+        return result
+        
+    except RaceConditionError as e:
+        log_warning(f"⚠️ Race condition detected for API '{api_name}'")
+        raise HTTPException(
+            status_code=409,
+            detail={
+                "message": e.message,
+                "last_update_user": e.last_update_user,
+                "last_update_date": e.last_update_date,
+                "type": "race_condition"
+            }
+        )
+    except ResourceNotFoundError:
+        raise HTTPException(status_code=404, detail="API not found")
+    except Exception as e:
+        log_error(f"❌ Error updating API '{api_name}'", e)
+        raise HTTPException(status_code=500, detail=str(e))
 
 @router.delete("/apis/{api_name}")
 async def delete_api(api_name: str, username: str = Depends(verify_token)):
@@ -901,6 +975,34 @@ async def notify_llm_startup(project, version):
         log_error("❌ Error notifying LLM provider", e)
         raise
 
+def create_token(username: str) -> str:
+    """Create JWT token with secure random"""
+    import secrets
+    
+    cfg = ConfigProvider.get()
+    
+    # Token için secure random jti (JWT ID) ekle
+    jti = secrets.token_urlsafe(16)
+    
+    payload = {
+        "sub": username,
+        "exp": datetime.now(timezone.utc) + timedelta(hours=24),
+        "iat": datetime.now(timezone.utc),
+        "jti": jti  # Unique token ID
+    }
+    
+    # Store token ID for revocation if needed
+    if not hasattr(cfg, '_active_tokens'):
+        cfg._active_tokens = set()
+    cfg._active_tokens.add(jti)
+    
+    secret = os.environ.get("JWT_SECRET", "your-secret-key")
+    token = jwt.encode(payload, secret, algorithm="HS256")
+    
+    if isinstance(token, bytes):
+        token = token.decode()
+    
+    return token
 # ===================== Cleanup Task =====================
 def cleanup_activity_log():
     """Cleanup old activity log entries"""