Denys Kanunnikov commited on
Commit
b2c2818
·
1 Parent(s): b5514e1

fix merge sytax error

Browse files
Files changed (2) hide show
  1. app.py +0 -14
  2. src/gradio_interface.py +0 -22
app.py CHANGED
@@ -253,13 +253,10 @@ Examples:
253
  python app.py --mode test # Run tests
254
  python app.py --mode gradio --port 8080 # Custom port
255
  python app.py --mode gradio --share # Public sharing
256
- <<<<<<< HEAD
257
  python app.py --mode gradio --mcp-server # Gradio with MCP server
258
 
259
  Environment Variables:
260
  GRADIO_MCP_SERVER=true # Enable MCP server in Gradio
261
- =======
262
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
263
  """
264
  )
265
 
@@ -303,15 +300,12 @@ Environment Variables:
303
  help="Enable debug mode"
304
  )
305
 
306
- <<<<<<< HEAD
307
  parser.add_argument(
308
  "--mcp-server",
309
  action="store_true",
310
  help="Enable MCP server functionality in Gradio interface"
311
  )
312
 
313
- =======
314
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
315
  return parser.parse_args()
316
 
317
 
@@ -342,12 +336,8 @@ async def main() -> None:
342
  "server_name": args.host,
343
  "server_port": args.port,
344
  "share": args.share,
345
- <<<<<<< HEAD
346
  "debug": args.debug,
347
  "mcp_server": args.mcp_server
348
- =======
349
- "debug": args.debug
350
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
351
  }
352
  runner.run_gradio_interface(**gradio_kwargs)
353
 
@@ -356,12 +346,8 @@ async def main() -> None:
356
  "server_name": args.host,
357
  "server_port": args.port,
358
  "share": args.share,
359
- <<<<<<< HEAD
360
  "debug": args.debug,
361
  "mcp_server": args.mcp_server
362
- =======
363
- "debug": args.debug
364
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
365
  }
366
  await runner.run_combined(**gradio_kwargs)
367
 
 
253
  python app.py --mode test # Run tests
254
  python app.py --mode gradio --port 8080 # Custom port
255
  python app.py --mode gradio --share # Public sharing
 
256
  python app.py --mode gradio --mcp-server # Gradio with MCP server
257
 
258
  Environment Variables:
259
  GRADIO_MCP_SERVER=true # Enable MCP server in Gradio
 
 
260
  """
261
  )
262
 
 
300
  help="Enable debug mode"
301
  )
302
 
 
303
  parser.add_argument(
304
  "--mcp-server",
305
  action="store_true",
306
  help="Enable MCP server functionality in Gradio interface"
307
  )
308
 
 
 
309
  return parser.parse_args()
310
 
311
 
 
336
  "server_name": args.host,
337
  "server_port": args.port,
338
  "share": args.share,
 
339
  "debug": args.debug,
340
  "mcp_server": args.mcp_server
 
 
 
341
  }
342
  runner.run_gradio_interface(**gradio_kwargs)
343
 
 
346
  "server_name": args.host,
347
  "server_port": args.port,
348
  "share": args.share,
 
349
  "debug": args.debug,
350
  "mcp_server": args.mcp_server
 
 
 
351
  }
352
  await runner.run_combined(**gradio_kwargs)
353
 
src/gradio_interface.py CHANGED
@@ -9,10 +9,7 @@ real-time analysis, confidence visualization, and history tracking.
9
  import asyncio
10
  import logging
11
  import json
12
- <<<<<<< HEAD
13
  import os
14
- =======
15
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
16
  from typing import Dict, Any, List, Tuple, Optional
17
  from datetime import datetime
18
  import pandas as pd
@@ -27,11 +24,7 @@ except ImportError:
27
  logging.error("Gradio not available. Install with: pip install gradio")
28
 
29
  from .sentiment_analyzer import get_analyzer, SentimentResult, SentimentLabel
30
- <<<<<<< HEAD
31
  from .tools import list_tools
32
- =======
33
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
34
-
35
 
36
  class SentimentHistory:
37
  """Manages sentiment analysis history."""
@@ -230,13 +223,10 @@ class GradioInterface:
230
  def get_backend_info() -> str:
231
  return asyncio.run(self._get_backend_info_async())
232
 
233
- <<<<<<< HEAD
234
  def get_mcp_schema() -> str:
235
  """Get MCP tools schema as JSON."""
236
  return asyncio.run(self._get_mcp_schema_async())
