diff --git a/maubot.yaml b/maubot.yaml index 75360a1..ef8c5ac 100644 --- a/maubot.yaml +++ b/maubot.yaml @@ -3,6 +3,7 @@ id: cn.tayxie.llmplus version: 1.0.0 license: MIT modules: + - maubot_platform - maubot_llmplus main_class: AiBotPlugin config: true diff --git a/maubot_llmplus/aibot.py b/maubot_llmplus/aibot.py index 34d7fff..7237533 100644 --- a/maubot_llmplus/aibot.py +++ b/maubot_llmplus/aibot.py @@ -1,23 +1,15 @@ -import asyncio -import json -import os import re -from datetime import datetime -from typing import Type, Deque, Dict, Generator -from mautrix.client import Client -from collections import deque, defaultdict -from maubot.handlers import command, event +from typing import Type +from maubot.handlers import event from maubot import Plugin, MessageEvent -from mautrix.errors import MNotFound, MatrixRequestError -from mautrix.types import Format, TextMessageEventContent, EventType, RoomID, UserID, MessageType, RelationType, \ - EncryptedEvent, MediaMessageEventContent, ImageInfo, EncryptedFile +from mautrix.types import Format, TextMessageEventContent, EventType, MessageType, RelationType from mautrix.util import markdown from mautrix.util.config import BaseProxyConfig, ConfigUpdateHelper -from maubot_llmplus.llm.local_paltform import Ollama, LmStudio -from maubot_llmplus.llm.platforms import Platform -from maubot_llmplus.llm.thrid_platform import OpenAi, Anthropic +from maubot_platform.local_paltform import Ollama, LmStudio +from maubot_platform import Platform +from maubot_platform.thrid_platform import OpenAi, Anthropic """ 配置文件加载 diff --git a/maubot_platform/__init__.py b/maubot_platform/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/maubot_llmplus/llm/local_paltform.py b/maubot_platform/local_paltform.py similarity index 84% rename from maubot_llmplus/llm/local_paltform.py rename to maubot_platform/local_paltform.py index 658b54b..576c7f0 100644 --- a/maubot_llmplus/llm/local_paltform.py +++ b/maubot_platform/local_paltform.py @@ -1,15 +1,10 @@ import json -import platform -from collections import deque -from typing import List -from maubot import Plugin from mautrix.types import MessageEvent from mautrix.util.config import BaseProxyConfig -from maubot_llmplus import AiBotPlugin -from maubot_llmplus.llm import platforms -from maubot_llmplus.llm.platforms import Platform, ChatCompletion +from maubot_platform import platforms +from maubot_platform.platforms import Platform, ChatCompletion class Ollama(Platform): diff --git a/maubot_llmplus/llm/platforms.py b/maubot_platform/platforms.py similarity index 100% rename from maubot_llmplus/llm/platforms.py rename to maubot_platform/platforms.py diff --git a/maubot_llmplus/llm/thrid_platform.py b/maubot_platform/thrid_platform.py similarity index 82% rename from maubot_llmplus/llm/thrid_platform.py rename to maubot_platform/thrid_platform.py index dfc6b42..4b50b71 100644 --- a/maubot_llmplus/llm/thrid_platform.py +++ b/maubot_platform/thrid_platform.py @@ -1,12 +1,7 @@ -from collections import deque -from typing import List - -from maubot import Plugin from mautrix.types import MessageEvent from mautrix.util.config import BaseProxyConfig -from maubot_llmplus import AiBotPlugin -from maubot_llmplus.llm.platforms import Platform, ChatCompletion +from maubot_platform.platforms import Platform, ChatCompletion class OpenAi(Platform):