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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-apod
-Version: 1.3.0
+Version: 1.3.2
 Summary: 定时发送 NASA 每日提供的天文图片
 Keywords: nonebot2,NASA
 Author: lyqgzbl
@@ -8,12 +8,12 @@ Author-email: lyqgzbl <admin@lyqgzbl.com>
 License-Expression: MIT
 Requires-Dist: aiofiles>=24.1.0
 Requires-Dist: httpx>=0.28.0,<1.0.0
-Requires-Dist: pillow>=10.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-Python: >=3.10
 Project-URL: Documentation, https://github.com/lyqgzbl/nonebot-plugin-apod#readme
 Project-URL: Homepage, https://github.com/lyqgzbl/nonebot-plugin-apod

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

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-apod"
-version = "1.3.0"
+version = "1.3.2"
 description = "定时发送 NASA 每日提供的天文图片"
 readme = "README.md"
 authors = [{ name = "lyqgzbl", email = "admin@lyqgzbl.com" }]
@@ -10,12 +10,12 @@ requires-python = ">=3.10"
 dependencies = [
   "aiofiles>=24.1.0",
   "httpx >=0.28.0, <1.0.0",
-  "Pillow >=10.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",
 ]
 
 [project.urls]

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

@@ -10,6 +10,7 @@ from nonebot.plugin import PluginMetadata, inherit_supported_adapters
 require("nonebot_plugin_argot")
 require("nonebot_plugin_alconna")
 require("nonebot_plugin_localstore")
+require("nonebot_plugin_htmlrender")
 require("nonebot_plugin_apscheduler")
 import nonebot_plugin_localstore as store
 from nonebot_plugin_argot import Image, Text
@@ -18,7 +19,7 @@ from nonebot_plugin_argot.extension import ArgotExtension
 from nonebot_plugin_alconna.uniseg import UniMessage, MsgTarget
 from nonebot_plugin_alconna import Args, Match, Option, Alconna, CommandMeta, on_alconna
 
-from .config import Config, plugin_config, get_cache_image, set_cache_image
+from .config import Config, plugin_config, get_cache_image
 from .apod import (
     generate_job_id,
     remove_apod_task,
@@ -46,7 +47,7 @@ __plugin_meta__ = PluginMetadata(
     supported_adapters=inherit_supported_adapters("nonebot_plugin_alconna"),
     extra={
         "author": "lyqgzbl <admin@lyqgzbl.com>",
-        "version": "1.3.0",
+        "version": "1.3.2",
     },
 )
 
@@ -169,10 +170,9 @@ async def apod_command_handle():
                 },
             )
         )
-    cache_image = await get_cache_image() or await generate_apod_image()
+    cache_image = await get_cache_image(generate_apod_image)
     if not cache_image:
         await apod_command.finish("发送今日的天文一图失败")
-    await set_cache_image(cache_image)
     url = data.get("hdurl", data["url"]) if plugin_config.apod_hd_image else data["url"]
     await UniMessage.image(raw=cache_image).send(
         reply_to=True,

{nonebot_plugin_apod-1.3.0 → nonebot_plugin_apod-1.3.2}/src/nonebot_plugin_apod/apod.py

@@ -13,7 +13,7 @@ from nonebot_plugin_alconna.uniseg import MsgTarget, Target, UniMessage
 
 from .infopuzzle import generate_apod_image
 from .utils import translate_text_auto, ensure_apod_data
-from .config import plugin_config, get_cache_image, set_cache_image, clear_cache_image
+from .config import plugin_config, get_cache_image, clear_cache_image
 
 
 driver = get_driver()
@@ -139,14 +139,13 @@ async def send_apod(target: MsgTarget):
             expired_at=timedelta(minutes=2),
         )
         return
-    cache_image = await get_cache_image() or await generate_apod_image()
+    cache_image = await get_cache_image(generate_apod_image)
     if not cache_image:
         await UniMessage.text("发送今日的天文一图失败，请稍后再试。").send(
             target=target,
             bot=bot,
         )
         return
