to pass lint and add log support for multiple tools

Author: BinWang28

.github/workflows/check-leaks.yml

@@ -15,7 +15,6 @@ permissions:
 
 jobs:
   scan:
-    if: github.repository_owner == 'MiroMindAI'
     name: gitleaks
     runs-on: ubuntu-latest
     steps:

.github/workflows/check-pr-title.yml

@@ -2,11 +2,10 @@ name: check-pr-title
 
 on:
   pull_request:
-   types: [opened, synchronize]
+   types: [opened, synchronize, edited]
 
 jobs:
   check-pr-title:
-    if: github.repository_owner == 'MiroMindAI'
     name: Check PR Title
     runs-on: ubuntu-latest
     steps:

.github/workflows/run-ruff.yml

@@ -6,7 +6,6 @@ on:
 
 jobs:
   lint:
-    if: github.repository_owner == 'MiroMindAI'
     name: lint pull request
     runs-on: ubuntu-latest
     steps:

common_benchmark.py

@@ -19,14 +19,20 @@
 from omegaconf import DictConfig, OmegaConf
 
 from utils.eval_utils import verify_answer_for_datasets
-from src.logging.logger import bootstrap_logger, task_logging_context, init_logging_for_benchmark_evaluation
+from src.logging.logger import (
+    bootstrap_logger,
+    task_logging_context,
+    init_logging_for_benchmark_evaluation,
+)
 from config import config_name, config_path
 from src.core.pipeline import (
     create_pipeline_components,
     execute_task_pipeline,
 )
+
 init_logging_for_benchmark_evaluation(print_task_logs=False)
 
+
 class TaskStatus(StrEnum):
     PENDING = "pending"
     RUN_FAILED = "run_failed"
