fix merge sytax error

app.py

@@ -253,13 +253,10 @@ Examples:
   python app.py --mode test                   # Run tests
   python app.py --mode gradio --port 8080     # Custom port
   python app.py --mode gradio --share         # Public sharing
-<<<<<<< HEAD
   python app.py --mode gradio --mcp-server    # Gradio with MCP server
   
 Environment Variables:
   GRADIO_MCP_SERVER=true                      # Enable MCP server in Gradio
-=======
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
         """
     )
     
@@ -303,15 +300,12 @@ Environment Variables:
         help="Enable debug mode"
     )
     
-<<<<<<< HEAD
     parser.add_argument(
         "--mcp-server",
         action="store_true",
         help="Enable MCP server functionality in Gradio interface"
     )
     
-=======
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
     return parser.parse_args()
 
 
@@ -342,12 +336,8 @@ async def main() -> None:
                 "server_name": args.host,
                 "server_port": args.port,
                 "share": args.share,
-<<<<<<< HEAD
                 "debug": args.debug,
                 "mcp_server": args.mcp_server
-=======
-                "debug": args.debug
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
             }
             runner.run_gradio_interface(**gradio_kwargs)
             
@@ -356,12 +346,8 @@ async def main() -> None:
                 "server_name": args.host,
                 "server_port": args.port,
                 "share": args.share,
-<<<<<<< HEAD
                 "debug": args.debug,
                 "mcp_server": args.mcp_server
-=======
-                "debug": args.debug
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
             }
             await runner.run_combined(**gradio_kwargs)
             

src/gradio_interface.py

@@ -9,10 +9,7 @@ real-time analysis, confidence visualization, and history tracking.
 import asyncio
 import logging
 import json
-<<<<<<< HEAD
 import os
-=======
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
 from typing import Dict, Any, List, Tuple, Optional
 from datetime import datetime
 import pandas as pd
@@ -27,11 +24,7 @@ except ImportError:
     logging.error("Gradio not available. Install with: pip install gradio")
 
 from .sentiment_analyzer import get_analyzer, SentimentResult, SentimentLabel
-<<<<<<< HEAD
 from .tools import list_tools
-=======
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
-
 
 class SentimentHistory:
     """Manages sentiment analysis history."""
@@ -230,13 +223,10 @@ class GradioInterface:
             def get_backend_info() -> str:
                 return asyncio.run(self._get_backend_info_async())
             
-<<<<<<< HEAD
             def get_mcp_schema() -> str:
                 """Get MCP tools schema as JSON."""
                 return asyncio.run(self._get_mcp_schema_async())
             
-=======
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
             # Example texts
             examples = [
                 "I absolutely love this new feature! It's incredible and makes everything so much easier.",
@@ -504,7 +494,6 @@ class GradioInterface:
             </div>
             """
     
-<<<<<<< HEAD
     async def _get_mcp_schema_async(self) -> str:
         """Get MCP tools schema as formatted JSON."""
         try:
@@ -528,21 +517,16 @@ class GradioInterface:
                 "error_type": type(e).__name__
             }, indent=2)
     
-=======
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
     def launch(self, **kwargs) -> None:
         if not self.interface:
             raise RuntimeError("Interface not initialized")
         
-<<<<<<< HEAD
         # Check for MCP server mode from environment variable or parameter
         mcp_server_enabled = (
             kwargs.get("mcp_server", False) or 
             os.getenv("GRADIO_MCP_SERVER", "").lower() in ("true", "1", "yes", "on")
         )
         
-=======
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
         launch_params = {
             "server_name": "0.0.0.0",
             "server_port": 7860,
@@ -552,7 +536,6 @@ class GradioInterface:
             "quiet": False
         }
         
-<<<<<<< HEAD
         # Add MCP server parameter if enabled
         if mcp_server_enabled:
             launch_params["mcp_server"] = True
@@ -563,11 +546,6 @@ class GradioInterface:
         self.logger.info(f"Launching Gradio interface on {launch_params['server_name']}:{launch_params['server_port']}")
         if mcp_server_enabled:
             self.logger.info("Gradio interface will also serve as MCP server with API endpoints")
-=======
-        launch_params.update(kwargs)
-        
-        self.logger.info(f"Launching Gradio interface on {launch_params['server_name']}:{launch_params['server_port']}")
->>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
         
         try:
             self.interface.launch(**launch_params)