nonebot-plugin-copywrite 0.2.2__tar.gz → 0.2.3__tar.gz

{nonebot_plugin_copywrite-0.2.2 → nonebot_plugin_copywrite-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-copywrite
-Version: 0.2.2
+Version: 0.2.3
 Summary: 
 License: Apache-2.0
 Author: Yan
@@ -33,9 +33,9 @@ _✨ NoneBot 定型文生成器 ✨_
 <a href="./LICENSE">
     <img src="https://img.shields.io/github/license/Yan-Zero/nonebot-plugin-copywrite.svg" alt="license">
 </a>
-<!-- <a href="https://pypi.python.org/pypi/nonebot-plugin-copywrite">
+<a href="https://pypi.python.org/pypi/nonebot-plugin-copywrite">
     <img src="https://img.shields.io/pypi/v/nonebot-plugin-copywrite.svg" alt="pypi">
-</a> -->
+</a>
 <a href="https://www.python.org">
     <img src="https://img.shields.io/badge/python-3.11+-blue.svg" alt="python">
 </a>
@@ -51,7 +51,67 @@ _✨ NoneBot 定型文生成器 ✨_
 
 </div>
 
-## 介绍
+## 📖 介绍
 
 基于 LLM 的定型文生成器
 
+## ⚙️ 数据配置
+
+### 定型文
+
+存放于 ./data/copywrite/ 下面
+
+#### 例子
+
+```yaml
+__category__: 114514
+
+鸣潮:
+  examples:
+    - 圆桌是这样的，亚瑟王只需要使用圣剑就行了，而圆桌骑士们需要考虑的就多了，什么时候和贵妇幽会，什么时候挑起内战，都需要深思熟虑
+    - 儿童节是这样的，大哥哥只需要在家等着被抓就行了，而小萝莉要考虑的事情就很多了，什么时候喊杂鱼杂鱼，什么时候掀裙子露内裤，什么时候拉响警报器，都需要经过深思熟虑
+    - 企业家是这样的，员工只需要完成工作任务就行了，而老板要考虑的事情就很多了，什么时候拖欠工资，什么时候增加工作时间，员工绩效怎么压，都需要深思熟虑
+  addition: "你回复的文案应该是辛辣讽刺的，例如老板考虑如何拖欠工资，学生考虑低分怎么辩解，游戏玩家考虑如何开挂。"
+  model: grok-beta
+```
+
+#### 解释
+
+- __category__: 定型文的分类
+- examples: 例子
+- addition: 附加内容，用以约束 LLM 可能的输出
+- model: 使用的模型
+
+## 💬 指令
+
+### 文案
+
+> /文案 [Key] (Keywords)* [Topic]
+> /文案 求真学生 吃饭
+
+查看可用文案：
+> /文案
+
+查看帮助（如果有）：
+> /文案 [Key]
+
+#### 保留关键字
+
+1. reload: 重新加载定型文数据
+2. fetch: ！！慎用！！ 调用 pip 更新 nonebot-plugin-copywrite，由于依赖问题，可能下一次bot就无法启动了。
+
+#### 文案 Alias
+
+- copywrite
+
+### 汉语新解
+
+> /汉语新解 [Word]
+> /汉语新解 求真书院
+
+著名的某图片生成prompt
+
+#### 汉语新解 Alias
+
+- new-meaning
+

{nonebot_plugin_copywrite-0.2.2 → nonebot_plugin_copywrite-0.2.3}/README.md

@@ -13,9 +13,9 @@ _✨ NoneBot 定型文生成器 ✨_
 <a href="./LICENSE">
     <img src="https://img.shields.io/github/license/Yan-Zero/nonebot-plugin-copywrite.svg" alt="license">
 </a>
-<!-- <a href="https://pypi.python.org/pypi/nonebot-plugin-copywrite">
+<a href="https://pypi.python.org/pypi/nonebot-plugin-copywrite">
     <img src="https://img.shields.io/pypi/v/nonebot-plugin-copywrite.svg" alt="pypi">
-</a> -->
+</a>
 <a href="https://www.python.org">
     <img src="https://img.shields.io/badge/python-3.11+-blue.svg" alt="python">
 </a>
@@ -31,6 +31,66 @@ _✨ NoneBot 定型文生成器 ✨_
 
 </div>
 
-## 介绍
+## 📖 介绍
 
 基于 LLM 的定型文生成器
+
+## ⚙️ 数据配置
+
+### 定型文
+
+存放于 ./data/copywrite/ 下面
+
+#### 例子
+
+```yaml
+__category__: 114514
+
+鸣潮:
+  examples:
+    - 圆桌是这样的，亚瑟王只需要使用圣剑就行了，而圆桌骑士们需要考虑的就多了，什么时候和贵妇幽会，什么时候挑起内战，都需要深思熟虑
+    - 儿童节是这样的，大哥哥只需要在家等着被抓就行了，而小萝莉要考虑的事情就很多了，什么时候喊杂鱼杂鱼，什么时候掀裙子露内裤，什么时候拉响警报器，都需要经过深思熟虑
+    - 企业家是这样的，员工只需要完成工作任务就行了，而老板要考虑的事情就很多了，什么时候拖欠工资，什么时候增加工作时间，员工绩效怎么压，都需要深思熟虑
+  addition: "你回复的文案应该是辛辣讽刺的，例如老板考虑如何拖欠工资，学生考虑低分怎么辩解，游戏玩家考虑如何开挂。"
+  model: grok-beta
+```
+
+#### 解释
+
+- __category__: 定型文的分类
+- examples: 例子
+- addition: 附加内容，用以约束 LLM 可能的输出
+- model: 使用的模型
+
+## 💬 指令
+
+### 文案
+
+> /文案 [Key] (Keywords)* [Topic]
+> /文案 求真学生 吃饭
+
+查看可用文案：
+> /文案
+
+查看帮助（如果有）：
+> /文案 [Key]
+
+#### 保留关键字
+
+1. reload: 重新加载定型文数据
+2. fetch: ！！慎用！！ 调用 pip 更新 nonebot-plugin-copywrite，由于依赖问题，可能下一次bot就无法启动了。
+
+#### 文案 Alias
+
+- copywrite
+
+### 汉语新解
+
+> /汉语新解 [Word]
+> /汉语新解 求真书院
+
+著名的某图片生成prompt
+
+#### 汉语新解 Alias
+
+- new-meaning

{nonebot_plugin_copywrite-0.2.2 → nonebot_plugin_copywrite-0.2.3}/nonebot_plugin_copywrite/__init__.py

@@ -1,5 +1,6 @@
 import re
 import sys
+import functools
 import itertools
 import asyncio
 import pathlib
@@ -22,12 +23,14 @@ from nonebot.log import logger
 
 from .copywrite import generate_copywrite
 from .copywrite import Pattern
+from .utils import to_await
 from .chat import chat
 
 # from datetime import datetime
 # from nonebot.adapters.onebot.v11 import GroupMessageEvent
 # from .config import copywrite_config
 
+
 m_copywrite = on_command(
     "copywrite",
     aliases={"文案"},
@@ -62,7 +65,7 @@ _COPY: dict[str, Pattern] = {}
 _COPY_TYPE: dict[str, set] = {}
 
 
-async def load(clear: bool = False, **kwargs):
+def load(clear: bool = False, **kwargs):
     global _COPY, _COPY_TYPE
     if clear:
         _COPY = {}
@@ -89,18 +92,18 @@ async def load(clear: bool = False, **kwargs):
                     _COPY_TYPE[category].add(key)
                     _COPY[key] = Pattern.model_validate(v)
 
+    return "重新加载完成。"
+
 
 async def fetch(diff: bool = False, **kwargs):
     pip_path = next(pathlib.Path(sys.executable).parent.glob("pip*"))
     if not pip_path:
         return "没有找到 pip 路径哦"
     ret = await asyncio.create_subprocess_exec(
-        str(pip_path.absolute()),
-        [
-            "install",
-            "--upgrade",
-            "git+https://github.com/Yan-Zero/nonebot-plugin-copywrite.git",
-        ],
+        pip_path.absolute(),
+        "install",
+        "--upgrade",
+        "nonebot-plugin-copywrite",
         stdout=asyncio.subprocess.PIPE,
         stderr=asyncio.subprocess.PIPE,
     )
@@ -121,7 +124,8 @@ async def fetch(diff: bool = False, **kwargs):
     await load(clear=True)
 
     ret = ret[ret.find("Successfully installed nonebot-plugin-copywrite-") + 48 :]
-    ret = f"已经更新 {ret[: ret.find("\n")]}。\n"
+    ret = ret[: ret.find("\n")]
+    ret = f"已经更新 {ret}。\n"
     if diff:
         if not _c:
             _c = {}
@@ -163,15 +167,15 @@ async def fetch(diff: bool = False, **kwargs):
     return ret.strip()
 
 
-RESERVED_WORD["reload"] = load
-RESERVED_WORD["fetch"] = lambda **kwargs: fetch(diff=True, **kwargs)
+RESERVED_WORD["reload"] = to_await(load)
+RESERVED_WORD["fetch"] = functools.partial(fetch, diff=True)
+load()
 
 
 @m_copywrite.handle()
 async def _(bot: Bot, event: MessageEvent, args=CommandArg()):
     args = args.extract_plain_text().strip()
     if not args:
-        ret = "请输入要仿写的文案名字"
         if True:
             ret = ""
             for category, keys in _COPY_TYPE.items():
@@ -180,6 +184,8 @@ async def _(bot: Bot, event: MessageEvent, args=CommandArg()):
                     + ", ".join(sorted(keys, key=lambda x: (-len(x), x)))
                     + "\n"
                 )
+        if not ret:
+            ret = "好像一片空白？"
         await m_copywrite.finish(ret)
 
     args = args.split(maxsplit=1)
@@ -211,7 +217,7 @@ async def _(bot: Bot, event: MessageEvent, args=CommandArg()):
 
     try:
         rsp = await chat(
-            message=[
+            messages=[
                 {
                     "role": "user",
                     "content": generate_copywrite(
@@ -240,7 +246,7 @@ async def _(args=CommandArg()):
 
     try:
         rsp = await chat(
-            message=[
+            messages=[
                 {
                     "role": "user",
                     "content": r""";; 模型: Claude Sonnet

{nonebot_plugin_copywrite-0.2.2 → nonebot_plugin_copywrite-0.2.3}/nonebot_plugin_copywrite/chat.py

@@ -5,19 +5,19 @@ from openai import AsyncOpenAI
 # from nonebot import get_plugin_config
 # from .config import Config
 
-OPENAI_CONFIG = {}
+OPENAI_ASYNC_CLIENT: dict[str, AsyncOpenAI] = {}
 try:
     with open("configs/chatgpt-vision/keys.yaml") as f:
         for i in yaml.safe_load(f):
-            OPENAI_CONFIG[i.get("model")] = {
-                "api_key": i.get("key"),
-                "base_url": i.get("url"),
-            }
+            OPENAI_ASYNC_CLIENT[i.get("model")] = AsyncOpenAI(
+                api_key=i.get("key"),
+                base_url=i.get("url"),
+            )
 except Exception:
     pass
 
 
-async def chat(message: list, model: str, times: int = 3, temperature: int = 0.65):
+async def chat(messages: list, model: str, times: int = 3, temperature: int = 0.65):
     """
     Chat with ChatGPT
 
@@ -30,11 +30,11 @@ async def chat(message: list, model: str, times: int = 3, temperature: int = 0.6
     times : int
         The times you want to try
     """
-    if model not in OPENAI_CONFIG:
+    if model not in OPENAI_ASYNC_CLIENT:
         raise ValueError(f"The model {model} is not supported.")
     try:
-        rsp = await AsyncOpenAI(**OPENAI_CONFIG[model]).chat.completions.create(
-            messages=message, model=model, temperature=temperature
+        rsp = await OPENAI_ASYNC_CLIENT[model].chat.completions.create(
+            messages=messages, model=model, temperature=temperature
         )
         if not rsp:
             raise ValueError("The Response is Null.")
@@ -46,8 +46,8 @@ async def chat(message: list, model: str, times: int = 3, temperature: int = 0.6
 
 
 async def draw_image(model: str, prompt: str, size: str = "1024x1024", times: int = 3):
-    if model not in OPENAI_CONFIG:
+    if model not in OPENAI_ASYNC_CLIENT:
         raise ValueError(f"The model {model} is not supported.")
-    return await AsyncOpenAI(**OPENAI_CONFIG[model]).images.generate(
+    return await OPENAI_ASYNC_CLIENT[model].images.generate(
         model=model, prompt=prompt, size=size
     )

nonebot_plugin_copywrite-0.2.3/nonebot_plugin_copywrite/utils.py

@@ -0,0 +1,9 @@
+import functools
+from typing import Callable
+
+
+def to_await(call: Callable):
+    async def _(method: Callable, *args, **kwargs):
+        return method(*args, **kwargs)
+
+    return functools.partial(_, method=call)

{nonebot_plugin_copywrite-0.2.2 → nonebot_plugin_copywrite-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-copywrite"
-version = "0.2.2"
+version = "0.2.3"
 description = ""
 authors = ["Yan <1964649083@qq.com>"]
 license = "Apache License 2.0"