nonebot-plugin-githubmodels 0.2.8__tar.gz → 1.0.0__tar.gz

{nonebot_plugin_githubmodels-0.2.8 → nonebot_plugin_githubmodels-1.0.0}/PKG-INFO

@@ -1,27 +1,18 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: nonebot-plugin-githubmodels
-Version: 0.2.8
-Summary: 一个调用 GitHub Models 的 AI 对话插件
-Home-page: https://github.com/lyqgzbl/nonebot-plugin-githubmodels
-License: MIT
-Keywords: nonebot2,GitHub Models
+Version: 1.0.0
+Summary: NoneBot 集成 GitHub Copilot 和 OpenAI 的 AI 代码生成模型插件
 Author: lyqgzbl
-Author-email: admin@lyqgzbl.com
-Requires-Python: >=3.8,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-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.54.0,<0.55.0)
-Requires-Dist: nonebot-plugin-htmlrender (>=0.5.0,<0.6.0)
-Requires-Dist: nonebot2 (>=2.2.1,<3.0.0)
-Requires-Dist: openai (>=1.44.1,<2.0.0)
-Project-URL: Documentation, https://github.com/lyqgzbl/nonebot-plugin-githubmodels#readme
-Project-URL: Repository, https://github.com/lyqgzbl/nonebot-plugin-githubmodels
+Author-email: lyqgzbl <122811297+lyqgzbl@users.noreply.github.com>
+License-Expression: MIT
+Requires-Dist: nonebot2>=2.2.1,<3.0.0
+Requires-Dist: azure-ai-inference>=1.0.0,<2.0.0
+Requires-Dist: nonebot-plugin-htmlrender>=0.5.0,<1.0.0
+Requires-Dist: nonebot-plugin-alconna>=0.54.0,<1.0.0
+Requires-Python: >=3.10, <4.0
+Project-URL: documentation, https://github.com/lyqgzbl/nonebot-plugin-daily-bing#readme
+Project-URL: homepage, https://github.com/lyqgzbl/nonebot-plugin-daily-bing
+Project-URL: repository, https://github.com/lyqgzbl/nonebot-plugin-daily-bing
 Description-Content-Type: text/markdown
 
 <!-- markdownlint-disable MD033 MD036 MD041 -->
@@ -90,7 +81,7 @@ pip install nonebot-plugin-githubmodels
 ### ai_model_name [选填]
 
 - 类型: `str`
-- 默认: `gpt-4o-mini`
+- 默认: `openai/gpt-4.1-mini`
 - 说明: 所使用的模型
 
 ### ai_temperature [选填]
@@ -99,14 +90,8 @@ pip install nonebot-plugin-githubmodels
 - 默认: `1.0`
 - 说明: 生成的文本的多样性和连贯性
 
-### ai_max_tokens [选填]
-
-- 类型: `int`
-- 默认: `1024`
-- 说明: 模型生成文本的字数
-
 ## ai_top_p [选填]
 
 - 类型: `float`
 - 默认: `1.0`
-- 说明: 生成文本随机性
+- 说明: 生成文本随机性

{nonebot_plugin_githubmodels-0.2.8 → nonebot_plugin_githubmodels-1.0.0}/README.md

@@ -64,7 +64,7 @@ pip install nonebot-plugin-githubmodels
 ### ai_model_name [选填]
 
 - 类型: `str`
-- 默认: `gpt-4o-mini`
+- 默认: `openai/gpt-4.1-mini`
 - 说明: 所使用的模型
 
 ### ai_temperature [选填]
@@ -73,12 +73,6 @@ pip install nonebot-plugin-githubmodels
 - 默认: `1.0`
 - 说明: 生成的文本的多样性和连贯性
 
-### ai_max_tokens [选填]
-
-- 类型: `int`
-- 默认: `1024`
-- 说明: 模型生成文本的字数
-
 ## ai_top_p [选填]
 
 - 类型: `float`

nonebot_plugin_githubmodels-1.0.0/pyproject.toml

