Merge pull request #7515 from oobabooga/dev

Merge dev branch
This commit is contained in:
oobabooga
2026-04-23 11:54:23 -03:00
committed by GitHub
+2 -3
View File
@@ -259,10 +259,9 @@ if __name__ == "__main__":
elif (shared.user_data_dir / 'settings.yaml').exists():
settings_file = shared.user_data_dir / 'settings.yaml'
from modules.tool_use import has_mcp_config, load_mcp_tools
from modules.tool_use import has_mcp_config
if has_mcp_config():
logger.warning(f"Loading MCP stdio servers from \"{shared.user_data_dir / 'mcp.json'}\"")
load_mcp_tools('')
logger.warning(f"MCP stdio servers will be loaded from \"{shared.user_data_dir / 'mcp.json'}\"")
if settings_file is not None:
logger.info(f"Loading settings from \"{settings_file}\"")