Fix import and environment issues for HF Spaces

.space/config.json

@@ -2,10 +2,11 @@
   "docker": {
     "image": "Dockerfile",
     "env": {
-      "PYTHONPATH": "$PYTHONPATH:/app:/app/src",
+      "PYTHONPATH": "/app:/app/src:/home/user/app:/home/user/app/src:.",
       "MODEL_REVISION": "20e66eb3d0788373c3bdc5b28fa2f2587b0e475f3bbc47e8ab9ff0dbdbb2df32",
       "MODEL_HF_REPO": "dennisvdang/chorus-detection",
-      "HF_MODEL_FILENAME": "chorus_detection_crnn.h5"
+      "HF_MODEL_FILENAME": "chorus_detection_crnn.h5",
+      "PYTHONUNBUFFERED": "1"
     }
   },
   "runtime": {
@@ -18,11 +19,13 @@
   },
   "app": {
     "port": 7860,
-    "entrypoint": ".space/app-entrypoint.sh"
+    "entrypoint": ".space/app-entrypoint.sh",
+    "working_directory": "/home/user/app"
   },
   "app_file": "app.py",
   "docker_build_args": {
-    "MODEL_HF_REPO": "dennisvdang/chorus-detection"
+    "MODEL_HF_REPO": "dennisvdang/chorus-detection",
+    "MODEL_REVISION": "20e66eb3d0788373c3bdc5b28fa2f2587b0e475f3bbc47e8ab9ff0dbdbb2df32"
   },
   "sdk": "streamlit",
   "python_requirements": "requirements.txt",

Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.9-slim
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
-ENV PYTHONPATH="${PYTHONPATH}:/app:/app/src"
+ENV PYTHONPATH="${PYTHONPATH}:/app:/app/src:/home/user/app:/home/user/app/src:."
 ENV MODEL_REVISION="20e66eb3d0788373c3bdc5b28fa2f2587b0e475f3bbc47e8ab9ff0dbdbb2df32"
 ENV MODEL_HF_REPO="dennisvdang/chorus-detection"
 ENV HF_MODEL_FILENAME="chorus_detection_crnn.h5"
@@ -25,14 +25,22 @@ COPY . .
 RUN pip install -e .
 
 # Make the entry point script executable
-RUN if [ -f .space/app-entrypoint.sh ]; then chmod +x .space/app-entrypoint.sh; fi
+RUN chmod +x .space/app-entrypoint.sh || echo "Could not chmod app-entrypoint.sh"
 
-# Ensure model exists
-RUN python -c "from src.download_model import ensure_model_exists; ensure_model_exists(revision='${MODEL_REVISION}')"
+# Create symlinks to ensure proper imports
+RUN ln -sf /app/src /src || echo "Could not create symlink"
+
+# Ensure model exists and debug info
+RUN echo "Debug: ls -la /app" && ls -la /app && \
+    echo "Debug: ls -la /app/src" && ls -la /app/src && \
+    echo "Debug: PYTHONPATH=$PYTHONPATH" && \
+    python -c "import sys; print(f'Python path: {sys.path}')" && \
+    python -c "import os; print(f'Working directory: {os.getcwd()}')" && \
+    python -c "from src.download_model import ensure_model_exists; ensure_model_exists(revision='${MODEL_REVISION}')" || echo "Warning: Model download failed during build"
 
 # Expose port for Streamlit
 EXPOSE 7860
 
 # Run the app
-CMD ["streamlit", "run", "app.py", "--server.port=7860", "--server.address=0.0.0.0"]
+CMD ["bash", "-c", "cd /app && ./.space/app-entrypoint.sh"]
 

app.py

@@ -22,22 +22,45 @@ if os.environ.get("SPACE_ID"):
     logger.info(f"Running in Hugging Face Space: {os.environ.get('SPACE_ID')}")
     logger.info(f"PYTHONPATH: {os.environ.get('PYTHONPATH')}")
     logger.info(f"MODEL_REVISION: {os.environ.get('MODEL_REVISION')}")
+    logger.info(f"Current working directory: {os.getcwd()}")
+    logger.info(f"Directory contents: {os.listdir()}")
 
 # Add the src directory to the Python path
 try:
-    sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
-    logger.info(f"Added src directory to Python path: {os.path.join(os.path.dirname(__file__), 'src')}")
+    app_dir = os.path.dirname(os.path.abspath(__file__))
+    src_dir = os.path.join(app_dir, "src")
+    sys.path.insert(0, app_dir)
+    sys.path.insert(0, src_dir)
+    logger.info(f"Added directories to Python path: {app_dir}, {src_dir}")
+    logger.info(f"Python path: {sys.path}")
 except Exception as e:
     logger.error(f"Error setting up Python path: {e}")
     sys.exit(1)
 
 # Import the app module from src
 try:
