From 140a01090708c5fba9f1d09c48488d0711863737 Mon Sep 17 00:00:00 2001
From: taylor <taylorxie18@gmail.com>
Date: Sun, 13 Oct 2024 15:58:48 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0ollama=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8AI=20chat=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maubot.yaml                                   |  1 +
 maubot_llmplus/aibot.py                       | 20 ++++++-------------
 maubot_platform/__init__.py                   |  0
 .../llm => maubot_platform}/local_paltform.py |  9 ++-------
 .../llm => maubot_platform}/platforms.py      |  0
 .../llm => maubot_platform}/thrid_platform.py |  7 +------
 6 files changed, 10 insertions(+), 27 deletions(-)
 create mode 100644 maubot_platform/__init__.py
 rename {maubot_llmplus/llm => maubot_platform}/local_paltform.py (84%)
 rename {maubot_llmplus/llm => maubot_platform}/platforms.py (100%)
 rename {maubot_llmplus/llm => maubot_platform}/thrid_platform.py (82%)

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):