Update app.py

app.py

@@ -211,30 +211,55 @@ def initialize_system():
     optimize_gpu_settings()
     
     try:
-        # 디렉토리 구조 생성
-        os.makedirs(INFERENCE_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)
+        # 절대 경로 설정
+        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, "xcodec_mini_infer"), exist_ok=True)
         
         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
+        
         # infer.py 파일 다운로드
         try:
-            infer_script_download = hf_hub_download(
+            infer_script = hf_hub_download(
                 repo_id="m-a-p/xcodec_mini_infer",
                 filename="infer.py",
-                local_dir=INFERENCE_DIR,
+                local_dir=inference_dir,
                 force_download=True
             )
-            if not os.path.exists(INFER_SCRIPT):
-                shutil.copy2(infer_script_download, INFER_SCRIPT)
-            logging.info(f"infer.py available at: {INFER_SCRIPT}")
+            logging.info(f"Downloaded infer.py to: {infer_script}")
         except Exception as e:
-            logging.error(f"Failed to download infer.py: {e}")
+            logging.error(f"Error downloading infer.py: {e}")
             raise
         
         # xcodec_mini_infer 모델 다운로드
-        xcodec_path = os.path.join(INFERENCE_DIR, "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,
@@ -251,7 +276,7 @@ def initialize_system():
         
         for model in models:
             model_name = model.split('/')[-1]
-            model_path = os.path.join(INFERENCE_DIR, "models", model_name)
+            model_path = os.path.join(inference_dir, "models", model_name)
             snapshot_download(
                 repo_id=model,
                 local_dir=model_path,
@@ -259,12 +284,19 @@ def initialize_system():
             )
         
         # 작업 디렉토리 변경
-        os.chdir(INFERENCE_DIR)
+        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 = [
-            INFER_SCRIPT,
+            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")
@@ -284,7 +316,6 @@ def initialize_system():
         raise
 
 
-
 @lru_cache(maxsize=100)
 def get_cached_file_path(content_hash, prefix):
     return create_temp_file(content_hash, prefix)
@@ -366,6 +397,9 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
 
 
         python_executable = sys.executable or "python"  # fallback to "python" if sys.executable is not available
+
+
+
         
         command = [
             python_executable,
@@ -382,7 +416,6 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
             "--disable_offload_model"
         ]
 
-
         env = os.environ.copy()
         if torch.cuda.is_available():
             env.update({
@@ -391,7 +424,8 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
                 "PATH": f"/usr/local/cuda/bin:{env.get('PATH', '')}",
                 "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"
+                "CUDA_LAUNCH_BLOCKING": "0",
+                "PYTHONPATH": f"{os.getcwd()}:{env.get('PYTHONPATH', '')}"
             })
 
         # transformers 캐시 마이그레이션 처리