237
 
238
- =======
239
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
240
  # Example texts
241
  examples = [
242
  "I absolutely love this new feature! It's incredible and makes everything so much easier.",
@@ -504,7 +494,6 @@ class GradioInterface:
504
  </div>
505
  """
506
 
507
- <<<<<<< HEAD
508
  async def _get_mcp_schema_async(self) -> str:
509
  """Get MCP tools schema as formatted JSON."""
510
  try:
@@ -528,21 +517,16 @@ class GradioInterface:
528
  "error_type": type(e).__name__
529
  }, indent=2)
530
 
531
- =======
532
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
533
  def launch(self, **kwargs) -> None:
534
  if not self.interface:
535
  raise RuntimeError("Interface not initialized")
536
 
537
- <<<<<<< HEAD
538
  # Check for MCP server mode from environment variable or parameter
539
  mcp_server_enabled = (
540
  kwargs.get("mcp_server", False) or
541
  os.getenv("GRADIO_MCP_SERVER", "").lower() in ("true", "1", "yes", "on")
542
  )
543
 
544
- =======
545
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
546
  launch_params = {
547
  "server_name": "0.0.0.0",
548
  "server_port": 7860,
@@ -552,7 +536,6 @@ class GradioInterface:
552
  "quiet": False
553
  }
554
 
555
- <<<<<<< HEAD
556
  # Add MCP server parameter if enabled
557
  if mcp_server_enabled:
558
  launch_params["mcp_server"] = True
@@ -563,11 +546,6 @@ class GradioInterface:
563
  self.logger.info(f"Launching Gradio interface on {launch_params['server_name']}:{launch_params['server_port']}")
564
  if mcp_server_enabled:
565
  self.logger.info("Gradio interface will also serve as MCP server with API endpoints")
566
- =======
567
- launch_params.update(kwargs)
568
-
569
- self.logger.info(f"Launching Gradio interface on {launch_params['server_name']}:{launch_params['server_port']}")
570
- >>>>>>> 6c0a877e212b959072c8948b934d212c97a3c597
571
 
572
  try:
573
  self.interface.launch(**launch_params)
 
9
  import asyncio
10
  import logging
11
  import json
 
12
  import os
 
 
13
  from typing import Dict, Any, List, Tuple, Optional
14
  from datetime import datetime
15
  import pandas as pd
 
24
  logging.error("Gradio not available. Install with: pip install gradio")
25
 
26
  from .sentiment_analyzer import get_analyzer, SentimentResult, SentimentLabel
 
27
  from .tools import list_tools
 
 
 
28
 
29
  class SentimentHistory:
30
  """Manages sentiment analysis history."""
 
223
  def get_backend_info() -> str:
224
  return asyncio.run(self._get_backend_info_async())
225
 
 
226
  def get_mcp_schema() -> str:
227
  """Get MCP tools schema as JSON."""
228
  return asyncio.run(self._get_mcp_schema_async())
229
 
 
 
230
  # Example texts
231
  examples = [
232
  "I absolutely love this new feature! It's incredible and makes everything so much easier.",
 
494
  </div>
495
  """
496
 
 
497
  async def _get_mcp_schema_async(self) -> str:
498
  """Get MCP tools schema as formatted JSON."""
499
  try:
 
517
  "error_type": type(e).__name__
518
  }, indent=2)
519
 
 
 
520
  def launch(self, **kwargs) -> None:
521
  if not self.interface:
522
  raise RuntimeError("Interface not initialized")
523
 
 
524
  # Check for MCP server mode from environment variable or parameter
525
  mcp_server_enabled = (
526
  kwargs.get("mcp_server", False) or
527
  os.getenv("GRADIO_MCP_SERVER", "").lower() in ("true", "1", "yes", "on")
528
  )
529
 
 
 
530
  launch_params = {
531
  "server_name": "0.0.0.0",
532
  "server_port": 7860,
 
536
  "quiet": False
537
  }
538
 
 
539
  # Add MCP server parameter if enabled
540
  if mcp_server_enabled:
541
  launch_params["mcp_server"] = True
 
546
  self.logger.info(f"Launching Gradio interface on {launch_params['server_name']}:{launch_params['server_port']}")
547
  if mcp_server_enabled:
548
  self.logger.info("Gradio interface will also serve as MCP server with API endpoints")
 
 
 
 
 
549
 
550
  try:
551
  self.interface.launch(**launch_params)