diff --git a/astrbot/core/provider/manager.py b/astrbot/core/provider/manager.py index 0dd10847..2abe59d6 100644 --- a/astrbot/core/provider/manager.py +++ b/astrbot/core/provider/manager.py @@ -325,8 +325,6 @@ class ProviderManager: inst = provider_metadata.cls_type( provider_config, self.provider_settings, - self.db_helper, - self.provider_settings.get("persistant_history", True), self.selected_default_persona, ) diff --git a/astrbot/core/provider/provider.py b/astrbot/core/provider/provider.py index 2cc956ae..1ecca353 100644 --- a/astrbot/core/provider/provider.py +++ b/astrbot/core/provider/provider.py @@ -1,6 +1,5 @@ import abc from typing import List -from astrbot.core.db import BaseDatabase from typing import TypedDict, AsyncGenerator from astrbot.core.provider.func_tool_manager import FuncCall from astrbot.core.provider.entities import LLMResponse, ToolCallsResult @@ -53,15 +52,13 @@ class Provider(AbstractProvider): self, provider_config: dict, provider_settings: dict, - persistant_history: bool = True, - db_helper: BaseDatabase = None, - default_persona: Personality = None, + default_persona: Personality | None = None, ) -> None: super().__init__(provider_config) self.provider_settings = provider_settings - self.curr_personality: Personality = default_persona + self.curr_personality = default_persona """维护了当前的使用的 persona,即人格。可能为 None""" @abc.abstractmethod diff --git a/astrbot/core/provider/sources/anthropic_source.py b/astrbot/core/provider/sources/anthropic_source.py index f40daa5e..18b4cfea 100644 --- a/astrbot/core/provider/sources/anthropic_source.py +++ b/astrbot/core/provider/sources/anthropic_source.py @@ -8,8 +8,7 @@ from anthropic import AsyncAnthropic from anthropic.types import Message from astrbot.core.utils.io import download_image_by_url -from astrbot.core.db import BaseDatabase -from astrbot.api.provider import Provider, Personality +from astrbot.api.provider import Provider from astrbot import logger from astrbot.core.provider.func_tool_manager import FuncCall from ..register import register_provider_adapter @@ -23,17 +22,13 @@ from typing import AsyncGenerator class ProviderAnthropic(Provider): def __init__( self, - provider_config: dict, - provider_settings: dict, - db_helper: BaseDatabase, - persistant_history=True, - default_persona: Personality = None, + provider_config, + provider_settings, + default_persona=None, ) -> None: super().__init__( provider_config, provider_settings, - persistant_history, - db_helper, default_persona, ) @@ -234,12 +229,12 @@ class ProviderAnthropic(Provider): async def text_chat( self, prompt, - session_id = None, - image_urls = [], - func_tool = None, + session_id=None, + image_urls=[], + func_tool=None, contexts=None, system_prompt=None, - tool_calls_result = None, + tool_calls_result=None, **kwargs, ) -> LLMResponse: if contexts is None: diff --git a/astrbot/core/provider/sources/dashscope_source.py b/astrbot/core/provider/sources/dashscope_source.py index f719190a..3498f834 100644 --- a/astrbot/core/provider/sources/dashscope_source.py +++ b/astrbot/core/provider/sources/dashscope_source.py @@ -5,7 +5,6 @@ from typing import List from .. import Provider, Personality from ..entities import LLMResponse from ..func_tool_manager import FuncCall -from astrbot.core.db import BaseDatabase from ..register import register_provider_adapter from astrbot.core.message.message_event_result import MessageChain from .openai_source import ProviderOpenAIOfficial @@ -19,16 +18,12 @@ class ProviderDashscope(ProviderOpenAIOfficial): self, provider_config: dict, provider_settings: dict, - db_helper: BaseDatabase, - persistant_history=False, - default_persona: Personality = None, + default_persona: Personality | None = None, ) -> None: Provider.__init__( self, provider_config, provider_settings, - persistant_history, - db_helper, default_persona, ) self.api_key = provider_config.get("dashscope_api_key", "") diff --git a/astrbot/core/provider/sources/dify_source.py b/astrbot/core/provider/sources/dify_source.py index 348c3e72..81c910d6 100644 --- a/astrbot/core/provider/sources/dify_source.py +++ b/astrbot/core/provider/sources/dify_source.py @@ -1,10 +1,9 @@ import astrbot.core.message.components as Comp import os from typing import List -from .. import Provider, Personality +from .. import Provider from ..entities import LLMResponse from ..func_tool_manager import FuncCall -from astrbot.core.db import BaseDatabase from ..register import register_provider_adapter from astrbot.core.utils.dify_api_client import DifyAPIClient from astrbot.core.utils.io import download_image_by_url, download_file @@ -17,17 +16,13 @@ from astrbot.core.utils.astrbot_path import get_astrbot_data_path class ProviderDify(Provider): def __init__( self, - provider_config: dict, - provider_settings: dict, - db_helper: BaseDatabase, - persistant_history=False, - default_persona: Personality = None, + provider_config, + provider_settings, + default_persona = None, ) -> None: super().__init__( provider_config, provider_settings, - persistant_history, - db_helper, default_persona, ) self.api_key = provider_config.get("dify_api_key", "") diff --git a/astrbot/core/provider/sources/gemini_source.py b/astrbot/core/provider/sources/gemini_source.py index b0870590..31c1695f 100644 --- a/astrbot/core/provider/sources/gemini_source.py +++ b/astrbot/core/provider/sources/gemini_source.py @@ -12,8 +12,7 @@ from google.genai.errors import APIError import astrbot.core.message.components as Comp from astrbot import logger -from astrbot.api.provider import Personality, Provider -from astrbot.core.db import BaseDatabase +from astrbot.api.provider import Provider from astrbot.core.message.message_event_result import MessageChain from astrbot.core.provider.entities import LLMResponse, ToolCallsResult from astrbot.core.provider.func_tool_manager import FuncCall @@ -52,17 +51,13 @@ class ProviderGoogleGenAI(Provider): def __init__( self, - provider_config: dict, - provider_settings: dict, - db_helper: BaseDatabase, - persistant_history=True, - default_persona: Personality = None, + provider_config, + provider_settings, + default_persona = None, ) -> None: super().__init__( provider_config, provider_settings, - persistant_history, - db_helper, default_persona, ) self.api_keys: list = provider_config.get("key", []) diff --git a/astrbot/core/provider/sources/openai_source.py b/astrbot/core/provider/sources/openai_source.py index 10db3c31..6fffa13e 100644 --- a/astrbot/core/provider/sources/openai_source.py +++ b/astrbot/core/provider/sources/openai_source.py @@ -14,8 +14,7 @@ from openai.lib.streaming.chat._completions import ChatCompletionStreamState from astrbot.core.utils.io import download_image_by_url from astrbot.core.message.message_event_result import MessageChain -from astrbot.core.db import BaseDatabase -from astrbot.api.provider import Provider, Personality +from astrbot.api.provider import Provider from astrbot import logger from astrbot.core.provider.func_tool_manager import FuncCall from typing import List, AsyncGenerator @@ -29,17 +28,13 @@ from astrbot.core.provider.entities import LLMResponse, ToolCallsResult class ProviderOpenAIOfficial(Provider): def __init__( self, - provider_config: dict, - provider_settings: dict, - db_helper: BaseDatabase, - persistant_history=True, - default_persona: Personality = None, + provider_config, + provider_settings, + default_persona = None, ) -> None: super().__init__( provider_config, provider_settings, - persistant_history, - db_helper, default_persona, ) self.chosen_api_key = None diff --git a/astrbot/core/provider/sources/zhipu_source.py b/astrbot/core/provider/sources/zhipu_source.py index e7e9d4a1..428dee8f 100644 --- a/astrbot/core/provider/sources/zhipu_source.py +++ b/astrbot/core/provider/sources/zhipu_source.py @@ -1,4 +1,3 @@ -from astrbot.core.db import BaseDatabase from astrbot import logger from astrbot.core.provider.func_tool_manager import FuncCall from typing import List @@ -13,15 +12,11 @@ class ProviderZhipu(ProviderOpenAIOfficial): self, provider_config: dict, provider_settings: dict, - db_helper: BaseDatabase, - persistant_history=True, default_persona=None, ) -> None: super().__init__( provider_config, provider_settings, - db_helper, - persistant_history, default_persona, )