Update app.py

app.py

@@ -11,7 +11,6 @@ REPO_DIR = "/home/user/app/sam-3d-objects"
 def patch_pyproject_toml():
     """
     Removes 'bpy==4.3.0' from pyproject.toml to prevent installation failures.
-    This package is often unavailable on PyPI and usually not needed for inference.
     """
     print("Patching pyproject.toml to remove strict bpy dependency...")
     pyproject_path = os.path.join(REPO_DIR, "pyproject.toml")
@@ -20,12 +19,9 @@ def patch_pyproject_toml():
         with open(pyproject_path, "r") as f:
             content = f.read()
         
-        # Remove dependency entries for bpy==4.3.0
-        # We try multiple formats to ensure we catch it (with/without quotes/commas)
+        # Remove dependency entries for bpy
         new_content = content.replace('"bpy==4.3.0",', '')
         new_content = new_content.replace("'bpy==4.3.0',", '')
-        new_content = new_content.replace('"bpy==4.3.0"', '')
-        new_content = new_content.replace("'bpy==4.3.0'", '')
         
         with open(pyproject_path, "w") as f:
             f.write(new_content)
@@ -35,51 +31,65 @@ def patch_pyproject_toml():
 
 def install_dependencies():
     """
-    Installs dependencies using the official repo method (pip install -e .[extras]).
+    Installs the specific list of dependencies requested by the user individually.
     """
-    print("Starting installation sequence...")
+    print("Starting manual installation sequence...")
 
-    # 1. Clone Repository
-    if not os.path.exists(REPO_DIR):
-        print(f"Cloning repository to {REPO_DIR}...")
-        subprocess.run(["git", "clone", REPO_URL, REPO_DIR], check=True)
-    
-    # Switch working directory to repo
-    os.chdir(REPO_DIR)
-
-    # 2. Patch the faulty dependency BEFORE installing
-    patch_pyproject_toml()
-
-    # 3. Set Environment Variables for PIP
+    # 1. Basic PIP Upgrade
     env = os.environ.copy()
+    # specific links for torch/cuda compatibility
     env["PIP_EXTRA_INDEX_URL"] = "https://pypi.ngc.nvidia.com https://download.pytorch.org/whl/cu121"
     env["PIP_FIND_LINKS"] = "https://nvidia-kaolin.s3.us-east-2.amazonaws.com/torch-2.5.1_cu121.html"
-    
-    # Upgrade pip
+    env["CUDA_HOME"] = "/usr/local/cuda"
+    env["MAX_JOBS"] = "4" # Speed up compilation
+
     subprocess.run([sys.executable, "-m", "pip", "install", "--upgrade", "pip"], env=env, check=True)
 
-    # 4. Install Dependencies via setup.py extras
-    
-    # Install [dev] (Modified by patch to exclude bpy)
-    print("Installing [dev] dependencies...")
-    subprocess.run([sys.executable, "-m", "pip", "install", "-e", ".[dev]"], env=env, check=True)
+    # 2. User Defined Package List
+    # Note: Order optimized slightly to put light packages first
+    packages = [
+        "pytest",
+        "pipdeptree",
+        "findpydeps",
+        "lovely_tensors",
+        "seaborn==0.13.2",
+        "gradio==5.49.0",  # Note: If this version doesn't exist, pip will error.
+        "kaolin==0.17.0",
+        "flash_attn==2.8.3",
+        # Git installs
+        "git+https://github.com/nerfstudio-project/gsplat.git@2323de5905d5e90e035f792fe65bad0fedd413e7",
+        "git+https://github.com/facebookresearch/pytorch3d.git@75ebeeaea0908c5527e7b1e305fbc7681382db47"
+    ]
 
-    # Install [p3d]
-    print("Installing [p3d] dependencies...")
-    subprocess.run([sys.executable, "-m", "pip", "install", "-e", ".[p3d]"], env=env, check=True)
+    for pkg in packages:
+        print(f"----------------------------------------")
+        print(f"Installing: {pkg}")
+        print(f"----------------------------------------")
+        try:
+            # We use --no-build-isolation for git repos sometimes to pick up current environment packages
+            cmd = [sys.executable, "-m", "pip", "install", pkg]
+            subprocess.run(cmd, env=env, check=True)
+        except subprocess.CalledProcessError as e:
+            print(f"❌ Failed to install {pkg}. Continuing to next package...")
 
-    # Install [inference]
-    print("Installing [inference] dependencies...")
-    subprocess.run([sys.executable, "-m", "pip", "install", "-e", ".[inference]"], env=env, check=True)
+    # 3. Clone & Install Main Repo (SAM 3D Objects)
+    if not os.path.exists(REPO_DIR):
+        print(f"Cloning repository to {REPO_DIR}...")
+        subprocess.run(["git", "clone", REPO_URL, REPO_DIR], check=True)
+    
+    os.chdir(REPO_DIR)
+    patch_pyproject_toml() # Strip bad dependencies
 
-    # 5. Apply Hydra Patch
+    # Install the repo itself (excluding the faulty dev deps we just manually handled)
+    print("Installing sam-3d-objects in editable mode...")
+    subprocess.run([sys.executable, "-m", "pip", "install", "--no-deps", "-e", "."], env=env, check=True)
+
+    # 4. Apply Hydra Patch
     patch_script = os.path.join(REPO_DIR, "patching", "hydra")
     if os.path.exists(patch_script):
         print("Applying Hydra patch...")
         subprocess.run(["chmod", "+x", patch_script], check=True)
         subprocess.run([patch_script], check=True)
-    else:
-        print(f"Warning: Patch script not found at {patch_script}")
 
 # Run installation
 install_dependencies()
@@ -177,6 +187,8 @@ def lazy_import_sam3d():
         except ImportError as e:
             print(f"Failed to import SAM 3D modules: {e}")
             print("Ensure the installation step completed successfully.")
+            # Helpful debugging for missing deps
+            subprocess.run([sys.executable, "-m", "pipdeptree"])
             raise
 
 def load_pipeline(config_file: str):