mars-cmbagent 2.2.0__tar.gz → 2.2.1__tar.gz

{mars_cmbagent-2.2.0/mars_cmbagent.egg-info → mars_cmbagent-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mars_cmbagent
-Version: 2.2.0
+Version: 2.2.1
 Summary: MARS CMBAgent — multi-agent system for autonomous discovery, powered by ag2. Built on the open-source CMBAgents/cmbagent core.
 Maintainer-email: MARS Team <cmbagent@infosys.com>
 License-Expression: Apache-2.0
@@ -21,6 +21,10 @@ Requires-Dist: jsonref==1.1.0
 Requires-Dist: pydantic>=2.7.4
 Requires-Dist: aiohttp>=3.9.0
 Requires-Dist: pandas>=2.2
+Requires-Dist: structlog>=24.0
+Requires-Dist: duckduckgo-search>=4.0.0
+Requires-Dist: ddgs>=6.0.0
+Requires-Dist: feedparser>=6.0.11
 Requires-Dist: ipython
 Requires-Dist: torch
 Provides-Extra: tracing
@@ -39,9 +43,6 @@ Requires-Dist: langchain-openai>=0.1.0; extra == "tools"
 Requires-Dist: langchain-anthropic>=0.1.0; extra == "tools"
 Requires-Dist: langchain-google-genai>=1.0.0; extra == "tools"
 Requires-Dist: crewai[tools]>=0.1.0; extra == "tools"
-Requires-Dist: duckduckgo-search>=4.0.0; extra == "tools"
-Requires-Dist: ddgs>=6.0.0; extra == "tools"
-Requires-Dist: feedparser>=6.0.11; extra == "tools"
 Requires-Dist: wikipedia>=1.4.0; extra == "tools"
 Requires-Dist: arxiv>=2.0.0; extra == "tools"
 Requires-Dist: markdownify>=1.0.0; extra == "tools"

{mars_cmbagent-2.2.0 → mars_cmbagent-2.2.1}/cmbagent/external_tools/__init__.py

@@ -48,13 +48,18 @@ from .news_tools import (
     announcements_noauth,
     curated_ai_sources_catalog,
     curated_ai_sources_search,
-    newsapi_search,
-    gnews_search,
     multi_engine_web_search,
     scrape_official_news_pages,
     verify_url,
     verify_reference_links,
 )
+from .user_tools import (
+    register_tool,
+    register_callable,
+    register_mcp_server,
+    load_tools_from_config,
+    list_user_tools,
+)
 
 # New AG2 native interoperability functions
 try:
@@ -93,16 +98,21 @@ __all__ = [
     'get_langchain_web_tools',
     'get_langchain_code_tools',
 
-    # News and announcement tools
+    # Free news and announcement tools (no API key required)
     'announcements_noauth',
     'curated_ai_sources_catalog',
     'curated_ai_sources_search',
-    'newsapi_search',
-    'gnews_search',
     'multi_engine_web_search',
     'scrape_official_news_pages',
     'verify_url',
     'verify_reference_links',
+
+    # User tool onboarding (plain functions, MCP servers, config file)
+    'register_tool',
+    'register_callable',
+    'register_mcp_server',
+    'load_tools_from_config',
+    'list_user_tools',
 ]
 
 # Add AG2 native interop functions if available

{mars_cmbagent-2.2.0 → mars_cmbagent-2.2.1}/cmbagent/external_tools/ag2_free_tools.py

@@ -21,9 +21,7 @@ from .news_tools import (
     announcements_noauth,
     curated_ai_sources_catalog,
     curated_ai_sources_search,
-    gnews_search,
     multi_engine_web_search,
-    newsapi_search,
     scrape_official_news_pages,
     verify_url,
     verify_reference_links,
@@ -74,7 +72,11 @@ def _build_safe_duckduckgo_tool() -> Any:
                 title = item.get("title") or item.get("url") or "Untitled"
                 url = item.get("url") or ""
                 engine = item.get("engine") or "fallback"
-                lines.append(f"{idx}. [{engine}] {title} - {url}")
+                body = (item.get("body") or "").strip()
+                lines.append(f"{idx}. [{engine}] {title}")
+                lines.append(f"   URL: {url}")
+                if body:
+                    lines.append(f"   Snippet: {body[:400]}")
             return "\n".join(lines)
 
         logger.warning(
@@ -118,11 +120,9 @@ class AG2FreeToolsLoader:
         }
 
     def load_news_tools(self) -> List[Any]:
-        """Load structured news and announcement retrieval tools."""
+        """Load free news and announcement retrieval tools (no API key required)."""
         tools = [
             announcements_noauth,
-            newsapi_search,
-            gnews_search,
             scrape_official_news_pages,
             multi_engine_web_search,
             curated_ai_sources_catalog,
@@ -132,8 +132,6 @@ class AG2FreeToolsLoader:
         ]
         self.loaded_tools['news'] = tools
         logger.info("tool_loaded", tool="Announcements NoAuth")
-        logger.info("tool_loaded", tool="NewsAPI")
-        logger.info("tool_loaded", tool="GNews")
         logger.info("tool_loaded", tool="Official News Pages")
         logger.info("tool_loaded", tool="Multi-Engine Web Search")
         logger.info("tool_loaded", tool="Curated AI Sources Catalog")

{mars_cmbagent-2.2.0 → mars_cmbagent-2.2.1}/cmbagent/external_tools/crewai_tools.py

@@ -2,8 +2,15 @@
 CrewAI free tools integration for CMBAgent.
 
 This module provides access to CrewAI's free tools that don't require API keys.
+
+When ``crewai_tools`` is not installed we log a **single** friendly install hint
+per loader call instead of spamming a separate ``tool_import_failed`` warning
+for every micro-import. Install with::
+
+    pip install mars_cmbagent[tools]     # or: pip install 'crewai[tools]'
 """
 
+import importlib
 import logging
 import structlog
 from typing import List
@@ -12,6 +19,25 @@ from .tool_adapter import AG2ToolAdapter, convert_crewai_tool_to_ag2
 logger = structlog.get_logger(__name__)
 
 
+def _crewai_tools_available() -> bool:
+    """One-shot check: is the ``crewai_tools`` package importable?"""
+    try:
+        importlib.import_module("crewai_tools")
+        return True
+    except ImportError:
+        return False
+
+
+def _log_missing(scope: str) -> None:
+    """Log a single friendly install hint (info level, never warning)."""
+    logger.info(
+        "external_tools_optional_dep_missing",
+        scope=scope,
+        package="crewai_tools",
+        install_hint="pip install mars_cmbagent[tools]",
+    )
+
+
 def get_crewai_free_tools() -> List[AG2ToolAdapter]:
     """
     Get all available free CrewAI tools.
@@ -23,6 +49,10 @@ def get_crewai_free_tools() -> List[AG2ToolAdapter]:
         >>> from cmbagent.external_tools import get_crewai_free_tools
         >>> tools = get_crewai_free_tools()
     """
+    if not _crewai_tools_available():
+        _log_missing("crewai_free_tools")
+        return []
+
     tools = []
 
     try:
@@ -39,7 +69,7 @@ def get_crewai_free_tools() -> List[AG2ToolAdapter]:
             convert_crewai_tool_to_ag2(FileWriteTool()),
         ])
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI file tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="file", error=str(e))
 
     try:
         # Code analysis tools (free)
@@ -53,7 +83,7 @@ def get_crewai_free_tools() -> List[AG2ToolAdapter]:
             convert_crewai_tool_to_ag2(CodeInterpreterTool()),
         ])
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI code tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="code", error=str(e))
 
     try:
         # Web scraping tools (free)
@@ -67,7 +97,7 @@ def get_crewai_free_tools() -> List[AG2ToolAdapter]:
             convert_crewai_tool_to_ag2(WebsiteSearchTool()),
         ])
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI web tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="web", error=str(e))
 
     try:
         # Directory and file search tools (free)
@@ -89,7 +119,7 @@ def get_crewai_free_tools() -> List[AG2ToolAdapter]:
             convert_crewai_tool_to_ag2(MDXSearchTool()),
         ])
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI search tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="search", error=str(e))
 
     try:
         # PDF tools (free)
@@ -97,7 +127,7 @@ def get_crewai_free_tools() -> List[AG2ToolAdapter]:
 
         tools.append(convert_crewai_tool_to_ag2(PDFSearchTool()))
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI PDF tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="pdf", error=str(e))
 
     try:
         # GitHub tools (free with GitHub API)
@@ -105,7 +135,7 @@ def get_crewai_free_tools() -> List[AG2ToolAdapter]:
 
         tools.append(convert_crewai_tool_to_ag2(GithubSearchTool()))
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI GitHub tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="github", error=str(e))
 
     return tools
 
@@ -117,6 +147,10 @@ def get_crewai_file_tools() -> List[AG2ToolAdapter]:
     Returns:
         List of file-related tools
     """
+    if not _crewai_tools_available():
+        _log_missing("crewai_file_tools")
+        return []
+
     tools = []
 
     try:
@@ -134,7 +168,7 @@ def get_crewai_file_tools() -> List[AG2ToolAdapter]:
             convert_crewai_tool_to_ag2(DirectorySearchTool()),
         ])
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI file tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="file", error=str(e))
 
     return tools
 
