Update backend/worker.py

backend/worker.py

@@ -3,10 +3,10 @@ import json
 import tempfile
 import shutil
 import traceback
-from .merge_engines.linear import merge_models
-from .merge_engines.evolutionary import evolutionary_merge
-from .uploader import upload_to_hf
-from .memory_manager import estimate_memory, check_memory_safe
+from merge_engines.linear import merge_models
+from merge_engines.evolutionary import evolutionary_merge
+from uploader import upload_to_hf
+from memory_manager import estimate_memory, check_memory_safe
 import asyncio
 
 async def run_job_async(job_id: str, params: dict):
@@ -20,7 +20,7 @@ def run_job(job_id, params):
         if not check_memory_safe(model_a_id, model_b_id, params.get("evo_params")):
             raise RuntimeError("Insufficient memory for this merge. Job rejected.")
         
-        from .model_loader import prepare_model
+        from model_loader import prepare_model
         path_a = prepare_model(params["model_a_source"], params["model_a_id"], params.get("civitai_key"))
         path_b = prepare_model(params["model_b_source"], params["model_b_id"], params.get("civitai_key"))
         
@@ -33,18 +33,15 @@ def run_job(job_id, params):
             dataset_path = params.get("dataset")
             evolutionary_merge(path_a, path_b, dataset_path, output_dir, evo_params)
         else:
-            # 線形系マージ（linear, slerp, franken）
             merge_type = params.get("merge_type", "linear")
             alpha = params.get("linear_alpha", 0.5)
             layers_from_a = params.get("franken_layers", None)
             merge_models(path_a, path_b, output_dir, method=merge_type,
                          alpha=alpha, layers_from_a=layers_from_a)
         
-        # HFへアップロード
         repo_name = params.get("output_repo_name") or f"merge-{job_id[:8]}"
         upload_to_hf(output_dir, repo_name, params["hf_token"])
         
-        # ★ メモリ最適化：不要な出力ディレクトリを削除
         if os.path.exists(output_dir):
             shutil.rmtree(output_dir)
         
@@ -53,6 +50,5 @@ def run_job(job_id, params):
         traceback.print_exc()
         raise
     finally:
-        # 安全のためトークン情報を破棄
         params["hf_token"] = None
         params["civitai_key"] = None