REvert and just ocmment out

app.py

@@ -1,16 +1,17 @@
-# Version: 1.1.3 - API State Fix + DEBUG (Video Disabled) + unload() Fix (2025-05-04)
+# Version: 1.1.0 - API State Fix + DEBUG (Video Disabled - Corrected Baseline) (2025-05-04)
 # Changes:
-# - FIXED TypeError in demo.unload() by removing incorrect 'inputs'/'outputs' arguments.
-# - ENSURED `import spaces` is present for the @spaces.GPU decorator.
-# - TEMPORARY DEBUGGING STEP: Commented out video rendering in `text_to_3d`
+# - Based *EXACTLY* on user-provided Version 1.1.0 code.
+# - TEMPORARY DEBUGGING STEP: Commented out video rendering/saving in `text_to_3d`
 #   and return None for video_path to isolate the "Session not found" error.
-# - Modified `text_to_3d` to explicitly return the serializable `state_dict` from `pack_state`.
-# - Modified `extract_glb`/`extract_gaussian` to accept `state_dict: dict`.
-# - Kept Gradio UI bindings using `output_buf`.
-# - Added minor safety checks and logging.
+# - All other code (imports, functions, UI bindings, pipeline loading) is from Version 1.1.0.
+# - Removed incorrect `torch_dtype` argument from pipeline loading.
+# - Removed incorrect `inputs`/`outputs` arguments from `demo.unload()`.
 
 import gradio as gr
-import spaces  # <<<--- ENSURE THIS IMPORT IS PRESENT
+# NOTE: Ensuring 'spaces' is imported if decorators are used (was missing in user provided snippet but needed)
+# If @spaces.GPU decorators are not used, this import is not needed.
+# Assuming they ARE used based on previous context:
+import spaces
 
 import os
 import shutil
@@ -29,60 +30,49 @@ from trellis.utils import render_utils, postprocessing_utils
 import traceback
 import sys
 
-
 MAX_SEED = np.iinfo(np.int32).max
-# Use standard /tmp directory which is usually available in container environments
-TMP_DIR = '/tmp/gradio_sessions'
-print(f"Using temporary directory: {TMP_DIR}")
-# Ensure the base temp directory exists
+# Using path relative to file as in original user provided code
+TMP_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tmp')
+# Ensure base directory exists
 try:
     os.makedirs(TMP_DIR, exist_ok=True)
+    print(f"Using temporary directory: {TMP_DIR}")
 except OSError as e:
-    print(f"Warning: Could not create base temp directory {TMP_DIR}: {e}", file=sys.stderr)
-    # Potentially fall back or exit if temp dir is critical
-    TMP_DIR = '.' # Fallback to current directory (less ideal)
-    print(f"Warning: Falling back to use current directory for temp files: {os.path.abspath(TMP_DIR)}")
-
+     print(f"Warning: Could not create base temp directory {TMP_DIR}: {e}", file=sys.stderr)
+     TMP_DIR = '.' # Fallback
+     print(f"Warning: Falling back to use current directory for temp files: {os.path.abspath(TMP_DIR)}")
 
 def start_session(req: gr.Request):
     """Creates a temporary directory for the user session."""
-    user_dir = None # Initialize
+    user_dir = None
     try:
         session_hash = req.session_hash
         if not session_hash:
-             session_hash = f"no_session_{np.random.randint(10000, 99999)}"
-             print(f"Warning: No session_hash in request, using temporary ID: {session_hash}")
-
-        # Ensure TMP_DIR exists before joining path
-        if not os.path.exists(TMP_DIR):
-             os.makedirs(TMP_DIR, exist_ok=True)
-
+            session_hash = f"no_session_{np.random.randint(10000, 99999)}"
+            print(f"Warning: No session_hash in request, using temporary ID: {session_hash}")
         user_dir = os.path.join(TMP_DIR, str(session_hash))
         os.makedirs(user_dir, exist_ok=True)
         print(f"Started session, ensured directory exists: {user_dir}")
     except Exception as e:
         print(f"Error in start_session creating directory '{user_dir}': {e}", file=sys.stderr)
-        traceback.print_exc()
-
 
 def end_session(req: gr.Request):
     """Removes the temporary directory for the user session."""