-    await set_cache_image(cache_image)
     url = data.get("hdurl", data["url"]) if plugin_config.apod_hd_image else data["url"]
     message = await UniMessage.image(raw=cache_image).send(
         target=target,

{nonebot_plugin_apod-1.3.0 → nonebot_plugin_apod-1.3.2}/src/nonebot_plugin_apod/config.py

@@ -1,8 +1,10 @@
-from asyncio import Lock
+from collections.abc import Awaitable, Callable
 from pydantic import BaseModel
 
 from nonebot import get_plugin_config
 
+from .singleflight import SingleFlight
+
 
 class Config(BaseModel):
     apod_api_key: str | None = None
@@ -32,25 +34,41 @@ plugin_config = get_plugin_config(Config)
 
 
 # 缓存天文一图图片
-cache_image = None
-cache_lock = Lock()
+cache_image: bytes | None = None
+cache_flight: SingleFlight[bytes | None] = SingleFlight()
+cache_lock = cache_flight
 
 
 # 获取缓存图片
-async def get_cache_image():
-    async with cache_lock:
+async def get_cache_image(
+    generator: Callable[[], Awaitable[bytes | None]] | None = None,
+) -> bytes | None:
+    global cache_image
+    if cache_image is not None:
         return cache_image
 
+    if generator is None:
+        return None
+
+    async def _generate_and_cache() -> bytes | None:
+        global cache_image
+        if cache_image is not None:
+            return cache_image
+        img = await generator()
+        if img:
+            cache_image = img
+        return img
+
+    return await cache_flight.do("apod_image", _generate_and_cache)
+
 
 # 设置缓存图片
-async def set_cache_image(image):
+async def set_cache_image(image: bytes | None):
     global cache_image
-    async with cache_lock:
-        cache_image = image
+    cache_image = image
 
 
 # 清除缓存图片
 async def clear_cache_image():
     global cache_image
-    async with cache_lock:
-        cache_image = None
+    cache_image = None

nonebot_plugin_apod-1.3.2/src/nonebot_plugin_apod/css/dark.css

@@ -0,0 +1,49 @@
+body {
+    font-family: -apple-system, BlinkMacSystemFont, "Microsoft Yahei", "Noto Sans", sans-serif, monospace;
+    line-height: 1.6;
+    margin: 0;
+    padding: 20px;
+    background-color: #1e1e1e;
+    color: #e0e0e0;
+}
+
+.container {
+    max-width: 800px;
+    margin: 0 auto;
+    background: #2c2c2c;
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.4);
+}
+
+h1, h2 {
+    text-align: center;
+}
+
+.image-container {
+    text-align: center;
+    margin: 20px 0;
+}
+
+.image-container img {
+    max-width: 100%;
+    height: auto;
+    border-radius: 8px;
+    border: 1px solid #4a4a4a;
+}
+
+.explanation {
+    text-align: left;
+    font-size: 1.1em;
+    margin: 0;
+}
+
+.info {
+    text-align: left;
+    font-size: 0.9em;
+    color: #a0a0a0;
+}
+
+.info p {
+    margin: 5px 0;
+}

nonebot_plugin_apod-1.3.2/src/nonebot_plugin_apod/css/light.css

