added new files to help conflicts

.dockerignore

@@ -0,0 +1,6 @@
+__pycache__
+*.pyc
+*.pyo
+*.pyd
+.git
+.gitignore

Dockerfile

@@ -22,39 +22,47 @@ RUN useradd -m -u 1000 user
 
 WORKDIR /app
 
-# Upgrade pip
-RUN pip install --upgrade pip setuptools wheel
+# CRITICAL: Downgrade setuptools to avoid the deprecated warnings
+RUN pip install --upgrade pip
+RUN pip install setuptools==69.5.1 wheel
 
-# Install PyTorch and dependencies in the correct order
-RUN pip install sympy filelock jinja2 networkx requests typing-extensions
+# Install PyTorch and core dependencies
 RUN pip install torch==2.0.1+cpu torchvision==0.15.2+cpu --index-url https://download.pytorch.org/whl/cpu
+RUN pip install numpy==1.24.3 pillow==10.0.0
 
-# Force specific numpy/pillow versions AFTER torch installation
-RUN pip uninstall -y numpy pillow && \
-    pip install numpy==1.24.3 pillow==10.0.0
+# Install COCO API first (required by detectron2)
+RUN pip install pycocotools opencv-python
 
-# Install COCO API and other dependencies needed by detectron2
-RUN pip install pycocotools opencv-python scipy matplotlib
-
-# Clone and install detectron2 from source
+# Method 1: Install detectron2 without editable mode and without build isolation
 RUN git clone https://github.com/facebookresearch/detectron2.git /tmp/detectron2 && \
     cd /tmp/detectron2 && \
     git checkout v0.6 && \
-    pip install -e .
+    pip install --no-build-isolation --no-deps . && \
+    pip install -r requirements.txt
+
+# Alternative Method 2: Build wheel first
+# RUN git clone https://github.com/facebookresearch/detectron2.git /tmp/detectron2 && \
+#     cd /tmp/detectron2 && \
+#     git checkout v0.6 && \
+#     python setup.py bdist_wheel && \
+#     pip install dist/*.whl && \
+#     pip install -r requirements.txt
 
-# Install additional dependencies
+# Install other dependencies
 RUN pip install \
     gradio \
     huggingface_hub \
+    scipy \
     scikit-learn \
     scikit-image \
+    matplotlib \
     tqdm
 
 # Switch to user
 USER user
 ENV HOME=/home/user PATH=/home/user/.local/bin:$PATH
 
-# Copy application files
+# Copy application
 COPY --chown=user:user . /app
 
 # Install remaining requirements as user

app.py

@@ -1,38 +1,91 @@
 #!/usr/bin/env python3
 """
-Minimal OneFormer Demo for HuggingFace Spaces
+NeuroNest Hugging Face Spaces App with Robust Detectron2 Support
 """
 
 import os
-os.environ['CUDA_VISIBLE_DEVICES'] = ''
-
-import gradio as gr
-import torch
-import numpy as np
-from PIL import Image
+import sys
+import subprocess
 
-# Force CPU
-device = torch.device("cpu")
+# Force CPU mode
+os.environ['CUDA_VISIBLE_DEVICES'] = ''
+os.environ['FORCE_CUDA'] = '0'
 
-def process_image(image):
-    """Simple image processing function"""
-    if image is None:
-        return None
+def ensure_detectron2():
+    """Ensure detectron2 is installed with multiple fallback methods"""
+    try:
+        import detectron2
+        return True
+    except ImportError:
+        print("Detectron2 not found, attempting installation...")
     
-    # For now, just return the image with a message
-    # Replace this with actual OneFormer inference
-    return image
+    # Method 1: Install from GitHub with no build isolation
+    try:
+        subprocess.run([
+            sys.executable, "-m", "pip", "install",
+            "--no-build-isolation",
+            "git+https://github.com/facebookresearch/detectron2.git@v0.6"
+        ], check=True)
+        import detectron2
+        return True
+    except:
+        pass
+    
+    # Method 2: Clone and build
+    try:
+        import tempfile
+        with tempfile.TemporaryDirectory() as tmpdir:
+            subprocess.run([
+                "git", "clone", "--depth", "1", "--branch", "v0.6",
+                "https://github.com/facebookresearch/detectron2.git",
+                f"{tmpdir}/detectron2"
+            ], check=True)
+            
+            subprocess.run([
+                sys.executable, "-m", "pip", "install",
+                "--no-build-isolation", f"{tmpdir}/detectron2"
+            ], check=True)
+        
+        import detectron2
+        return True
+    except:
+        return False
 