-    from src.app import main
-    logger.info("Successfully imported main from src.app")
+    # Try direct import first
+    if os.path.exists(os.path.join(src_dir, "app.py")):
+        import src.app as app_module
+        logger.info("Successfully imported app module directly")
+        main = app_module.main
+    else:
+        # Fall back to regular import
+        from src.app import main
+        logger.info("Successfully imported main from src.app")
 except ImportError as e:
     logger.error(f"Failed to import main from src.app: {e}")
-    sys.exit(1)
+    logger.info(f"Trying alternative import approach...")
+    
+    try:
+        # Try importing directly from the current directory
+        sys.path.append('.')
+        from app import main as direct_main
+        main = direct_main
+        logger.info("Successfully imported main using direct approach")
+    except ImportError as e2:
+        logger.error(f"All import attempts failed: {e2}")
+        sys.exit(1)
 
 if __name__ == "__main__":
     try:

src → src/download_model.py

@@ -12,22 +12,31 @@ import sys
 from pathlib import Path
 import logging
 
+# Configure logging
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+logger = logging.getLogger("model-downloader")
+
+# Debug environment info
+logger.info(f"Current working directory: {os.getcwd()}")
+logger.info(f"Python path: {sys.path}")
+logger.info(f"MODEL_REVISION: {os.environ.get('MODEL_REVISION')}")
+logger.info(f"MODEL_HF_REPO: {os.environ.get('MODEL_HF_REPO')}")
+logger.info(f"HF_MODEL_FILENAME: {os.environ.get('HF_MODEL_FILENAME')}")
+
 # Use huggingface_hub for better integration with HF ecosystem
 try:
     from huggingface_hub import hf_hub_download
     HF_HUB_AVAILABLE = True
+    logger.info("huggingface_hub is available")
 except ImportError:
     HF_HUB_AVAILABLE = False
+    logger.warning("huggingface_hub is not available, falling back to direct download")
     import requests
     from tqdm import tqdm
 
-# Configure logging
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-)
-logger = logging.getLogger("model-downloader")
-
 def download_file_with_progress(url: str, destination: Path) -> None:
     """Download a file with a progress bar.
     
@@ -62,7 +71,7 @@ def download_file_with_progress(url: str, destination: Path) -> None:
 def ensure_model_exists(
     model_filename: str = "best_model_V3.h5",
     repo_id: str = None,
-    model_dir: Path = Path("models/CRNN"),
+    model_dir: Path = None,
     hf_model_filename: str = None,
     revision: str = None
 ) -> Path:
@@ -88,6 +97,35 @@ def ensure_model_exists(
     if revision is None:
         revision = os.environ.get("MODEL_REVISION", "20e66eb3d0788373c3bdc5b28fa2f2587b0e475f3bbc47e8ab9ff0dbdbb2df32")
     
+    # Handle model directory paths for different environments
+    if model_dir is None:
+        # Check if we're in HF Spaces
+        if os.environ.get("SPACE_ID"):
+            # Try several possible locations
+            possible_dirs = [
+                Path("models/CRNN"),
+                Path("/home/user/app/models/CRNN"),
+                Path("/app/models/CRNN"),
+                Path(os.getcwd()) / "models" / "CRNN"
+            ]
+            
+            for directory in possible_dirs:
+                if directory.exists() or directory.parent.exists():
+                    model_dir = directory
+                    break
+            
+            # If none exist, use the first option and create it
+            if model_dir is None:
+                model_dir = possible_dirs[0]
+        else:
+            model_dir = Path("models/CRNN")
+    
+    # Make sure model_dir is a Path object
+    if isinstance(model_dir, str):
+        model_dir = Path(model_dir)
+    
+    logger.info(f"Using model directory: {model_dir}")
+    
     model_path = model_dir / model_filename
     
     # Log environment info when running in HF Space
@@ -119,6 +157,8 @@ def ensure_model_exists(
                 revision=revision  # Specify the exact revision to use
             )
             
+            logger.info(f"Downloaded to: {downloaded_path}")
+            
             # Rename if necessary
             if os.path.basename(downloaded_path) != model_filename:
                 downloaded_path_obj = Path(downloaded_path)
@@ -135,8 +175,14 @@ def ensure_model_exists(
         logger.info(f"Successfully downloaded model to {model_path}")
         return model_path
     except Exception as e:
-        logger.error(f"Failed to download model: {e}")
-        sys.exit(1)
+        logger.error(f"Failed to download model: {e}", exc_info=True)
+        
+        # Handle error more gracefully in production environment
+        if os.environ.get("SPACE_ID"):
+            logger.warning("Continuing despite model download failure")
+            return model_path
+        else:
+            sys.exit(1)
 
 if __name__ == "__main__":
     ensure_model_exists()