Update app.py

app.py

@@ -204,21 +204,37 @@ def install_flash_attn():
 
 def check_model_files():
     base_dir = os.getcwd()
-    required_files = [
-        os.path.join(base_dir, "xcodec_mini_infer", "config.json"),
-        os.path.join(base_dir, "xcodec_mini_infer", "vocal_decoder.pth"),
-        os.path.join(base_dir, "xcodec_mini_infer", "inst_decoder.pth")
-    ]
+    xcodec_dir = os.path.join(base_dir, "xcodec_mini_infer")
+    
+    # 필요한 파일 목록
+    required_files = {
+        "config.json": "config.json",
+        "vocal_decoder.pth": "vocal_decoder.pth",
+        "inst_decoder.pth": "inst_decoder.pth"
+    }
     
-    missing_files = [f for f in required_files if not os.path.exists(f)]
-    if missing_files:
-        logging.warning(f"Missing required files: {missing_files}")
+    # 파일 존재 여부 확인
+    missing = False
+    for file_name in required_files.keys():
+        file_path = os.path.join(xcodec_dir, file_name)
+        if not os.path.exists(file_path):
+            missing = True
+            logging.warning(f"Missing file: {file_path}")
+    
+    if missing:
+        logging.info("Downloading missing files...")
         download_missing_files()
         
-    # 파일 존재 확인
-    for file_path in required_files:
-        if not os.path.exists(file_path):
-            raise FileNotFoundError(f"Required file still missing after download: {file_path}")
+        # 다운로드 후 파일 재확인
+        for file_name, src_name in required_files.items():
+            src_path = os.path.join(xcodec_dir, src_name)
+            dst_path = os.path.join(xcodec_dir, file_name)
+            
+            if not os.path.exists(dst_path) and os.path.exists(src_path):
+                shutil.copy2(src_path, dst_path)
+            
+            if not os.path.exists(dst_path):
+                raise FileNotFoundError(f"Failed to download or locate required file: {file_name}")
 
 def download_missing_files():
     try:
@@ -229,10 +245,22 @@ def download_missing_files():
             repo_id="m-a-p/xcodec_mini_infer",
             local_dir="./xcodec_mini_infer",
             resume_download=True,
-            force_download=True
+            force_download=True,
+            local_files_only=False
         )
         logging.info(f"Downloaded xcodec_mini_infer to: {xcodec_path}")
         
+        # 파일 존재 확인 및 복사
+        xcodec_dir = "./xcodec_mini_infer"
+        for root, _, files in os.walk(xcodec_dir):
+            for file in files:
+                if file in ["config.json", "vocal_decoder.pth", "inst_decoder.pth"]:
+                    src_path = os.path.join(root, file)
+                    dst_path = os.path.join(xcodec_dir, file)
+                    if src_path != dst_path:
+                        shutil.copy2(src_path, dst_path)
+                        logging.info(f"Copied {file} to {dst_path}")
+        
         # YuE 모델들 다운로드
         models = [
             "m-a-p/YuE-s1-7B-anneal-jp-kr-cot",
@@ -247,7 +275,8 @@ def download_missing_files():
                 repo_id=model,
                 local_dir=f"./models/{model_name}",
                 resume_download=True,
-                force_download=True
+                force_download=True,
+                local_files_only=False
             )
             logging.info(f"Downloaded {model_name} to: {model_path}")
             
@@ -280,20 +309,18 @@ def initialize_system():
         # 모델 파일 체크 및 다운로드
         check_model_files()
         
-        # GPU 설정 확인
-        if torch.cuda.is_available():
-            torch.cuda.empty_cache()
-            device = torch.device("cuda")
-            logging.info(f"Using GPU device: {torch.cuda.get_device_name(0)}")
-        else:
-            device = torch.device("cpu")
-            logging.warning("GPU not available, using CPU")
+        # 파일 권한 확인
+        xcodec_dir = "./xcodec_mini_infer"
+        for file_name in ["config.json", "vocal_decoder.pth", "inst_decoder.pth"]:
+            file_path = os.path.join(xcodec_dir, file_name)
+            if os.path.exists(file_path):
+                os.chmod(file_path, 0o644)  # 읽기 권한 확인
         
         logging.info("System initialization completed successfully")
         
     except Exception as e:
         logging.error(f"Initialization error: {e}")
-        os.chdir(original_dir)  # 오류 발생 시 원래 디렉토리로 복귀
+        os.chdir(original_dir)
         raise
 
 @lru_cache(maxsize=100)