google-news-trends-mcp 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

google_news_trends_mcp/cli.py

@@ -82,17 +82,10 @@ def topic(topic, period, max_results, no_nlp):
 @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(
-    "--max-results",
-    "max_results",
-    type=int,
-    default=100,
-    help="Maximum number of results to return.",
-)
-def trending(geo, full_data, max_results):
+def trending(geo, full_data):
     # Browser not used for Google Trends
     async def _trending():
-        trending_terms = await get_trending_terms(geo=geo, full_data=full_data, max_results=max_results)
+        trending_terms = await get_trending_terms(geo=geo, full_data=full_data)
         if trending_terms:
             print("Trending terms:")
             for term in trending_terms:

google_news_trends_mcp/news.py

@@ -14,7 +14,7 @@ import newspaper  # newspaper4k
 from googlenewsdecoder import gnewsdecoder
 import cloudscraper
 from playwright.async_api import async_playwright, Browser, Playwright
-from trendspy import Trends, TrendKeyword
+from trendspy import Trends, TrendKeywordLite
 from typing import Optional, cast, overload, Literal, Awaitable
 from contextlib import asynccontextmanager, AsyncContextDecorator
 import logging
@@ -48,9 +48,6 @@ google_news = GNews(
     # exclude_websites=[],
 )
 
-playwright: Optional[Playwright] = None
-browser: Optional[Browser] = None
-
 ProgressCallback = Callable[[float, Optional[float]], Awaitable[None]]
 
 
@@ -64,14 +61,15 @@ class BrowserManager(AsyncContextDecorator):
         if cls.browser is None:
             async with cls._lock:
                 if cls.browser is None:
-                    await cls._startup()
+                    logger.info("Starting browser...")
+                    try:
+                        cls.playwright = await async_playwright().start()
+                        cls.browser = await cls.playwright.chromium.launch(headless=True)
+                    except Exception as e:
+                        logger.critical("Browser startup failed", exc_info=e)
+                        raise SystemExit(1)
         return cast(Browser, cls.browser)
 
-    @classmethod
-    async def _startup(cls):
-        logger.info("Starting browser...")
-        cls.playwright = await async_playwright().start()
-        cls.browser = await cls.playwright.chromium.launch(headless=True)
 
     @classmethod
     async def _shutdown(cls):
@@ -89,11 +87,11 @@ class BrowserManager(AsyncContextDecorator):
         async def _browser_context_cm():
             browser_inst = await cls._get_browser()
             context = await browser_inst.new_context()
-            logging.debug("Created browser context...")
+            logger.debug("Created browser context...")
             try:
                 yield context
             finally:
-                logging.debug("Closing browser context...")
+                logger.debug("Closing browser context...")
                 await context.close()
 
         return _browser_context_cm()
@@ -119,7 +117,7 @@ async def download_article_with_playwright(url) -> newspaper.Article | None:
             article = newspaper.article(url, input_html=content)
             return article
     except Exception as e:
-        logging.warning(f"Error downloading article with Playwright from {url}\n {e.args}")
+        logger.warning(f"Error downloading article with Playwright from {url}\n {e.args}")
         return None
 
 
@@ -128,18 +126,18 @@ def download_article_with_scraper(url) -> newspaper.Article | None:
     try:
         article = newspaper.article(url)
     except Exception as e:
-        logging.debug(f"Error downloading article with newspaper from {url}\n {e.args}")
+        logger.debug(f"Error downloading article with newspaper from {url}\n {e.args}")
         try:
             # Retry with cloudscraper
             response = scraper.get(url)
             if response.status_code < 400:
                 article = newspaper.article(url, input_html=response.text)
             else:
