nonebot-plugin-apod 1.3.2__tar.gz → 1.3.3__tar.gz

{nonebot_plugin_apod-1.3.2 → nonebot_plugin_apod-1.3.3}/PKG-INFO

@@ -1,19 +1,20 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-apod
-Version: 1.3.2
+Version: 1.3.3
 Summary: 定时发送 NASA 每日提供的天文图片
 Keywords: nonebot2,NASA
 Author: lyqgzbl
 Author-email: lyqgzbl <admin@lyqgzbl.com>
 License-Expression: MIT
 Requires-Dist: aiofiles>=24.1.0
+Requires-Dist: tzdata>=2024.1
 Requires-Dist: httpx>=0.28.0,<1.0.0
 Requires-Dist: nonebot2>=2.2.1,<3.0.0
 Requires-Dist: nonebot-plugin-argot>=0.2.2
 Requires-Dist: nonebot-plugin-localstore>=0.7.0,<1.0.0
 Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<1.0.0
 Requires-Dist: nonebot-plugin-alconna>=0.57.1,<1.0.0
-Requires-Dist: nonebot-plugin-htmlrender>=0.3.0,<1.0.0
+Requires-Dist: nonebot-plugin-htmlrender>=0.6.7,<0.7.0
 Requires-Python: >=3.10
 Project-URL: Documentation, https://github.com/lyqgzbl/nonebot-plugin-apod#readme
 Project-URL: Homepage, https://github.com/lyqgzbl/nonebot-plugin-apod
@@ -81,11 +82,11 @@ pip install nonebot-plugin-apod
 
 配置方式：直接在 NoneBot 全局配置文件中添加以下配置项即可
 
-### apod_api_key [必填]
+### apod_api_key [直连时必填]
 
 - 类型：`str`
 - 默认值：`None`
