Update backend/main.py

backend/main.py

@@ -1,5 +1,3 @@
-import os
-import asyncio
 from fastapi import FastAPI, UploadFile, File, Form, Header, BackgroundTasks
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel
@@ -11,23 +9,26 @@ import db
 app = FastAPI()
 queue = JobQueue()
 
-@app.on_event("startup")
-async def startup():
-    await db.init_db()
-    asyncio.create_task(queue.process_jobs())
-
 class MergeRequest(BaseModel):
     model_a_source: str      # "hf" or "civitai"
     model_a_id: str
     model_b_source: str
     model_b_id: str
-    method: str = "linear"   # linear, evolutionary
+    method: str = "linear"   # linear or evolutionary
+    merge_type: Optional[str] = "linear"  # linear, slerp, franken (linear時のみ有効)
     linear_alpha: Optional[float] = 0.5
     evo_params: Optional[dict] = None
-    dataset: Optional[str] = None  # base64 encoded zip or path in job dir
+    dataset: Optional[str] = None
     output_repo_name: Optional[str] = None
     hf_token_manual: Optional[str] = None
     civitai_key: Optional[str] = None
+    franken_layers: Optional[List[str]] = None  # フランケンマージ用
+
+@app.on_event("startup")
+async def startup():
+    await db.init_db()
+    import asyncio
+    asyncio.create_task(queue.process_jobs())
 
 @app.post("/api/submit-job")
 async def submit_job(