Update app.py

app.py

@@ -214,55 +214,43 @@ def initialize_system():
         # 절대 경로 설정
         app_dir = os.path.abspath(os.path.dirname(__file__))
         inference_dir = os.path.join(app_dir, "inference")
-        models_dir = os.path.join(inference_dir, "models")
         
         # 기본 디렉토리 구조 생성
         os.makedirs(inference_dir, exist_ok=True)
-        os.makedirs(models_dir, exist_ok=True)
+        os.makedirs(os.path.join(inference_dir, "models"), exist_ok=True)
         os.makedirs(os.path.join(inference_dir, "xcodec_mini_infer"), exist_ok=True)
         
+        # 작업 디렉토리 변경
+        os.chdir(inference_dir)
+        logging.info(f"Working directory changed to: {os.getcwd()}")
+        
         from huggingface_hub import snapshot_download, hf_hub_download
         
-        # models 모듈 다운로드
-        try:
-            models_files = [
-                "soundstream_hubert_new.py",
-                "__init__.py"
-            ]
-            
-            for file_name in models_files:
-                file_path = hf_hub_download(
-                    repo_id="m-a-p/xcodec_mini_infer",
-                    filename=f"models/{file_name}",
-                    local_dir=inference_dir,
-                    force_download=True
-                )
-                target_path = os.path.join(models_dir, file_name)
-                os.makedirs(os.path.dirname(target_path), exist_ok=True)
-                shutil.copy2(file_path, target_path)
-                logging.info(f"Copied {file_name} to: {target_path}")
-        except Exception as e:
-            logging.error(f"Error downloading models files: {e}")
-            raise
+        # models 모듈 파일 다운로드 및 설정
+        models_dir = os.path.join(inference_dir, "models")
+        os.makedirs(models_dir, exist_ok=True)
+        
+        # __init__.py 생성
+        with open(os.path.join(models_dir, "__init__.py"), "w") as f:
+            f.write("")
         
-        # infer.py 파일 다운로드
+        # soundstream_hubert_new.py 다운로드
         try:
-            infer_script = hf_hub_download(
+            soundstream_file = hf_hub_download(
                 repo_id="m-a-p/xcodec_mini_infer",
-                filename="infer.py",
-                local_dir=inference_dir,
+                filename="models/soundstream_hubert_new.py",
+                cache_dir=os.path.join(inference_dir, "cache"),
                 force_download=True
             )
-            logging.info(f"Downloaded infer.py to: {infer_script}")
+            shutil.copy2(soundstream_file, os.path.join(models_dir, "soundstream_hubert_new.py"))
         except Exception as e:
-            logging.error(f"Error downloading infer.py: {e}")
+            logging.error(f"Failed to download soundstream_hubert_new.py: {e}")
             raise
         
         # xcodec_mini_infer 모델 다운로드
-        xcodec_path = os.path.join(inference_dir, "xcodec_mini_infer")
         snapshot_download(
             repo_id="m-a-p/xcodec_mini_infer",
-            local_dir=xcodec_path,
+            local_dir=os.path.join(inference_dir, "xcodec_mini_infer"),
             force_download=True
         )
         
@@ -276,30 +264,23 @@ def initialize_system():
         
         for model in models:
             model_name = model.split('/')[-1]
-            model_path = os.path.join(inference_dir, "models", model_name)
             snapshot_download(
                 repo_id=model,
-                local_dir=model_path,
+                local_dir=os.path.join(inference_dir, "models", model_name),
                 force_download=True
             )
         
-        # 작업 디렉토리 변경
-        os.chdir(inference_dir)
-        logging.info(f"Working directory changed to: {os.getcwd()}")
-        
         # PYTHONPATH 설정
         if inference_dir not in sys.path:
             sys.path.insert(0, inference_dir)
-            logging.info(f"Added to PYTHONPATH: {inference_dir}")
         
         # 파일 존재 확인
         required_files = [
-            os.path.join(inference_dir, "infer.py"),
-            os.path.join(models_dir, "soundstream_hubert_new.py"),
             os.path.join(models_dir, "__init__.py"),
-            os.path.join(xcodec_path, "config.json"),
-            os.path.join(xcodec_path, "vocal_decoder.pth"),
-            os.path.join(xcodec_path, "inst_decoder.pth")
+            os.path.join(models_dir, "soundstream_hubert_new.py"),
+            os.path.join(inference_dir, "xcodec_mini_infer", "config.json"),
+            os.path.join(inference_dir, "xcodec_mini_infer", "vocal_decoder.pth"),
+            os.path.join(inference_dir, "xcodec_mini_infer", "inst_decoder.pth")
         ]
         
         for file_path in required_files:
@@ -415,8 +396,9 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
             "--max_new_tokens", str(actual_max_tokens),
             "--disable_offload_model"
         ]
-
         env = os.environ.copy()
+        current_dir = os.getcwd()
+        
         if torch.cuda.is_available():
             env.update({
                 "CUDA_VISIBLE_DEVICES": "0",
@@ -425,7 +407,7 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
                 "LD_LIBRARY_PATH": f"/usr/local/cuda/lib64:{env.get('LD_LIBRARY_PATH', '')}",
                 "PYTORCH_CUDA_ALLOC_CONF": "max_split_size_mb:512",
                 "CUDA_LAUNCH_BLOCKING": "0",
-                "PYTHONPATH": f"{os.getcwd()}:{env.get('PYTHONPATH', '')}"
+                "PYTHONPATH": current_dir
             })
 
         # transformers 캐시 마이그레이션 처리