From 4f92bdd6b60f06dc1b7878ca335b0dd985e0f9b7 Mon Sep 17 00:00:00 2001 From: Twisuki Date: Thu, 5 Dec 2024 13:13:01 +0800 Subject: [PATCH] modified: nonebot_plugin_marshoai/models.py nonebot_plugin_marshoai/tools/marshoai-megakits/__init__.py nonebot_plugin_marshoai/tools/marshoai-megakits/tools.json --- nonebot_plugin_marshoai/models.py | 11 ++++++----- nonebot_plugin_marshoai/util.py | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nonebot_plugin_marshoai/models.py b/nonebot_plugin_marshoai/models.py index 0526b4c6..918bd015 100644 --- a/nonebot_plugin_marshoai/models.py +++ b/nonebot_plugin_marshoai/models.py @@ -1,4 +1,6 @@ from nonebot_plugin_alconna.uniseg.adapters import module +from requests.packages import package +from six import spec_from_loader from .util import * from .config import config @@ -80,8 +82,6 @@ class MarshoTools: logger.info(f"尝试加载工具包 {package_name}") - sys.path.append(package_path) - if os.path.isdir(package_path) and os.path.exists( os.path.join(package_path, "__init__.py") ): @@ -96,9 +96,10 @@ class MarshoTools: spec = importlib.util.spec_from_file_location( package_name, os.path.join(package_path, "__init__.py") ) - module = importlib.util.module_from_spec(spec) - sys.modules[spec.name] = module - spec.loader.exec_module(sys.modules[spec.name]) + package = importlib.util.module_from_spec(spec) + self.imported_packages[package_name] = package + sys.modules[package_name] = package + spec.loader.exec_module(package) logger.success(f"成功加载工具包 {package_name}") except json.JSONDecodeError as e: diff --git a/nonebot_plugin_marshoai/util.py b/nonebot_plugin_marshoai/util.py index 17f3c1e4..4ca295f7 100644 --- a/nonebot_plugin_marshoai/util.py +++ b/nonebot_plugin_marshoai/util.py @@ -96,6 +96,7 @@ async def make_chat( client: 用于与AI模型进行通信 msg: 消息内容 model_name: 指定AI模型名""" + return await client.complete( messages=msg, model=model_name,