command fix

app.py

@@ -1,36 +1,92 @@
 import os
+import io
 import sys
+import gradio as gr
 from rich.console import Console
+
+# Import your custom modules
 from cli_app.command_handler import handle_command
+import cli_app.command_handler as handler
 from utils.logger import logger
 from vector_store.instruction_embedder import embed_analyze_instructions
-import os
-import gradio as gr
-from cli_app.command_handler import handle_command
-from vector_store.instruction_embedder import embed_analyze_instructions
-import io
 
+# Global console for local CLI use
 console = Console()
 
-def run_web():
-    """The 'Space Way': A Gradio interface that acts like your CLI."""
-    import gradio as gr
+def terminal_logic(command):
+    """
+    Captures Rich console output and returns it as a string for Gradio.
+    """
+    output_buffer = io.StringIO()
     
-    def chat_interface(command):
-        # Calls your existing logic exactly like the CLI
-        return handle_command(command)
-
-    demo = gr.Interface(
-        fn=chat_interface,
-        inputs=gr.Textbox(label="EDA Command", placeholder="Type your command here..."),
-        outputs=gr.Code(label="Terminal Output", language="markdown"),
-        title="EDA Explorer",
-        description="Web terminal for EDA Explorer. Type 'help' or your analysis commands."
+    # color_system=None removes the 'gibberish' ANSI escape codes
+    temp_console = Console(
+        file=output_buffer, 
+        force_terminal=True, 
+        width=100, 
+        color_system=None, 
+        legacy_windows=False
     )
-    # HF Spaces uses port 7860
+    
+    # Safely swap the console in the command_handler module
+    old_console = getattr(handler, 'console', None)
+    handler.console = temp_console 
+
+    try:
+        if command.lower() == "exit":
+            return "Session ended. Please refresh the page to restart."
+
+        # Execute the actual logic
+        result = handle_command(command)
+        
+        # Get what was printed to our 'fake' terminal (tables, etc.)
+        captured = output_buffer.getvalue()
+        
+        # Merge printed output and returned string
+        if result and result not in captured:
+            return f"{captured}\n{result}".strip()
+        return captured.strip() or "Command executed."
+
+    except Exception as e:
+        logger.error(f"Space Terminal Error: {e}")
+        return f"Error: {str(e)}"
+    finally:
+        # ALWAYS restore the original console
+        if old_console:
+            handler.console = old_console
+
+def run_space_interface():
+    """
+    Hugging Face Space Layout using a Monospace Code block for the terminal feel.
+    """
+    embed_analyze_instructions()
+
+    with gr.Blocks(title="EDA Explorer Terminal", theme="monochrome") as demo:
+        gr.Markdown("# 📊 EDA Explorer Terminal")
+        gr.Markdown("Direct CLI access for dataset analysis. Type `help` to see available commands.")
+        
+        with gr.Row():
+            output_box = gr.Code(
+                label="Console Output", 
+                language="markdown",  # markdown supports the box-drawing characters safely
+                lines=25,
+                interactive=False
+            )
+        
+        with gr.Row():
+            input_box = gr.Textbox(
+                label="Command Line", 
+                placeholder="e.g., load data.csv, list, analyze dataset...", 
+                autofocus=True
+            )
+
+        # Submit button logic
+        input_box.submit(fn=terminal_logic, inputs=input_box, outputs=output_box)
+        
     demo.launch(server_name="0.0.0.0", server_port=7860)
 
 def run_cli():
+    """Standard local terminal loop."""
     embed_analyze_instructions() 
     console.print("\n[bold cyan]EDA Explorer[/bold cyan]")
     console.print("Type 'exit' to quit\n")
@@ -48,58 +104,12 @@ def run_cli():
             break
         except Exception as e:
             logger.error(f"CLI error | {e}")
-            console.print(f"Error: {e}")
-
-def run_space_interface():
-    embed_analyze_instructions()
-
-    def terminal_logic(command):
-        output_buffer = io.StringIO()
-        # width=80 is safer for mobile/small screens
-        # color_system=None is CRITICAL to stop the  junk
-        temp_console = Console(
-            file=output_buffer, 
-            force_terminal=True, 
-            width=80, 
-            color_system=None, 
-            legacy_windows=False
-        )
-        
-        import cli_app.command_handler as handler
-        old_console = getattr(handler, 'console', None)
-        handler.console = temp_console 
-
-        try:
-            result = handler.handle_command(command)
-            captured = output_buffer.getvalue()
-            # If your handler already prints, we just return the captured text
-            return captured if not result else f"{captured}\n{result}"
-        except Exception as e:
-            return f"Error: {str(e)}"
-        finally:
-            if old_console:
-                handler.console = old_console
-
-    with gr.Blocks(title="EDA Explorer Terminal", theme="monochrome") as demo:
-        gr.Markdown("# 📊 EDA Explorer Terminal")
-        gr.Markdown("Type `help` to see commands or `list` to see datasets.")
-        
-        input_box = gr.Textbox(label="Command", placeholder="Type here...", autofocus=True)
-        # gr.Code forces the Monospace font so the table lines (┏━┓) align!
-        output_box = gr.Code(label="Console Output", language="text", lines=20)
-        
-        input_box.submit(fn=terminal_logic, inputs=input_box, outputs=output_box)
-
-    demo.launch(server_name="0.0.0.0", server_port=7860)
+            console.print(f"[red]Error:[/red] {e}")
 
 if __name__ == "__main__":
-    # Force initialize the instructions/embeddings before anything else
-    print("Initializing EDA System...")
-    try:
-        embed_analyze_instructions()
-        print("Embeddings loaded successfully.")
-    except Exception as e:
-        print(f"Embedding Error: {e}")
-
-    # Start the interface
-    run_space_interface()
+    # Check if running on Hugging Face or locally
+    if "SPACE_ID" in os.environ:
+        print("Starting Web Interface...")
+        run_space_interface()
+    else:
+        run_cli()