@@ -373,7 +379,7 @@ async def run_parallel_inference(
         async def run_with_semaphore(task):
             async with semaphore:
                 with task_logging_context(task.task_id, self.get_log_dir()):
-                        result = await self.run_single_task(task)
+                    result = await self.run_single_task(task)
                 return result
 
         # Shuffle tasks to avoid order bias and improve balancing

src/logging/logger.py

@@ -8,16 +8,18 @@
 import logging
 from functools import lru_cache
 from pathlib import Path
-from typing import Literal, Dict
+from typing import Literal
 from contextvars import ContextVar
 import hydra
 from rich.console import Console
 from rich.logging import RichHandler
 import asyncio
 import threading
 from contextlib import contextmanager
+
 TASK_CONTEXT_VAR: ContextVar[str | None] = ContextVar("CURRENT_TASK_ID", default=None)
 
+
 class ZMQLogHandler(logging.Handler):
     def __init__(self, addr="tcp://127.0.0.1:6000", tool_name="unknown_tool"):
         super().__init__()
@@ -34,6 +36,7 @@ def emit(self, record):
         except Exception:
             self.handleError(record)
 
+
 async def zmq_log_listener(bind_addr="tcp://127.0.0.1:6000"):
     ctx = zmq.asyncio.Context()
     sock = ctx.socket(zmq.PULL)
@@ -47,23 +50,30 @@ async def zmq_log_listener(bind_addr="tcp://127.0.0.1:6000"):
             task_id, tool_name, msg = raw.split("||", 2)
 
             record = root_logger.makeRecord(
-                name=f'[TOOL] {tool_name}',
+                name=f"[TOOL] {tool_name}",
                 level=logging.INFO,
-                fn="", lno=0, msg=msg, args=(),
-                exc_info=None
+                fn="",
+                lno=0,
+                msg=msg,
+                args=(),
+                exc_info=None,
             )
             record.task_id = task_id
 
             root_logger.handle(record)
         else:
             root_logger.info(raw)
 
+
 def start_zmq_listener():
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
     loop.run_until_complete(zmq_log_listener())
 
-def setup_mcp_logging(level="INFO", addr="tcp://127.0.0.1:6000", tool_name="unknown_tool"):
+
+def setup_mcp_logging(
+    level="INFO", addr="tcp://127.0.0.1:6000", tool_name="unknown_tool"
+):
     root = logging.getLogger()
     root.setLevel(level)
 
@@ -78,29 +88,36 @@ def setup_mcp_logging(level="INFO", addr="tcp://127.0.0.1:6000", tool_name="unkn
             for h in logger.handlers[:]:
                 logger.removeHandler(h)
                 h.close()
-            logger.propagate = True  # 确保冒泡到 root
+            logger.propagate = True  # Ensure bubbling to root
 
     # Re-add the ZMQ handler
     handler = ZMQLogHandler(addr=addr, tool_name=tool_name)
-    handler.setFormatter(logging.Formatter("[TOOL] %(asctime)s %(levelname)s: %(message)s"))
+    handler.setFormatter(
+        logging.Formatter("[TOOL] %(asctime)s %(levelname)s: %(message)s")
+    )
     root.addHandler(handler)
 
+
 def setup_log_record_factory():
     old_factory = logging.getLogRecordFactory()
+
     def record_factory(*args, **kwargs):
         record = old_factory(*args, **kwargs)
         record.task_id = TASK_CONTEXT_VAR.get()
         return record
+
     logging.setLogRecordFactory(record_factory)
 
+
 class TaskFilter(logging.Filter):
     def __init__(self, task_id: str):
         super().__init__()
         self.task_id = task_id
-    
+
     def filter(self, record: logging.LogRecord) -> bool:
         return getattr(record, "task_id", None) == self.task_id
 
+
 def make_task_logger(task_id: str, log_dir: Path) -> logging.Handler:
     log_dir.mkdir(parents=True, exist_ok=True)
     file_path = log_dir / f"task_{task_id}.log"
@@ -111,9 +128,10 @@ def make_task_logger(task_id: str, log_dir: Path) -> logging.Handler:
     logging.getLogger().addHandler(fh)
     return fh
 
+
 def remove_all_console_handlers():
     """
-    移除当前进程中所有 logger 上的 console handler (StreamHandler/RichHandler)。
+    Remove all console handlers (StreamHandler/RichHandler) from all loggers in the current process.
     """
     for name, logger in logging.Logger.manager.loggerDict.items():
         if isinstance(logger, logging.Logger):
@@ -134,6 +152,7 @@ def remove_all_console_handlers():
         root_logger.removeHandler(h)
         h.close()
 
+
 @contextmanager
 def task_logging_context(task_id: str, log_dir: Path):
     token = TASK_CONTEXT_VAR.set(task_id)
@@ -145,21 +164,25 @@ def task_logging_context(task_id: str, log_dir: Path):
         logging.getLogger().removeHandler(handler)
         handler.close()
 
+
 def init_logging_for_benchmark_evaluation(print_task_logs=False):
-    threading.Thread(target=start_zmq_listener, daemon=True).start() #monitoring tool logs
-    logging.basicConfig(handlers=[]) 
+    threading.Thread(
+        target=start_zmq_listener, daemon=True
+    ).start()  # monitoring tool logs
+    logging.basicConfig(handlers=[])
     setup_log_record_factory()
     if not print_task_logs:
-        remove_all_console_handlers()  
+        remove_all_console_handlers()
+
 
 @lru_cache
 def bootstrap_logger(
     level: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] | int = "INFO",
     logger_name: str = "miroflow",
     logger: logging.Logger | None = None,
-    log_dir: str | Path | None = None,   # 日志存储目录
-    log_filename: str = "miroflow.log",  # 默认日志文件名
-    to_console: bool = True,             # 是否显示到 console
+    log_dir: str | Path | None = None,  # Log storage directory
+    log_filename: str = "miroflow.log",  # Default log filename
+    to_console: bool = True,  # Whether to display to console
 ) -> logging.Logger:
     """Configure only this logger, not the root logger"""
     if logger is None:
@@ -173,7 +196,7 @@ def bootstrap_logger(
             console=Console(
                 stderr=True,
                 width=200,
-                color_system=None,   
+                color_system=None,
                 force_terminal=False,
                 legacy_windows=False,
             ),
@@ -191,9 +214,9 @@ def bootstrap_logger(
         log_dir.mkdir(parents=True, exist_ok=True)
         file_path = log_dir / log_filename
         file_handler = logging.FileHandler(file_path, encoding="utf-8")
-        file_handler.setFormatter(logging.Formatter(
-            "%(asctime)s [%(levelname)s] %(name)s: %(message)s"
-        ))
+        file_handler.setFormatter(
+            logging.Formatter("%(asctime)s [%(levelname)s] %(name)s: %(message)s")
+        )
         logger.addHandler(file_handler)
 
     logger.setLevel(level)

src/tool/manager.py

@@ -20,15 +20,20 @@
 
 R = TypeVar("R")
 
-def update_server_params_with_context_var(server_params: StdioServerParameters) -> StdioServerParameters:
+
+def update_server_params_with_context_var(
+    server_params: StdioServerParameters,
+) -> StdioServerParameters:
     """
     Update the server params with the context var.
     """
     from src.logging.logger import TASK_CONTEXT_VAR
+
     if TASK_CONTEXT_VAR.get() is not None:
         server_params.env["TASK_ID"] = TASK_CONTEXT_VAR.get()
     return server_params
 
+
 def with_timeout(timeout_s: float = 300.0):
     """
     Decorator: wraps any *async* function in asyncio.wait_for().
@@ -116,7 +121,9 @@ async def _find_servers_with_tool(self, tool_name):
 
             try:
                 if isinstance(server_params, StdioServerParameters):
-                    async with stdio_client(update_server_params_with_context_var(server_params)) as (read, write):
+                    async with stdio_client(
+                        update_server_params_with_context_var(server_params)
+                    ) as (read, write):
                         async with ClientSession(
                             read, write, sampling_callback=None
                         ) as session:
@@ -176,7 +183,9 @@ async def get_all_tool_definitions(self):
 
             try:
                 if isinstance(server_params, StdioServerParameters):
-                    async with stdio_client(update_server_params_with_context_var(server_params)) as (read, write):
+                    async with stdio_client(
+                        update_server_params_with_context_var(server_params)
+                    ) as (read, write):
                         async with ClientSession(
                             read, write, sampling_callback=None
                         ) as session:
@@ -350,7 +359,9 @@ async def execute_tool_call(self, server_name, tool_name, arguments) -> Any:
             try:
                 result_content = None
                 if isinstance(server_params, StdioServerParameters):
-                    async with stdio_client(update_server_params_with_context_var(server_params)) as (read, write):
+                    async with stdio_client(
+                        update_server_params_with_context_var(server_params)
+                    ) as (read, write):
                         async with ClientSession(
                             read, write, sampling_callback=None
                         ) as session:

src/tool/mcp_servers/audio_mcp_server.py

@@ -14,6 +14,8 @@
 import contextlib
 from mutagen import File as MutagenFile
 import asyncio
+from src.logging.logger import setup_mcp_logging
+
 
 OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
 OPENAI_BASE_URL = os.environ.get("OPENAI_BASE_URL", "https://api.openai.com/v1")
@@ -25,10 +27,10 @@
 )
 
 # Initialize FastMCP server
-from src.logging.logger import setup_mcp_logging
 setup_mcp_logging(tool_name=os.path.basename(__file__))
 mcp = FastMCP("audio-mcp-server")
 
+
 def _get_audio_extension(url: str, content_type: str = None) -> str:
     """
     Determine the appropriate audio file extension from URL or content type.
@@ -290,4 +292,4 @@ async def audio_question_answering(audio_path_or_url: str, question: str) -> str
 
 
 if __name__ == "__main__":
-    mcp.run(transport="stdio",show_banner=False)
+    mcp.run(transport="stdio", show_banner=False)

src/tool/mcp_servers/audio_mcp_server_os.py

@@ -25,12 +25,14 @@
 from fastmcp import FastMCP
 from mutagen import File as MutagenFile
 from openai import OpenAI
+from src.logging.logger import setup_mcp_logging
 
 WHISPER_API_KEY = os.environ.get("WHISPER_API_KEY")
 WHISPER_BASE_URL = os.environ.get("WHISPER_BASE_URL")
 WHISPER_MODEL_NAME = os.environ.get("WHISPER_MODEL_NAME")
 
 # Initialize FastMCP server
+setup_mcp_logging(tool_name=os.path.basename(__file__))
 mcp = FastMCP("audio-mcp-server-os")
 
 
@@ -210,4 +212,4 @@ async def audio_transcription(audio_path_or_url: str) -> str:
 
 
 if __name__ == "__main__":
-    mcp.run(transport="stdio")
+    mcp.run(transport="stdio", show_banner=False)

src/tool/mcp_servers/browser_session.py

@@ -97,4 +97,4 @@ async def test_persistent_session():
 
 
 if __name__ == "__main__":
-    asyncio.run(test_persistent_session(),show_banner=False)
+    asyncio.run(test_persistent_session(), show_banner=False)

src/tool/mcp_servers/python_server.py

@@ -10,6 +10,7 @@
 
 # Initialize FastMCP server
 from src.logging.logger import setup_mcp_logging
+
 setup_mcp_logging(tool_name=os.path.basename(__file__))
 mcp = FastMCP("e2b-python-interpreter")
 
@@ -413,4 +414,4 @@ async def download_file_from_sandbox_to_local(
 
 
 if __name__ == "__main__":
-    mcp.run(transport="stdio",show_banner=False)
+    mcp.run(transport="stdio", show_banner=False)