Fix module imports and directory handling

Dockerfile

@@ -43,17 +43,18 @@ RUN pip install --no-cache-dir openmim && \
     mim install "mmdet>=3.1.0" && \
     mim install "mmpose>=1.1.0"
 
-# Clone and set up MuseV with exact case
-RUN git clone https://github.com/TMElyralab/MuseV.git && \
-    mv MuseV musev_temp && \
-    mv musev_temp MuseV && \
+# Clone and set up MuseV
+RUN git clone https://github.com/TMElyralab/MuseV.git /tmp/MuseV && \
+    mkdir -p MuseV && \
+    cp -r /tmp/MuseV/* MuseV/ && \
     cd MuseV && \
     git clone https://github.com/huggingface/diffusers.git && \
     git clone https://github.com/patrickvonplaten/controlnet_aux.git && \
     cd diffusers && pip install -e . && \
     cd ../controlnet_aux && pip install -e . && \
     cd .. && \
-    cp -r scripts/gradio/* ../ && \
+    cp -r scripts/gradio/gradio_video2video.py ../gradio_video2video.py && \
+    cp -r scripts/gradio/gradio_text2video.py ../gradio_text2video.py && \
     chmod +x ../gradio_*.py
 
 # Set up Python path
@@ -68,7 +69,10 @@ RUN echo "Current directory:" && pwd && \
     echo "MuseV directory contents:" && ls -la MuseV && \
     echo "Gradio scripts directory contents:" && ls -la MuseV/scripts/gradio && \
     echo "Python path:" && echo $PYTHONPATH && \
-    echo "Checking gradio scripts:" && ls -la gradio_*.py
+    echo "Checking gradio scripts:" && ls -la gradio_*.py && \
+    echo "Verifying file contents:" && \
+    head -n 1 gradio_video2video.py && \
+    head -n 1 gradio_text2video.py
 
 EXPOSE 7860
 

app.py

@@ -8,24 +8,27 @@ import numpy as np
 import gradio as gr
 import spaces
 import cuid
+import importlib.util
 
 from huggingface_hub import snapshot_download
 
 print("Starting application...")
 
+def import_from_path(module_name, file_path):
+    """Import a module from a file path."""
+    if not os.path.exists(file_path):
+        raise ImportError(f"File not found: {file_path}")
+    
+    print(f"Importing {module_name} from {file_path}")
+    spec = importlib.util.spec_from_file_location(module_name, file_path)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
 # Set up paths
 ProjectDir = os.path.dirname(os.path.abspath(__file__))
 CheckpointsDir = os.path.join(ProjectDir, "checkpoints")
-
-# Look for MuseV directory with either case
-if os.path.exists(os.path.join(ProjectDir, "MuseV")):
-    MuseVDir = os.path.join(ProjectDir, "MuseV")
-elif os.path.exists(os.path.join(ProjectDir, "musev")):
-    MuseVDir = os.path.join(ProjectDir, "musev")
-else:
-    print("Error: Could not find MuseV directory")
-    sys.exit(1)
-
+MuseVDir = os.path.join(ProjectDir, "MuseV")  # We ensure this is capitalized in Dockerfile
 GradioScriptsDir = os.path.join(MuseVDir, "scripts", "gradio")
 
 print(f"Project directory: {ProjectDir}")
@@ -35,11 +38,11 @@ print(f"Gradio scripts directory: {GradioScriptsDir}")
 # Add the MuseV paths to sys.path
 paths_to_add = [
     ProjectDir,  # Add current directory first
-    GradioScriptsDir,
     MuseVDir,
     os.path.join(MuseVDir, "MMCM"),
     os.path.join(MuseVDir, "diffusers", "src"),
-    os.path.join(MuseVDir, "controlnet_aux", "src")
+    os.path.join(MuseVDir, "controlnet_aux", "src"),
+    GradioScriptsDir
 ]
 
 for path in paths_to_add:
@@ -74,46 +77,29 @@ for path in sys.path:
 
 print("Attempting to import gradio modules...")
 
-# First check if the files exist in the current directory
-print("Checking for gradio module files...")
+# Try importing from current directory first
 video2video_path = os.path.join(ProjectDir, "gradio_video2video.py")
 text2video_path = os.path.join(ProjectDir, "gradio_text2video.py")
-print(f"Looking for video2video at: {video2video_path}")
-print(f"Looking for text2video at: {text2video_path}")
-
-if os.path.exists(video2video_path):
-    print(f"Found video2video at {video2video_path}")
-else:
-    print(f"Warning: video2video not found at {video2video_path}")
 
-if os.path.exists(text2video_path):
-    print(f"Found text2video at {text2video_path}")
-else:
-    print(f"Warning: text2video not found at {text2video_path}")
+print(f"Looking for modules at:")
+print(f"video2video: {video2video_path}")
+print(f"text2video: {text2video_path}")
 
-# Try importing from current directory first
 try:
-    import gradio_video2video
-    import gradio_text2video
-    online_v2v_inference = gradio_video2video.online_v2v_inference
-    online_t2v_inference = gradio_text2video.online_t2v_inference
-    print("Successfully imported gradio modules from current directory")
+    print("Attempting to import from current directory...")
+    video2video = import_from_path("gradio_video2video", video2video_path)
+    text2video = import_from_path("gradio_text2video", text2video_path)
+    online_v2v_inference = video2video.online_v2v_inference
+    online_t2v_inference = text2video.online_t2v_inference
+    print("Successfully imported modules")
 except Exception as e:
-    print(f"Error importing from current directory: {str(e)}")
-    print("Attempting to import from MuseV directory...")
-    try:
-        sys.path.insert(0, os.path.join(MuseVDir, "scripts", "gradio"))
-        from gradio_video2video import online_v2v_inference
-        from gradio_text2video import online_t2v_inference
-        print("Successfully imported from MuseV directory")
-    except Exception as e2:
-        print(f"Error importing from MuseV directory: {str(e2)}")
-        print("Current directory contents:")
-        print(os.listdir('.'))
-        if os.path.exists(GradioScriptsDir):
-            print("Gradio scripts directory contents:")
-            print(os.listdir(GradioScriptsDir))
-        sys.exit(1)
+    print(f"Error importing modules: {str(e)}")
+    print("\nDirectory contents:")
+    print(os.listdir(ProjectDir))
+    if os.path.exists(GradioScriptsDir):
+        print("\nGradio scripts directory contents:")
+        print(os.listdir(GradioScriptsDir))
+    sys.exit(1)
 
 ignore_video2video = False
 max_image_edge = 1280