Fix module import issues with robust path handling

app.py

@@ -10,6 +10,14 @@ without circular imports.
 import os
 import sys
 import logging
+import subprocess
+
+# Add src directory to path
+current_dir = os.path.dirname(os.path.abspath(__file__))
+src_dir = os.path.join(current_dir, "src")
+if src_dir not in sys.path:
+    sys.path.insert(0, src_dir)
+    sys.path.insert(0, current_dir)
 
 # Configure logging
 logging.basicConfig(
@@ -27,6 +35,24 @@ if os.environ.get("SPACE_ID"):
     logger.info(f"Directory contents: {os.listdir()}")
     if os.path.exists('src'):
         logger.info(f"src directory contents: {os.listdir('src')}")
+    
+    # Install package in development mode
+    try:
+        logger.info("Installing package in development mode...")
+        subprocess.check_call([sys.executable, "-m", "pip", "install", "-e", "."])
+        logger.info("Package installation successful")
+    except Exception as e:
+        logger.error(f"Error installing package: {e}")
+    
+    # Verify python path
+    logger.info(f"Python path after update: {sys.path}")
+    
+    # Try importing chorus_detection to verify
+    try:
+        import chorus_detection
+        logger.info(f"Successfully imported chorus_detection from {chorus_detection.__file__}")
+    except ImportError as e:
+        logger.error(f"Failed to import chorus_detection: {e}")
 
 def main():
     """Main entry point for the Streamlit app."""

src/chorus_detection/__init__.py

@@ -0,0 +1,10 @@
+"""Chorus Detection package for identifying choruses in music.
+
+This package contains modules for:
+- Audio processing and feature extraction
+- Machine learning models for chorus detection
+- Visualization tools for audio analysis
+- Utility functions
+"""
+
+__version__ = "0.1.0"

src/streamlit_app.py

@@ -17,6 +17,14 @@ logger = logging.getLogger("streamlit-app")
 # Configure TensorFlow logging before importing TensorFlow
 os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2'  # Suppress TensorFlow logs
 
+# Ensure proper import paths
+current_dir = os.path.dirname(os.path.abspath(__file__))
+root_dir = os.path.dirname(current_dir)
+if current_dir not in sys.path:
+    sys.path.insert(0, current_dir)
+if root_dir not in sys.path:
+    sys.path.insert(0, root_dir)
+
 # Import model downloader to ensure model is available
 try:
     if os.path.exists(os.path.join(os.getcwd(), "download_model.py")):
@@ -54,22 +62,55 @@ from pydub import AudioSegment
 warnings.filterwarnings("ignore")  # Suppress all warnings
 tf.get_logger().setLevel('ERROR')  # Suppress TensorFlow ERROR logs
 
+# Debug import paths
+logger.info(f"Python path: {sys.path}")
+logger.info(f"Current working directory: {os.getcwd()}")
+
+# First try direct import with src in path
 try:
+    # Add src directory to Python path if not already there
+    src_path = os.path.dirname(current_dir)
+    if src_path not in sys.path:
+        sys.path.insert(0, src_path)
+        
     from chorus_detection.audio.data_processing import process_audio
     from chorus_detection.audio.processor import extract_audio
     from chorus_detection.models.crnn import load_CRNN_model, make_predictions
     from chorus_detection.utils.cli import is_youtube_url
     from chorus_detection.utils.logging import logger
+    
+    logger.info("Successfully imported chorus_detection modules")
 except ImportError as e:
     logger.error(f"Error importing chorus_detection modules: {e}")
     logger.info("Trying alternative imports...")
-    # Adjust import paths as needed
-    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-    from chorus_detection.audio.data_processing import process_audio
-    from chorus_detection.audio.processor import extract_audio
-    from chorus_detection.models.crnn import load_CRNN_model, make_predictions
-    from chorus_detection.utils.cli import is_youtube_url
-    from chorus_detection.utils.logging import logger
+    
+    # Try with manual path adjustment
+    try:
+        # Adjust import paths - try different directories
+        possible_paths = [
+            os.path.join(os.getcwd(), "src"),
+            os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+            os.path.dirname(os.getcwd())
+        ]
+        
+        for path in possible_paths:
+            if path not in sys.path and os.path.exists(path):
+                sys.path.insert(0, path)
+                logger.info(f"Added path to sys.path: {path}")
+                
+        # Try importing directly from chorus_detection module path
+        sys.path.insert(0, os.path.join(os.getcwd(), "src", "chorus_detection"))
+        
+        from chorus_detection.audio.data_processing import process_audio
+        from chorus_detection.audio.processor import extract_audio
+        from chorus_detection.models.crnn import load_CRNN_model, make_predictions
+        from chorus_detection.utils.cli import is_youtube_url
+        from chorus_detection.utils.logging import logger
+        
+        logger.info("Successfully imported chorus_detection modules after path adjustment")
+    except ImportError as e2:
+        logger.error(f"Alternative imports also failed: {e2}")
+        raise
 
 # Define the MODEL_PATH directly
 MODEL_PATH = os.path.join(os.getcwd(), "models", "CRNN", "best_model_V3.h5")