google-news-trends-mcp 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

google_news_trends_mcp/cli.py

@@ -17,9 +17,7 @@ def cli():
 
 @cli.command(help=get_news_by_keyword.__doc__)
 @click.argument("keyword")
-@click.option(
-    "--period", type=int, default=7, help="Period in days to search for articles."
-)
+@click.option("--period", type=int, default=7, help="Period in days to search for articles.")
 @click.option(
     "--max-results",
     "max_results",
@@ -27,24 +25,16 @@ def cli():
     default=10,
     help="Maximum number of results to return.",
 )
-@click.option(
-    "--no-nlp", is_flag=True, default=False, help="Disable NLP processing for articles."
-)
+@click.option("--no-nlp", is_flag=True, default=False, help="Disable NLP processing for articles.")
 def keyword(keyword, period, max_results, no_nlp):
-    articles = asyncio.run(
-        get_news_by_keyword(
-            keyword, period=period, max_results=max_results, nlp=not no_nlp
-        )
-    )
+    articles = asyncio.run(get_news_by_keyword(keyword, period=period, max_results=max_results, nlp=not no_nlp))
     # asyncio.run(articles)  # Ensure the articles are fetched asynchronously
     print_articles(articles)
 
 
 @cli.command(help=get_news_by_location.__doc__)
 @click.argument("location")
-@click.option(
-    "--period", type=int, default=7, help="Period in days to search for articles."
-)
+@click.option("--period", type=int, default=7, help="Period in days to search for articles.")
 @click.option(
     "--max-results",
     "max_results",
@@ -52,23 +42,15 @@ def keyword(keyword, period, max_results, no_nlp):
     default=10,
     help="Maximum number of results to return.",
 )
-@click.option(
-    "--no-nlp", is_flag=True, default=False, help="Disable NLP processing for articles."
-)
+@click.option("--no-nlp", is_flag=True, default=False, help="Disable NLP processing for articles.")
 def location(location, period, max_results, no_nlp):
-    articles = asyncio.run(
-        get_news_by_location(
-            location, period=period, max_results=max_results, nlp=not no_nlp
-        )
-    )
+    articles = asyncio.run(get_news_by_location(location, period=period, max_results=max_results, nlp=not no_nlp))
     print_articles(articles)
 
 
 @cli.command(help=get_news_by_topic.__doc__)
 @click.argument("topic")
-@click.option(
-    "--period", type=int, default=7, help="Period in days to search for articles."
-)
+@click.option("--period", type=int, default=7, help="Period in days to search for articles.")
 @click.option(
     "--max-results",
     "max_results",
@@ -76,23 +58,15 @@ def location(location, period, max_results, no_nlp):
     default=10,
     help="Maximum number of results to return.",
 )
-@click.option(
-    "--no-nlp", is_flag=True, default=False, help="Disable NLP processing for articles."
-)
+@click.option("--no-nlp", is_flag=True, default=False, help="Disable NLP processing for articles.")
 def topic(topic, period, max_results, no_nlp):
-    articles = asyncio.run(
-        get_news_by_topic(topic, period=period, max_results=max_results, nlp=not no_nlp)
-    )
+    articles = asyncio.run(get_news_by_topic(topic, period=period, max_results=max_results, nlp=not no_nlp))
     print_articles(articles)
 
 
 @cli.command(help=get_trending_terms.__doc__)
-@click.option(
-    "--geo", type=str, default="US", help="Country code, e.g. 'US', 'GB', 'IN', etc."
-)
-@click.option(
-    "--full-data", is_flag=True, default=False, help="Return full data for each trend."
-)
+@click.option("--geo", type=str, default="US", help="Country code, e.g. 'US', 'GB', 'IN', etc.")
+@click.option("--full-data", is_flag=True, default=False, help="Return full data for each trend.")
 @click.option(
     "--max-results",
     "max_results",
@@ -101,9 +75,7 @@ def topic(topic, period, max_results, no_nlp):
     help="Maximum number of results to return.",
 )
 def trending(geo, full_data, max_results):
-    trending_terms = asyncio.run(
-        get_trending_terms(geo=geo, full_data=full_data, max_results=max_results)
-    )
+    trending_terms = asyncio.run(get_trending_terms(geo=geo, full_data=full_data, max_results=max_results))
     if trending_terms:
         print("Trending terms:")
         for term in trending_terms:
@@ -116,9 +88,7 @@ def trending(geo, full_data, max_results):
 
 
 @cli.command(help=get_top_news.__doc__)