@@ -0,0 +1,48 @@
+body {
+    font-family: -apple-system, BlinkMacSystemFont, "Microsoft Yahei", "Noto Sans", sans-serif, monospace;
+    line-height: 1.6;
+    margin: 0;
+    padding: 20px;
+    background-color: #f4f4f4;
+    color: #333;
+}
+
+.container {
+    max-width: 800px;
+    margin: 0 auto;
+    background: #fff;
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
+
+h1, h2 {
+    text-align: center;
+}
+
+.image-container {
+    text-align: center;
+    margin: 20px 0;
+}
+
+.image-container img {
+    max-width: 100%;
+    height: auto;
+    border-radius: 8px;
+}
+
+.explanation {
+    text-align: left;
+    font-size: 1.1em;
+    margin: 0;
+}
+
+.info {
+    text-align: left;
+    font-size: 0.9em;
+    color: #555;
+}
+
+.info p {
+    margin: 5px 0;
+}

nonebot_plugin_apod-1.3.2/src/nonebot_plugin_apod/infopuzzle.py

@@ -0,0 +1,59 @@
+import json
+from html import escape
+from pathlib import Path
+
+import aiofiles
+from nonebot.log import logger
+import nonebot_plugin_localstore as store
+from nonebot_plugin_htmlrender import md_to_pic
+
+from .config import plugin_config
+from .utils import ensure_apod_data, translate_text_auto
+
+infopuzzle_mode = plugin_config.apod_infopuzzle_dark_mode
+apod_cache_json = store.get_plugin_cache_file("apod.json")
+
+
+async def apod_json_to_md(apod_json: dict) -> str:
+    title = escape(apod_json["title"])
+    explanation = apod_json["explanation"]
+    url = apod_json["url"]
+    copyright = escape(apod_json.get("copyright", "无"))
+    date = escape(apod_json["date"])
+    explanation = escape(await translate_text_auto(explanation))
+    return f"""<div class="container">
+    <h1>今日天文一图</h1>
+    <h2>{title}</h2>
+
+    <div class="image-container">
+        <img src="{url}" alt="APOD">
+    </div>
+
+    <p class="explanation">{explanation}</p>
+
+    <div class="info">
+        <p><strong>版权：</strong> {copyright}</p>
+        <p><strong>日期：</strong> {date}</p>
+    </div>
+</div>
+"""
+
+
+async def generate_apod_image() -> bytes | None:
+    try:
+        if not await ensure_apod_data():
+            return None
+        async with aiofiles.open(apod_cache_json, encoding="utf-8") as f:
+            content = await f.read()
+            data = json.loads(content)
+        md_content = await apod_json_to_md(data)
+        css_file = (
+            Path(__file__).parent
+            / "css"
+            / ("dark.css" if infopuzzle_mode else "light.css")
+        )
+        img_bytes = await md_to_pic(md_content, width=600, css_path=str(css_file))
+        return img_bytes
+    except Exception as e:
+        logger.error(f"生成 NASA APOD 图片时发生错误：{e}")
+        return None

nonebot_plugin_apod-1.3.2/src/nonebot_plugin_apod/singleflight.py

@@ -0,0 +1,38 @@
+import asyncio
+from collections.abc import Awaitable, Callable
+from typing import Any, Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class SingleFlight(Generic[T]):
+    def __init__(self) -> None:
+        self._calls: dict[Any, asyncio.Future] = {}
+        self._lock = asyncio.Lock()
+
+    async def do(self, key: Any, fn: Callable[[], Awaitable[T]]) -> T:
+        async with self._lock:
+            if key in self._calls:
+                fut = self._calls[key]
+                is_leader = False
+            else:
+                loop = asyncio.get_running_loop()
+                fut = loop.create_future()
+                self._calls[key] = fut
+                is_leader = True
+
+        if not is_leader:
+            return await asyncio.shield(fut)
+
+        try:
+            res = await fn()
+            if not fut.done():
+                fut.set_result(res)
+            return res
+        except BaseException as e:
+            if not fut.done():
+                fut.set_exception(e)
+            raise
+        finally:
+            async with self._lock:
+                self._calls.pop(key, None)

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

@@ -5,6 +5,7 @@ import hashlib
 import asyncio
 import contextlib
 from datetime import datetime
+from typing import Any
 
 import httpx
 import aiofiles
@@ -31,9 +32,7 @@ openai_model_name = (
     plugin_config.apod_openai_model_name
     if plugin_config.apod_openai_trans or plugin_config.apod_openai_model_name
     else (
-        plugin_config.apod_qwen_mt_model_name
-        if plugin_config.apod_qwen_trans
-        else None
+        plugin_config.apod_qwen_mt_model_name if plugin_config.apod_qwen_trans else None
     )
 )
 OPENAI_API_URL = (
@@ -147,7 +146,7 @@ async def openai_translate_text(
             "Authorization": f"Bearer {api_key}",
             "Content-Type": "application/json",
         }
-        payload = {
+        payload: dict[str, Any] = {
             "messages": [
                 {
                     "role": "system",

nonebot_plugin_apod-1.3.0/src/nonebot_plugin_apod/infopuzzle.py

@@ -1,287 +0,0 @@
-import json
-from io import BytesIO
-
-import aiofiles
-from PIL import Image, ImageDraw, ImageFont
-from nonebot.log import logger
-from nonebot import get_driver
-import nonebot_plugin_localstore as store
-
-from .config import plugin_config
-from .utils import ensure_apod_data, translate_text_auto, get_httpx_client
-
-
-FontLike = ImageFont.FreeTypeFont | ImageFont.ImageFont
-SCALE = 2
-CANVAS_WIDTH = 600 * SCALE
-PADDING = 35 * SCALE
-CARD_PADDING = 20 * SCALE
-CONTENT_WIDTH = CANVAS_WIDTH - 2 * PADDING - 2 * CARD_PADDING
-SPACING = 20 * SCALE
-CORNER_RADIUS = 8 * SCALE
-
-FONT_BASE_URL = (
-    "https://raw.githubusercontent.com/"
-    "TCOTC/siyuan-ttf-HarmonyOS_Sans_SC-and-Twemoji/"
-    "main/HarmonyOS_Sans_Backup/HarmonyOS_SansSC/"
-)
-FONTS = {
-    "regular": "HarmonyOS_SansSC_Regular.ttf",
-    "bold": "HarmonyOS_SansSC_Bold.ttf",
-}
-
-data_dir = store.get_plugin_data_dir()
-apod_cache_json = store.get_plugin_cache_file("apod.json")
-dark_mode = plugin_config.apod_infopuzzle_dark_mode
-
-THEMES = {
-    False: {
-        "bg": (244, 244, 244),
-        "card_bg": (255, 255, 255),
-        "title_color": (51, 51, 51),
-        "text_color": (51, 51, 51),
-        "info_color": (85, 85, 85),
-    },
-    True: {
-        "bg": (30, 30, 30),
-        "card_bg": (44, 44, 44),
-        "title_color": (224, 224, 224),
-        "text_color": (224, 224, 224),
-        "info_color": (160, 160, 160),
-    },
-}
-
-driver = get_driver()
-
-
-@driver.on_startup
-async def _download_fonts():
-    client = get_httpx_client()
-    for name, filename in FONTS.items():
-        path = data_dir / filename
-        if path.exists():
-            continue
-        url = FONT_BASE_URL + filename
-        logger.info(f"正在下载 HarmonyOS Sans SC {name}...")
-        try:
-            resp = await client.get(url, timeout=60)
-            resp.raise_for_status()
-            async with aiofiles.open(path, "wb") as f:
-                await f.write(resp.content)
-            logger.info(f"HarmonyOS Sans SC {name} 下载完成")
-        except Exception as e:
-            logger.warning(f"下载 HarmonyOS Sans SC {name} 失败: {e}")
-
-
-def _load_font(size: int, bold: bool = False) -> ImageFont.FreeTypeFont | None:
-    key = "bold" if bold else "regular"
-    path = data_dir / FONTS[key]
-    if path.exists():
-        return ImageFont.truetype(str(path), size)
-    if bold:
-        regular = data_dir / FONTS["regular"]
-        if regular.exists():
-            return ImageFont.truetype(str(regular), size)
-    return None
-
-
-def _wrap_text(
-    draw: ImageDraw.ImageDraw,
-    text: str,
-    font: FontLike,
-    max_width: int,
-) -> list[str]:
-    lines: list[str] = []
-    for paragraph in text.split("\n"):
-        if not paragraph:
-            lines.append("")
-            continue
-        line = ""
-        for char in paragraph:
-            test = line + char
-            if draw.textlength(test, font=font) > max_width:
-                if line:
-                    lines.append(line)
-                line = char
-            else:
-                line = test
-        if line:
-            lines.append(line)
-    return lines
-
-
-def _draw_centered_lines(
-    draw: ImageDraw.ImageDraw,
-    lines: list[str],
-    font: FontLike,
-    y: int,
-    canvas_width: int,
-    fill: tuple[int, int, int],
-    line_spacing: int,
-) -> int:
-    for line in lines:
-        tw = draw.textlength(line, font=font)
-        draw.text(((canvas_width - tw) / 2, y), line, fill=fill, font=font)
-        y += _line_height(draw, font) + line_spacing
-    return y
-
-
-def _line_height(draw: ImageDraw.ImageDraw, font: FontLike) -> int:
-    return int(draw.textbbox((0, 0), "测试Tg", font=font)[3])
-
-
-def _round_corners(img: Image.Image, radius: int) -> Image.Image:
-    img = img.convert("RGBA")
-    mask = Image.new("L", img.size, 0)
-    draw = ImageDraw.Draw(mask)
-    draw.rounded_rectangle((0, 0, *img.size), radius=radius, fill=255)
-    img.putalpha(mask)
-    return img
-
-
-async def _fetch_image(url: str) -> Image.Image | None:
-    try:
-        client = get_httpx_client()
-        resp = await client.get(url, timeout=20)
-        resp.raise_for_status()
-        return Image.open(BytesIO(resp.content)).convert("RGB")
-    except Exception as e:
-        logger.warning(f"下载天文图片失败: {e}")
-        return None
-
-
-async def generate_apod_image() -> bytes | None:
-    try:
-        if not await ensure_apod_data():
-            return None
-
-        font_title = _load_font(28 * SCALE, bold=True)
-        if font_title is None:
-            logger.warning("缺少字体文件, 已降级为单图模式")
-            return None
-        font_subtitle = _load_font(26 * SCALE, bold=True)
-        font_body = _load_font(20 * SCALE)
-        font_info = _load_font(14 * SCALE)
-        if font_subtitle is None or font_body is None or font_info is None:
-            logger.warning("缺少字体文件, 已降级为单图模式")
-            return None
-
-        async with aiofiles.open(apod_cache_json, encoding="utf-8") as f:
-            data = json.loads(await f.read())
-
-        theme = THEMES[dark_mode]
-        title_text = "今日天文一图"
-        subtitle_text = data["title"]
-        explanation = await translate_text_auto(data["explanation"])
-        copyright_text = f"版权：{data.get('copyright', '无')}"
-        date_text = f"日期：{data['date']}"
-        image_url = data.get("url")
-
-        tmp = Image.new("RGB", (1, 1))
-        draw = ImageDraw.Draw(tmp)
-
-        title_lines = _wrap_text(draw, title_text, font_title, CONTENT_WIDTH)
-        subtitle_lines = _wrap_text(draw, subtitle_text, font_subtitle, CONTENT_WIDTH)
-        body_lines = _wrap_text(draw, explanation, font_body, CONTENT_WIDTH)
-
-        title_lh = _line_height(draw, font_title)
-        subtitle_lh = _line_height(draw, font_subtitle)
-        body_lh = _line_height(draw, font_body)
-        info_lh = _line_height(draw, font_info)
-
-        apod_img = await _fetch_image(image_url) if image_url else None
-        img_height = 0
-        if apod_img:
-            ratio = CONTENT_WIDTH / apod_img.width
-            img_height = int(apod_img.height * ratio)
-            apod_img = apod_img.resize(
-                (CONTENT_WIDTH, img_height), Image.Resampling.LANCZOS
-            )
-            apod_img = _round_corners(apod_img, CORNER_RADIUS)
-
-        card_content_h = (
-            25 * SCALE
-            + len(title_lines) * (title_lh + 4 * SCALE)
-            + 25 * SCALE
-            + len(subtitle_lines) * (subtitle_lh + 4 * SCALE)
-            + 20 * SCALE
-            + (img_height + SPACING if apod_img else 0)
-            + len(body_lines) * (body_lh + 6 * SCALE)
-            + 15 * SCALE
-            + info_lh + 5 * SCALE
-            + info_lh
-        )
-        card_height = 2 * CARD_PADDING + card_content_h
-        canvas_height = 2 * PADDING + card_height
-
-        canvas = Image.new("RGBA", (CANVAS_WIDTH, canvas_height), theme["bg"])
-        draw = ImageDraw.Draw(canvas)
-
-        card_x = PADDING
-        card_y = PADDING
-        draw.rounded_rectangle(
-            [card_x, card_y, CANVAS_WIDTH - PADDING, card_y + card_height],
-            radius=CORNER_RADIUS,
-            fill=theme["card_bg"],
-        )
-
-        y = card_y + CARD_PADDING
-        y += 25 * SCALE
-        y = _draw_centered_lines(
-            draw,
-            title_lines,
-            font_title,
-            y,
-            CANVAS_WIDTH,
-            theme["title_color"],
-            4 * SCALE,
-        )
-        y += 25 * SCALE
-
-        y = _draw_centered_lines(
-            draw,
-            subtitle_lines,
-            font_subtitle,
-            y,
-            CANVAS_WIDTH,
-            theme["title_color"],
-            4 * SCALE,
-        )
-        y += 20 * SCALE
-
-        content_x = card_x + CARD_PADDING
-        if apod_img:
-            canvas.paste(apod_img, (content_x, y), apod_img)
-            y += img_height + SPACING
-
-        for line in body_lines:
-            draw.text(
-                (content_x, y),
-                line,
-                fill=theme["text_color"],
-                font=font_body,
-            )
-            y += body_lh + 6 * SCALE
-        y += 15 * SCALE
-
-        draw.text(
-            (content_x, y),
-            copyright_text,
-            fill=theme["info_color"],
-            font=font_info,
-        )
-        y += info_lh + 5 * SCALE
-        draw.text(
-            (content_x, y),
-            date_text,
-            fill=theme["info_color"],
-            font=font_info,
-        )
-
-        output = canvas.convert("RGB")
-        buf = BytesIO()
-        output.save(buf, format="PNG")
-        return buf.getvalue()
-    except Exception as e:
-        logger.error(f"生成 NASA APOD 图片时发生错误：{e}")
-        return None