LiteyukiStudio/nonebot-plugin-marshoai
4
4
Fork 0
mirror of https://github.com/LiteyukiStudio/nonebot-plugin-marshoai.git synced 2025-01-26 18:12:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

modified: nonebot_plugin_marshoai/models.py

Browse Source 
nonebot_plugin_marshoai/tools/marshoai-megakits/__init__.py
	nonebot_plugin_marshoai/tools/marshoai-megakits/tools.json
This commit is contained in:
Twisuki 2024-12-05 13:13:01 +08:00
parent 5d1cdecfc0
commit 4f92bdd6b6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nonebot_plugin_marshoai/models.py
View File

@ -1,4 +1,6 @@
from nonebot_plugin_alconna.uniseg.adapters import module from nonebot_plugin_alconna.uniseg.adapters import module
from requests.packages import package
from six import spec_from_loader
from .util import * from .util import *
from .config import config from .config import config
@ -80,8 +82,6 @@ class MarshoTools:
logger.info(f"尝试加载工具包 {package_name}") logger.info(f"尝试加载工具包 {package_name}")
sys.path.append(package_path)
if os.path.isdir(package_path) and os.path.exists( if os.path.isdir(package_path) and os.path.exists(
os.path.join(package_path, "__init__.py") os.path.join(package_path, "__init__.py")
): ):
@ -96,9 +96,10 @@ class MarshoTools:
spec = importlib.util.spec_from_file_location( spec = importlib.util.spec_from_file_location(
package_name, os.path.join(package_path, "__init__.py") package_name, os.path.join(package_path, "__init__.py")
) )
module = importlib.util.module_from_spec(spec) package = importlib.util.module_from_spec(spec)
sys.modules[spec.name] = module self.imported_packages[package_name] = package
spec.loader.exec_module(sys.modules[spec.name]) sys.modules[package_name] = package
spec.loader.exec_module(package)
logger.success(f"成功加载工具包 {package_name}") logger.success(f"成功加载工具包 {package_name}")
except json.JSONDecodeError as e: except json.JSONDecodeError as e:

1
nonebot_plugin_marshoai/util.py
View File

@ -96,6 +96,7 @@ async def make_chat(
client: 用于与AI模型进行通信 client: 用于与AI模型进行通信
msg: 消息内容 msg: 消息内容
model_name: 指定AI模型名""" model_name: 指定AI模型名"""
return await client.complete( return await client.complete(
messages=msg, messages=msg,
model=model_name, model=model_name,