Theme功能添加 #400

AzideCupric · 2023-10-13T15:58:46Z

No description provided.

netlify · 2023-10-13T15:59:05Z

✅ Deploy Preview for nonebot-bison ready!

Name	Link
🔨 Latest commit	`17c70a4`
🔍 Latest deploy log	https://app.netlify.com/sites/nonebot-bison/deploys/65ccf4a79620ae00086d22a4
😎 Deploy Preview	https://deploy-preview-400--nonebot-bison.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

codecov · 2023-10-15T18:30:16Z

Codecov Report

Attention: 112 lines in your changes are missing coverage. Please review.

Comparison is base (f6ee4a4) 82.53% compared to head (b944e8d) 82.17%.
Report is 12 commits behind head on main.

❗ Current head b944e8d differs from pull request most recent head 17c70a4. Consider uploading reports for the commit 17c70a4 to get more accurate results

Files	Patch %	Lines
nonebot_bison/theme/themes/ceobe_canteen/build.py	43.75%	36 Missing ⚠️
nonebot_bison/post/abstract_post.py	42.85%	16 Missing ⚠️
nonebot_bison/utils/image.py	82.35%	15 Missing ⚠️
nonebot_bison/post/post.py	86.20%	8 Missing ⚠️
nonebot_bison/theme/themes/ht2i/build.py	73.33%	8 Missing ⚠️
nonebot_bison/theme/types.py	84.78%	7 Missing ⚠️
nonebot_bison/platform/arknights.py	88.67%	6 Missing ⚠️
nonebot_bison/theme/themes/arknights/build.py	83.33%	6 Missing ⚠️
nonebot_bison/theme/utils.py	50.00%	4 Missing ⚠️
nonebot_bison/theme/__init__.py	87.50%	2 Missing ⚠️
... and 3 more

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #400      +/-   ##
==========================================
- Coverage   82.53%   82.17%   -0.37%     
==========================================
  Files          64       78      +14     
  Lines        3246     3545     +299     
==========================================
+ Hits         2679     2913     +234     
- Misses        567      632      +65

