chore: 修改包名

pkg/command/cmdmgr.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import typing
 
 from ..core import app, entities as core_entities
-from ..gai import entities as llm_entities
-from ..gai.session import entities as session_entities
+from ..provider import entities as llm_entities
+from ..provider.session import entities as session_entities
 from . import entities, operator, errors
 
 from .operators import func, plugin, default, reset, list as list_cmd, last, next, delc, resend, prompt, cfg, cmd, help, version, update

pkg/command/entities.py

@@ -6,7 +6,7 @@ import pydantic
 import mirai
 
 from ..core import app, entities as core_entities
-from ..gai.session import entities as session_entities
+from ..provider.session import entities as session_entities
 from . import errors, operator
 
 

pkg/command/operator.py

@@ -4,7 +4,7 @@ import typing
 import abc
 
 from ..core import app, entities as core_entities
-from ..gai.session import entities as session_entities
+from ..provider.session import entities as session_entities
 from . import entities
 
 

pkg/core/app.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 import logging
 import asyncio
 
-from ..im import manager as qqbot_mgr
-from ..gai.session import sessionmgr as llm_session_mgr
-from ..gai.requester import modelmgr as llm_model_mgr
-from ..gai.sysprompt import sysprompt as llm_prompt_mgr
-from ..gai.tools import toolmgr as llm_tool_mgr
+from ..platform import manager as qqbot_mgr
+from ..provider.session import sessionmgr as llm_session_mgr
+from ..provider.requester import modelmgr as llm_model_mgr
+from ..provider.sysprompt import sysprompt as llm_prompt_mgr
+from ..provider.tools import toolmgr as llm_tool_mgr
 from ..config import manager as config_mgr
 from ..database import manager as database_mgr
 from ..utils.center import v2 as center_mgr

pkg/core/boot.py

@@ -14,11 +14,11 @@ from . import controller
 from ..pipeline import stagemgr
 from ..audit import identifier
 from ..database import manager as db_mgr
-from ..gai.session import sessionmgr as llm_session_mgr
-from ..gai.requester import modelmgr as llm_model_mgr
-from ..gai.sysprompt import sysprompt as llm_prompt_mgr
-from ..gai.tools import toolmgr as llm_tool_mgr
-from ..im import manager as im_mgr
+from ..provider.session import sessionmgr as llm_session_mgr
+from ..provider.requester import modelmgr as llm_model_mgr
+from ..provider.sysprompt import sysprompt as llm_prompt_mgr
+from ..provider.tools import toolmgr as llm_tool_mgr
+from ..platform import manager as im_mgr
 from ..command import cmdmgr
 from ..plugin import host as plugin_host
 from ..utils.center import v2 as center_v2

pkg/pipeline/process/handlers/chat.py

@@ -7,7 +7,7 @@ import mirai
 from .. import handler
 from ... import entities
 from ....core import entities as core_entities
-from ....gai import entities as llm_entities
+from ....provider import entities as llm_entities
 
 
 class ChatMessageHandler(handler.MessageHandler):

pkg/platform/manager.py

@@ -10,11 +10,11 @@ from mirai import At, GroupMessage, MessageEvent, StrangerMessage, \
 import mirai
 import func_timeout
 
-from ..gai import session as openai_session
+from ..provider import session as openai_session
 
 from ..utils import context
 import tips as tips_custom
-from ..im import adapter as msadapter
+from ..platform import adapter as msadapter
 from .ratelim import ratelim
 
 from ..core import app, entities as core_entities
@@ -44,13 +44,13 @@ class QQBotManager:
 
         logging.debug("Use adapter:" + config['msg_source_adapter'])
         if config['msg_source_adapter'] == 'yirimirai':
-            from pkg.im.sources.yirimirai import YiriMiraiAdapter
+            from pkg.platform.sources.yirimirai import YiriMiraiAdapter
 
             mirai_http_api_config = config['mirai_http_api_config']
             self.bot_account_id = config['mirai_http_api_config']['qq']
             self.adapter = YiriMiraiAdapter(mirai_http_api_config)
         elif config['msg_source_adapter'] == 'nakuru':
-            from pkg.im.sources.nakuru import NakuruProjectAdapter
+            from pkg.platform.sources.nakuru import NakuruProjectAdapter
             self.adapter = NakuruProjectAdapter(config['nakuru_config'])
             self.bot_account_id = self.adapter.bot_account_id
         

pkg/platform/sources/nakuru.py

@@ -9,7 +9,7 @@ import nakuru
 import nakuru.entities.components as nkc
 
 from .. import adapter as adapter_model
-from ...im import blob
+from ...platform import blob
 from ...utils import context
 
 

pkg/plugin/host.py

@@ -15,7 +15,7 @@ from ..utils import network as network
 from ..utils import context as context
 from ..plugin import switch as switch
 from ..plugin import settings as settings
-from ..im import adapter as msadapter
+from ..platform import adapter as msadapter
 from ..plugin import metadata as metadata
 
 from mirai import Mirai

pkg/provider/modelmgr.py

@@ -8,9 +8,9 @@ Completion - text-davinci-003 等模型
 import tiktoken
 import openai
 
-from ..gai.api import model as api_model
-from ..gai.api import completion as api_completion
-from ..gai.api import chat_completion as api_chat_completion
+from ..provider.api import model as api_model
+from ..provider.api import completion as api_completion
+from ..provider.api import chat_completion as api_chat_completion
 
 COMPLETION_MODELS = {
     "gpt-3.5-turbo-instruct",

pkg/provider/sysprompt/entities.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import typing
 import pydantic
 
-from ...gai import entities
+from ...provider import entities
 
 
 class Prompt(pydantic.BaseModel):

pkg/provider/sysprompt/loaders/scenario.py

@@ -5,7 +5,7 @@ import os
 
 from .. import loader
 from .. import entities
-from ....gai import entities as llm_entities
+from ....provider import entities as llm_entities
 
 
 class ScenarioPromptLoader(loader.PromptLoader):

pkg/provider/sysprompt/loaders/single.py

@@ -3,7 +3,7 @@ import os
 
 from .. import loader
 from .. import entities
-from ....gai import entities as llm_entities
+from ....provider import entities as llm_entities
 
 
 class SingleSystemPromptLoader(loader.PromptLoader):