nonebot-plugin-latex 0.0.2.3__tar.gz → 0.0.3.1__tar.gz

{nonebot_plugin_latex-0.0.2.3 → nonebot_plugin_latex-0.0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nonebot-plugin-latex
-Version: 0.0.2.3
+Version: 0.0.3.1
 Summary: 通过互联网公共服务渲染LaTeX公式
 Author-email: Eilles <EillesWan@outlook.com>
 License:                 木兰宽松许可证, 第2版
@@ -136,9 +136,9 @@ Project-URL: Bug Tracker, https://github.com/EillesWan/nonebot-plugin-latex/issu
 Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: nonebot2>=2.2.0
+Requires-Dist: nonebot2<1000.0.0,>=2.2.0
 Requires-Dist: httpx<0.28.0,>=0.27.0
-Requires-Dist: nonebot-adapter-onebot>=2.4.3
+Requires-Dist: nonebot-plugin-alconna<1000.0.0,>=0.48.0
 
 # nonebot-plugin-latex
 

{nonebot_plugin_latex-0.0.2.3 → nonebot_plugin_latex-0.0.3.1}/nonebot_plugin_latex/__init__.py

@@ -13,25 +13,34 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 See the Mulan PSL v2 for more details.
 """
 
-from nonebot import get_plugin_config
-from nonebot.plugin import PluginMetadata
+from nonebot import get_plugin_config, get_driver
+from nonebot.plugin import PluginMetadata, inherit_supported_adapters
 
 from .config import Config
-from .converter import converter
+from .converter import _converter, get_converter
 
-__version__ = "0.0.2.3"
+__version__ = "0.0.3.1"
 
 __author__ = "Eilles"
 
 __plugin_meta__ = PluginMetadata(
-    name="LaTeX图形渲染插件",
-    description="从互联网服务渲染LaTeX公式并发送",
+    name="LaTeX 在线渲染插件",
+    description="从互联网服务渲染 LaTeX 公式",
     usage="发送 latex 或 公式，后接内容或回复公式信息。",
-    type="application",
-    homepage="https://github.com/LiteyukiStudio/nonebot-plugin-marshoai",
+    type="library",
+    homepage="https://github.com/EillesWan/nonebot-plugin-latex",
+    config=Config,
+    supported_adapters=inherit_supported_adapters("nonebot_plugin_alconna"),
     extra={"License": "Mulan PSL v2", "Author": __author__},
 )
 
+__all__ = ["get_converter"]
+
+
+@get_driver().on_startup
+async def init():
+    await _converter.load_channel()
+
 
 config = get_plugin_config(Config)
 

nonebot_plugin_latex-0.0.3.1/nonebot_plugin_latex/converter.py

@@ -0,0 +1,13 @@
+from .data import ConvertLatex
+
+_converter = ConvertLatex()
+"""
+Latex 渲染器
+"""
+
+
+def get_converter() -> ConvertLatex:
+    """
+    获取渲染器
+    """
+    return _converter

{nonebot_plugin_latex-0.0.2.3 → nonebot_plugin_latex-0.0.3.1}/nonebot_plugin_latex/data.py

@@ -13,10 +13,23 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 See the Mulan PSL v2 for more details.
 """
 
-from typing import Optional, Literal, Tuple
-import httpx
-import time
 import re
+import time
+import asyncio
+from typing import Literal, Optional, Tuple
+
+import httpx
+from nonebot import logger
+
+
+# 正则匹配 LaTeX 公式内容
+LATEX_PATTERN = re.compile(
+    r"\\begin\{equation\}(.*?)\\end\{equation\}|(?<!\$)(\$(.*?)\$|\$\$(.*?)\$\$|\\\[(.*?)\\\]|\\\[.*?\\\]|\\\((.*?)\\\))",
+    re.DOTALL,
+)
+
+
+MAX_TIME = 0xFFFFFF
 
 
 class ConvertChannel:
@@ -33,8 +46,8 @@ class ConvertChannel:
         return False, "请勿直接调用母类"
 
     @staticmethod
-    def channel_test() -> int:
-        return -1
+    async def channel_test() -> int:
+        return MAX_TIME
 
 
 class L2PChannel(ConvertChannel):
@@ -52,6 +65,7 @@ class L2PChannel(ConvertChannel):
 
         async with httpx.AsyncClient(
             timeout=timeout,
+            verify=False,
         ) as client:
             while retry > 0:
                 try:
@@ -87,36 +101,38 @@ class L2PChannel(ConvertChannel):
         return False, "未知错误"
 
     @staticmethod
-    def channel_test() -> int:
-        with httpx.Client(timeout=5) as client:
+    async def channel_test() -> int:
+        async with httpx.AsyncClient(timeout=5, verify=False) as client:
             try:
                 start_time = time.time_ns()
                 latex2png = (
-                    client.get(
+                    await client.get(
                         "http://www.latex2png.com{}"
-                        + client.post(
-                            "http://www.latex2png.com/api/convert",
-                            json={
-                                "auth": {"user": "guest", "password": "guest"},
-                                "latex": "\\\\int_{a}^{b} x^2 \\\\, dx = \\\\frac{b^3}{3} - \\\\frac{a^3}{5}\n",
-                                "resolution": 600,
-                                "color": "000000",
-                            },
+                        + (
+                            await client.post(
+                                "http://www.latex2png.com/api/convert",
+                                json={
+                                    "auth": {"user": "guest", "password": "guest"},
+                                    "latex": "\\\\int_{a}^{b} x^2 \\\\, dx = \\\\frac{b^3}{3} - \\\\frac{a^3}{5}\n",
+                                    "resolution": 600,
+                                    "color": "000000",
+                                },
+                            )
                         ).json()["url"]
                     ),
                     time.time_ns() - start_time,
                 )
             except:
-                return 99999
+                return MAX_TIME
         if latex2png[0].status_code == 200:
             return latex2png[1]
         else:
-            return 99999
+            return MAX_TIME
 
 
 class CDCChannel(ConvertChannel):
 
-    URL = "http://latex.codecogs.com"
+    URL = "https://latex.codecogs.com"
 
     async def get_to_convert(
         self,
@@ -128,6 +144,7 @@ class CDCChannel(ConvertChannel):
     ) -> Tuple[Literal[True], bytes] | Tuple[Literal[False], bytes | str]:
         async with httpx.AsyncClient(
             timeout=timeout,
+            verify=False,
         ) as client:
 
             while retry > 0:
@@ -152,27 +169,27 @@ class CDCChannel(ConvertChannel):
         return False, "未知错误"
 
     @staticmethod
-    def channel_test() -> int:
-        with httpx.Client(timeout=5) as client:
+    async def channel_test() -> int:
+        async with httpx.AsyncClient(timeout=5, verify=False) as client:
             try:
                 start_time = time.time_ns()
                 codecogs = (
-                    client.get(
-                        r"http://latex.codecogs.com/png.image?\huge%20\dpi{600}\\int_{a}^{b}x^2\\,dx=\\frac{b^3}{3}-\\frac{a^3}{5}"
+                    await client.get(
+                        r"https://latex.codecogs.com/png.image?\huge%20\dpi{600}\\int_{a}^{b}x^2\\,dx=\\frac{b^3}{3}-\\frac{a^3}{5}"
                     ),
                     time.time_ns() - start_time,
                 )
             except:
-                return 99999
+                return MAX_TIME
         if codecogs[0].status_code == 200:
             return codecogs[1]
         else:
-            return 99999
+            return MAX_TIME
 
 
 class JRTChannel(ConvertChannel):
 
-    URL = "http://latex2image.joeraut.com"
+    URL = "https://latex2image.joeraut.com"
 
     async def get_to_convert(
         self,
@@ -185,6 +202,7 @@ class JRTChannel(ConvertChannel):
 
         async with httpx.AsyncClient(
             timeout=timeout,
+            verify=False,
         ) as client:
             while retry > 0:
                 try:
@@ -196,7 +214,6 @@ class JRTChannel(ConvertChannel):
                             "outputScale": "{}%".format(dpi / 3 * 5),
                         },
                     )
-                    print(post_response)
                     if post_response.status_code == 200:
 
                         if not (json_response := post_response.json())["error"]:
@@ -218,29 +235,31 @@ class JRTChannel(ConvertChannel):
         return False, "未知错误"
 
     @staticmethod
-    def channel_test() -> int:
-        with httpx.Client(timeout=5) as client:
+    async def channel_test() -> int:
+        async with httpx.AsyncClient(timeout=5, verify=False) as client:
             try:
                 start_time = time.time_ns()
                 joeraut = (
-                    client.get(
-                        client.post(
-                            "http://www.latex2png.com/api/convert",
-                            json={
-                                "latexInput": "\\\\int_{a}^{b} x^2 \\\\, dx = \\\\frac{b^3}{3} - \\\\frac{a^3}{5}",
-                                "outputFormat": "PNG",
-                                "outputScale": "1000%",
-                            },
+                    await client.get(
+                        (
+                            await client.post(
+                                "http://www.latex2png.com/api/convert",
+                                json={
+                                    "latexInput": "\\\\int_{a}^{b} x^2 \\\\, dx = \\\\frac{b^3}{3} - \\\\frac{a^3}{5}",
+                                    "outputFormat": "PNG",
+                                    "outputScale": "1000%",
+                                },
+                            )
                         ).json()["imageUrl"]
                     ),
                     time.time_ns() - start_time,
                 )
             except:
-                return 99999
+                return MAX_TIME
         if joeraut[0].status_code == 200:
             return joeraut[1]
         else:
-            return 99999
+            return MAX_TIME
 
 
 CHANNEL_LIST: list[type[ConvertChannel]] = [L2PChannel, CDCChannel, JRTChannel]
@@ -248,20 +267,17 @@ CHANNEL_LIST: list[type[ConvertChannel]] = [L2PChannel, CDCChannel, JRTChannel]
 
 class ConvertLatex:
 
-    channel: ConvertChannel
-
-    def __init__(self, channel: Optional[ConvertChannel] = None) -> None:
-        """
-        LaTeX在线渲染类
+    channel: Optional[ConvertChannel]
 
-        Args:
-            channel (Optional[ConvertChannel], optional):
-                选择何种在线转换通道，若为空，则自动选择延迟最低的通道。默认为空。
-                [WARNING] 请注意！选择通道时采取的是同步函数，因此可能造成阻塞。
-        """
+    def __init__(self, channel: Optional[ConvertChannel] = None):
+        self.channel = channel
+        logger.info("LaTeX 转换服务将在 Bot 连接时异步加载")
 
+    async def load_channel(self, channel: ConvertChannel | None = None) -> None:
         if channel is None:
-            self.channel = self.auto_choose_channel()
+            logger.info("正在选择 LaTeX 转换服务频道，请稍等...")
+            self.channel = await self.auto_choose_channel()
+            logger.info(f"已选择 {self.channel.__class__.__name__} 服务频道")
         else:
             self.channel = channel
 
@@ -276,8 +292,7 @@ class ConvertLatex:
         """
         LaTeX 在线渲染
 
-        参数
-        ====
+        参数:
 
             latex: str
                 LaTeX 代码
@@ -289,26 +304,37 @@ class ConvertLatex:
                 超时时间
             retry_: int
                 重试次数
-        返回
-        ====
+        返回:
             bytes
             图片
         """
-        return await self.channel.get_to_convert(
+        if self.channel is None:
+            await self.load_channel()
+
+        return await self.channel.get_to_convert(  # type: ignore
             latex, dpi, foreground_colour, timeout_, retry_
         )
 
     @staticmethod
-    def auto_choose_channel() -> ConvertChannel:
+    async def auto_choose_channel() -> ConvertChannel:
+        """
+        依据访问延迟，自动选择 LaTeX 转换服务频道
 
-        return min(
-            CHANNEL_LIST,
-            key=lambda channel: channel.channel_test(),
-        )()
+        返回
+        ====
+            ConvertChannel
+                LaTeX 转换服务实例
+        """
 
+        async def channel_test_wrapper(
+            channel: type[ConvertChannel],
+        ) -> Tuple[int, type[ConvertChannel]]:
+            score = await channel.channel_test()
+            return score, channel
 
-# 正则匹配 LaTeX 公式内容
-LATEX_PATTERN = re.compile(
-    r"\\begin\{equation\}(.*?)\\end\{equation\}|(?<!\$)(\$(.*?)\$|\$\$(.*?)\$\$|\\\[(.*?)\\\]|\\\[.*?\\\]|\\\((.*?)\\\))",
-    re.DOTALL,
-)
+        return min(
+            await asyncio.gather(
+                *(channel_test_wrapper(channel) for channel in CHANNEL_LIST)
+            ),
+            key=lambda x: x[0],
+        )[1]()

{nonebot_plugin_latex-0.0.2.3 → nonebot_plugin_latex-0.0.3.1}/nonebot_plugin_latex/main.py

@@ -14,22 +14,22 @@ See the Mulan PSL v2 for more details.
 """
 
 import nonebot
-from nonebot.adapters.onebot.v11 import MessageEvent
 
+from nonebot_plugin_alconna.uniseg import Text
 
-# from nonebot.matcher import Matcher
 
 nonebot.require("nonebot_plugin_alconna")
 
-# from nonebot_plugin_alconna.util import annotation
 from nonebot_plugin_alconna import (
     Image as Alconna_Image,
+    Reply,
     Text as Alconnna_Text,
     UniMessage,
+    UniMsg
 )
 
 from .data import LATEX_PATTERN
-from .converter import converter
+from .converter import _converter
 
 command_heads = (
     "latex",
@@ -47,28 +47,16 @@ command_heads = (
 
 
 async def check_for_scan(
-    event: MessageEvent,
+    msg: UniMsg,
     # state: T_State,
 ) -> bool:
     """
     检查是否为 LaTeX 指令
     """
-
-    # print("检查消息满足渲染要求：", event)
-    if isinstance(event, MessageEvent):
-        # print("此为原始信息：", event.raw_message)
-        # event.message
-        for msg in event.message:
-            # print("这是其中一个信息---", msg)
-            if msg.type == "text" and (msgdata := msg.data["text"].strip()):
-                if msgdata.startswith(command_heads):
-
-                    # print("判断：这确实是指令发出")
-                    return True
-                else:
-                    # print("判断：这不是指令")
-                    return False
-        return False
+    return any(
+        isinstance(seg, Text) and seg.text.strip().startswith(command_heads)
+        for seg in msg
+    )
 
 
 latexg = nonebot.on_message(
@@ -80,18 +68,19 @@ latexg = nonebot.on_message(
 
 @latexg.handle()
 async def handle_pic(
-    event: MessageEvent,
+    msgs: UniMsg,
     # state: T_State,
     # arg: Optional[Message] = CommandArg(),
 ):
     # print("正在解决reply指令……")
     latexes = []
-    if event.reply:
-        latexes.extend(LATEX_PATTERN.finditer(event.reply.message.extract_plain_text()))
+    if msgs.has(Reply):
+        i = msgs[Reply, 0]
+        if i.msg:
+            latexes.extend(LATEX_PATTERN.finditer(i.msg if isinstance(i.msg, str) else i.msg.extract_plain_text()))
 
     # print(arg)
-    if event.message:
-        latexes.extend(LATEX_PATTERN.finditer(event.message.extract_plain_text()))
+    latexes.extend(LATEX_PATTERN.finditer(msgs.extract_plain_text()))
 
     if not latexes:
         await latexg.finish(
@@ -103,7 +92,7 @@ async def handle_pic(
 
     for tex_macher in latexes:
         tex = tex_macher.group().replace("$", "")
-        if (result := await converter.generate_png(tex))[0]:
+        if (result := await _converter.generate_png(tex))[0]:
             result_msg.append(
                 Alconna_Image(raw=result[1], mimetype="image/png", name="latex.png")  # type: ignore
             )

{nonebot_plugin_latex-0.0.2.3 → nonebot_plugin_latex-0.0.3.1}/nonebot_plugin_latex.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nonebot-plugin-latex
-Version: 0.0.2.3
+Version: 0.0.3.1
 Summary: 通过互联网公共服务渲染LaTeX公式
 Author-email: Eilles <EillesWan@outlook.com>
 License:                 木兰宽松许可证, 第2版
@@ -136,9 +136,9 @@ Project-URL: Bug Tracker, https://github.com/EillesWan/nonebot-plugin-latex/issu
 Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: nonebot2>=2.2.0
+Requires-Dist: nonebot2<1000.0.0,>=2.2.0
 Requires-Dist: httpx<0.28.0,>=0.27.0
-Requires-Dist: nonebot-adapter-onebot>=2.4.3
+Requires-Dist: nonebot-plugin-alconna<1000.0.0,>=0.48.0
 
 # nonebot-plugin-latex
 

nonebot_plugin_latex-0.0.3.1/nonebot_plugin_latex.egg-info/requires.txt

@@ -0,0 +1,3 @@
+nonebot2<1000.0.0,>=2.2.0
+httpx<0.28.0,>=0.27.0
+nonebot-plugin-alconna<1000.0.0,>=0.48.0

{nonebot_plugin_latex-0.0.2.3 → nonebot_plugin_latex-0.0.3.1}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "nonebot-plugin-latex"
-version = "0.0.2.3"
+version = "0.0.3.1"
 description = "通过互联网公共服务渲染LaTeX公式"
 authors = [{ name = "Eilles", email = "EillesWan@outlook.com" }]
 dependencies = [
-    "nonebot2>=2.2.0",
+    "nonebot2>=2.2.0,<1000.0.0",
     "httpx>=0.27.0,<0.28.0",
-    "nonebot-adapter-onebot>=2.4.3",
+    "nonebot-plugin-alconna>=0.48.0,<1000.0.0",
 ]
 requires-python = ">=3.9,<4.0"
 readme = "README.md"
@@ -15,3 +15,6 @@ license = { file = "LICENSE" }
 [project.urls]
 "Homepage" = "https://github.com/EillesWan/nonebot-plugin-latex"
 "Bug Tracker" = "https://github.com/EillesWan/nonebot-plugin-latex/issues"
+
+[tool.pyright]
+typeCheckingMode = "standard"

nonebot_plugin_latex-0.0.2.3/nonebot_plugin_latex/converter.py

@@ -1,6 +0,0 @@
-from .data import ConvertLatex
-
-converter = ConvertLatex()
-"""
-Latex 渲染器
-"""

nonebot_plugin_latex-0.0.2.3/nonebot_plugin_latex.egg-info/requires.txt

@@ -1,3 +0,0 @@
-nonebot2>=2.2.0
-httpx<0.28.0,>=0.27.0
-nonebot-adapter-onebot>=2.4.3