-- 说明：用于获取每日天文一图的 [NASA API Key](https://api.nasa.gov/)
+- 说明：用于获取每日天文一图的 [NASA API Key](https://api.nasa.gov/)。配置镜像地址和镜像密钥后可省略；镜像失败后的直连回退使用 `DEMO_KEY`。
 
 ### apod_default_send_time [选填]
 
@@ -159,4 +160,33 @@ pip install nonebot-plugin-apod
 - 默认值：`https://api.openai.com/v1`
 - 说明：OpenAI 兼容接口的 Base API URL（如 DeepSeek 可填 `https://api.deepseek.com`，Qwen 可填 `https://dashscope.aliyuncs.com/compatible-mode/v1`）
 
-> **注**：为保持向后兼容，旧版本的 `apod_qwen_trans`、`apod_qwen_mt_model_name`、`apod_qwen_mt_api_key` 和 `apod_qwen_mt_api_url` 配置项依然生效。
+> **注**：为保持向后兼容，旧版本的 `apod_qwen_trans`、`apod_qwen_mt_model_name`、`apod_qwen_mt_api_key` 和 `apod_qwen_mt_api_url` 配置项依然生效。
+
+## NASA Science 主站迁移
+
+直连使用 `https://science.nasa.gov/wp-json/wp/v2/apod-basic`。插件兼容对象和数组响应，严格匹配日期；集合接口未返回目标日期时，使用同端点下的 `YYMMDD` 日期路径。今日数据和缓存日期以 `America/New_York` 为准。
+
+NASA 图片响应中的 `url` 可能指向文章页，因此插件将 `hdurl` 映射为内部图片 `url`，并将标题、说明和版权中的 HTML 转为纯文本。镜像响应的 `url` 保持不变，继续使用 apod-server 的图片缓存。视频仍提示为天文视频。
+
+新端点的 `count=1` 实测返回最近多条记录，因此随机功能改为在 1995-06-16 至 NASA 当天之间随机选日期，再请求该日期；最多尝试三个日期。今日、指定日期和随机功能均支持镜像优先、NASA 直连回退。
+
+镜像配置示例：
+
+```dotenv
+APOD_MIRROR_URL=https://your-apod-server.example/v1/apod
+APOD_MIRROR_API_KEY=your_server_bearer_key
+```
+
+`APOD_MIRROR_URL` 是完整元数据接口地址，`APOD_MIRROR_API_KEY` 对应服务端 `API_AUTH_KEY`，不等同于 NASA API Key。启用高清原图时仍可能直接访问 NASA 图片 CDN。
+
+
+### htmlrender 版本兼容
+
+当前拼图使用 `md_to_pic` 接口，依赖限制为 `nonebot-plugin-htmlrender>=0.6.7,<0.7.0`。htmlrender 新版更改了公开接口，0.8 已移除该旧接口，不能直接升级到新版。若安装环境出现 `cannot import name 'md_to_pic'`，请在机器人项目中重新解析依赖并同步环境；使用 uv 的项目可执行：
+
+```bash
+uv add "nonebot-plugin-htmlrender>=0.6.7,<0.7.0"
+uv sync
+```
+
+仅更新 APOD 源码不会自动调整已安装依赖。后续若迁移新版 htmlrender，需要同时适配渲染 API、返回值、Provider 和配置。

{nonebot_plugin_apod-1.3.2 → nonebot_plugin_apod-1.3.3}/README.md

@@ -59,11 +59,11 @@ pip install nonebot-plugin-apod
 
 配置方式：直接在 NoneBot 全局配置文件中添加以下配置项即可
 
-### apod_api_key [必填]
+### apod_api_key [直连时必填]
 
 - 类型：`str`
 - 默认值：`None`
-- 说明：用于获取每日天文一图的 [NASA API Key](https://api.nasa.gov/)
+- 说明：用于获取每日天文一图的 [NASA API Key](https://api.nasa.gov/)。配置镜像地址和镜像密钥后可省略；镜像失败后的直连回退使用 `DEMO_KEY`。
 
 ### apod_default_send_time [选填]
 
@@ -137,4 +137,33 @@ pip install nonebot-plugin-apod
 - 默认值：`https://api.openai.com/v1`
 - 说明：OpenAI 兼容接口的 Base API URL（如 DeepSeek 可填 `https://api.deepseek.com`，Qwen 可填 `https://dashscope.aliyuncs.com/compatible-mode/v1`）
 
-> **注**：为保持向后兼容，旧版本的 `apod_qwen_trans`、`apod_qwen_mt_model_name`、`apod_qwen_mt_api_key` 和 `apod_qwen_mt_api_url` 配置项依然生效。
+> **注**：为保持向后兼容，旧版本的 `apod_qwen_trans`、`apod_qwen_mt_model_name`、`apod_qwen_mt_api_key` 和 `apod_qwen_mt_api_url` 配置项依然生效。
+
+## NASA Science 主站迁移
+
+直连使用 `https://science.nasa.gov/wp-json/wp/v2/apod-basic`。插件兼容对象和数组响应，严格匹配日期；集合接口未返回目标日期时，使用同端点下的 `YYMMDD` 日期路径。今日数据和缓存日期以 `America/New_York` 为准。
+
+NASA 图片响应中的 `url` 可能指向文章页，因此插件将 `hdurl` 映射为内部图片 `url`，并将标题、说明和版权中的 HTML 转为纯文本。镜像响应的 `url` 保持不变，继续使用 apod-server 的图片缓存。视频仍提示为天文视频。
+
+新端点的 `count=1` 实测返回最近多条记录，因此随机功能改为在 1995-06-16 至 NASA 当天之间随机选日期，再请求该日期；最多尝试三个日期。今日、指定日期和随机功能均支持镜像优先、NASA 直连回退。
+
+镜像配置示例：
+
+```dotenv
+APOD_MIRROR_URL=https://your-apod-server.example/v1/apod
+APOD_MIRROR_API_KEY=your_server_bearer_key
+```
+
+`APOD_MIRROR_URL` 是完整元数据接口地址，`APOD_MIRROR_API_KEY` 对应服务端 `API_AUTH_KEY`，不等同于 NASA API Key。启用高清原图时仍可能直接访问 NASA 图片 CDN。
+
+
+### htmlrender 版本兼容
+
+当前拼图使用 `md_to_pic` 接口，依赖限制为 `nonebot-plugin-htmlrender>=0.6.7,<0.7.0`。htmlrender 新版更改了公开接口，0.8 已移除该旧接口，不能直接升级到新版。若安装环境出现 `cannot import name 'md_to_pic'`，请在机器人项目中重新解析依赖并同步环境；使用 uv 的项目可执行：
+
+```bash
+uv add "nonebot-plugin-htmlrender>=0.6.7,<0.7.0"
+uv sync
+```
+
+仅更新 APOD 源码不会自动调整已安装依赖。后续若迁移新版 htmlrender，需要同时适配渲染 API、返回值、Provider 和配置。

{nonebot_plugin_apod-1.3.2 → nonebot_plugin_apod-1.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-apod"
-version = "1.3.2"
+version = "1.3.3"
 description = "定时发送 NASA 每日提供的天文图片"
 readme = "README.md"
 authors = [{ name = "lyqgzbl", email = "admin@lyqgzbl.com" }]
@@ -9,13 +9,14 @@ keywords = ["nonebot2", "NASA"]
 requires-python = ">=3.10"
 dependencies = [
   "aiofiles>=24.1.0",
+  "tzdata>=2024.1",
   "httpx >=0.28.0, <1.0.0",
   "nonebot2 >=2.2.1, <3.0.0",
   "nonebot-plugin-argot >=0.2.2",
   "nonebot-plugin-localstore >=0.7.0, <1.0.0",
   "nonebot-plugin-apscheduler >=0.5.0, <1.0.0",
   "nonebot-plugin-alconna >=0.57.1, <1.0.0",
-  "nonebot-plugin-htmlrender >=0.3.0, <1.0.0",
+  "nonebot-plugin-htmlrender >=0.6.7, <0.7.0",
 ]
 
 [project.urls]

{nonebot_plugin_apod-1.3.2 → nonebot_plugin_apod-1.3.3}/src/nonebot_plugin_apod/__init__.py

@@ -47,7 +47,7 @@ __plugin_meta__ = PluginMetadata(
     supported_adapters=inherit_supported_adapters("nonebot_plugin_alconna"),
     extra={
         "author": "lyqgzbl <admin@lyqgzbl.com>",
-        "version": "1.3.2",
+        "version": "1.3.3",
     },
 )
 
@@ -60,15 +60,15 @@ apod_cache_json = store.get_plugin_cache_file("apod.json")
 task_config_file = store.get_plugin_data_file("apod_task_config.json")
 
 
-if not plugin_config.apod_api_key:
+if not (plugin_config.apod_api_key or (mirror_url and mirror_api_key)):
     logger.opt(colors=True).warning(
-        "<yellow>缺失必要配置项 'apod_api_key'，已禁用该插件</yellow>"
+        "<yellow>未配置 NASA API Key 或完整镜像配置，已禁用该插件</yellow>"
     )
 
 
 def is_enable() -> Rule:
     def _rule() -> bool:
-        return bool(plugin_config.apod_api_key)
+        return bool(plugin_config.apod_api_key or (mirror_url and mirror_api_key))
 
     return Rule(_rule)
 

nonebot_plugin_apod-1.3.3/src/nonebot_plugin_apod/nasa.py

@@ -0,0 +1,113 @@
+"""Normalize NASA Science data to the plugin's existing APOD contract."""
+
+import re
+from datetime import date, datetime
+from html.parser import HTMLParser
+from urllib.parse import urlsplit
+from zoneinfo import ZoneInfo
+
+NASA_API_URL = "https://science.nasa.gov/wp-json/wp/v2/apod-basic"
+
+
+def nasa_today() -> date:
+    return datetime.now(ZoneInfo("America/New_York")).date()
+
+
+class _Text(HTMLParser):
+    def __init__(self):
+        super().__init__(convert_charrefs=True)
+        self.parts: list[str] = []
+        self.hidden = 0
+
+    def handle_starttag(self, tag, attrs):
+        if tag in {"script", "style", "noscript"}:
+            self.hidden += 1
+        if tag in {"p", "br", "div"}:
+            self.parts.append(" ")
+
+    def handle_endtag(self, tag):
+        if tag in {"script", "style", "noscript"} and self.hidden:
+            self.hidden -= 1
+        if tag in {"p", "div"}:
+            self.parts.append(" ")
+
+    def handle_data(self, data):
+        if not self.hidden:
+            self.parts.append(data)
+
+
+def plain_text(value: object) -> str:
+    if not isinstance(value, str):
+        return ""
+    parser = _Text()
+    parser.feed(value)
+    return " ".join("".join(parser.parts).split())
+
+
+def valid_media(
+    value: object, permalink: object = None, *, allow_article: bool = False
+) -> bool:
+    if (
+        not isinstance(value, str)
+        or not value.strip()
+        or (not allow_article and value == permalink)
+    ):
+        return False
+    try:
+        url = urlsplit(value)
+        return (
+            url.scheme in {"http", "https"}
+            and bool(url.hostname)
+            and url.username is None
+            and not (
+                not allow_article
+                and url.hostname == "science.nasa.gov"
+                and url.path.startswith("/image-article/")
+            )
+        )
+    except ValueError:
+        return False
+
+
+def normalize_apod(payload: object, expected_date: str, *, nasa: bool) -> dict | None:
+    records = payload if isinstance(payload, list) else [payload]
+    for record in records:
+        if not isinstance(record, dict) or record.get("date") != expected_date:
+            continue
+        result = _normalize_record(record, nasa=nasa)
+        if result is not None:
+            return result
+    return None
+
+
+def _normalize_record(record: dict, *, nasa: bool) -> dict | None:
+    kind = record.get("media_type")
+    media = record.get("hdurl") if nasa and kind == "image" else record.get("url")
+    if kind not in {"image", "video"} or not valid_media(
+        media, record.get("permalink"), allow_article=kind == "video"
+    ):
+        return None
+    title = plain_text(record.get("title")) if nasa else record.get("title")
+    explanation = record.get("explanation")
+    if nasa:
+        explanation = plain_text(explanation)
+        explanation = re.sub(r"^Explanation:\s*", "", explanation, flags=re.I)
+        explanation = re.split(
+            r"APOD['’]s (?:email for image submissions|main NASA site)"
+            r"|Tomorrow['’]s picture:",
+            explanation,
+            maxsplit=1,
+            flags=re.I,
+        )[0].strip()
+    if not isinstance(title, str) or not title.strip():
+        return None
+    if not isinstance(explanation, str) or not explanation.strip():
+        return None
+    result = dict(record, title=title, explanation=explanation, url=media)
+    if nasa:
+        result["copyright"] = plain_text(record.get("copyright"))
+        result["service_version"] = "v1"
+        result.pop("basic_html", None)
+    if kind == "image" and not valid_media(result.get("hdurl")):
+        result["hdurl"] = media
+    return result

{nonebot_plugin_apod-1.3.2 → nonebot_plugin_apod-1.3.3}/src/nonebot_plugin_apod/utils.py

@@ -4,7 +4,7 @@ import random
 import hashlib
 import asyncio
 import contextlib
-from datetime import datetime
+from datetime import date as calendar_date, datetime, timedelta
 from typing import Any
 
 import httpx
@@ -14,13 +14,13 @@ from nonebot import get_driver
 import nonebot_plugin_localstore as store
 
 from .config import plugin_config
+from .nasa import NASA_API_URL, nasa_today, normalize_apod
 
 nasa_api_key = plugin_config.apod_api_key
 baidu_trans = plugin_config.apod_baidu_trans
 deepl_trans = plugin_config.apod_deepl_trans
 openai_trans = plugin_config.apod_openai_trans or plugin_config.apod_qwen_trans
 apod_infopuzzle = plugin_config.apod_infopuzzle
-NASA_API_URL = "https://api.nasa.gov/planetary/apod"
 baidu_trans_appid = plugin_config.apod_baidu_trans_appid
 DEEPL_API_URL = "https://api-free.deepl.com/v2/translate"
 deepl_trans_api_key = plugin_config.apod_deepl_trans_api_key
@@ -103,9 +103,9 @@ async def ensure_apod_data() -> bool:
         try:
             content = apod_cache_json.read_text(encoding="utf-8")
             data = json.loads(content)
-            cached_date = data.get("date", "")
-            today = datetime.now().strftime("%Y-%m-%d")
-            if cached_date == today:
+            cached_date = data.get("date", "") if isinstance(data, dict) else ""
+            today = nasa_today().isoformat()
+            if isinstance(data, dict) and cached_date == today:
                 return True
             logger.debug(f"天文一图数据缓存过期（{cached_date}）,将重新获取")
         except (json.JSONDecodeError, KeyError, OSError) as e:
@@ -267,55 +267,54 @@ async def translate_text_auto(text: str, timeout: int = 8) -> str:
 
 
 async def fetch_apod_data() -> bool:
-    try:
-        client = get_httpx_client()
-        response = await client.get(NASA_API_URL, params={"api_key": nasa_api_key})
-        response.raise_for_status()
-        data = response.json()
-        async with aiofiles.open(apod_cache_json, "w", encoding="utf-8") as f:
-            await f.write(json.dumps(data, indent=4))
-        return True
-    except (httpx.RequestError, httpx.HTTPStatusError) as e:
-        logger.error(f"获取 NASA 每日天文一图数据时发生错误: {e}")
+    data = await fetch_apod_data_by_date(nasa_today().isoformat())
+    if data is None:
         return False
+    async with aiofiles.open(apod_cache_json, "w", encoding="utf-8") as f:
+        await f.write(json.dumps(data, indent=4))
+    return True
 
 
 async def fetch_apod_data_by_date(date: str) -> dict | None:
     try:
+        parsed_date = calendar_date.fromisoformat(date)
         client = get_httpx_client()
+        params = {"api_key": nasa_api_key or "DEMO_KEY", "date": date}
+        response = await client.get(NASA_API_URL, params=params)
+        response.raise_for_status()
+        data = normalize_apod(response.json(), date, nasa=True)
+        if data is not None:
+            return data
+        # The collection endpoint currently ignores some date queries. Its
+        # date-specific route returns the requested historical entry directly.
         response = await client.get(
-            NASA_API_URL,
-            params={"api_key": nasa_api_key, "date": date},
+            f"{NASA_API_URL}/{parsed_date.strftime('%y%m%d')}",
+            params={"api_key": nasa_api_key or "DEMO_KEY"},
         )
         response.raise_for_status()
-        data = response.json()
-        if isinstance(data, dict):
-            return data
-        if isinstance(data, list) and len(data) > 0:
-            return data[0]
-        return None
-    except (httpx.RequestError, httpx.HTTPStatusError) as e:
+        return normalize_apod(response.json(), date, nasa=True)
+    except (httpx.RequestError, httpx.HTTPStatusError, ValueError) as e:
         logger.error(f"获取 NASA 指定日期天文一图数据时发生错误: {e}")
         return None
 
 
 async def fetch_randomly_apod_data() -> dict | None:
-    try:
-        client = get_httpx_client()
-        response = await client.get(
-            NASA_API_URL,
-            params={"api_key": nasa_api_key, "count": 1},
-        )
-        response.raise_for_status()
-        data = response.json()
-        if isinstance(data, list) and len(data) > 0:
-            return data[0]
-        if isinstance(data, dict):
+    # Do not rely on count: NASA currently returns its latest collection even
+    # for count=1. Sample a date across the full APOD archive instead.
+    first = calendar_date(1995, 6, 16)
+    span = (nasa_today() - first).days
+    for _ in range(3):
+        selected = (first + timedelta(days=random.randint(0, span))).isoformat()
+        if mirror_url and mirror_api_key:
+            data = await fetch_apod_data_by_date_from_mirror(
+                mirror_url, mirror_api_key, selected
+            )
+            if data is not None:
+                return data
+        data = await fetch_apod_data_by_date(selected)
+        if data is not None:
             return data
-        return None
-    except (httpx.RequestError, httpx.HTTPStatusError) as e:
-        logger.error(f"获取 NASA 随机天文一图数据时发生错误: {e}")
-        return None
+    return None
 
 
 async def fetch_apod_data_from_mirror(url: str, api_key: str) -> bool:
@@ -324,12 +323,17 @@ async def fetch_apod_data_from_mirror(url: str, api_key: str) -> bool:
         headers = {"Authorization": f"Bearer {api_key}"}
         response = await client.get(url, headers=headers)
         response.raise_for_status()
-        data = response.json()
+        payload = response.json()
+        # The mirror may intentionally serve its latest cached day.
+        date = payload.get("date") if isinstance(payload, dict) else None
+        data = normalize_apod(payload, date, nasa=False) if date else None
+        if data is None:
+            return False
         async with aiofiles.open(apod_cache_json, "w", encoding="utf-8") as f:
             await f.write(json.dumps(data, indent=4))
         logger.debug("成功通过镜像获取天文一图数据")
         return True
-    except (httpx.RequestError, httpx.HTTPStatusError) as e:
+    except (httpx.RequestError, httpx.HTTPStatusError, ValueError) as e:
         logger.error(f"通过镜像获取天文一图数据时发生错误: {e}")
         return False
 
@@ -346,9 +350,8 @@ async def fetch_apod_data_by_date_from_mirror(
             params={"date": date},
         )
         response.raise_for_status()
-        data = response.json()
-        return data
-    except (httpx.RequestError, httpx.HTTPStatusError) as e:
+        return normalize_apod(response.json(), date, nasa=False)
+    except (httpx.RequestError, httpx.HTTPStatusError, ValueError) as e:
         logger.error(f"通过镜像获取指定日期天文一图数据时发生错误: {e}")
         return None