-    user_dir = None # Initialize
+    user_dir = None
     try:
         session_hash = req.session_hash
         if not session_hash:
-            print("Warning: No session_hash in end_session request, cannot clean up.")
-            return
-
+             print("Warning: No session_hash in end_session request, cannot clean up.")
+             return
         user_dir = os.path.join(TMP_DIR, str(session_hash))
-        if os.path.exists(user_dir) and os.path.isdir(user_dir): # Extra check if it's a directory
+        if os.path.exists(user_dir) and os.path.isdir(user_dir):
             try:
                 shutil.rmtree(user_dir)
                 print(f"Ended session, removed directory: {user_dir}")
             except OSError as e:
                 print(f"Error removing tmp directory {user_dir}: {e.strerror}", file=sys.stderr)
         else:
-            print(f"Ended session, directory not found or not a directory: {user_dir}")
+             print(f"Ended session, directory not found or not a directory: {user_dir}")
     except Exception as e:
         print(f"Error in end_session cleaning directory '{user_dir}': {e}", file=sys.stderr)
 
@@ -108,9 +98,9 @@ def pack_state(gs: Gaussian, mesh: MeshExtractResult) -> dict:
         print(f"[pack_state] Dictionary created. Keys: {list(packed_data.keys())}, Gaussian points: {len(packed_data['gaussian']['_xyz'])}, Mesh vertices: {len(packed_data['mesh']['vertices'])}")
         return packed_data
     except Exception as e:
-        print(f"Error during pack_state: {e}", file=sys.stderr)
-        traceback.print_exc()
-        raise
+         print(f"Error during pack_state: {e}", file=sys.stderr)
+         traceback.print_exc()
+         raise
 
 
 def unpack_state(state_dict: dict) -> Tuple[Gaussian, edict]:
@@ -161,6 +151,7 @@ def get_seed(randomize_seed: bool, seed: int) -> int:
     return int(new_seed)
 
 
+# Decorator requires 'import spaces' at the top
 @spaces.GPU
 def text_to_3d(
     prompt: str,
@@ -170,22 +161,20 @@ def text_to_3d(
     slat_guidance_strength: float,
     slat_sampling_steps: int,
     req: gr.Request,
-) -> Tuple[dict, Optional[str]]:
+) -> Tuple[dict, Optional[str]]: # Return Optional[str] for video path
     """
     Generates a 3D model (Gaussian and Mesh) from text and returns a
     serializable state dictionary and potentially a video preview path.
     >>> TEMPORARILY DISABLED VIDEO RENDERING FOR DEBUGGING <<<
     """
     print(f"[text_to_3d - DEBUG MODE] Received prompt: '{prompt}', Seed: {seed}")
-    user_dir = None # Initialize
-    state_dict = None # Initialize
+    user_dir = None
+    state_dict = None
     try:
         session_hash = req.session_hash
         if not session_hash:
-            session_hash = f"no_session_{np.random.randint(10000, 99999)}"
-            print(f"Warning: No session_hash in text_to_3d request, using temporary ID: {session_hash}")
-
-        # Ensure user directory exists
+             session_hash = f"no_session_{np.random.randint(10000, 99999)}"
+             print(f"Warning: No session_hash in text_to_3d request, using temporary ID: {session_hash}")
         user_dir = os.path.join(TMP_DIR, str(session_hash))
         os.makedirs(user_dir, exist_ok=True)
         print(f"[text_to_3d - DEBUG MODE] User directory: {user_dir}")