-                logging.debug(
+                logger.debug(
                     f"Failed to download article with cloudscraper from {url}, status code: {response.status_code}"
                 )
         except Exception as e:
-            logging.debug(f"Error downloading article with cloudscraper from {url}\n {e.args}")
+            logger.debug(f"Error downloading article with cloudscraper from {url}\n {e.args}")
     return article
 
 
@@ -150,10 +148,10 @@ def decode_url(url: str) -> str:
             if decoded_url.get("status"):
                 url = decoded_url["decoded_url"]
             else:
-                logging.debug("Failed to decode Google News RSS link:")
+                logger.debug("Failed to decode Google News RSS link:")
                 return ""
         except Exception as err:
-            logging.warning(f"Error while decoding url {url}\n {err.args}")
+            logger.warning(f"Error while decoding url {url}\n {err.args}")
     return url
 
 
@@ -184,7 +182,7 @@ async def process_gnews_articles(
     for idx, gnews_article in enumerate(gnews_articles):
         article = await download_article(gnews_article["url"])
         if article is None or not article.text:
-            logging.debug(f"Failed to download article from {gnews_article['url']}:\n{article}")
+            logger.debug(f"Failed to download article from {gnews_article['url']}:\n{article}")
             continue
         article.parse()
         if nlp:
@@ -209,7 +207,7 @@ async def get_news_by_keyword(
     google_news.max_results = max_results
     gnews_articles = google_news.get_news(keyword)
     if not gnews_articles:
-        logging.debug(f"No articles found for keyword '{keyword}' in the last {period} days.")
+        logger.debug(f"No articles found for keyword '{keyword}' in the last {period} days.")
         return []
     return await process_gnews_articles(gnews_articles, nlp=nlp, report_progress=report_progress)
 
@@ -227,7 +225,7 @@ async def get_top_news(
     google_news.max_results = max_results
     gnews_articles = google_news.get_top_news()
     if not gnews_articles:
-        logging.debug("No top news articles found.")
+        logger.debug("No top news articles found.")
         return []
     return await process_gnews_articles(gnews_articles, nlp=nlp, report_progress=report_progress)
 
@@ -244,7 +242,7 @@ async def get_news_by_location(
     google_news.max_results = max_results
     gnews_articles = google_news.get_news_by_location(location)
     if not gnews_articles:
-        logging.debug(f"No articles found for location '{location}' in the last {period} days.")
+        logger.debug(f"No articles found for location '{location}' in the last {period} days.")
         return []
     return await process_gnews_articles(gnews_articles, nlp=nlp, report_progress=report_progress)
 
@@ -271,39 +269,39 @@ async def get_news_by_topic(
     google_news.max_results = max_results
     gnews_articles = google_news.get_news_by_topic(topic)
     if not gnews_articles:
-        logging.debug(f"No articles found for topic '{topic}' in the last {period} days.")
+        logger.debug(f"No articles found for topic '{topic}' in the last {period} days.")
         return []
     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
+    geo: str = "US", full_data: Literal[False] = False
 ) -> 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]:
+    geo: str = "US", full_data: Literal[True] = True
+) -> list[TrendKeywordLite]:
     pass
 
 
 async def get_trending_terms(
-    geo: str = "US", full_data: bool = False, max_results: int = 100
-) -> list[dict[str, int]] | list[TrendKeyword]:
+    geo: str = "US", full_data: bool = False
+) -> list[dict[str, int]] | list[TrendKeywordLite]:
     """
     Returns google trends for a specific geo location.
     """
     try:
-        trends = list(tr.trending_now(geo=geo))
-        trends = list(sorted(trends, key=lambda tt: tt.volume, reverse=True))[:max_results]
+        trends = cast(list[TrendKeywordLite], tr.trending_now_by_rss(geo=geo))
+        trends = sorted(trends, key=lambda tt: int(tt.volume[:-1]), reverse=True)
         if not full_data:
             return [{"keyword": trend.keyword, "volume": trend.volume} for trend in trends]
         return trends
     except Exception as e:
-        logging.warning(f"Error fetching trending terms: {e}")
+        logger.warning(f"Error fetching trending terms: {e}")
         return []
 
 
@@ -351,4 +349,4 @@ def save_article_to_json(article: newspaper.Article, filename: str = "") -> None
             filename += ".json"
     with open(filename, "w") as f:
         json.dump(article_data, f, indent=4)
-    logging.debug(f"Article saved to {filename}")
+    logger.debug(f"Article saved to {filename}")

google_news_trends_mcp/server.py

@@ -63,25 +63,16 @@ class TrendingTermArticleOut(BaseModelClean):
 
 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)."),
-    ] = None
-    ended_timestamp: Annotated[
-        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
+    volume: Annotated[Optional[str], Field(description="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
+    link: Annotated[Optional[str], Field(description="URL to more information.")] = None
+    started: Annotated[Optional[int], Field(description="Unix timestamp when the trend started.")] = None
+    picture: Annotated[Optional[str], Field(description="URL to related image.")] = None
+    picture_source: Annotated[Optional[str], Field(description="Source of the picture.")] = 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
 
 
 @asynccontextmanager
@@ -154,6 +145,19 @@ async def summarize_article(article: Article, ctx: Context) -> None:
         article.summary = "No summary available."
 
 
+async def summarize_articles(articles: list[Article], ctx: Context) -> None:
+    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)
+
+
 @mcp.tool(
     description=news.get_news_by_keyword.__doc__,
     tags={"news", "articles", "keyword"},
@@ -185,16 +189,7 @@ async def get_news_by_keyword(
         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 summarize_articles(articles, ctx)
     await ctx.report_progress(progress=len(articles), total=len(articles))
     return [ArticleOut(**a.to_json(False)) for a in articles]
 
@@ -230,16 +225,7 @@ async def get_news_by_location(
         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 summarize_articles(articles, ctx)
     await ctx.report_progress(progress=len(articles), total=len(articles))
     return [ArticleOut(**a.to_json(False)) for a in articles]
 
@@ -272,17 +258,7 @@ async def get_news_by_topic(
         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 summarize_articles(articles, ctx)
     await ctx.report_progress(progress=len(articles), total=len(articles))
     return [ArticleOut(**a.to_json(False)) for a in articles]
 
@@ -313,17 +289,7 @@ async def get_top_news(
         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 summarize_articles(articles, ctx)
     await ctx.report_progress(progress=len(articles), total=len(articles))
     return [ArticleOut(**a.to_json(False)) for a in articles]
 
@@ -335,14 +301,18 @@ async def get_trending_terms(
         bool,
         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,
 ) -> list[TrendingTermOut]:
     if not full_data:
-        trends = await news.get_trending_terms(geo=geo, full_data=False, max_results=max_results)
+        trends = await news.get_trending_terms(geo=geo, full_data=False)
         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]
+    trends = await news.get_trending_terms(geo=geo, full_data=True)
+    trends_out = []
+    for trend in trends:
+        trend = trend.__dict__
+        if 'news' in trend:
+            trend["news"] = [TrendingTermArticleOut(**article.__dict__) for article in trend["news"]]
+        trends_out.append(TrendingTermOut(**trend))
+    return trends_out
 
 
 def main():

{google_news_trends_mcp-0.2.0.dist-info → google_news_trends_mcp-0.2.2.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: google-news-trends-mcp
-Version: 0.2.0
-Summary: An MCP server to access Google News and Google Trends.
+Version: 0.2.2
+Summary: An MCP server to access RSS feeds of Google News and Google Trends
 Author-email: Jesse Manek <jesse.manek@gmail.com>
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/jmanek/google-news-trends-mcp
@@ -27,11 +27,11 @@ Dynamic: license-file
 
 # Google News Trends MCP
 
-An MCP server to access Google News and Google Trends.  Does not rely on any paid APIs.  
+An MCP server to access RSS feeds of Google News and Google Trends.
 
 ## Features
 
-- Search Google News articles based on keyword, location, topic
+- Search Google News RSS feeds for articles based on keyword, location, topic
 - Get top news stories from Google News
 - Google Trends keywords based on location
 - Optional LLM Sampling and NLP to summarize articles and extract keywords

google_news_trends_mcp-0.2.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+google_news_trends_mcp/__init__.py,sha256=nDWNd6_TSf4vDQuHVBoAf4QfZCB3ZUFQ0M7XvifNJ-g,78
+google_news_trends_mcp/__main__.py,sha256=ysiAk_xpnnW3lrLlzdIQQa71tuGBRT8WocbecBsY2Fs,87
+google_news_trends_mcp/cli.py,sha256=IZ4UdAQ-tBnfutLcd3lGwsukpkYbdaJyuXZf7vddfLs,4383
+google_news_trends_mcp/news.py,sha256=pTAUTrM8Rkp8GaTPOLOo7BkFx9mePdQeCON7C6Q32aA,12489
+google_news_trends_mcp/server.py,sha256=TYVOnUVFQk2RQTGRVyHqoOMrADlHvFmfkN-0TmsuEO8,13394
+google_news_trends_mcp-0.2.2.dist-info/licenses/LICENSE,sha256=5dsv2ZI5EZIer0a9MktVmILVrlp5vqH_0tPIe3bRLgE,1067
+google_news_trends_mcp-0.2.2.dist-info/METADATA,sha256=W8baSQmZHv8jyLfp3ysVzZuG7zCfK4WU7NlBqGUCRxs,4458
+google_news_trends_mcp-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_news_trends_mcp-0.2.2.dist-info/entry_points.txt,sha256=eVT3xd6YJQgsWAUBwhnffuwhXNF7yyt_uco6fjBy-1o,130
+google_news_trends_mcp-0.2.2.dist-info/top_level.txt,sha256=RFheDbzhNnEV_Y3iFNm7jhRhY1P1wQgfiYqVpXCTD_U,23
+google_news_trends_mcp-0.2.2.dist-info/RECORD,,

google_news_trends_mcp-0.2.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-google_news_trends_mcp/__init__.py,sha256=nDWNd6_TSf4vDQuHVBoAf4QfZCB3ZUFQ0M7XvifNJ-g,78
-google_news_trends_mcp/__main__.py,sha256=ysiAk_xpnnW3lrLlzdIQQa71tuGBRT8WocbecBsY2Fs,87
-google_news_trends_mcp/cli.py,sha256=3Z916898HXTigmQYEfvb7ybfbuUE7bjMC6yjT5-l6u0,4558
-google_news_trends_mcp/news.py,sha256=MPNZlzI7KXkhQ2uj7233N2i9kFHGUgGMdRBCAbj-B44,12471
-google_news_trends_mcp/server.py,sha256=S-tlFY1wiFm9VPeb4NDnV0NGtczaQDmx20kIrZZQHto,15031
-google_news_trends_mcp-0.2.0.dist-info/licenses/LICENSE,sha256=5dsv2ZI5EZIer0a9MktVmILVrlp5vqH_0tPIe3bRLgE,1067
-google_news_trends_mcp-0.2.0.dist-info/METADATA,sha256=rok_3L-eDVXQJSuG6ze1Vuicnh-kpcWyJxaF2DbqZ1s,4454
-google_news_trends_mcp-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_news_trends_mcp-0.2.0.dist-info/entry_points.txt,sha256=eVT3xd6YJQgsWAUBwhnffuwhXNF7yyt_uco6fjBy-1o,130
-google_news_trends_mcp-0.2.0.dist-info/top_level.txt,sha256=RFheDbzhNnEV_Y3iFNm7jhRhY1P1wQgfiYqVpXCTD_U,23
-google_news_trends_mcp-0.2.0.dist-info/RECORD,,