some cleanup, tweakery

pyproject.toml

@@ -14,6 +14,7 @@ dependencies = [
     "groq>=0.36.0",
     "mcp>=1.20.0",
     "newsapi>=0.1.1",
+    "newsapi-python>=0.2.7",
     "openaq>=0.5.0",
     "python-dotenv>=1.2.1",
     "pytrends>=4.9.2",

src/characters/check_char_init.py

@@ -0,0 +1,55 @@
+import os
+import sys
+import logging
+
+# Add the parent directory of 'src' to sys.path to resolve imports
+sys.path.append('/Users/gboa/cluas/')
+
+# Disable logging for cleaner output
+logging.getLogger().setLevel(logging.CRITICAL)
+
+try:
+    from src.characters.corvus import Corvus
+    from src.characters.crow import Crow
+    from src.characters.magpie import Magpie
+    from src.characters.raven import Raven
+except ImportError as e:
+    print(f"Error importing character classes: {e}")
+    sys.exit(1)
+
+characters = {
+    "Corvus": Corvus,
+    "Crow": Crow,
+    "Magpie": Magpie,
+    "Raven": Raven,
+}
+
+print("--- Initializing Characters ---")
+
+# Set a dummy GROQ_API_KEY for testing purposes if it's not already set
+# This allows the use_groq=True path to be tested without an actual key,
+# but it will still raise an error if the key is explicitly checked for existence
+# in the character's __init__ method (which is good, as it tests that check).
+if "GROQ_API_KEY" not in os.environ:
+    os.environ["GROQ_API_KEY"] = "dummy_key_for_testing"
+
+for name, char_class in characters.items():
+    print(f"Testing {name}...")
+
+    # Test with use_groq=True
+    try:
+        instance = char_class(use_groq=True)
+        print(f"  ✅ {name} (use_groq=True) initialized successfully.")
+    except ValueError as e:
+        print(f"  ❌ {name} (use_groq=True) failed to initialize: {e} (Expected if GROQ_API_KEY is missing or invalid)")
+    except Exception as e:
+        print(f"  ❌ {name} (use_groq=True) failed to initialize with unexpected error: {e}")
+
+    # Test with use_groq=False (Ollama path)
+    try:
+        instance = char_class(use_groq=False)
+        print(f"  ✅ {name} (use_groq=False) initialized successfully.")
+    except Exception as e:
+        print(f"  ❌ {name} (use_groq=False) failed to initialize: {e}")
+
+print("--- Character Initialization Test Complete ---")

src/characters/magpie.py

@@ -4,7 +4,8 @@ import asyncio
 from typing import Optional, List, Dict
 from dotenv import load_dotenv
 from groq import Groq
-from src.cluas_mcp.web.web_search import search_web, find_trending_topics, get_quick_facts
+from src.cluas_mcp.web.web_search import search_web
+from src.cluas_mcp.web.trending import fetch_trends
 
 from src.cluas_mcp.common.paper_memory import PaperMemory
 from src.cluas_mcp.common.observation_memory import ObservationMemory
@@ -17,7 +18,7 @@ class Magpie:
     def __init__(self, use_groq=True, location="Brooklyn, NY"):
         self.name = "Magpie"
         self.use_groq = use_groq
-        self.tools = ["search_web", "find_trending_topics"]
+        self.tools = ["search_web", "fetch_trends"]
         self.trend_memory = TrendMemory()
         self.paper_memory = PaperMemory()
         self.observation_memory = ObservationMemory(location=location)
@@ -51,7 +52,7 @@ You're in a group chat, so keep it fun and engaging!
 
 TOOLS AVAILABLE:
 - search_web: Search the web for current information
-- find_trending_topics: Find what's trending right now
+- fetch_trend_topics: Find what's trending right now
 - get_quick_facts: Get quick facts about any topic
 
 When you need current information or want to share something interesting, use your tools!"""
@@ -135,7 +136,7 @@ When you need current information or want to share something interesting, use yo
             {
                 "type": "function",
                 "function": {
-                    "name": "find_trending_topics",
+                    "name": "fetch_trends",
                     "description": "Find trending topics in a given category",
                     "parameters": {
                         "type": "object",
@@ -197,9 +198,9 @@ When you need current information or want to share something interesting, use yo
                 search_results = await loop.run_in_executor(None, search_web, query)
                 tool_result = self._format_web_search_for_llm(search_results)
             
-            elif tool_name == "find_trending_topics":
+            elif tool_name == "fetch_trends":
                 category = args.get("category", "general")
-                trending_results = await loop.run_in_executor(None, find_trending_topics, category)
+                trending_results = await loop.run_in_executor(None, fetch_trends, category)
                 tool_result = self._format_trending_topics_for_llm(trending_results)
             
             elif tool_name == "get_quick_facts":

src/characters/src/data/memory.json

@@ -0,0 +1 @@
+{}

src/characters/src/data/observations.json

@@ -0,0 +1 @@
+{}

src/cluas_mcp/academic/thing.py

@@ -1,2 +0,0 @@
-from src.cluas_mcp.academic.pubmed import PubMedClient
-print(hasattr(PubMedClient, "fetch_articles"))

src/cluas_mcp/news/news_search_entrypoint.py

@@ -9,3 +9,4 @@ def search_news_entrypoint(query: str, max_results: int = 5) -> dict:
     Uses cascading fallbacks: NewsAPI -> DuckDuckGo -> Google -> Bing -> Mock.
     """
     return search_news(query, max_results)
+

src/cluas_mcp/observation/observation_entrypoint.py

@@ -127,3 +127,4 @@ def analyze_temporal_patterns(obs_type: str, location: Optional[str] = None, day
 #     }
 
 
+

src/cluas_mcp/observation/sunrise_sunset.py

@@ -1,6 +1,7 @@
 from astral import LocationInfo
 from astral.sun import sun
 from datetime import datetime, date
+from typing import Optional
 
 LOCATIONS = {
     "brooklyn": LocationInfo("Brooklyn", "USA", "America/New_York", 40.6782, -73.9442),

src/cluas_mcp/server.py

@@ -6,8 +6,9 @@ from mcp.server.stdio import stdio_server
 from mcp.types import Tool, TextContent
 
 from src.cluas_mcp.academic.academic_search_entrypoint import academic_search
-from src.cluas_mcp.web.web_search import search_web, find_trending_topics, get_quick_facts
-from src.cluas_mcp.news.news_search_entrypoint import search_news, get_environmental_data, verify_claim
+from src.cluas_mcp.web.web_search import search_web
+from src.cluas_mcp.web.trending import fetch_trends
+from src.cluas_mcp.news.news_search_entrypoint import search_news
 from src.cluas_mcp.observation.observation_entrypoint import get_bird_sightings, get_weather_patterns, analyze_temporal_patterns
 
 logging.basicConfig(level=logging.INFO)
@@ -50,7 +51,7 @@ async def list_tools() -> list[Tool]:
             }
         ),
         Tool(
-            name="find_trending_topics",
+            name="fetch_trends",
             description="Find trending topics in a given category",
             inputSchema={
                 "type": "object",
@@ -216,9 +217,9 @@ async def call_tool(tool_name: str, arguments: dict) -> list[TextContent]:
         formatted = format_web_search_results(results)
         return [TextContent(type="text", text=formatted)]
     
-    elif tool_name == "find_trending_topics":
+    elif tool_name == "fetch_trends":
         category = arguments.get("category", "general")
-        results = await loop.run_in_executor(None, find_trending_topics, category)
+        results = await loop.run_in_executor(None, fetch_trends, category)
         formatted = format_trending_topics(results)
         return [TextContent(type="text", text=formatted)]
     

src/cluas_mcp/tools.py

@@ -1,20 +0,0 @@
-def search_academic_papers(
-    query: str,
-    topic: str = "corvid",
-    year_range: tuple[int, int] | None = None,
-    sort_by: str = "relevance",
-    max_results: int = 5
-) -> list[dict] | None:
-    """
-    Search academic papers on a given topic using arXiv and fallback APIs.
-
-    Args:
-        query: Search terms (e.g., "tool use in crows").
-        topic: Domain of interest (e.g., "corvid", "conservation").
-        year_range: Optional (start_year, end_year) filter.
-        sort_by: Sort results by "relevance" or "date".
-        max_results: Maximum number of results to return.
-
-    Returns:
-        List of paper metadata (dicts) or None if no results.
-    """

src/cluas_mcp/web/web_search.py

@@ -74,72 +74,4 @@ def _mock_search_web(query: str) -> dict:
         "total_results": 2
     }
 
-def fetch_trending(category: str = "general") -> dict:
-    """
-    Find trending topics in a given category.
-    
-    TODO: Implement full trending topics functionality using a trends API.
-    
-    Args:
-        category: Category to search for trends (e.g., "general", "technology", "science")
-        
-    Returns:
-        Dictionary with trending topics
-    """
-    logger.info("Finding trending topics for category: %s", category)
-    
-    # Mock structured data
-    return {
-        "trending_topics": [
-            {
-                "topic": "Mock Trending Topic 1",
-                "category": category,
-                "trend_score": 95,
-                "description": "This is a mock trending topic. Real implementation would fetch actual trending data."
-            },
-            {
-                "topic": "Mock Trending Topic 2",
-                "category": category,
-                "trend_score": 87,
-                "description": "Another mock trending topic for demonstration purposes."
-            },
-            {
-                "topic": "Mock Trending Topic 3",
-                "category": category,
-                "trend_score": 82,
-                "description": "Third mock trending topic to show structure."
-            }
-        ],
-        "category": category
-    }
-
-def get_quick_facts(topic: str) -> dict:
-    """
-    Get quick facts about a topic.
-    
-    TODO: Implement full quick facts functionality using a knowledge API.
-    
-    Args:
-        topic: Topic to get facts about
-        
-    Returns:
-        Dictionary with quick facts
-    """
-    logger.info("Getting quick facts for topic: %s", topic)
-    
-    # Mock structured data
-    return {
-        "topic": topic,
-        "facts": [
-            f"Mock fact 1 about {topic}: This is a placeholder fact that would be replaced with real data in a full implementation.",
-            f"Mock fact 2 about {topic}: Another placeholder fact demonstrating the expected structure.",
-            f"Mock fact 3 about {topic}: A third placeholder fact to show the format."
-        ],
-        "source": "mock_data"
-    }
-
-
-
-
-
 

uv.lock

@@ -341,6 +341,7 @@ dependencies = [
     { name = "groq" },
     { name = "mcp" },
     { name = "newsapi" },
+    { name = "newsapi-python" },
     { name = "openaq" },
     { name = "python-dotenv" },
     { name = "pytrends" },
@@ -365,6 +366,7 @@ requires-dist = [
     { name = "groq", specifier = ">=0.36.0" },
     { name = "mcp", specifier = ">=1.20.0" },
     { name = "newsapi", specifier = ">=0.1.1" },
+    { name = "newsapi-python", specifier = ">=0.2.7" },
     { name = "openaq", specifier = ">=0.5.0" },
     { name = "python-dotenv", specifier = ">=1.2.1" },
     { name = "pytrends", specifier = ">=4.9.2" },
@@ -1156,6 +1158,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/56/70/df0dd31067f03703d06f66b6c3f324915bd43bc8a597ee1a7eef27c9e622/newsapi-0.1.1-py2.py3-none-any.whl", hash = "sha256:baef702f6e29fc2736932858528d94f18b2baaef9d330018ba78369e005e1df4", size = 4127, upload-time = "2017-03-28T22:10:12.306Z" },
 ]
 
+[[package]]
+name = "newsapi-python"
+version = "0.2.7"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "requests" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/f8/4b/12fb9495211fc5a6d3a96968759c1a48444124a1654aaf65d0de80b46794/newsapi-python-0.2.7.tar.gz", hash = "sha256:a4b66d5dd9892198cdaa476f7542f2625cdd218e5e3121c8f880b2ace717a3c2", size = 7485, upload-time = "2023-03-02T13:15:35.89Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/74/47/e3b099102f0c826d37841d2266e19f1568dcf58ba86e4c6948e2a124f91d/newsapi_python-0.2.7-py2.py3-none-any.whl", hash = "sha256:11d34013a24d92ca7b7cbdac84ed2d504862b1e22467bc2a9a6913a70962318e", size = 7942, upload-time = "2023-03-02T13:15:34.475Z" },
+]
+
 [[package]]
 name = "numpy"
 version = "2.3.5"