nonebot-plugin-githubmodels 0.2.3__tar.gz → 0.2.5__tar.gz

{nonebot_plugin_githubmodels-0.2.3 → nonebot_plugin_githubmodels-0.2.5}/LICENSE

@@ -16,4 +16,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{nonebot_plugin_githubmodels-0.2.3 → nonebot_plugin_githubmodels-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-githubmodels
-Version: 0.2.3
+Version: 0.2.5
 Summary: API 调用 GitHub Models 的大语言模型
 Home-page: https://github.com/lyqgzbl/nonebot-plugin-githubmodels
 License: MIT
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: nonebot-plugin-alconna (>=0.52.0,<0.53.0)
+Requires-Dist: nonebot-plugin-alconna (>=0.53.0,<0.54.0)
 Requires-Dist: nonebot-plugin-htmlrender (>=0.3.5,<0.4.0)
 Requires-Dist: nonebot2 (>=2.2.1,<3.0.0)
 Requires-Dist: openai (>=1.44.1,<2.0.0)
@@ -38,33 +38,29 @@ Description-Content-Type: text/markdown
 
 _✨ API调用GitHub models大语言模型 ✨_
 
-</div>
+<a href ="https://raw.githubusercontent.com/lyqgzbl/nonebot-plugin-githubmodels/refs/heads/main/LICENSE"><img src="https://img.shields.io/pypi/l/nonebot-plugin-githubmodels"> </a>
+<a href="https://pypi.python.org/pypi/nonebot-plugin-githubmodels"> <img src="https://img.shields.io/pypi/v/nonebot-plugin-githubmodels.svg" alt="pypi"></a> 
+<img src="https://img.shields.io/badge/python-3.8+-blue.svg" alt="python">
 
-<p align="center">
-  <a href="https://raw.githubusercontent.com/kexue-z/nonebot-plugin-heweather/master/LICENSE">
-    <img src="https://img.shields.io/github/license/kexue-z/nonebot-plugin-heweather.svg" alt="license">
-  </a>
-  <a href="https://pypi.org/project/nonebot-plugin-heweather/">
-    <img src="https://img.shields.io/pypi/v/nonebot-plugin-heweather" alt="pypi">
-  </a>
-  <img src="https://img.shields.io/badge/python-3.8+-blue.svg" alt="python">
-</p>
+</div>
 
 # 安装
-
-使用nb-cli  
+使用nb-cli [推荐]
 ```shell
 nb plugin install nonebot-plugin-githubmodels
 ```
+使用pip
+```shell
+pip install nonebot-plugin-githubmodels
+```
 
-# 指令
-
-“AI xxx”  询问AI
-例如“AI 嗨”
-
-”AI 重置“  重置上下文记忆
+# 使用
+命令需要加 [NoneBot 命令前缀](https://nonebot.dev/docs/appendices/config#command-start-和-command-separator) (默认为`/`)  
+使用命令`AI`/`ai`触发插件  
+命令选项`-r` 重置上下文记忆  
+命令选项`-i` 临时启用图片回复  
 
 # 配置
 
-## 见 [.env.example](https://github.com/lyqgzbl/nonebot-plugin-githubmodels/blob/main/.env.example)
+配置参见 [.env.example](https://github.com/lyqgzbl/nonebot-plugin-githubmodels/blob/main/.env.example)
 

nonebot_plugin_githubmodels-0.2.5/README.md

@@ -0,0 +1,41 @@
+<!-- markdownlint-disable MD033 MD036 MD041 -->
+
+<div align="center">
+
+<a href="https://v2.nonebot.dev/store">
+  <img src="https://raw.githubusercontent.com/A-kirami/nonebot-plugin-template/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo">
+</a>
+
+<p>
+  <img src="https://raw.githubusercontent.com/lgc-NB2Dev/readme/main/template/plugin.svg" alt="NoneBotPluginText">
+</p>
+
+# nonebot-plugin-githubmodels
+
+_✨ API调用GitHub models大语言模型 ✨_
+
+<a href ="https://raw.githubusercontent.com/lyqgzbl/nonebot-plugin-githubmodels/refs/heads/main/LICENSE"><img src="https://img.shields.io/pypi/l/nonebot-plugin-githubmodels"> </a>
+<a href="https://pypi.python.org/pypi/nonebot-plugin-githubmodels"> <img src="https://img.shields.io/pypi/v/nonebot-plugin-githubmodels.svg" alt="pypi"></a> 
+<img src="https://img.shields.io/badge/python-3.8+-blue.svg" alt="python">
+
+</div>
+
+# 安装
+使用nb-cli [推荐]
+```shell
+nb plugin install nonebot-plugin-githubmodels
+```
+使用pip
+```shell
+pip install nonebot-plugin-githubmodels
+```
+
+# 使用
+命令需要加 [NoneBot 命令前缀](https://nonebot.dev/docs/appendices/config#command-start-和-command-separator) (默认为`/`)  
+使用命令`AI`/`ai`触发插件  
+命令选项`-r` 重置上下文记忆  
+命令选项`-i` 临时启用图片回复  
+
+# 配置
+
+配置参见 [.env.example](https://github.com/lyqgzbl/nonebot-plugin-githubmodels/blob/main/.env.example)

nonebot_plugin_githubmodels-0.2.5/nonebot_plugin_githubmodels/GPT_handler.py

@@ -0,0 +1,29 @@
+from openai import AsyncOpenAI
+
+class GPTHandler:
+    def __init__(
+        self,
+        api_key: str,
+        endpoint: str,
+        model_name: str,
+        max_context_length: int,
+        temperature: float,
+        max_tokens: int,
+        top_p: float,
+    ):
+        self.client = AsyncOpenAI(base_url=endpoint, api_key=api_key)
+        self.model_name = model_name
+        self.max_context_length = max_context_length
+        self.temperature = temperature
+        self.max_tokens = max_tokens
+        self.top_p = top_p
+
+    async def get_response(self, messages: list) -> str:
+        response = await self.client.chat.completions.create(
+            messages=messages,
+            model=self.model_name,
+            temperature=self.temperature,
+            max_tokens=self.max_tokens,
+            top_p=self.top_p,
+        )
+        return response.choices[0].message.content

{nonebot_plugin_githubmodels-0.2.3 → nonebot_plugin_githubmodels-0.2.5}/nonebot_plugin_githubmodels/__init__.py

@@ -1,26 +1,48 @@
 import nonebot
 from nonebot import require, get_plugin_config
+from nonebot.rule import Rule
+from nonebot.log import logger
+from nonebot.plugin import PluginMetadata
+
 require("nonebot_plugin_alconna")
 require("nonebot_plugin_htmlrender")
-from openai import AsyncOpenAI
+from openai import BadRequestError
 from arclet.alconna import Args, Option, Alconna, MultiVar
-from nonebot.plugin import PluginMetadata
-from nonebot_plugin_htmlrender import md_to_pic
 from nonebot_plugin_alconna import UniMessage, on_alconna, Match
+from nonebot_plugin_htmlrender import md_to_pic
+
 from .config import Config
+from .GPT_handler import GPTHandler
+from .context_manager import ContextManager
+
 
 plugin_config = get_plugin_config(Config)
-TOKEN = plugin_config.github_token
-MODEL_NAME = plugin_config.ai_model_name
 REPLY_IMAGE = plugin_config.ai_reply_image
-MAX_CONTEXT_LENGTH = plugin_config.max_context_length
 
-endpoint = "https://models.inference.ai.azure.com"
-client = AsyncOpenAI(
-    base_url=endpoint,
-    api_key=TOKEN,
-)
-shared_context = []
+
+if not plugin_config.github_token:
+    logger.opt(colors=True).warning("<yellow>缺失必要配置项 'github_token'，已禁用该插件</yellow>")
+    GPT_handler = None
+else:
+    GPT_handler = GPTHandler(
+        api_key=plugin_config.github_token,
+        endpoint="https://models.inference.ai.azure.com",
+        model_name=plugin_config.ai_model_name,
+        max_context_length=plugin_config.max_context_length,
+        temperature=plugin_config.ai_temperature,
+        max_tokens=plugin_config.ai_max_tokens,
+        top_p=plugin_config.ai_top_p,
+    )
+
+
+def is_enable() -> Rule:
+    def _rule() -> bool:
+        return bool(plugin_config.github_token)
+    return Rule(_rule)
+
+
+context_manager = ContextManager(max_context_length=plugin_config.max_context_length)
+
 
 ai = on_alconna(
     Alconna(
@@ -29,17 +51,19 @@ ai = on_alconna(
         Option("-r|--reset"),
         Option("-i|--image"),
     ),
+    rule=is_enable(),
     use_cmd_start=True,
     block=True,
     aliases={"ai"},
 )
 
+
 @ai.assign("reset")
 async def ai_reset():
-    global shared_context
-    shared_context = []
+    context_manager.reset_context()
     await ai.finish("上下文已重置")
 
+
 @ai.assign("image")
 async def ai_image(user_input: Match[tuple[str]]):
     if user_input.available:
@@ -47,48 +71,34 @@ async def ai_image(user_input: Match[tuple[str]]):
         REPLY_IMAGE = True
         ai.set_path_arg("user_input", " ".join(user_input.result))
 
+
 @ai.handle()
 async def handle_function(user_input: Match[tuple[str]]):
     if user_input.available:
         ai.set_path_arg("user_input", " ".join(user_input.result))
 
+
 @ai.got_path("user_input", prompt="请输入有效问题")
 async def got_location(user_input: str):
-    global shared_context, REPLY_IMAGE
-    if MAX_CONTEXT_LENGTH > 0:
-        shared_context.append({"role": "user", "content": user_input})
-        if len(shared_context) > MAX_CONTEXT_LENGTH:
-            shared_context = shared_context[-MAX_CONTEXT_LENGTH:]
-
-    messages = [
-        {"role": "system", "content": "回答尽量简练,请始终用中文回答"}
-    ]
-    if MAX_CONTEXT_LENGTH > 0:
-        messages += shared_context
-    else:
-        messages.append({"role": "user", "content": user_input})
-
+    global REPLY_IMAGE
     try:
-        response = await client.chat.completions.create(
-        messages=messages,
-        model=MODEL_NAME,
-        temperature=1,
-        max_tokens=500,
-        top_p=1,
-    )
-
-        reply = response.choices[0].message.content
-        if MAX_CONTEXT_LENGTH > 0:
-            shared_context.append({"role": "assistant", "content": reply})
-
+        messages = [{"role": "system", "content": "回答尽量简练,请始终用中文回答"}]
+        context_manager.add_message("user", user_input)
+        messages += context_manager.get_context()
+        reply = await GPT_handler.get_response(messages)
+        context_manager.add_message("assistant", reply)
         if REPLY_IMAGE:
             pic = await md_to_pic(md=reply)
             await UniMessage.image(raw=pic).send(reply_to=True)
         else:
             await UniMessage.text(reply).send(reply_to=True)
+    except BadRequestError as e:
+        logger.opt(colors=True).error(f"<red>API 请求失败: {e}</red>")
+        await ai.send("问题触发了内容过滤策略,请修改问题后重试")
     finally:
         REPLY_IMAGE = plugin_config.ai_reply_image
 
+
 __plugin_meta__ = PluginMetadata(
     name="githubmodels",
     description="API 调用 GitHub Models 的大语言模型",
@@ -96,4 +106,4 @@ __plugin_meta__ = PluginMetadata(
     type="application",
     homepage="https://github.com/lyqgzbl/nonebot-plugin-githubmodels",
     supported_adapters=None,
-)
+)

{nonebot_plugin_githubmodels-0.2.3 → nonebot_plugin_githubmodels-0.2.5}/nonebot_plugin_githubmodels/config.py

@@ -3,6 +3,9 @@ from pydantic import BaseModel, Field
 
 class Config(BaseModel):
     github_token: Optional[str] = None
-    ai_model_name: str = "gpt-4o-mini"
     max_context_length: int = Field(20)
     ai_reply_image: bool = False
+    ai_model_name: str = "gpt-4o-mini"
+    ai_temperature: float = Field(1.0)
+    ai_max_tokens: int = Field(1024)
+    ai_top_p: float = Field(1.0)

nonebot_plugin_githubmodels-0.2.5/nonebot_plugin_githubmodels/context_manager.py

@@ -0,0 +1,16 @@
+class ContextManager:
+    def __init__(self, max_context_length: int):
+        self.max_context_length = max_context_length
+        self.shared_context = []
+
+    def add_message(self, role: str, content: str):
+        if self.max_context_length > 0:
+            self.shared_context.append({"role": role, "content": content})
+            if len(self.shared_context) > self.max_context_length:
+                self.shared_context = self.shared_context[-self.max_context_length:]
+
+    def get_context(self):
+        return self.shared_context.copy() if self.max_context_length > 0 else []
+
+    def reset_context(self):
+        self.shared_context = []

{nonebot_plugin_githubmodels-0.2.3 → nonebot_plugin_githubmodels-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-githubmodels"
-version = "0.2.3"
+version = "0.2.5"
 description = "API 调用 GitHub Models 的大语言模型"
 readme = "README.md"
 authors = ["lyqgzbl <admin@lyqgzbl.com>"]
@@ -13,7 +13,7 @@ python = "^3.8"
 nonebot2 = "^2.2.1"
 openai = "^1.44.1"
 nonebot-plugin-htmlrender = "^0.3.5"
-nonebot-plugin-alconna = "^0.52.0"
+nonebot-plugin-alconna = "^0.53.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

nonebot_plugin_githubmodels-0.2.3/README.md

@@ -1,45 +0,0 @@
-<!-- markdownlint-disable MD033 MD036 MD041 -->
-
-<div align="center">
-
-<a href="https://v2.nonebot.dev/store">
-  <img src="https://raw.githubusercontent.com/A-kirami/nonebot-plugin-template/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo">
-</a>
-
-<p>
-  <img src="https://raw.githubusercontent.com/lgc-NB2Dev/readme/main/template/plugin.svg" alt="NoneBotPluginText">
-</p>
-
-# nonebot-plugin-githubmodels
-
-_✨ API调用GitHub models大语言模型 ✨_
-
-</div>
-
-<p align="center">
-  <a href="https://raw.githubusercontent.com/kexue-z/nonebot-plugin-heweather/master/LICENSE">
-    <img src="https://img.shields.io/github/license/kexue-z/nonebot-plugin-heweather.svg" alt="license">
-  </a>
-  <a href="https://pypi.org/project/nonebot-plugin-heweather/">
-    <img src="https://img.shields.io/pypi/v/nonebot-plugin-heweather" alt="pypi">
-  </a>
-  <img src="https://img.shields.io/badge/python-3.8+-blue.svg" alt="python">
-</p>
-
-# 安装
-
-使用nb-cli  
-```shell
-nb plugin install nonebot-plugin-githubmodels
-```
-
-# 指令
-
-“AI xxx”  询问AI
-例如“AI 嗨”
-
-”AI 重置“  重置上下文记忆
-
-# 配置
-
-## 见 [.env.example](https://github.com/lyqgzbl/nonebot-plugin-githubmodels/blob/main/.env.example)