nonebot-plugin-apod 0.0.2__tar.gz → 0.0.4__tar.gz

nonebot_plugin_apod-0.0.4/PKG-INFO

@@ -0,0 +1,85 @@
+Metadata-Version: 2.1
+Name: nonebot-plugin-apod
+Version: 0.0.4
+Summary: 定时发送 NASA 每日提供的天文图片
+Home-page: https://github.com/lyqgzbl/nonebot-plugin-apod
+License: MIT
+Keywords: nonebot2,NASA
+Author: lyqgzbl
+Author-email: admin@lyqgzbl.com
+Requires-Python: >=3.8,<4.0
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: httpx (>=0.28.0,<0.29.0)
+Requires-Dist: nonebot-plugin-alconna (>=0.54.0,<0.55.0)
+Requires-Dist: nonebot-plugin-apscheduler (>=0.5.0,<0.6.0)
+Requires-Dist: nonebot-plugin-localstore (>=0.7.0,<0.8.0)
+Requires-Dist: nonebot-plugin-send-anything-anywhere (>=0.7.0,<0.8.0)
+Requires-Dist: nonebot2 (>=2.2.1,<3.0.0)
+Project-URL: Documentation, https://github.com/lyqgzbl/nonebot-plugin-apod#readme
+Project-URL: Repository, https://github.com/lyqgzbl/nonebot-plugin-apod
+Description-Content-Type: text/markdown
+
+<!-- markdownlint-disable MD033 MD036 MD041 -->
+
+<div align="center">
+
+<a href="https://v2.nonebot.dev/store">
+  <img src="https://raw.githubusercontent.com/A-kirami/nonebot-plugin-template/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo">
+</a>
+
+<p>
+  <img src="https://raw.githubusercontent.com/lgc-NB2Dev/readme/main/template/plugin.svg" alt="NoneBotPluginText">
+</p>
+
+# nonebot-plugin-apod
+
+_✨ 每日天文一图 ✨_
+
+![License](https://img.shields.io/pypi/l/nonebot-plugin-apod)
+![PyPI](https://img.shields.io/pypi/v/nonebot-plugin-apod.svg)
+![Python](https://img.shields.io/badge/python-3.8+-blue.svg)  
+[![NoneBot Registry](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin%2Fnonebot-plugin-apod)](https://registry.nonebot.dev/plugin/nonebot-plugin-apod:nonebot_plugin_apod)
+[![Supported Adapters](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin-adapters%2Fnonebot-plugin-send-anything-anywhere)](https://registry.nonebot.dev/plugin/nonebot-plugin-send-anything-anywhere:nonebot_plugin_saa)
+
+</div>
+
+## 安装
+使用nb-cli [推荐]
+```shell
+nb plugin install nonebot-plugin-apod
+```
+使用pip
+```shell
+pip install nonebot-plugin-apod
+```
+
+## 使用
+命令需要加 [NoneBot 命令前缀](https://nonebot.dev/docs/appendices/config#command-start-和-command-separator) (默认为`/`)  
+命令需要用户为 [SuperUsers](https://nonebot.dev/docs/appendices/config#superusers)  
+使用命令`APOD`/`apod`触发插件  
+命令选项`状态` 查询定时任务状态  
+命令选项`关闭` 关闭定时任务  
+命令选项`开启` 开启定时任务  
+
+## 配置项
+
+配置方式：直接在 NoneBot 全局配置文件中添加以下配置项即可
+
+### apod_api_key [必填]
+
+- 类型：`str`
+- 默认值：`None`
+- 说明：用于获取每日天文一图的 NASA API Key
+
+### apod_default_send_time [选填]
+
+- 类型：`str`
+- 默认值：`13:00`
+- 说明：每日天文一图的默认发送时间

nonebot_plugin_apod-0.0.4/README.md

@@ -0,0 +1,57 @@
+<!-- markdownlint-disable MD033 MD036 MD041 -->
+
+<div align="center">
+
+<a href="https://v2.nonebot.dev/store">
+  <img src="https://raw.githubusercontent.com/A-kirami/nonebot-plugin-template/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo">
+</a>
+
+<p>
+  <img src="https://raw.githubusercontent.com/lgc-NB2Dev/readme/main/template/plugin.svg" alt="NoneBotPluginText">
+</p>
+
+# nonebot-plugin-apod
+
+_✨ 每日天文一图 ✨_
+
+![License](https://img.shields.io/pypi/l/nonebot-plugin-apod)
+![PyPI](https://img.shields.io/pypi/v/nonebot-plugin-apod.svg)
+![Python](https://img.shields.io/badge/python-3.8+-blue.svg)  
+[![NoneBot Registry](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin%2Fnonebot-plugin-apod)](https://registry.nonebot.dev/plugin/nonebot-plugin-apod:nonebot_plugin_apod)
+[![Supported Adapters](https://img.shields.io/endpoint?url=https%3A%2F%2Fnbbdg.lgc2333.top%2Fplugin-adapters%2Fnonebot-plugin-send-anything-anywhere)](https://registry.nonebot.dev/plugin/nonebot-plugin-send-anything-anywhere:nonebot_plugin_saa)
+
+</div>
+
+## 安装
+使用nb-cli [推荐]
+```shell
+nb plugin install nonebot-plugin-apod
+```
+使用pip
+```shell
+pip install nonebot-plugin-apod
+```
+
+## 使用
+命令需要加 [NoneBot 命令前缀](https://nonebot.dev/docs/appendices/config#command-start-和-command-separator) (默认为`/`)  
+命令需要用户为 [SuperUsers](https://nonebot.dev/docs/appendices/config#superusers)  
+使用命令`APOD`/`apod`触发插件  
+命令选项`状态` 查询定时任务状态  
+命令选项`关闭` 关闭定时任务  
+命令选项`开启` 开启定时任务  
+
+## 配置项
+
+配置方式：直接在 NoneBot 全局配置文件中添加以下配置项即可
+
+### apod_api_key [必填]
+
+- 类型：`str`
+- 默认值：`None`
+- 说明：用于获取每日天文一图的 NASA API Key
+
+### apod_default_send_time [选填]
+
+- 类型：`str`
+- 默认值：`13:00`
+- 说明：每日天文一图的默认发送时间

{nonebot_plugin_apod-0.0.2 → nonebot_plugin_apod-0.0.4}/nonebot_plugin_apod/__init__.py

@@ -13,11 +13,11 @@ require("nonebot_plugin_localstore")
 require("nonebot_plugin_apscheduler")
 import nonebot_plugin_localstore as store
 from nonebot_plugin_apscheduler import scheduler
-from nonebot_plugin_alconna import Args, Match, Option, Alconna, CommandMeta, on_alconna
-from nonebot_plugin_saa import SaaTarget, enable_auto_select_bot, PlatformTarget, get_target
+from nonebot_plugin_alconna import Args, Match, Option, Alconna, CommandMeta, on_alconna, UniMessage
+from nonebot_plugin_saa import Text, Image, SaaTarget, enable_auto_select_bot, PlatformTarget, get_target
 
 from .config import Config
-from .apod import send_apod, remove_apod_task, schedule_apod_task
+from .apod import send_apod, remove_apod_task, schedule_apod_task, fetch_apod_data
 
 
 __plugin_meta__ = PluginMetadata(
@@ -35,15 +35,17 @@ __plugin_meta__ = PluginMetadata(
 
 enable_auto_select_bot()
 plugin_config = get_plugin_config(Config)
-if not plugin_config.nasa_api_key:
+apod_cache_image = store.get_plugin_cache_file("apod_image")
+task_config_file = store.get_plugin_data_file("apod_task_config.json")
+if not plugin_config.apod_api_key:
     logger.opt(colors=True).warning("<yellow>缺失必要配置项 'nasa_api_key'，已禁用该插件</yellow>")
 def is_enable() -> Rule:
     def _rule() -> bool:
-        return bool(plugin_config.nasa_api_key)
+        return bool(plugin_config.apod_api_key)
     return Rule(_rule)
 
 
-apod = on_alconna(
+apod_setting = on_alconna(
     Alconna(
         "apod",
         Option("状态|status"),
@@ -67,6 +69,19 @@ apod = on_alconna(
 )
 
 
+apod = on_alconna(
+    Alconna(
+        "今日天文一图",
+        meta=CommandMeta(
+            description="获取今日天文一图",
+            example="/今日天文一图",
+        ),
+    ),
+    rule=is_enable(),
+    use_cmd_start=True,
+)
+
+
 def is_valid_time_format(time_str: str) -> bool:
     if not re.match(r"^\d{1,2}:\d{2}$", time_str):
         return False
@@ -77,19 +92,34 @@ def is_valid_time_format(time_str: str) -> bool:
         return False
 
 
-@apod.assign("status")
+@apod.handle()
+async def apod_handle():
+    if not apod_cache_image.exists():
+        is_image = await fetch_apod_data()
+    else:
+        is_image = True
+    if is_image and apod_cache_image.exists():
+        try:
+            await UniMessage.text("今日天文一图为").image(raw=apod_cache_image.read_bytes()).send(reply_to=True)
+        except Exception as e:
+            logger.error(f"发送天文一图时发生错误：{e}")
+            await apod.finish("发送今日天文一图失败，请稍后再试")
+    else:
+        await apod.finish("今日 NASA 提供的为天文视频")
+
+
+@apod_setting.assign("status")
 async def apod_status(event):
-    task_config_file = store.get_plugin_data_file("apod_task_config.json")
     if not task_config_file.exists():
-        await apod.finish("NASA 每日天文一图定时任务未开启")
+        await apod_setting.finish("NASA 每日天文一图定时任务未开启")
     try:
         with task_config_file.open("r", encoding="utf-8") as f:
             config = json.load(f)
         tasks = config.get("tasks", [])
     except Exception as e:
-        await apod.finish(f"加载任务配置时发生错误：{e}")
+        await apod_setting.finish(f"加载任务配置时发生错误：{e}")
     if not tasks:
-        await apod.finish("NASA 每日天文一图定时任务未开启")
+        await apod_setting.finish("NASA 每日天文一图定时任务未开启")
     current_target = get_target(event)
     for task in tasks:
         target_data = task["target"]
@@ -103,31 +133,31 @@ async def apod_status(event):
                     job.next_run_time.strftime("%Y-%m-%d %H:%M:%S")
                     if job.next_run_time else "未知"
                 )
-                await apod.finish(f"NASA 每日天文一图定时任务已开启 | 下次发送时间: {next_run}")
+                await apod_setting.finish(f"NASA 每日天文一图定时任务已开启 | 下次发送时间: {next_run}")
             else:
-                await apod.finish("NASA 每日天文一图定时任务未开启")
-    await apod.finish("NASA 每日天文一图定时任务未开启")
+                await apod_setting.finish("NASA 每日天文一图定时任务未开启")
+    await apod_setting.finish("NASA 每日天文一图定时任务未开启")
 
 
-@apod.assign("stop")
+@apod_setting.assign("stop")
 async def apod_stop(target: SaaTarget):
     remove_apod_task(target)
-    await apod.finish("已关闭 NASA 每日天文一图定时任务")
+    await apod_setting.finish("已关闭 NASA 每日天文一图定时任务")
 
 
-@apod.assign("start")
+@apod_setting.assign("start")
 async def apod_start(send_time: Match[str], target: SaaTarget):
     if send_time.available:
         time = send_time.result
         if not is_valid_time_format(time):
-            await apod.send("时间格式不正确,请使用 HH:MM 格式")
+            await apod_setting.send("时间格式不正确,请使用 HH:MM 格式")
         try:
             schedule_apod_task(time, target)
-            await apod.send(f"已开启 NASA 每日天文一图定时任务,发送时间为 {time}")
+            await apod_setting.send(f"已开启 NASA 每日天文一图定时任务,发送时间为 {time}")
         except Exception as e:
             logger.error(f"设置 NASA 每日天文一图定时任务时发生错误:{e}")
-            await apod.finish("设置 NASA 每日天文一图定时任务时发生错误")
+            await apod_setting.finish("设置 NASA 每日天文一图定时任务时发生错误")
     else:
-        default_time = plugin_config.default_apod_send_time
+        default_time = plugin_config.apod_default_send_time
         schedule_apod_task(default_time, target)
-        await apod.finish(f"已开启 NASA 每日天文一图定时任务,默认发送时间为 {default_time}")
+        await apod_setting.finish(f"已开启 NASA 每日天文一图定时任务,默认发送时间为 {default_time}")

{nonebot_plugin_apod-0.0.2 → nonebot_plugin_apod-0.0.4}/nonebot_plugin_apod/apod.py

@@ -1,17 +1,19 @@
-import datetime
-import httpx
 import json
-import nonebot_plugin_localstore as store
+import httpx
+import datetime
 
-from nonebot import get_plugin_config, get_bot
 from nonebot.log import logger
+import nonebot_plugin_localstore as store
+from nonebot import get_plugin_config, get_bot
 from nonebot_plugin_apscheduler import scheduler
 from nonebot_plugin_saa import Text, Image, PlatformTarget
+
 from .config import Config
 
 plugin_config = get_plugin_config(Config)
 NASA_API_URL = "https://api.nasa.gov/planetary/apod"
-NASA_API_KEY = plugin_config.nasa_api_key
+NASA_API_KEY = plugin_config.apod_api_key
+apod_cache_image = store.get_plugin_cache_file("apod_image")
 task_config_file = store.get_plugin_data_file("apod_task_config.json")
 
 
@@ -43,31 +45,36 @@ def load_task_configs():
         return []
 
 
-async def fetch_apod_data():
+async def fetch_apod_data() -> bool:
     try:
         async with httpx.AsyncClient() as client:
             response = await client.get(NASA_API_URL, params={"api_key": NASA_API_KEY})
             response.raise_for_status()
-            return response.json()
+            data = response.json()
+            if data.get("media_type") == "image" and "url" in data:
+                image_url = data["url"]
+                image_response = await client.get(image_url)
+                image_response.raise_for_status()
+                apod_cache_image.write_bytes(image_response.content)
+                return True
+            else:
+                return False
     except httpx.RequestError as e:
         logger.error(f"获取 NASA 每日天文一图数据时发生错误: {e}")
-        return None
+        return False
 
 
 async def send_apod(target: PlatformTarget):
-    apod_data = await fetch_apod_data()
-    if apod_data:
-        title = apod_data.get("title", "NASA APOD")
-        url = apod_data.get("url")
+    apod_is_image = await fetch_apod_data()
+    if apod_is_image:
         try:
-            await Image(url).send_to(target, bot=get_bot())
-            await Text(f"链接：{url}").send_to(target, bot=get_bot())
+            await Text("今日天文一图为").send_to(target, bot=get_bot())
+            await Image(str(apod_cache_image)).send_to(target, bot=get_bot())
         except Exception as e:
             logger.error(f"发送 NASA 每日天文一图时发生错误：{e}")
             await Text("发送 NASA 每日天文一图时发生错误").send_to(target, bot=get_bot())
     else:
-        logger.error("无法获取今天的天文图片")
-        await Text("无法获取今天的天文图片。").send_to(target, bot=get_bot())
+        await Text("今日 NASA 提供的为天文视频").send_to(target, bot=get_bot())
 
 
 def schedule_apod_task(send_time: str, target: PlatformTarget):
@@ -118,4 +125,13 @@ try:
             schedule_apod_task(send_time, target)
     logger.debug("已恢复所有 NASA 每日天文一图定时任务")
 except Exception as e:
-    logger.error(f"恢复 NASA 每日天文一图定时任务时发生错误：{e}")
+    logger.error(f"恢复 NASA 每日天文一图定时任务时发生错误：{e}")
+
+
+@scheduler.scheduled_job("cron", hour=13, minute=0, id="clear_apod_cache")
+async def clear_apod_cache():
+    if apod_cache_image.exists():
+        apod_cache_image.unlink()
+        logger.debug("apod缓存图片已清除")
+    else:
+        logger.debug("apod缓存图片不存在")

{nonebot_plugin_apod-0.0.2 → nonebot_plugin_apod-0.0.4}/nonebot_plugin_apod/config.py

@@ -3,5 +3,5 @@ from pydantic import BaseModel
 
 
 class Config(BaseModel):
-    nasa_api_key: Optional[str] = None
-    default_apod_send_time: str = "13:00"
+    apod_api_key: Optional[str] = None
+    apod_default_send_time: str = "13:00"

{nonebot_plugin_apod-0.0.2 → nonebot_plugin_apod-0.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-apod"
-version = "0.0.2"
+version = "0.0.4"
 description = "定时发送 NASA 每日提供的天文图片"
 readme = "README.md"
 authors = ["lyqgzbl <admin@lyqgzbl.com>"]

nonebot_plugin_apod-0.0.2/PKG-INFO

@@ -1,29 +0,0 @@
-Metadata-Version: 2.1
-Name: nonebot-plugin-apod
-Version: 0.0.2
-Summary: 定时发送 NASA 每日提供的天文图片
-Home-page: https://github.com/lyqgzbl/nonebot-plugin-apod
-License: MIT
-Keywords: nonebot2,NASA
-Author: lyqgzbl
-Author-email: admin@lyqgzbl.com
-Requires-Python: >=3.8,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: httpx (>=0.28.0,<0.29.0)
-Requires-Dist: nonebot-plugin-alconna (>=0.54.0,<0.55.0)
-Requires-Dist: nonebot-plugin-apscheduler (>=0.5.0,<0.6.0)
-Requires-Dist: nonebot-plugin-localstore (>=0.7.0,<0.8.0)
-Requires-Dist: nonebot-plugin-send-anything-anywhere (>=0.7.0,<0.8.0)
-Requires-Dist: nonebot2 (>=2.2.1,<3.0.0)
-Project-URL: Documentation, https://github.com/lyqgzbl/nonebot-plugin-apod#readme
-Project-URL: Repository, https://github.com/lyqgzbl/nonebot-plugin-apod
-Description-Content-Type: text/markdown
-
-# nonebot-plugin-apod

nonebot_plugin_apod-0.0.2/README.md

@@ -1 +0,0 @@
-# nonebot-plugin-apod