-@click.option(
-    "--period", type=int, default=3, help="Period in days to search for top articles."
-)
+@click.option("--period", type=int, default=3, help="Period in days to search for top articles.")
 @click.option(
     "--max-results",
     "max_results",
@@ -126,13 +96,9 @@ def trending(geo, full_data, max_results):
     default=10,
     help="Maximum number of results to return.",
 )
-@click.option(
-    "--no-nlp", is_flag=True, default=False, help="Disable NLP processing for articles."
-)
+@click.option("--no-nlp", is_flag=True, default=False, help="Disable NLP processing for articles.")
 def top(period, max_results, no_nlp):
-    articles = asyncio.run(
-        get_top_news(max_results=max_results, period=period, nlp=not no_nlp)
-    )
+    articles = asyncio.run(get_top_news(max_results=max_results, period=period, nlp=not no_nlp))
     print_articles(articles)
     print(f"Found {len(articles)} top articles.")
 

google_news_trends_mcp/news.py

@@ -17,10 +17,11 @@ import cloudscraper
 from playwright.async_api import async_playwright, Browser, Playwright
 from trendspy import Trends, TrendKeyword
 import click
-from typing import Optional, cast
+from typing import Optional, cast, overload, Literal, Awaitable
 import atexit
 from contextlib import asynccontextmanager
 import logging
+from collections.abc import Callable
 
 logger = logging.getLogger(__name__)
 
@@ -53,6 +54,8 @@ google_news = GNews(
 playwright: Optional[Playwright] = None
 browser: Optional[Browser] = None
 
+ProgressCallback = Callable[[float, Optional[float]], Awaitable[None]]
+
 
 async def startup_browser():
     global playwright, browser
@@ -148,23 +151,33 @@ async def download_article(url: str, nlp: bool = True) -> newspaper.Article | No
 
 
 async def process_gnews_articles(
-    gnews_articles: list[dict], nlp: bool = True
-) -> list["newspaper.Article"]:
+    gnews_articles: list[dict],
+    nlp: bool = True,
+    report_progress: Optional[ProgressCallback] = None,
+) -> list[newspaper.Article]:
     """
     Process a list of Google News articles and download them (async).
+    Optionally report progress via report_progress callback.
     """
     articles = []
-    for gnews_article in gnews_articles:
+    total = len(gnews_articles)
+    for idx, gnews_article in enumerate(gnews_articles):
         article = await download_article(gnews_article["url"], nlp=nlp)
         if article is None or not article.text:
             logging.debug(f"Failed to download article from {gnews_article['url']}:\n{article}")
             continue
         articles.append(article)
+        if report_progress:
+            await report_progress(idx, total)
     return articles
 
 
 async def get_news_by_keyword(
-    keyword: str, period=7, max_results: int = 10, nlp: bool = True
+    keyword: str,
+    period=7,
+    max_results: int = 10,
+    nlp: bool = True,
+    report_progress: Optional[ProgressCallback] = None,
 ) -> list[newspaper.Article]:
     """
     Find articles by keyword using Google News.
@@ -179,12 +192,15 @@ async def get_news_by_keyword(
     if not gnews_articles:
         logging.debug(f"No articles found for keyword '{keyword}' in the last {period} days.")
         return []
-    return await process_gnews_articles(gnews_articles, nlp=nlp)
+    return await process_gnews_articles(gnews_articles, nlp=nlp, report_progress=report_progress)
 
 
 async def get_top_news(
-    period: int = 3, max_results: int = 10, nlp: bool = True
-) -> list["newspaper.Article"]:
+    period: int = 3,
+    max_results: int = 10,
+    nlp: bool = True,
+    report_progress: Optional[ProgressCallback] = None,
+) -> list[newspaper.Article]:
     """
     Get top news stories from Google News.
     period: is the number of days to look back for top articles.
