nonebot-plugin-htmlrender 0.3.1__tar.gz → 0.3.3__tar.gz

{nonebot_plugin_htmlrender-0.3.1 → nonebot_plugin_htmlrender-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-htmlrender
-Version: 0.3.1
+Version: 0.3.3
 Summary: 通过浏览器渲染图片
 Author-Email: kexue <xana278@foxmail.com>
 License: MIT License
@@ -26,9 +26,9 @@ License: MIT License
         SOFTWARE.
 Project-URL: Homepage, https://github.com/kexue-z/nonebot-plugin-htmlrender
 Project-URL: Bug tracker, https://github.com/kexue-z/nonebot-plugin-htmlrender/issues
-Requires-Python: <4.0,>=3.8
+Requires-Python: <4.0,>=3.9
 Requires-Dist: playwright>=1.17.2
-Requires-Dist: nonebot2[fastapi]>=2.2.0
+Requires-Dist: nonebot2>=2.2.0
 Requires-Dist: jinja2>=3.0.3
 Requires-Dist: markdown>=3.3.6
 Requires-Dist: Pygments>=2.10.0

{nonebot_plugin_htmlrender-0.3.1 → nonebot_plugin_htmlrender-0.3.3}/nonebot_plugin_htmlrender/browser.py

@@ -8,6 +8,7 @@
 @Description    : None
 @GitHub         : https://github.com/yanyongyu
 """
+
 __author__ = "yanyongyu"
 
 from contextlib import asynccontextmanager
@@ -18,7 +19,6 @@ from nonebot.log import logger
 from playwright.async_api import Browser, Error, Page, Playwright, async_playwright
 
 from .config import Config
-import asyncio
 
 config = get_plugin_config(Config)
 

{nonebot_plugin_htmlrender-0.3.1 → nonebot_plugin_htmlrender-0.3.3}/nonebot_plugin_htmlrender/data_source.py

@@ -1,6 +1,6 @@
 from os import getcwd
 from pathlib import Path
-from typing import Literal, Optional, Union
+from typing import Any, Dict, Literal, Optional, Union
 
 import aiofiles
 import jinja2
@@ -192,6 +192,7 @@ async def html_to_pic(
     if "file:" not in template_path:
         raise Exception("template_path 应该为 file:///path/to/template")
     async with get_new_page(device_scale_factor, **kwargs) as page:
+        page.on("console", lambda msg: logger.debug(f"浏览器控制台: {msg.text}"))
         await page.goto(template_path)
         await page.set_content(html, wait_until="networkidle")
         await page.wait_for_timeout(wait)
@@ -205,8 +206,8 @@ async def html_to_pic(
 async def template_to_pic(
     template_path: str,
     template_name: str,
-    templates: dict,
-    pages: Optional[dict] = None,
+    templates: Dict[Any, Any],
+    pages: Optional[Dict[Any, Any]] = None,
     wait: int = 0,
     type: Literal["jpeg", "png"] = "png",  # noqa: A002
     quality: Union[int, None] = None,
@@ -217,8 +218,8 @@ async def template_to_pic(
     Args:
         template_path (str): 模板路径
         template_name (str): 模板名
-        templates (dict): 模板内参数 如: {"name": "abc"}
-        pages (dict): 网页参数 Defaults to
+        templates (Dict[Any, Any]): 模板内参数 如: {"name": "abc"}
+        pages (Optional[Dict[Any, Any]]): 网页参数 Defaults to
             {"base_url": f"file://{getcwd()}", "viewport": {"width": 500, "height": 10}}
         wait (int, optional): 网页载入等待时间. Defaults to 0.
         type (Literal["jpeg", "png"]): 图片类型, 默认 png
@@ -259,6 +260,7 @@ async def capture_element(
     **kwargs,
 ) -> bytes:
     async with get_new_page(**kwargs) as page:
+        page.on("console", lambda msg: logger.debug(f"浏览器控制台: {msg.text}"))
         await page.goto(url, timeout=timeout)
         return await page.locator(element).screenshot(
             type=type,

{nonebot_plugin_htmlrender-0.3.1 → nonebot_plugin_htmlrender-0.3.3}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "nonebot-plugin-htmlrender"
-version = "0.3.1"
+version = "0.3.3"
 description = "通过浏览器渲染图片"
 authors = [
     { name = "kexue", email = "xana278@foxmail.com" },
 ]
 dependencies = [
     "playwright>=1.17.2",
-    "nonebot2[fastapi]>=2.2.0",
+    "nonebot2>=2.2.0",
     "jinja2>=3.0.3",
     "markdown>=3.3.6",
     "Pygments>=2.10.0",
@@ -15,7 +15,7 @@ dependencies = [
     "pymdown-extensions>=9.1",
     "aiofiles>=0.8.0",
 ]
-requires-python = ">=3.8,<4.0"
+requires-python = ">=3.9,<4.0"
 readme = "README.md"
 
 [project.license]
@@ -30,6 +30,7 @@ dev = [
     "pytest-asyncio<1.0.0,>=0.18.1",
     "nonebug @ git+https://github.com/nonebot/nonebug.git",
     "nonebot-adapter-onebot>=2.2.3",
+    "fastapi>=0.111.0",
 ]
 
 [tool.pdm.build]