PyPI - nonebot-plugin-htmlrender - Versions diffs - 0.3.3__tar.gz → 0.3.5__tar.gz - Mend

nonebot-plugin-htmlrender 0.3.3tar.gz → 0.3.5tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

{nonebot_plugin_htmlrender-0.3.3 → nonebot_plugin_htmlrender-0.3.5}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-htmlrender
-Version: 0.3.3
+Version: 0.3.5
 Summary: 通过浏览器渲染图片
 Author-Email: kexue <xana278@foxmail.com>
 License: MIT License

{nonebot_plugin_htmlrender-0.3.3 → nonebot_plugin_htmlrender-0.3.5}/nonebot_plugin_htmlrender/data_source.py RENAMED Viewed

@@ -144,6 +144,7 @@ async def read_tpl(path: str) -> str:
 async def template_to_html(
     template_path: str,
     template_name: str,
+    filters: Optional[Dict[str, Any]] = None,
     **kwargs,
 ) -> str:
     """使用jinja2模板引擎通过html生成图片
@@ -151,6 +152,7 @@ async def template_to_html(
     Args:
         template_path (str): 模板路径
         template_name (str): 模板名
+        filters (Optional[Dict[str, Any]]): 自定义过滤器
         **kwargs: 模板内容
     Returns:
         str: html
@@ -160,6 +162,12 @@ async def template_to_html(
         loader=jinja2.FileSystemLoader(template_path),
         enable_async=True,
     )
+    if filters:
+        for filter_name, filter_func in filters.items():
+            template_env.filters[filter_name] = filter_func
+            logger.debug(f"加载自定义过滤器 {filter_name}")
     template = template_env.get_template(template_name)
     return await template.render_async(**kwargs)
@@ -207,6 +215,7 @@ async def template_to_pic(
     template_path: str,
     template_name: str,
     templates: Dict[Any, Any],
+    filters: Optional[Dict[str, Any]] = None,
     pages: Optional[Dict[Any, Any]] = None,
     wait: int = 0,
     type: Literal["jpeg", "png"] = "png",  # noqa: A002
@@ -219,6 +228,7 @@ async def template_to_pic(
         template_path (str): 模板路径
         template_name (str): 模板名
         templates (Dict[Any, Any]): 模板内参数 如: {"name": "abc"}
+        filters (Optional[Dict[str, Any]]): 自定义过滤器
         pages (Optional[Dict[Any, Any]]): 网页参数 Defaults to
             {"base_url": f"file://{getcwd()}", "viewport": {"width": 500, "height": 10}}
         wait (int, optional): 网页载入等待时间. Defaults to 0.
@@ -238,6 +248,12 @@ async def template_to_pic(
         loader=jinja2.FileSystemLoader(template_path),
         enable_async=True,
     )
+    if filters:
+        for filter_name, filter_func in filters.items():
+            template_env.filters[filter_name] = filter_func
+            logger.debug(f"加载自定义过滤器 {filter_name}")
     template = template_env.get_template(template_name)
     return await html_to_pic(

{nonebot_plugin_htmlrender-0.3.3 → nonebot_plugin_htmlrender-0.3.5}/pyproject.toml RENAMED Viewed

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-htmlrender"
-version = "0.3.3"
+version = "0.3.5"
 description = "通过浏览器渲染图片"
 authors = [
     { name = "kexue", email = "xana278@foxmail.com" },
@@ -31,6 +31,7 @@ dev = [
     "nonebug @ git+https://github.com/nonebot/nonebug.git",
     "nonebot-adapter-onebot>=2.2.3",
     "fastapi>=0.111.0",
+    "pillow>=10.4.0",
 ]
 [tool.pdm.build]

nonebot_plugin_htmlrender-0.3.5/tests/conftest.py ADDED Viewed

@@ -0,0 +1,10 @@
+import nonebot
+import pytest
+from nonebug import App
+@pytest.fixture
+def app():
+    nonebot.require("nonebot_plugin_htmlrender")
+    yield App()

nonebot_plugin_htmlrender-0.3.5/tests/templates/progress.html.jinja2 ADDED Viewed

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Test</title>
+</head>
+<body>
+  {% for count in counts %}
+    <p style="width: 10px; height: 10px; background-color: {{ count | count_to_color}};"></p>
+  {% endfor %}
+</body>
+</html>

{nonebot_plugin_htmlrender-0.3.3 → nonebot_plugin_htmlrender-0.3.5}/tests/test_htmlrender.py RENAMED Viewed

@@ -1,5 +1,10 @@
 import pytest
+from io import BytesIO
 from nonebug import App
+from PIL import Image, ImageChops
+from .utils import count_to_color
 @pytest.mark.asyncio
@@ -51,3 +56,31 @@ async def test_template_to_pic(app: App):
             wait=2,
         )
         assert isinstance(img, bytes)
+@pytest.mark.asyncio
+async def test_template_filter(app: App):
+    from pathlib import Path
+    from nonebot_plugin_htmlrender import template_to_pic
+    count_list = ["1", "2", "3", "4"]
+    template_path = str(Path(__file__).parent / "templates")
+    template_name = "progress.html.jinja2"
+    image_byte = await template_to_pic(
+        template_path=template_path,
+        template_name=template_name,
+        templates={"counts": count_list},
+        filters={"count_to_color": count_to_color},
+        pages={
+            "viewport": {"width": 600, "height": 300},
+            "base_url": f"file://{template_path}",
+        }
+    )
+    test_image_path = Path(__file__).parent / "test_template_filter.png"
+    test_image = Image.open(test_image_path)
+    image = Image.open(BytesIO(initial_bytes=image_byte))
+    diff = ImageChops.difference(image, test_image)
+    assert diff.getbbox() is None

nonebot_plugin_htmlrender-0.3.5/tests/test_template_filter.png ADDED Viewed

Binary file

nonebot_plugin_htmlrender-0.3.5/tests/utils.py ADDED Viewed

@@ -0,0 +1,10 @@
+def count_to_color(count: str) -> str:
+    if count == '1':
+        return "#facc15"
+    elif count == '2':
+        return "#f87171"
+    elif count == '3':
+        return "#c084fc"
+    else:
+        return "#60a5fa"

nonebot_plugin_htmlrender-0.3.3/tests/conftest.py DELETED Viewed

@@ -1,10 +0,0 @@
-import pytest
-import nonebot
-@pytest.fixture(scope="session", autouse=True)
-def load_bot():
-    # 加载插件
-    import nonebot_plugin_htmlrender
-    nonebot.load_plugin("nonebot_plugin_htmlrender")