@@ -0,0 +1,45 @@
+[project]
+name = "nonebot-plugin-githubmodels"
+version = "1.0.0"
+description = "NoneBot 集成 GitHub Copilot 和 OpenAI 的 AI 代码生成模型插件"
+readme = "README.md"
+authors = [
+    { name = "lyqgzbl", email = "122811297+lyqgzbl@users.noreply.github.com" }
+]
+requires-python = ">=3.10, <4.0"
+license = "MIT"
+dependencies = [
+  "nonebot2 >=2.2.1, <3.0.0",
+  "azure-ai-inference >=1.0.0, <2.0.0",
+  "nonebot-plugin-htmlrender >=0.5.0, <1.0.0",
+  "nonebot-plugin-alconna >=0.54.0, <1.0.0",
+]
+
+[project.urls]
+homepage = "https://github.com/lyqgzbl/nonebot-plugin-daily-bing"
+repository = "https://github.com/lyqgzbl/nonebot-plugin-daily-bing"
+documentation = "https://github.com/lyqgzbl/nonebot-plugin-daily-bing#readme"
+
+[build-system]
+requires = ["uv_build>=0.8.17,<0.9.0"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "ruff>=0.14.0",
+]
+
+[tool.ruff]
+line-length = 88
+target-version = "py310"
+
+[tool.ruff.lint]
+select = ["E", "W", "F", "UP", "C", "T", "PYI", "PT", "Q"]
+ignore = ["E402", "C901"]
+fixable = ["ALL"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"

{nonebot_plugin_githubmodels-0.2.8 → nonebot_plugin_githubmodels-1.0.0/src}/nonebot_plugin_githubmodels/__init__.py

@@ -1,17 +1,17 @@
 import datetime
 from pathlib import Path
 
-import nonebot
-from nonebot import require, get_plugin_config
+
 from nonebot.rule import Rule
 from nonebot.log import logger
+from nonebot import require, get_plugin_config
+from azure.ai.inference.models import SystemMessage
 from nonebot.plugin import PluginMetadata, inherit_supported_adapters
 require("nonebot_plugin_alconna")
 require("nonebot_plugin_htmlrender")
-from openai import BadRequestError
-from arclet.alconna import Args, Option, Alconna, MultiVar, CommandMeta
-from nonebot_plugin_alconna import UniMessage, on_alconna, Match
 from nonebot_plugin_htmlrender import md_to_pic
+from nonebot_plugin_alconna import UniMessage, on_alconna, Match
+from arclet.alconna import Args, Option, Alconna, MultiVar, CommandMeta
 
 from .config import Config
 from .openai_handler import OPENAI_Handler
@@ -34,16 +34,16 @@ REPLY_IMAGE = plugin_config.ai_reply_image
 
 
 if not plugin_config.github_token:
-    logger.opt(colors=True).warning("<yellow>缺失必要配置项 'github_token'，已禁用该插件</yellow>")
-    openai_handler = None
+    logger.opt(colors=True).warning("<yellow>缺失必要配置项 'github_token'，" \
+    "已禁用该插件</yellow>")
+    Openai_Handler = None
 else:
-    openai_handler = OPENAI_Handler(
+    Openai_Handler = OPENAI_Handler(
         api_key=plugin_config.github_token,
-        endpoint="https://models.inference.ai.azure.com",
+        endpoint="https://models.github.ai/inference",
         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,
     )
 
@@ -54,7 +54,7 @@ def is_enable() -> Rule:
     return Rule(_rule)
 
 
-context_manager = ContextManager(max_context_length=plugin_config.max_context_length)
+Context_Manager = ContextManager(max_context_length=plugin_config.max_context_length)
 
 
 ai = on_alconna(
@@ -79,7 +79,7 @@ ai = on_alconna(
 
 @ai.assign("reset")
 async def ai_reset():
-    context_manager.reset_context()
+    Context_Manager.reset_context()
     await ai.finish("上下文已重置")
 
 
@@ -101,23 +101,25 @@ async def handle_function(user_input: Match[tuple[str]]):
 async def got_location(user_input: str):
     global REPLY_IMAGE
     try:
-        messages = [{"role": "system", "content": "回答尽量简练,请始终用中文回答"}]
-        context_manager.add_message("user", user_input)
-        messages += context_manager.get_context()
-        reply = await openai_handler.get_response(messages)
-        context_manager.add_message("assistant", reply)
+        messages = [SystemMessage(content="回答尽量简练,请始终用中文回答")]
+        Context_Manager.add_message("user", user_input)
+        messages += Context_Manager.get_context()
+        if Openai_Handler is not None:
+            reply = await Openai_Handler.get_response(messages)
+        Context_Manager.add_message("assistant", reply)
         if REPLY_IMAGE:
             current_hour = datetime.datetime.now().hour
             is_dark_mode = 18 <= current_hour or current_hour < 6
             css_file = (
-                Path(__file__).parent / "css" / ("dark.css" if is_dark_mode else "light.css")
+                Path(__file__).
+                parent / "css" / ("dark.css" if is_dark_mode else "light.css")
             )
             pic = await md_to_pic(md=reply, css_path=str(css_file))
             await UniMessage.image(raw=pic).send(reply_to=True)
         else:
             await UniMessage.text(reply).send(reply_to=True)
-    except BadRequestError as e:
+    except Exception as e:
         logger.opt(colors=True).error(f"<red>API 请求失败: {e}</red>")
         await ai.send("问题触发了内容过滤策略,请修改问题后重试")
     finally:
-        REPLY_IMAGE = plugin_config.ai_reply_image
+        REPLY_IMAGE = plugin_config.ai_reply_image

{nonebot_plugin_githubmodels-0.2.8 → nonebot_plugin_githubmodels-1.0.0/src}/nonebot_plugin_githubmodels/config.py

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

nonebot_plugin_githubmodels-1.0.0/src/nonebot_plugin_githubmodels/context_manager.py

@@ -0,0 +1,41 @@
+from __future__ import annotations
+from azure.ai.inference.models import (
+    AssistantMessage,
+    ChatRequestMessage,
+    SystemMessage,
+    UserMessage,
+)
+
+
+class ContextManager:
+    def __init__(self, max_context_length: int):
+        self.max_context_length = max_context_length
+        self.shared_context: list[ChatRequestMessage] = []
+
+    def add_message(self, role: str, content: str):
+        if self.max_context_length <= 0:
+            return
+
+        message = self._create_message(role, content)
+        if message is None:
+            return
+
+        self.shared_context.append(message)
+        if len(self.shared_context) > self.max_context_length:
+            self.shared_context = self.shared_context[-self.max_context_length:]
+
+    def get_context(self) -> list[ChatRequestMessage]:
+        return self.shared_context.copy() if self.max_context_length > 0 else []
+
+    def reset_context(self):
+        self.shared_context = []
+
+    @staticmethod
+    def _create_message(role: str, content: str) -> ChatRequestMessage | None:
+        if role == "user":
+            return UserMessage(content=content)
+        if role == "assistant":
+            return AssistantMessage(content=content)
+        if role == "system":
+            return SystemMessage(content=content)
+        return None

nonebot_plugin_githubmodels-1.0.0/src/nonebot_plugin_githubmodels/openai_handler.py

@@ -0,0 +1,36 @@
+from collections.abc import Sequence
+from azure.ai.inference.aio import ChatCompletionsClient
+from azure.ai.inference.models import ChatRequestMessage
+from azure.core.credentials import AzureKeyCredential
+
+
+class OPENAI_Handler:
+    def __init__(
+        self,
+        api_key: str,
+        endpoint: str,
+        model_name: str,
+        max_context_length: int,
+        temperature: float,
+        top_p: float,
+    ):
+        self.client = ChatCompletionsClient(
+            endpoint=endpoint,
+            credential=AzureKeyCredential(api_key)
+        )
+        self.model_name = model_name
+        self.max_context_length = max_context_length
+        self.temperature = temperature
+        self.top_p = top_p
+
+    async def get_response(self, messages: Sequence[ChatRequestMessage]) -> str:
+        response = await self.client.complete(
+            messages=list(messages),
+            model=self.model_name,
+            temperature=self.temperature,
+            top_p=self.top_p,
+        )
+        content = response.choices[0].message.content
+        if not content:
+            raise ValueError("模型未返回内容")
+        return content

nonebot_plugin_githubmodels-0.2.8/LICENSE

@@ -1,19 +0,0 @@
-The MIT License (MIT)
-Copyright (c) 2024 lyqgzbl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-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.

nonebot_plugin_githubmodels-0.2.8/nonebot_plugin_githubmodels/context_manager.py

@@ -1,16 +0,0 @@
-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.8/nonebot_plugin_githubmodels/openai_handler.py

@@ -1,29 +0,0 @@
-from openai import AsyncOpenAI
-
-class OPENAI_Handler:
-    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.8/pyproject.toml

@@ -1,22 +0,0 @@
-[tool.poetry]
-name = "nonebot-plugin-githubmodels"
-version = "0.2.8"
-description = "一个调用 GitHub Models 的 AI 对话插件"
-readme = "README.md"
-authors = ["lyqgzbl <admin@lyqgzbl.com>"]
-license = "MIT"
-homepage = "https://github.com/lyqgzbl/nonebot-plugin-githubmodels"
-repository = "https://github.com/lyqgzbl/nonebot-plugin-githubmodels"
-documentation = "https://github.com/lyqgzbl/nonebot-plugin-githubmodels#readme"
-keywords = ["nonebot2", "GitHub Models"]
-
-[tool.poetry.dependencies]
-python = "^3.8"
-nonebot2 = "^2.2.1"
-openai = "^1.44.1"
-nonebot-plugin-htmlrender = "^0.5.0"
-nonebot-plugin-alconna = "^0.54.0"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"