@@ -197,11 +213,15 @@ async def get_top_news(
     if not gnews_articles:
         logging.debug("No top news articles found.")
         return []
-    return await process_gnews_articles(gnews_articles, nlp=nlp)
+    return await process_gnews_articles(gnews_articles, nlp=nlp, report_progress=report_progress)
 
 
 async def get_news_by_location(
-    location: str, period=7, max_results: int = 10, nlp: bool = True
+    location: str,
+    period=7,
+    max_results: int = 10,
+    nlp: bool = True,
+    report_progress: Optional[ProgressCallback] = None,
 ) -> list[newspaper.Article]:
     """Find articles by location using Google News.
     location: is the name of city/state/country
@@ -215,11 +235,15 @@ async def get_news_by_location(
     if not gnews_articles:
         logging.debug(f"No articles found for location '{location}' in the last {period} days.")
         return []
-    return await process_gnews_articles(gnews_articles, nlp=nlp)
+    return await process_gnews_articles(gnews_articles, nlp=nlp, report_progress=report_progress)
 
 
 async def get_news_by_topic(
-    topic: str, period=7, max_results: int = 10, nlp: bool = True
+    topic: str,
+    period=7,
+    max_results: int = 10,
+    nlp: bool = True,
+    report_progress: Optional[ProgressCallback] = None,
 ) -> list[newspaper.Article]:
     """Find articles by topic using Google News.
     topic is one of
@@ -241,7 +265,21 @@ async def get_news_by_topic(
     if not gnews_articles:
         logging.debug(f"No articles found for topic '{topic}' in the last {period} days.")
         return []
-    return await process_gnews_articles(gnews_articles, nlp=nlp)
+    return await process_gnews_articles(gnews_articles, nlp=nlp, report_progress=report_progress)
+
+
+@overload
+async def get_trending_terms(
+    geo: str = "US", full_data: Literal[False] = False, max_results: int = 100
+) -> list[dict[str, int]]:
+    pass
+
+
+@overload
+async def get_trending_terms(
+    geo: str = "US", full_data: Literal[True] = True, max_results: int = 100
+) -> list[TrendKeyword]:
+    pass
 
 
 async def get_trending_terms(
@@ -256,9 +294,7 @@ async def get_trending_terms(
     """
     try:
         trends = list(tr.trending_now(geo=geo))
-        trends = list(sorted(trends, key=lambda tt: tt.volume, reverse=True))[
-            :max_results
-        ]
+        trends = list(sorted(trends, key=lambda tt: tt.volume, reverse=True))[:max_results]
         if not full_data:
             return [{"keyword": trend.keyword, "volume": trend.volume} for trend in trends]
         return trends

google_news_trends_mcp/server.py

@@ -1,123 +1,87 @@
-from fastmcp import FastMCP
+from typing import Annotated, cast, Optional, Any, Literal, TYPE_CHECKING
+from fastmcp import FastMCP, Context
 from fastmcp.exceptions import ToolError
 from fastmcp.server.dependencies import get_context
-from pydantic import BaseModel, Field
-from typing import Optional
-from google_news_trends_mcp import news
-from typing import Annotated
 from fastmcp.server.middleware.timing import TimingMiddleware
 from fastmcp.server.middleware.logging import LoggingMiddleware
 from fastmcp.server.middleware.rate_limiting import RateLimitingMiddleware
 from fastmcp.server.middleware.error_handling import ErrorHandlingMiddleware
+from mcp.types import TextContent
+from pydantic import BaseModel, Field, model_serializer
+from google_news_trends_mcp import news
+from newspaper import settings as newspaper_settings
+from newspaper.article import Article
 
 
-class ArticleOut(BaseModel):
-    read_more_link: Annotated[
-        Optional[str], Field(description="Link to read more about the article.")
-    ] = None
-    language: Annotated[
-        Optional[str], Field(description="Language code of the article.")
-    ] = None
-    meta_img: Annotated[Optional[str], Field(description="Meta image URL.")] = None
-    movies: Annotated[
-        Optional[list[str]], Field(description="List of movie URLs or IDs.")
-    ] = None
-    meta_favicon: Annotated[
-        Optional[str], Field(description="Favicon URL from meta data.")
-    ] = None
-    meta_site_name: Annotated[
-        Optional[str], Field(description="Site name from meta data.")
-    ] = None
+class BaseModelClean(BaseModel):
+    @model_serializer
+    def serializer(self, **kwargs) -> dict[str, Any]:
+        return {
+            field: self.__getattribute__(field)
+            for field in self.model_fields_set
+            if self.__getattribute__(field) is not None
+        }
+
+    if TYPE_CHECKING:
+
+        def model_dump(self, **kwargs) -> dict[str, Any]: ...
+
+
+class ArticleOut(BaseModelClean):
     title: Annotated[str, Field(description="Title of the article.")]
-    authors: Annotated[Optional[list[str]], Field(description="list of authors.")] = (
-        None
-    )
-    publish_date: Annotated[
-        Optional[str], Field(description="Publish date in ISO format.")
-    ] = None
-    top_image: Annotated[Optional[str], Field(description="URL of the top image.")] = (
-        None
-    )
-    images: Annotated[Optional[list[str]], Field(description="list of image URLs.")] = (
-        None
-    )
-    text: Annotated[str, Field(description="Full text of the article.")]
     url: Annotated[str, Field(description="Original article URL.")]
-    summary: Annotated[Optional[str], Field(description="Summary of the article.")] = (
-        None
-    )
-    keywords: Annotated[
-        Optional[list[str]], Field(description="Extracted keywords.")
-    ] = None
-    tags: Annotated[Optional[list[str]], Field(description="Tags for the article.")] = (
-        None
-    )
-    meta_keywords: Annotated[
-        Optional[list[str]], Field(description="Meta keywords from the article.")
-    ] = None
-    meta_description: Annotated[
-        Optional[str], Field(description="Meta description from the article.")
-    ] = None
-    canonical_link: Annotated[
-        Optional[str], Field(description="Canonical link for the article.")
-    ] = None
-    meta_data: Annotated[
-        Optional[dict[str, str | int]], Field(description="Meta data dictionary.")
-    ] = None
-    meta_lang: Annotated[
-        Optional[str], Field(description="Language of the article.")
-    ] = None
-    source_url: Annotated[
-        Optional[str], Field(description="Source URL if different from original.")
-    ] = None
+    read_more_link: Annotated[Optional[str], Field(description="Link to read more about the article.")] = None
+    language: Annotated[Optional[str], Field(description="Language code of the article.")] = None
+    meta_img: Annotated[Optional[str], Field(description="Meta image URL.")] = None
+    movies: Annotated[Optional[list[str]], Field(description="List of movie URLs or IDs.")] = None
+    meta_favicon: Annotated[Optional[str], Field(description="Favicon URL from meta data.")] = None
+    meta_site_name: Annotated[Optional[str], Field(description="Site name from meta data.")] = None
+    authors: Annotated[Optional[list[str]], Field(description="list of authors.")] = None
+    publish_date: Annotated[Optional[str], Field(description="Publish date in ISO format.")] = None
+    top_image: Annotated[Optional[str], Field(description="URL of the top image.")] = None
+    images: Annotated[Optional[list[str]], Field(description="list of image URLs.")] = None
+    text: Annotated[Optional[str], Field(description="Full text of the article.")] = None
+    summary: Annotated[Optional[str], Field(description="Summary of the article.")] = None
+    keywords: Annotated[Optional[list[str]], Field(description="Extracted keywords.")] = None
+    tags: Annotated[Optional[list[str]], Field(description="Tags for the article.")] = None
+    meta_keywords: Annotated[Optional[list[str]], Field(description="Meta keywords from the article.")] = None
+    meta_description: Annotated[Optional[str], Field(description="Meta description from the article.")] = None
+    canonical_link: Annotated[Optional[str], Field(description="Canonical link for the article.")] = None
+    meta_data: Annotated[Optional[dict[str, str | int]], Field(description="Meta data dictionary.")] = None
+    meta_lang: Annotated[Optional[str], Field(description="Language of the article.")] = None
+    source_url: Annotated[Optional[str], Field(description="Source URL if different from original.")] = None
 
 
-class TrendingTermArticleOut(BaseModel):
+class TrendingTermArticleOut(BaseModelClean):
     title: Annotated[str, Field(description="Article title.")] = ""
     url: Annotated[str, Field(description="Article URL.")] = ""
     source: Annotated[Optional[str], Field(description="News source name.")] = None
     picture: Annotated[Optional[str], Field(description="URL to article image.")] = None
-    time: Annotated[
-        Optional[str | int], Field(description="Publication time or timestamp.")
-    ] = None
+    time: Annotated[Optional[str | int], Field(description="Publication time or timestamp.")] = None
     snippet: Annotated[Optional[str], Field(description="Article preview text.")] = None
 
 
-class TrendingTermOut(BaseModel):
+class TrendingTermOut(BaseModelClean):
     keyword: Annotated[str, Field(description="Trending keyword.")]
     volume: Annotated[Optional[int], Field(description="Search volume.")] = None
     geo: Annotated[Optional[str], Field(description="Geographic location code.")] = None
     started_timestamp: Annotated[
         Optional[list],
-        Field(
-            description="When the trend started (year, month, day, hour, minute, second)."
-        ),
+        Field(description="When the trend started (year, month, day, hour, minute, second)."),
     ] = None
     ended_timestamp: Annotated[
-        Optional[tuple[int, int]],
-        Field(
-            description="When the trend ended (year, month, day, hour, minute, second)."
-        ),
-    ] = None
-    volume_growth_pct: Annotated[
-        Optional[float], Field(description="Percentage growth in search volume.")
-    ] = None
-    trend_keywords: Annotated[
-        Optional[list[str]], Field(description="Related keywords.")
-    ] = None
-    topics: Annotated[
-        Optional[list[str | int]], Field(description="Related topics.")
+        Optional[list],
+        Field(description="When the trend ended (year, month, day, hour, minute, second)."),
     ] = None
+    volume_growth_pct: Annotated[Optional[float], Field(description="Percentage growth in search volume.")] = None
+    trend_keywords: Annotated[Optional[list[str]], Field(description="Related keywords.")] = None
+    topics: Annotated[Optional[list[str | int]], Field(description="Related topics.")] = None
     news: Annotated[
         Optional[list[TrendingTermArticleOut]],
         Field(description="Related news articles."),
     ] = None
-    news_tokens: Annotated[
-        Optional[list], Field(description="Associated news tokens.")
-    ] = None
-    normalized_keyword: Annotated[
-        Optional[str], Field(description="Normalized form of the keyword.")
-    ] = None
+    news_tokens: Annotated[Optional[list], Field(description="Associated news tokens.")] = None
+    normalized_keyword: Annotated[Optional[str], Field(description="Normalized form of the keyword.")] = None
 
 
 mcp = FastMCP(
@@ -132,28 +96,100 @@ mcp.add_middleware(TimingMiddleware())  # Time actual execution
 mcp.add_middleware(LoggingMiddleware())  # Log everything
 
 
+def set_newspaper_article_fields(full_data: bool = False):
+    if full_data:
+        newspaper_settings.article_json_fields = [
+            "url",
+            "read_more_link",
+            "language",
+            "title",
+            "top_image",
+            "meta_img",
+            "images",
+            "movies",
+            "keywords",
+            "keyword_scores",
+            "meta_keywords",
+            "tags",
+            "authors",
+            "publish_date",
+            "summary",
+            "meta_description",
+            "meta_lang",
+            "meta_favicon",
+            "meta_site_name",
+            "canonical_link",
+            "text",
+        ]
+    else:
+        newspaper_settings.article_json_fields = [
+            "url",
+            "title",
+            "publish_date",
+            "summary",
+        ]
+
+
+async def summarize_article(article: Article, ctx: Context) -> None:
+    if article.text:
+        prompt = f"Please provide a concise summary of the following news article:\n\n{article.text}"
+        response = await ctx.sample(prompt)
+        # response = cast(TextContent, response)
+        if isinstance(response, TextContent):
+            if not response.text:
+                await ctx.warning("NLP response is empty. Unable to summarize article.")
+                article.summary = "No summary available."
+            else:
+                article.summary = response.text
+        else:
+            await ctx.warning("NLP response is not a TextContent object. Unable to summarize article.")
+            article.summary = "No summary available."
+    else:
+        article.summary = "No summary available."
+
+
 @mcp.tool(
     description=news.get_news_by_keyword.__doc__,
     tags={"news", "articles", "keyword"},
 )
 async def get_news_by_keyword(
+    ctx: Context,
     keyword: Annotated[str, Field(description="Search term to find articles.")],
-    period: Annotated[
-        int, Field(description="Number of days to look back for articles.", ge=1)
-    ] = 7,
-    max_results: Annotated[
-        int, Field(description="Maximum number of results to return.", ge=1)
-    ] = 10,
-    nlp: Annotated[
-        bool, Field(description="Whether to perform NLP on the articles.")
+    period: Annotated[int, Field(description="Number of days to look back for articles.", ge=1)] = 7,
+    max_results: Annotated[int, Field(description="Maximum number of results to return.", ge=1)] = 10,
+    full_data: Annotated[
+        bool,
+        Field(
+            description="Return full data for each article. If False a summary should be created by setting the summarize flag"
+        ),
+    ] = False,
+    summarize: Annotated[
+        bool,
+        Field(
+            description="Generate a summary of the article, will first try LLM Sampling but if unavailable will use nlp"
+        ),
     ] = True,
 ) -> list[ArticleOut]:
+    set_newspaper_article_fields(full_data)
     articles = await news.get_news_by_keyword(
         keyword=keyword,
         period=period,
         max_results=max_results,
-        nlp=nlp,
+        nlp=False,
+        report_progress=ctx.report_progress,
     )
+    if summarize:
+        total_articles = len(articles)
+        try:
+            for idx, article in enumerate(articles):
+                await summarize_article(article, ctx)
+                await ctx.report_progress(idx, total_articles)
+        except Exception as err:
+            await ctx.debug(f"Failed to use LLM sampling for article summary:\n{err.args}")
+            for idx, article in enumerate(articles):
+                article.nlp()
+                await ctx.report_progress(idx, total_articles)
+    await ctx.report_progress(progress=len(articles), total=len(articles))
     return [ArticleOut(**a.to_json(False)) for a in articles]
 
 
@@ -162,98 +198,147 @@ async def get_news_by_keyword(
     tags={"news", "articles", "location"},
 )
 async def get_news_by_location(
+    ctx: Context,
     location: Annotated[str, Field(description="Name of city/state/country.")],
-    period: Annotated[
-        int, Field(description="Number of days to look back for articles.", ge=1)
-    ] = 7,
-    max_results: Annotated[
-        int, Field(description="Maximum number of results to return.", ge=1)
-    ] = 10,
-    nlp: Annotated[
-        bool, Field(description="Whether to perform NLP on the articles.")
+    period: Annotated[int, Field(description="Number of days to look back for articles.", ge=1)] = 7,
+    max_results: Annotated[int, Field(description="Maximum number of results to return.", ge=1)] = 10,
+    full_data: Annotated[
+        bool,
+        Field(
+            description="Return full data for each article. If False a summary should be created by setting the summarize flag"
+        ),
+    ] = False,
+    summarize: Annotated[
+        bool,
+        Field(
+            description="Generate a summary of the article, will first try LLM Sampling but if unavailable will use nlp"
+        ),
     ] = True,
 ) -> list[ArticleOut]:
+    set_newspaper_article_fields(full_data)
     articles = await news.get_news_by_location(
         location=location,
         period=period,
         max_results=max_results,
-        nlp=nlp,
+        nlp=False,
+        report_progress=ctx.report_progress,
     )
+    if summarize:
+        total_articles = len(articles)
+        try:
+            for idx, article in enumerate(articles):
+                await summarize_article(article, ctx)
+                await ctx.report_progress(idx, total_articles)
+        except Exception as err:
+            await ctx.debug(f"Failed to use LLM sampling for article summary:\n{err.args}")
+            for idx, article in enumerate(articles):
+                article.nlp()
+                await ctx.report_progress(idx, total_articles)
+    await ctx.report_progress(progress=len(articles), total=len(articles))
     return [ArticleOut(**a.to_json(False)) for a in articles]
 
 
-@mcp.tool(
-    description=news.get_news_by_topic.__doc__, tags={"news", "articles", "topic"}
-)
+@mcp.tool(description=news.get_news_by_topic.__doc__, tags={"news", "articles", "topic"})
 async def get_news_by_topic(
+    ctx: Context,
     topic: Annotated[str, Field(description="Topic to search for articles.")],
-    period: Annotated[
-        int, Field(description="Number of days to look back for articles.", ge=1)
-    ] = 7,
-    max_results: Annotated[
-        int, Field(description="Maximum number of results to return.", ge=1)
-    ] = 10,
-    nlp: Annotated[
-        bool, Field(description="Whether to perform NLP on the articles.")
+    period: Annotated[int, Field(description="Number of days to look back for articles.", ge=1)] = 7,
+    max_results: Annotated[int, Field(description="Maximum number of results to return.", ge=1)] = 10,
+    full_data: Annotated[
+        bool,
+        Field(
+            description="Return full data for each article. If False a summary should be created by setting the summarize flag"
+        ),
+    ] = False,
+    summarize: Annotated[
+        bool,
+        Field(
+            description="Generate a summary of the article, will first try LLM Sampling but if unavailable will use nlp"
+        ),
     ] = True,
 ) -> list[ArticleOut]:
+    set_newspaper_article_fields(full_data)
     articles = await news.get_news_by_topic(
         topic=topic,
         period=period,
         max_results=max_results,
-        nlp=nlp,
+        nlp=False,
+        report_progress=ctx.report_progress,
     )
+    if summarize:
+        total_articles = len(articles)
+        try:
+            for idx, article in enumerate(articles):
+                await summarize_article(article, ctx)
+                await ctx.report_progress(idx, total_articles)
+        except Exception as err:
+            await ctx.debug(f"Failed to use LLM sampling for article summary:\n{err.args}")
+            for idx, article in enumerate(articles):
+                article.nlp()
+                await ctx.report_progress(idx, total_articles)
+
+    await ctx.report_progress(progress=len(articles), total=len(articles))
     return [ArticleOut(**a.to_json(False)) for a in articles]
 
 
 @mcp.tool(description=news.get_top_news.__doc__, tags={"news", "articles", "top"})
 async def get_top_news(
-    period: Annotated[
-        int, Field(description="Number of days to look back for top articles.", ge=1)
-    ] = 3,
-    max_results: Annotated[
-        int, Field(description="Maximum number of results to return.", ge=1)
-    ] = 10,
-    nlp: Annotated[
-        bool, Field(description="Whether to perform NLP on the articles.")
+    ctx: Context,
+    period: Annotated[int, Field(description="Number of days to look back for top articles.", ge=1)] = 3,
+    max_results: Annotated[int, Field(description="Maximum number of results to return.", ge=1)] = 10,
+    full_data: Annotated[
+        bool,
+        Field(
+            description="Return full data for each article. If False a summary should be created by setting the summarize flag"
+        ),
+    ] = False,
+    summarize: Annotated[
+        bool,
+        Field(
+            description="Generate a summary of the article, will first try LLM Sampling but if unavailable will use nlp"
+        ),
     ] = True,
 ) -> list[ArticleOut]:
+    set_newspaper_article_fields(full_data)
     articles = await news.get_top_news(
         period=period,
         max_results=max_results,
-        nlp=nlp,
+        nlp=False,
+        report_progress=ctx.report_progress,
     )
+    if summarize:
+        total_articles = len(articles)
+        try:
+            for idx, article in enumerate(articles):
+                await summarize_article(article, ctx)
+                await ctx.report_progress(idx, total_articles)
+        except Exception as err:
+            await ctx.debug(f"Failed to use LLM sampling for article summary:\n{err.args}")
+            for idx, article in enumerate(articles):
+                article.nlp()
+                await ctx.report_progress(idx, total_articles)
+
+    await ctx.report_progress(progress=len(articles), total=len(articles))
     return [ArticleOut(**a.to_json(False)) for a in articles]
 
 
-@mcp.tool(
-    description=news.get_trending_terms.__doc__, tags={"trends", "google", "trending"}
-)
+@mcp.tool(description=news.get_trending_terms.__doc__, tags={"trends", "google", "trending"})
 async def get_trending_terms(
-    geo: Annotated[
-        str, Field(description="Country code, e.g. 'US', 'GB', 'IN', etc.")
-    ] = "US",
+    geo: Annotated[str, Field(description="Country code, e.g. 'US', 'GB', 'IN', etc.")] = "US",
     full_data: Annotated[
         bool,
-        Field(
-            description="Return full data for each trend. Should be False for most use cases."
-        ),
+        Field(description="Return full data for each trend. Should be False for most use cases."),
     ] = False,
-    max_results: Annotated[
-        int, Field(description="Maximum number of results to return.", ge=1)
-    ] = 100,
+    max_results: Annotated[int, Field(description="Maximum number of results to return.", ge=1)] = 100,
 ) -> list[TrendingTermOut]:
-    trends = await news.get_trending_terms(
-        geo=geo, full_data=full_data, max_results=max_results
-    )
+
     if not full_data:
-        # Only return keyword and volume fields
-        return [
-            TrendingTermOut(keyword=tt["keyword"], volume=tt["volume"]) for tt in trends
-        ]
-    else:
-        # Assume each tt is a TrendingTerm object
-        return [TrendingTermOut(**tt.__dict__) for tt in trends]
+        trends = await news.get_trending_terms(geo=geo, full_data=False, max_results=max_results)
+        return [TrendingTermOut(keyword=str(tt["keyword"]), volume=tt["volume"]) for tt in trends]
+
+    trends = await news.get_trending_terms(geo=geo, full_data=True, max_results=max_results)
+    return [TrendingTermOut(**tt.__dict__) for tt in trends]
+
 
 def main():
     mcp.run()

{google_news_trends_mcp-0.1.6.dist-info → google_news_trends_mcp-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-news-trends-mcp
-Version: 0.1.6
+Version: 0.1.8
 Summary: An MCP server to access Google News and Google Trends.
 Author-email: Jesse Manek <jesse.manek@gmail.com>
 License-Expression: MIT
@@ -30,14 +30,13 @@ Dynamic: license-file
 # Google News Trends MCP
 
 An MCP server to access Google News and Google Trends.  Does not rely on any paid APIs.  
-The returned data currently uses a lot of tokens, so it is recommended to always use limits when making requests.  
 
 ## Features
 
 - Search Google News articles based on keyword, location, topic
 - Get top news stories from Google News
 - Google Trends keywords base on location
-- Optional NLP to summarize articles and extract keywords
+- Optional LLM Sampling and NLP to summarize articles and extract keywords
 
 ## Installation
 
@@ -71,7 +70,7 @@ Add to your Claude settings:
   "mcpServers": {
     "google-news-trends": {
       "command": "uvx",
-      "args": ["google-news-trends-mcp"]
+      "args": ["google-news-trends-mcp@latest"]
     }
   }
 }
@@ -104,7 +103,7 @@ Add to your Claude settings:
     "servers": {
       "google-news-trends": {
         "command": "uvx",
-        "args": ["google-news-trends-mcp"]
+        "args": ["google-news-trends-mcp@latest"]
       }
     }
   }

google_news_trends_mcp-0.1.8.dist-info/RECORD

@@ -0,0 +1,11 @@
+google_news_trends_mcp/__init__.py,sha256=J9O5WNvC9cNDaxecveSUvzLGOXOYO-pCHbiGopfYoIc,76
+google_news_trends_mcp/__main__.py,sha256=ysiAk_xpnnW3lrLlzdIQQa71tuGBRT8WocbecBsY2Fs,87
+google_news_trends_mcp/cli.py,sha256=-Cith02x6-9o91rXpgMM0lrhArPDMB9d3h8AAE1rimw,3959
+google_news_trends_mcp/news.py,sha256=Anxs65Fxq1Qz_tkmVyTDY3Fn-I0dv0xR3ipDrLBc6gw,12851
+google_news_trends_mcp/server.py,sha256=promIVXRcd1ZUSgFClZ73l2scXlsS-joRHv1AZs73SE,14946
+google_news_trends_mcp-0.1.8.dist-info/licenses/LICENSE,sha256=5dsv2ZI5EZIer0a9MktVmILVrlp5vqH_0tPIe3bRLgE,1067
+google_news_trends_mcp-0.1.8.dist-info/METADATA,sha256=j0yuLLp3OaCYS07o-Q5vNVs3xCk5HHAMcGVUn7kT2TI,4495
+google_news_trends_mcp-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_news_trends_mcp-0.1.8.dist-info/entry_points.txt,sha256=eVT3xd6YJQgsWAUBwhnffuwhXNF7yyt_uco6fjBy-1o,130
+google_news_trends_mcp-0.1.8.dist-info/top_level.txt,sha256=RFheDbzhNnEV_Y3iFNm7jhRhY1P1wQgfiYqVpXCTD_U,23
+google_news_trends_mcp-0.1.8.dist-info/RECORD,,

google_news_trends_mcp-0.1.6.dist-info/RECORD

@@ -1,11 +0,0 @@
-google_news_trends_mcp/__init__.py,sha256=J9O5WNvC9cNDaxecveSUvzLGOXOYO-pCHbiGopfYoIc,76
-google_news_trends_mcp/__main__.py,sha256=ysiAk_xpnnW3lrLlzdIQQa71tuGBRT8WocbecBsY2Fs,87
-google_news_trends_mcp/cli.py,sha256=XJNnRVpDXX2MCb8dPfDcQJWYYA4CxTuxbhvpJGeVQgs,4133
-google_news_trends_mcp/news.py,sha256=FYz1guxLZThMmh_9uN3VcdHBjLHZF5brhk7Bw7QxeDo,11780
-google_news_trends_mcp/server.py,sha256=MdEWk9QVark4z00UlTIckdAM3hPW7eRQgZRZ2h8WUPk,9363
-google_news_trends_mcp-0.1.6.dist-info/licenses/LICENSE,sha256=5dsv2ZI5EZIer0a9MktVmILVrlp5vqH_0tPIe3bRLgE,1067
-google_news_trends_mcp-0.1.6.dist-info/METADATA,sha256=HewouWHDlGkCPzEM_Nq7_s2KE66FVvtLLdHYToz9WgE,4580
-google_news_trends_mcp-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_news_trends_mcp-0.1.6.dist-info/entry_points.txt,sha256=eVT3xd6YJQgsWAUBwhnffuwhXNF7yyt_uco6fjBy-1o,130
-google_news_trends_mcp-0.1.6.dist-info/top_level.txt,sha256=RFheDbzhNnEV_Y3iFNm7jhRhY1P1wQgfiYqVpXCTD_U,23
-google_news_trends_mcp-0.1.6.dist-info/RECORD,,