@@ -213,29 +202,40 @@ def text_to_3d(
     except Exception as e:
         print(f"❌ [text_to_3d - DEBUG MODE] Error during generation or packing: {e}", file=sys.stderr)
         traceback.print_exc()
-        # Raise a Gradio error to send failure message back to client if possible
         raise gr.Error(f"Core generation failed: {e}")
 
     # --- Render Video Preview (TEMPORARILY DISABLED FOR DEBUGGING) ---
-    video_path = None
+    video_path = None # Explicitly set path to None for this debug version
     print("[text_to_3d - DEBUG MODE] Skipping video rendering.")
-    # --- Original Video Code Block (Keep commented) ---
-    # ... (video code commented out) ...
+    # --- Start Original Video Code Block (Commented Out) ---
+    # try:
+    #     print("[text_to_3d] Rendering video preview...")
+    #     video = render_utils.render_video(outputs['gaussian'][0], num_frames=120)['color']
+    #     video_geo = render_utils.render_video(outputs['mesh'][0], num_frames=120)['normal']
+    #     video = [np.concatenate([v.astype(np.uint8), vg.astype(np.uint8)], axis=1) for v, vg in zip(video, video_geo)]
+    #     video_path_tmp = os.path.join(user_dir, 'sample.mp4')
+    #     imageio.mimsave(video_path_tmp, video, fps=15, quality=8)
+    #     print(f"[text_to_3d] Video saved to: {video_path_tmp}")
+    #     video_path = video_path_tmp
+    # except Exception as e:
+    #     print(f"❌ [text_to_3d] Video rendering/saving error: {e}", file=sys.stderr)
+    #     traceback.print_exc()
+    #     video_path = None # Indicate video failure
+    # --- End Original Video Code Block ---
 
     # --- Cleanup and Return ---
     if torch.cuda.is_available():
         torch.cuda.empty_cache()
         print("[text_to_3d - DEBUG MODE] Cleared CUDA cache.")
 
-    # --- Return Serializable Dictionary and None Video Path ---
     print("[text_to_3d - DEBUG MODE] Returning state dictionary and None video path.")
     if state_dict is None:
-         # This case should ideally be caught by the exception handling above
          print("Error: state_dict is None before return, generation likely failed.", file=sys.stderr)
          raise gr.Error("State dictionary creation failed.")
     return state_dict, video_path
 
 
+# Decorator requires 'import spaces' at the top
 @spaces.GPU(duration=120)
 def extract_glb(
     state_dict: dict,
@@ -247,13 +247,13 @@ def extract_glb(
     Extracts a GLB file from the provided 3D model state dictionary.
     """
     print(f"[extract_glb] Received request. Simplify: {mesh_simplify}, Texture Size: {texture_size}")
-    user_dir = None # Initialize
-    glb_path = None # Initialize
+    user_dir = None
+    glb_path = None
     try:
         session_hash = req.session_hash
         if not session_hash:
-            session_hash = f"no_session_{np.random.randint(10000, 99999)}"
-            print(f"Warning: No session_hash in extract_glb request, using temporary ID: {session_hash}")
+             session_hash = f"no_session_{np.random.randint(10000, 99999)}"
+             print(f"Warning: No session_hash in extract_glb request, using temporary ID: {session_hash}")
 
         if not isinstance(state_dict, dict):
             print("❌ [extract_glb] Error: Invalid state_dict received (not a dictionary).")
@@ -279,7 +279,7 @@ def extract_glb(
     except Exception as e:
         print(f"❌ [extract_glb] Error during GLB extraction: {e}", file=sys.stderr)
         traceback.print_exc()
-        raise gr.Error(f"Failed to extract GLB: {e}") # Propagate error
+        raise gr.Error(f"Failed to extract GLB: {e}")
 
     # --- Cleanup and Return ---
     if torch.cuda.is_available():
@@ -293,6 +293,7 @@ def extract_glb(
     return glb_path, glb_path
 
 
+# Decorator requires 'import spaces' at the top
 @spaces.GPU
 def extract_gaussian(
     state_dict: dict,
@@ -302,13 +303,13 @@ def extract_gaussian(
     Extracts a PLY (Gaussian) file from the provided 3D model state dictionary.
     """
     print("[extract_gaussian] Received request.")
-    user_dir = None # Initialize
-    gaussian_path = None # Initialize
+    user_dir = None
+    gaussian_path = None
     try:
         session_hash = req.session_hash
         if not session_hash:
-            session_hash = f"no_session_{np.random.randint(10000, 99999)}"
-            print(f"Warning: No session_hash in extract_gaussian request, using temporary ID: {session_hash}")
+             session_hash = f"no_session_{np.random.randint(10000, 99999)}"
+             print(f"Warning: No session_hash in extract_gaussian request, using temporary ID: {session_hash}")
 
         if not isinstance(state_dict, dict):
             print("❌ [extract_gaussian] Error: Invalid state_dict received (not a dictionary).")
@@ -330,7 +331,7 @@ def extract_gaussian(
     except Exception as e:
         print(f"❌ [extract_gaussian] Error during Gaussian extraction: {e}", file=sys.stderr)
         traceback.print_exc()
-        raise gr.Error(f"Failed to extract Gaussian PLY: {e}") # Propagate error
+        raise gr.Error(f"Failed to extract Gaussian PLY: {e}")
 
     # --- Cleanup and Return ---
     if torch.cuda.is_available():
@@ -355,13 +356,11 @@ with gr.Blocks(delete_cache=(600, 600), title="TRELLIS Text-to-3D") as demo:
     *(Note: Video preview is temporarily disabled for debugging)*
     """)
 
-    # --- State Buffer ---
     output_buf = gr.State()
 
     with gr.Row():
-        with gr.Column(scale=1): # Input column
+        with gr.Column(scale=1):
             text_prompt = gr.Textbox(label="Text Prompt", lines=5, placeholder="e.g., a cute red dragon")
-
             with gr.Accordion(label="Generation Settings", open=False):
                 seed = gr.Slider(0, MAX_SEED, label="Seed", value=0, step=1)
                 randomize_seed = gr.Checkbox(label="Randomize Seed", value=True)
@@ -373,39 +372,28 @@ with gr.Blocks(delete_cache=(600, 600), title="TRELLIS Text-to-3D") as demo:
                 with gr.Row():
                     slat_guidance_strength = gr.Slider(0.0, 15.0, label="Guidance Strength", value=7.5, step=0.1)
                     slat_sampling_steps = gr.Slider(10, 50, label="Sampling Steps", value=25, step=1)
-
             generate_btn = gr.Button("Generate 3D Preview", variant="primary")
-
             with gr.Accordion(label="GLB Extraction Settings", open=True):
                 mesh_simplify = gr.Slider(0.9, 0.99, label="Simplify Factor", value=0.95, step=0.01, info="Higher value = less simplification (more polys)")
                 texture_size = gr.Slider(512, 2048, label="Texture Size (pixels)", value=1024, step=512, info="Size of the generated texture map")
-
             with gr.Row():
                 extract_glb_btn = gr.Button("Extract GLB", interactive=False)
                 extract_gs_btn = gr.Button("Extract Gaussian (PLY)", interactive=False)
             gr.Markdown("""
                         *NOTE: Gaussian file (.ply) can be very large (~50MB+) and may take time to process/download.*
                         """)
-
-        with gr.Column(scale=1): # Output column
-            # Video component remains for layout but won't show anything in this debug version
+        with gr.Column(scale=1):
             video_output = gr.Video(label="Generated 3D Preview (DISABLED FOR DEBUG)", autoplay=False, loop=False, value=None, height=350)
             model_output = gr.Model3D(label="Extracted Model Preview", height=350, clear_color=[0.95, 0.95, 0.95, 1.0])
-
             with gr.Row():
                 download_glb = gr.DownloadButton(label="Download GLB", interactive=False)
                 download_gs = gr.DownloadButton(label="Download Gaussian (PLY)", interactive=False)
 
     # --- Event Handlers ---
     print("Defining Gradio event handlers...")
+    demo.load(start_session) # Removed inputs/outputs kwargs, they are optional
+    demo.unload(end_session) # Removed incorrect inputs/outputs kwargs
 
-    # Handle session start/end
-    # demo.load() is valid with inputs=None, outputs=None (though default)
-    demo.load(start_session, inputs=None, outputs=None)
-    # >>> FIX: demo.unload() does NOT take inputs/outputs arguments <<<
-    demo.unload(end_session) # Removed inputs/outputs kwargs
-
-    # --- Generate Button Click Flow ---
     generate_event = generate_btn.click(
         get_seed,
         inputs=[randomize_seed, seed],
@@ -414,20 +402,17 @@ with gr.Blocks(delete_cache=(600, 600), title="TRELLIS Text-to-3D") as demo:
     ).then(
         text_to_3d,
         inputs=[text_prompt, seed, ss_guidance_strength, ss_sampling_steps, slat_guidance_strength, slat_sampling_steps],
-        outputs=[output_buf, video_output], # state_dict -> output_buf, None -> video_output
+        outputs=[output_buf, video_output],
         api_name="text_to_3d"
     ).then(
         lambda: (
-            gr.Button(interactive=True),
-            gr.Button(interactive=True),
-            gr.DownloadButton(interactive=False),
-            gr.DownloadButton(interactive=False)
+            gr.Button(interactive=True), gr.Button(interactive=True),
+            gr.DownloadButton(interactive=False), gr.DownloadButton(interactive=False)
         ),
         inputs=None,
         outputs=[extract_glb_btn, extract_gs_btn, download_glb, download_gs],
     )
 
-    # --- Extract GLB Button Click Flow ---
     extract_glb_event = extract_glb_btn.click(
         extract_glb,
         inputs=[output_buf, mesh_simplify, texture_size],
@@ -439,7 +424,6 @@ with gr.Blocks(delete_cache=(600, 600), title="TRELLIS Text-to-3D") as demo:
         outputs=[download_glb],
     )
 
-    # --- Extract Gaussian Button Click Flow ---
     extract_gs_event = extract_gs_btn.click(
         extract_gaussian,
         inputs=[output_buf],
@@ -451,7 +435,6 @@ with gr.Blocks(delete_cache=(600, 600), title="TRELLIS Text-to-3D") as demo:
         outputs=[download_gs],
     )
 
-    # --- Clear Download Button Interactivity when model preview is cleared ---
     model_output.clear(
         lambda: (gr.DownloadButton(interactive=False), gr.DownloadButton(interactive=False)),
         inputs=None,
@@ -459,10 +442,8 @@ with gr.Blocks(delete_cache=(600, 600), title="TRELLIS Text-to-3D") as demo:
     )
     video_output.clear(
          lambda: (
-            gr.Button(interactive=False),
-            gr.Button(interactive=False),
-            gr.DownloadButton(interactive=False),
-            gr.DownloadButton(interactive=False)
+            gr.Button(interactive=False), gr.Button(interactive=False),
+            gr.DownloadButton(interactive=False), gr.DownloadButton(interactive=False)
         ),
         inputs=None,
         outputs=[extract_glb_btn, extract_gs_btn, download_glb, download_gs],
@@ -474,18 +455,19 @@ with gr.Blocks(delete_cache=(600, 600), title="TRELLIS Text-to-3D") as demo:
 # --- Launch the Gradio app ---
 if __name__ == "__main__":
     print("Loading Trellis pipeline...")
+    pipeline = None
     pipeline_loaded = False
-    pipeline = None # Initialize
     try:
+        # --- Load pipeline WITHOUT torch_dtype ---
         pipeline = TrellisTextTo3DPipeline.from_pretrained(
-            "JeffreyXiang/TRELLIS-text-xlarge",
-            torch_dtype=torch.float16 # Use float16 if GPU supports it
+            "JeffreyXiang/TRELLIS-text-xlarge"
+            # Removed: torch_dtype=torch.float16
         )
         if torch.cuda.is_available():
             pipeline = pipeline.to("cuda")
             print("✅ Trellis pipeline loaded successfully to GPU.")
         else:
-            print("⚠️ WARNING: CUDA not available, running on CPU (will be very slow).")
+            print("⚠️ WARNING: CUDA not available, running on CPU.")
             print("✅ Trellis pipeline loaded successfully to CPU.")
         pipeline_loaded = True
     except Exception as e:
@@ -496,16 +478,7 @@ if __name__ == "__main__":
 
     if pipeline_loaded:
         print("Launching Gradio demo...")
-        # Consider increasing queue timeout if tasks are long
-        demo.queue(
-             # default_concurrency_limit=2, # Limit concurrency if resource issues suspected
-             # status_update_rate='auto'
-        ).launch(
-            # server_name="0.0.0.0", # Allows access from local network
-            # share=False, # Set True for public link (careful with resources)
-            debug=True, # Enable Gradio/FastAPI debug logs
-            # prevent_thread_lock=True # Might help sometimes
-        )
+        demo.queue().launch(debug=True)
         print("Gradio demo launched.")
     else:
-         print("Gradio demo not launched due to pipeline loading failure.")
+         print("Gradio demo not launched.")