-# Create simple interface
-iface = gr.Interface(
-    fn=process_image,
-    inputs=gr.Image(type="numpy"),
-    outputs=gr.Image(type="numpy"),
-    title="OneFormer Demo",
-    description="OneFormer: Universal Image Segmentation (CPU Mode)",
-)
+def main():
+    # Ensure detectron2 is available
+    if not ensure_detectron2():
+        print("WARNING: Could not install detectron2, running in limited mode")
+        
+        # Run minimal version without detectron2
+        import gradio as gr
+        
+        def minimal_interface(image):
+            return "Detectron2 not available. Please check deployment logs."
+        
+        demo = gr.Interface(
+            fn=minimal_interface,
+            inputs=gr.Image(type="filepath"),
+            outputs="text",
+            title="NeuroNest - Limited Mode"
+        )
+        demo.launch(server_name="0.0.0.0", server_port=7860)
+        return
+    
+    # Normal operation with detectron2
+    try:
+        from gradio_test import create_gradio_interface
+        
+        print("Starting NeuroNest application...")
+        interface = create_gradio_interface()
+        interface.launch(
+            server_name="0.0.0.0",
+            server_port=7860,
+            share=False
+        )
+    except Exception as e:
+        print(f"Error: {e}")
+        import traceback
+        traceback.print_exc()
 
 if __name__ == "__main__":
-    print(f"PyTorch version: {torch.__version__}")
-    print(f"Running on: CPU")
-    iface.launch(server_name="0.0.0.0", server_port=7860)
+    main()

install.py

@@ -0,0 +1,19 @@
+import subprocess
+import sys
+import os
+
+# Install torch first
+subprocess.check_call([sys.executable, "-m", "pip", "install", "torch>=2.0.0", "torchvision>=0.15.0"])
+
+# Clone and install detectron2
+if not os.path.exists('detectron2'):
+    subprocess.check_call(["git", "clone", "https://github.com/facebookresearch/detectron2"])
+
+# Install detectron2 dependencies
+import distutils.core
+dist = distutils.core.run_setup("./detectron2/setup.py")
+deps = ' '.join([f"'{x}'" for x in dist.install_requires if 'torch' not in x])
+subprocess.check_call(f"{sys.executable} -m pip install {deps}", shell=True)
+
+# Add detectron2 to path
+sys.path.insert(0, os.path.abspath('./detectron2'))

pre_install.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+"""
+Pre-installation setup for Hugging Face Spaces
+Run this before main app to ensure detectron2 is properly installed
+"""
+
+import subprocess
+import sys
+import os
+
+# Downgrade setuptools first
+subprocess.run([sys.executable, "-m", "pip", "install", "setuptools==69.5.1"], check=True)
+
+# Set environment variables
+os.environ['CUDA_VISIBLE_DEVICES'] = ''
+os.environ['FORCE_CUDA'] = '0'
+
+# Install torch first
+subprocess.run([
+    sys.executable, "-m", "pip", "install", 
+    "torch==2.0.1+cpu", "torchvision==0.15.2+cpu",
+    "--index-url", "https://download.pytorch.org/whl/cpu"
+], check=True)
+
+# Install detectron2 dependencies
+subprocess.run([
+    sys.executable, "-m", "pip", "install",
+    "numpy==1.24.3", "pillow==10.0.0", "pycocotools", "opencv-python"
+], check=True)
+
+# Clone and install detectron2
+import tempfile
+import shutil
+
+with tempfile.TemporaryDirectory() as tmpdir:
+    # Clone repo
+    subprocess.run([
+        "git", "clone", "https://github.com/facebookresearch/detectron2.git",
+        os.path.join(tmpdir, "detectron2")
+    ], check=True)
+    
+    # Checkout stable version
+    os.chdir(os.path.join(tmpdir, "detectron2"))
+    subprocess.run(["git", "checkout", "v0.6"], check=True)
+    
+    # Install without build isolation
+    subprocess.run([
+        sys.executable, "-m", "pip", "install",
+        "--no-build-isolation", "."
+    ], check=True)
+
+print("Pre-installation complete!")

setup.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Setup script for Hugging Face Spaces
+
+# Install system dependencies
+apt-get update && apt-get install -y git build-essential
+
+# Downgrade setuptools
+pip install setuptools==69.5.1
+
+# Install PyTorch
+pip install torch==2.0.1+cpu torchvision==0.15.2+cpu --index-url https://download.pytorch.org/whl/cpu
+
+# Install detectron2 from source
+git clone https://github.com/facebookresearch/detectron2.git
+cd detectron2
+git checkout v0.6
+pip install --no-build-isolation .
+cd ..
+rm -rf detectron2
+
+# Install other requirements
+pip install -r requirements.txt