@@ -146,6 +180,10 @@ def get_crewai_web_tools() -> List[AG2ToolAdapter]:
     Returns:
         List of web-related tools
     """
+    if not _crewai_tools_available():
+        _log_missing("crewai_web_tools")
+        return []
+
     tools = []
 
     try:
@@ -159,7 +197,7 @@ def get_crewai_web_tools() -> List[AG2ToolAdapter]:
             convert_crewai_tool_to_ag2(WebsiteSearchTool()),
         ])
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI web tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="web", error=str(e))
 
     return tools
 
@@ -171,6 +209,10 @@ def get_crewai_code_tools() -> List[AG2ToolAdapter]:
     Returns:
         List of code-related tools
     """
+    if not _crewai_tools_available():
+        _log_missing("crewai_code_tools")
+        return []
+
     tools = []
 
     try:
@@ -184,7 +226,7 @@ def get_crewai_code_tools() -> List[AG2ToolAdapter]:
             convert_crewai_tool_to_ag2(CodeInterpreterTool()),
         ])
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI code tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="code", error=str(e))
 
     return tools
 
@@ -196,6 +238,10 @@ def get_crewai_search_tools() -> List[AG2ToolAdapter]:
     Returns:
         List of search-related tools
     """
+    if not _crewai_tools_available():
+        _log_missing("crewai_search_tools")
+        return []
+
     tools = []
 
     try:
@@ -217,6 +263,6 @@ def get_crewai_search_tools() -> List[AG2ToolAdapter]:
             convert_crewai_tool_to_ag2(PDFSearchTool()),
         ])
     except Exception as e:
-        logger.warning("tool_import_failed", tool="CrewAI search tools", error=str(e))
+        logger.debug("crewai_subtool_import_failed", tool="search", error=str(e))
 
     return tools

mars_cmbagent-2.2.1/cmbagent/external_tools/langchain_tools.py

@@ -0,0 +1,303 @@
+"""
+LangChain free tools integration for CMBAgent.
+
+This module provides access to LangChain's free tools that don't require API keys.
+
+When ``langchain_community`` (or a sub-dep like ``wikipedia`` / ``arxiv``) is not
+installed we log a **single** friendly install hint per loader call instead of
+spamming a separate ``tool_import_failed`` warning for every micro-import.
+
+Install with::
+
+    pip install mars_cmbagent[tools]
+"""
+
+import importlib
+import logging
+import structlog
+from typing import List
+from .tool_adapter import AG2ToolAdapter, convert_langchain_tool_to_ag2
+from .ag2_free_tools import _build_safe_duckduckgo_tool
+
+logger = structlog.get_logger(__name__)
+
+
+def _has_module(name: str) -> bool:
+    """Return True when ``name`` can be imported. Never raises."""
+    try:
+        importlib.import_module(name)
+        return True
+    except ImportError:
+        return False
+
+
+def _langchain_community_available() -> bool:
+    """One-shot check: is ``langchain_community`` importable?"""
+    return _has_module("langchain_community")
+
+
+def _log_missing(scope: str, package: str = "langchain_community") -> None:
+    """Log a single friendly install hint (info level)."""
+    logger.info(
+        "external_tools_optional_dep_missing",
+        scope=scope,
+        package=package,
+        install_hint="pip install mars_cmbagent[tools]",
+    )
+
+
+def get_langchain_free_tools() -> List[AG2ToolAdapter]:
+    """
+    Get all available free LangChain tools.
+
+    Returns:
+        List of AG2ToolAdapter instances for free LangChain tools
+
+    Example:
+        >>> from cmbagent.external_tools import get_langchain_free_tools
+        >>> tools = get_langchain_free_tools()
+    """
+    tools: List[AG2ToolAdapter] = []
+
+    # DuckDuckGo — never depends on langchain_community. Always try.
+    try:
+        ddg_fn = _build_safe_duckduckgo_tool()
+        tools.append(AG2ToolAdapter(
+            tool_name="duckduckgo_search",
+            tool_description="Search the web via DuckDuckGo with multi-engine fallbacks.",
+            tool_function=ddg_fn,
+        ))
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="duckduckgo", error=str(e))
+
+    if not _langchain_community_available():
+        _log_missing("langchain_free_tools")
+        return tools  # DuckDuckGo already added above
+
+    # Wikipedia tool (free) — requires langchain_community + wikipedia
+    if _has_module("wikipedia"):
+        try:
+            from langchain_community.tools import WikipediaQueryRun
+            from langchain_community.utilities import WikipediaAPIWrapper
+            tools.append(convert_langchain_tool_to_ag2(
+                WikipediaQueryRun(api_wrapper=WikipediaAPIWrapper())
+            ))
+        except Exception as e:
+            logger.debug("langchain_subtool_import_failed", tool="wikipedia", error=str(e))
+    else:
+        logger.info(
+            "external_tools_optional_dep_missing",
+            scope="wikipedia_tool",
+            package="wikipedia",
+            install_hint="pip install wikipedia",
+        )
+
+    # ArXiv tool (free) — requires langchain_community + arxiv
+    if _has_module("arxiv"):
+        try:
+            from langchain_community.tools import ArxivQueryRun
+            from langchain_community.utilities import ArxivAPIWrapper
+            tools.append(convert_langchain_tool_to_ag2(
+                ArxivQueryRun(api_wrapper=ArxivAPIWrapper())
+            ))
+        except Exception as e:
+            logger.debug("langchain_subtool_import_failed", tool="arxiv", error=str(e))
+    else:
+        logger.info(
+            "external_tools_optional_dep_missing",
+            scope="arxiv_tool",
+            package="arxiv",
+            install_hint="pip install arxiv",
+        )
+
+    # Python REPL tool (free) — moved to langchain_experimental in newer versions
+    try:
+        from langchain_community.tools import PythonREPLTool
+        tools.append(convert_langchain_tool_to_ag2(PythonREPLTool()))
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="python_repl", error=str(e))
+
+    # File management tools (free — built-in)
+    try:
+        from langchain_community.tools import (
+            ReadFileTool,
+            WriteFileTool,
+            ListDirectoryTool,
+        )
+        tools.extend([
+            convert_langchain_tool_to_ag2(ReadFileTool()),
+            convert_langchain_tool_to_ag2(WriteFileTool()),
+            convert_langchain_tool_to_ag2(ListDirectoryTool()),
+        ])
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="file_management", error=str(e))
+
+    # Shell tool (free but use with caution)
+    try:
+        from langchain_community.tools import ShellTool
+        tools.append(convert_langchain_tool_to_ag2(ShellTool()))
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="shell", error=str(e))
+
+    # JSON tool (free — built-in)
+    try:
+        from langchain_community.tools import JsonGetValueTool, JsonListKeysTool
+        tools.extend([
+            convert_langchain_tool_to_ag2(JsonListKeysTool()),
+            convert_langchain_tool_to_ag2(JsonGetValueTool()),
+        ])
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="json", error=str(e))
+
+    # Requests tools (free — built-in)
+    try:
+        from langchain_community.tools import (
+            RequestsGetTool,
+            RequestsPostTool,
+            RequestsPatchTool,
+            RequestsPutTool,
+            RequestsDeleteTool,
+        )
+        tools.extend([
+            convert_langchain_tool_to_ag2(RequestsGetTool()),
+            convert_langchain_tool_to_ag2(RequestsPostTool()),
+            convert_langchain_tool_to_ag2(RequestsPatchTool()),
+            convert_langchain_tool_to_ag2(RequestsPutTool()),
+            convert_langchain_tool_to_ag2(RequestsDeleteTool()),
+        ])
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="requests", error=str(e))
+
+    logger.info("langchain_tools_loaded", count=len(tools))
+    return tools
+
+
+def get_langchain_search_tools() -> List[AG2ToolAdapter]:
+    """
+    Get LangChain search and research tools.
+
+    Returns:
+        List of search-related tools
+    """
+    tools: List[AG2ToolAdapter] = []
+    try:
+        tools.append(AG2ToolAdapter(
+            tool_name="duckduckgo_search",
+            tool_description="Search the web via DuckDuckGo with multi-engine fallbacks.",
+            tool_function=_build_safe_duckduckgo_tool(),
+        ))
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="duckduckgo", error=str(e))
+
+    if not _langchain_community_available():
+        _log_missing("langchain_search_tools")
+        return tools
+
+    if _has_module("wikipedia"):
+        try:
+            from langchain_community.tools import WikipediaQueryRun
+            from langchain_community.utilities import WikipediaAPIWrapper
+            tools.append(convert_langchain_tool_to_ag2(
+                WikipediaQueryRun(api_wrapper=WikipediaAPIWrapper())
+            ))
+        except Exception as e:
+            logger.debug("langchain_subtool_import_failed", tool="wikipedia", error=str(e))
+
+    if _has_module("arxiv"):
+        try:
+            from langchain_community.tools import ArxivQueryRun
+            from langchain_community.utilities import ArxivAPIWrapper
+            tools.append(convert_langchain_tool_to_ag2(
+                ArxivQueryRun(api_wrapper=ArxivAPIWrapper())
+            ))
+        except Exception as e:
+            logger.debug("langchain_subtool_import_failed", tool="arxiv", error=str(e))
+
+    return tools
+
+
+def get_langchain_file_tools() -> List[AG2ToolAdapter]:
+    """
+    Get LangChain file operation tools.
+
+    Returns:
+        List of file-related tools
+    """
+    if not _langchain_community_available():
+        _log_missing("langchain_file_tools")
+        return []
+
+    tools: List[AG2ToolAdapter] = []
+    try:
+        from langchain_community.tools import (
+            ReadFileTool,
+            WriteFileTool,
+            ListDirectoryTool,
+        )
+        tools.extend([
+            convert_langchain_tool_to_ag2(ReadFileTool()),
+            convert_langchain_tool_to_ag2(WriteFileTool()),
+            convert_langchain_tool_to_ag2(ListDirectoryTool()),
+        ])
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="file", error=str(e))
+    return tools
+
+
+def get_langchain_web_tools() -> List[AG2ToolAdapter]:
+    """
+    Get LangChain web/HTTP request tools.
+
+    Returns:
+        List of web-related tools
+    """
+    if not _langchain_community_available():
+        _log_missing("langchain_web_tools")
+        return []
+
+    tools: List[AG2ToolAdapter] = []
+    try:
+        from langchain_community.tools import (
+            RequestsGetTool,
+            RequestsPostTool,
+            RequestsPatchTool,
+            RequestsPutTool,
+            RequestsDeleteTool,
+        )
+        tools.extend([
+            convert_langchain_tool_to_ag2(RequestsGetTool()),
+            convert_langchain_tool_to_ag2(RequestsPostTool()),
+            convert_langchain_tool_to_ag2(RequestsPatchTool()),
+            convert_langchain_tool_to_ag2(RequestsPutTool()),
+            convert_langchain_tool_to_ag2(RequestsDeleteTool()),
+        ])
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="web", error=str(e))
+    return tools
+
+
+def get_langchain_code_tools() -> List[AG2ToolAdapter]:
+    """
+    Get LangChain code execution tools.
+
+    Returns:
+        List of code-related tools
+    """
+    if not _langchain_community_available():
+        _log_missing("langchain_code_tools")
+        return []
+
+    tools: List[AG2ToolAdapter] = []
+    try:
+        from langchain_community.tools import (
+            PythonREPLTool,
+            ShellTool,
+        )
+        tools.extend([
+            convert_langchain_tool_to_ag2(PythonREPLTool()),
+            convert_langchain_tool_to_ag2(ShellTool()),
+        ])
+    except Exception as e:
+        logger.debug("langchain_subtool_import_failed", tool="code", error=str(e))
+    return tools
+