Flag	Coverage Δ
smoke-test	`82.17% <78.86%> (-0.37%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

nonebot_bison/plugin_config.py

nonebot_bison/post/abstract_post.py

nonebot_bison/theme/themes/arknights/parse.py

felinae98 · 2023-10-25T11:53:12Z

nonebot_bison/theme/themes/ht2i/parse.py

+    from nonebot_bison.post import Post
+
+
+class Ht2iTheme(AbstractTheme):


真的不打算写一个全称吗

html-render-text-to-image（？

nonebot_bison/post/abstract_post.py

nonebot_bison/utils/__init__.py

felinae98 · 2023-11-10T02:43:38Z

nonebot_bison/theme/utils.py

+def convert_to_qr(data: str) -> str:
+    """Convert data to QR code
+    Args:
+        data (str): data to be converted
+    Returns:
+        bytes: QR code image
+    """


怎么签名里返回 str，doc 里是 byte

坏了改到ceobe的pr里了

拿过来还是说等着那边合就行

felinae98 · 2023-11-20T07:34:02Z

nonebot_bison/post/abstract_post.py

-                msgs = [reduce(lambda x, y: x.append(y), msg_segments, MessageFactory([]))]
-            else:
-                msgs = [MessageFactory([msg_segment]) for msg_segment in msg_segments]
+    async def message_process(self, msg_segments: list[MessageSegmentFactory]) -> list[MessageFactory]:


Suggested change

async def message_process(self, msg_segments: list[MessageSegmentFactory]) -> list[MessageFactory]:

async def merge_message_segments(self, msg_segments: list[MessageSegmentFactory]) -> list[MessageFactory]:

这个函数的命名原本是考虑作为一个 list[MessageFactory] 生成和处理函数，合并message segment只是它其中的一个功能（取名的时候是考虑给子类留个口子）
不过现在看的话 message_process 想和 message_segments_process 对应的话应该是一个 list[MessageFactory] -> list[MessageFactory] 这样的函数
所以generate_messages应该是

msg_segments = await self.generate() msg_segments = await self.message_segments_process(msg_segments) msgs = await self.merge_message_segments(msg_segments) msgs = await self.message_process(msg_segments) return msgs

这样的？
然后这四个函数的具体实现应该放到具体子类里？（不过留在Abstract里是因为我觉这个流程还算通用
还需要讨论讨论

nonebot_bison/post/post.py

nonebot_bison/post/abstract_post.py

felinae98 · 2023-11-20T07:37:39Z

nonebot_bison/post/abstract_post.py


    @abstractmethod
-    async def generate_pic_messages(self) -> list[MessageSegmentFactory]:
-        "Generate MessageFactory list from this instance with `use_pic`"
+    async def generate(self) -> list[MessageSegmentFactory]:


Suggested change

async def generate(self) -> list[MessageSegmentFactory]:

async def generate_message_segments(self) -> list[MessageSegmentFactory]:

之前用 generate 命名是考虑到他是最主要的部分不想名字太长(
在加上有 typing 的话也不需要再在函数名里赘述

nonebot_bison/utils/image.py

nonebot_bison/post/abstract_post.py

nonebot_bison/post/post.py

felinae98 · 2023-11-20T08:23:39Z

nonebot_bison/theme/__init__.py

+    theme_module = import_module(f"{__name__}.themes.{theme}")
+
+    if not hasattr(theme_module, "__theme_meta__"):
+        raise ThemeRegistrationError(f"{theme} has no __theme_meta__")


这里可能不应该 raise，一个坏了后面的都不 register 了不然

确实是期望有问题就不能注册的

nonebot_bison/plugin_config.py

felinae98 · 2024-02-10T10:15:41Z

bison_theme_use_browser 这个在 docker 里默认开启吧

AzideCupric · 2024-02-10T11:11:42Z

bison_theme_use_browser 这个在 docker 里默认开启吧

这个归 #447 管应该

nonebot_bison/plugin_config.py

* 🔧 添加theme相关配置 * 👷 取消对docker.env.prod的忽略

* ✨ 优化Post类的__str__ * ✅ 补充转发测试

AzideCupric force-pushed the feat/color-sharp branch from 679ee7e to 0a1ac43 Compare October 15, 2023 18:25

felinae98 reviewed Oct 25, 2023

View reviewed changes

felinae98 reviewed Oct 26, 2023

View reviewed changes

nonebot_bison/post/abstract_post.py Outdated Show resolved Hide resolved

nonebot_bison/utils/__init__.py Outdated Show resolved Hide resolved

AzideCupric force-pushed the feat/color-sharp branch 2 times, most recently from eb8d812 to bb9f825 Compare November 5, 2023 15:44

felinae98 requested a review from he0119 November 8, 2023 12:37

felinae98 reviewed Nov 10, 2023

View reviewed changes

AzideCupric force-pushed the feat/color-sharp branch from 0dd1831 to cc97adc Compare November 12, 2023 10:29

he0119 approved these changes Nov 12, 2023

View reviewed changes

felinae98 reviewed Nov 20, 2023

View reviewed changes

AzideCupric force-pushed the feat/color-sharp branch from cc97adc to b0b8bdd Compare November 20, 2023 12:02

AzideCupric force-pushed the feat/color-sharp branch from b0b8bdd to b944e8d Compare December 18, 2023 13:16

AzideCupric force-pushed the feat/color-sharp branch from 001d9f7 to 1819f3c Compare February 11, 2024 14:42

AzideCupric closed this Feb 11, 2024

AzideCupric deleted the feat/color-sharp branch February 11, 2024 14:47

AzideCupric restored the feat/color-sharp branch February 11, 2024 14:47

AzideCupric reopened this Feb 11, 2024

felinae98 force-pushed the feat/color-sharp branch from 9301647 to 48d3a06 Compare February 12, 2024 02:41

felinae98 force-pushed the main branch from 7c77e48 to 2973eae Compare February 12, 2024 02:44

felinae98 force-pushed the feat/color-sharp branch from 48d3a06 to ff9d8dc Compare February 12, 2024 02:45

felinae98 reviewed Feb 14, 2024

View reviewed changes

nonebot_bison/plugin_config.py Show resolved Hide resolved

nonebot_bison/plugin_config.py Show resolved Hide resolved

AzideCupric added 4 commits February 15, 2024 01:12

✨ 添加 Theme 功能

265dfec

🔧 构建测试镜像 (#475)

8f55c79

* 🔧 添加theme相关配置 * 👷 取消对docker.env.prod的忽略

✨ ✨ 优化 Post 的 __str__ 输出 (#476)

4fd0602

* ✨ 优化Post类的__str__ * ✅ 补充转发测试

📝 添加 Theme 配置相关文档

17c70a4

AzideCupric force-pushed the feat/color-sharp branch from a6dc247 to 17c70a4 Compare February 14, 2024 17:13

AzideCupric requested a review from felinae98 February 14, 2024 17:13

felinae98 merged commit c8916ba into main Feb 16, 2024
19 checks passed

felinae98 deleted the feat/color-sharp branch February 16, 2024 01:46

AzideCupric mentioned this pull request Feb 16, 2024

✨ 为 Post 引入 Theme #381

Closed

felinae98 added the enhancement New feature or request label Feb 26, 2024

felinae98 changed the title ~~✨ Theme功能添加~~ Theme功能添加 Feb 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Theme功能添加 #400

Theme功能添加 #400

AzideCupric commented Oct 13, 2023

netlify bot commented Oct 13, 2023 •

edited

codecov bot commented Oct 15, 2023 •

edited

felinae98 Oct 25, 2023

AzideCupric Oct 25, 2023

felinae98 Nov 10, 2023

AzideCupric Nov 10, 2023

AzideCupric Nov 10, 2023

felinae98 Nov 20, 2023

AzideCupric Nov 20, 2023

felinae98 Nov 20, 2023

AzideCupric Nov 20, 2023

felinae98 Nov 20, 2023

AzideCupric Nov 20, 2023

felinae98 commented Feb 10, 2024

AzideCupric commented Feb 10, 2024

		from nonebot_bison.post import Post


		class Ht2iTheme(AbstractTheme):

	async def message_process(self, msg_segments: list[MessageSegmentFactory]) -> list[MessageFactory]:
	async def merge_message_segments(self, msg_segments: list[MessageSegmentFactory]) -> list[MessageFactory]:

	async def generate(self) -> list[MessageSegmentFactory]:
	async def generate_message_segments(self) -> list[MessageSegmentFactory]:

Theme功能添加 #400

Theme功能添加 #400

Conversation

AzideCupric commented Oct 13, 2023

netlify bot commented Oct 13, 2023 • edited

✅ Deploy Preview for nonebot-bison ready!

codecov bot commented Oct 15, 2023 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

felinae98 commented Feb 10, 2024

AzideCupric commented Feb 10, 2024

netlify bot commented Oct 13, 2023 •

edited

codecov bot commented Oct 15, 2023 •

edited