nonebot-plugin-githubmodels 0.1.0__tar.gz → 0.1.3__tar.gz

{nonebot_plugin_githubmodels-0.1.0 → nonebot_plugin_githubmodels-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-githubmodels
-Version: 0.1.0
+Version: 0.1.3
 Summary: API 调用 GitHub Models 的 GPT-4o 模型
 Home-page: https://github.com/lyqgzbl/nonebot-plugin-githubmodels
 License: MIT
@@ -14,7 +14,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: nonebot-adapter-onebot (>=2.0.0,<3.0.0)
-Requires-Dist: nonebot2[fastapi] (>=2.0.0,<3.0.0)
+Requires-Dist: nonebot2 (>=2.2.1,<3.0.0)
 Requires-Dist: openai (>=1.44.1,<2.0.0)
 Project-URL: Repository, https://github.com/lyqgzbl/nonebot-plugin-githubmodels

{nonebot_plugin_githubmodels-0.1.0 → nonebot_plugin_githubmodels-0.1.3}/nonebot_plugin_githubmodels/__init__.py

@@ -1,20 +1,18 @@
 import nonebot
-from openai import OpenAI
+from openai import AsyncOpenAI
 from nonebot import on_command
 from nonebot.adapters import Message
 from nonebot.params import CommandArg
 from nonebot.plugin import PluginMetadata
+from .config import TOKEN,MODEL_NAME,MAX_CONTEXT_LENGTH,Config
 
-config = nonebot.get_driver().config
-token = config.github_token
 endpoint = "https://models.inference.ai.azure.com"
-model_name = "gpt-4o-mini"
-client = OpenAI(
+client = AsyncOpenAI(
     base_url=endpoint,
-    api_key=token,
+    api_key=TOKEN,
 )
+
 shared_context = []
-MAX_CONTEXT_LENGTH = 20  # 设置上下文最大保留条数
 AI = on_command("AI", priority=10, block=True)
 
 @AI.handle()
@@ -29,7 +27,6 @@ async def handle_function(args: Message = CommandArg()):
     
     shared_context.append({"role": "user", "content": user_input})
     
-    # 保持上下文列表的最大长度
     if len(shared_context) > MAX_CONTEXT_LENGTH:
         shared_context = shared_context[-MAX_CONTEXT_LENGTH:]
     
@@ -39,21 +36,26 @@ async def handle_function(args: Message = CommandArg()):
             "content": "回答尽量简练，请始终用中文回答。",
         }
     ] + shared_context
-    response = client.chat.completions.create(
+    
+    response = await client.chat.completions.create(
         messages=messages,
-        model=model_name,
+        model=MODEL_NAME,
         temperature=1,
         max_tokens=500,
         top_p=1,
     )
+    
     reply = response.choices[0].message.content
     shared_context.append({"role": "assistant", "content": reply})
     
-    # 保持上下文列表的最大长度
     if len(shared_context) > MAX_CONTEXT_LENGTH:
         shared_context = shared_context[-MAX_CONTEXT_LENGTH:]
     
     await AI.send(reply, reply_message=True)
+    reply = response.choices[0].message.content
+    shared_context.append({"role": "assistant", "content": reply})
+    
+
 
 __plugin_meta__ = PluginMetadata(
     name="githubmodels",
@@ -61,5 +63,5 @@ __plugin_meta__ = PluginMetadata(
     usage="AI",
     type="application",
     homepage="https://github.com/lyqgzbl/nonebot-plugin-githubmodels",
-    supported_adapters={"~onebot.v11"},
-)
+    supported_adapters=None,
+)

nonebot_plugin_githubmodels-0.1.3/nonebot_plugin_githubmodels/config.py

@@ -0,0 +1,25 @@
+from typing import Optional
+from nonebot import get_driver
+from nonebot import get_plugin_config
+
+class Config:
+    def __init__(self):
+        try:
+            self.github_token = get_driver().config.github_token  
+        except AttributeError:
+            self.github_token = None
+            
+        try:
+            self.model_name = get_driver().config.model_name
+        except AttributeError:
+            self.model_name = "gpt-4o-mini"
+            
+        try:
+            self.MAX_CONTEXT_LENGTH = get_driver().config.MAX_CONTEXT_LENGTH
+        except AttributeError:
+            self.MAX_CONTEXT_LENGTH = 20
+
+config = Config()  
+TOKEN = config.github_token 
+MODEL_NAME = config.model_name
+MAX_CONTEXT_LENGTH = config.MAX_CONTEXT_LENGTH

{nonebot_plugin_githubmodels-0.1.0 → nonebot_plugin_githubmodels-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-githubmodels"
-version = "0.1.0"
+version = "0.1.3"
 description = "API 调用 GitHub Models 的 GPT-4o 模型"
 authors = ["lyqgzbl <admin@lyqgzbl.com>"]
 license = "MIT"
@@ -9,9 +9,8 @@ repository = "https://github.com/lyqgzbl/nonebot-plugin-githubmodels"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-nonebot2 = { version = "^2.0.0", extras = ["fastapi"] }
+nonebot2 = "^2.2.1"
 openai = "^1.44.1"
-nonebot-adapter-onebot = "^2.0.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
@@ -21,4 +20,3 @@ build-backend = "poetry.core.masonry.api"
 name = "githubmodels"
 description = "API 调用 GitHub Models 的 GPT-4o 模型"
 type = "application"
-supported_adapters = ["~onebot.v11"]