From aa8c56a688869a77db61400332b2a6afd7cd1df4 Mon Sep 17 00:00:00 2001
From: Soulter <905617992@qq.com>
Date: Sun, 2 Feb 2025 19:13:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9B=B8=E5=90=8Ctype=E7=9A=84provider?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E4=BA=86=E8=AE=B0=E5=BF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 astrbot/core/provider/provider.py                | 2 +-
 astrbot/core/provider/sources/gemini_source.py   | 3 ++-
 astrbot/core/provider/sources/llmtuner_source.py | 2 +-
 astrbot/core/provider/sources/openai_source.py   | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/astrbot/core/provider/provider.py b/astrbot/core/provider/provider.py
index 34580c6f7..dfa0bc8a1 100644
--- a/astrbot/core/provider/provider.py
+++ b/astrbot/core/provider/provider.py
@@ -74,7 +74,7 @@ class Provider(AbstractProvider):
         if persistant_history:
             # 读取历史记录
             try:
-                for history in db_helper.get_llm_history(provider_type=provider_config['type']):
+                for history in db_helper.get_llm_history(provider_type=provider_config['id']):
                     self.session_memory[history.session_id] = json.loads(history.content)
             except BaseException as e:
                 logger.warning(f"读取 LLM 对话历史记录 失败：{e}。仍可正常使用。")
diff --git a/astrbot/core/provider/sources/gemini_source.py b/astrbot/core/provider/sources/gemini_source.py
index 67b025b6a..66e4c7763 100644
--- a/astrbot/core/provider/sources/gemini_source.py
+++ b/astrbot/core/provider/sources/gemini_source.py
@@ -260,10 +260,11 @@ class ProviderGoogleGenAI(Provider):
                     "role": "assistant",
                     "content": llm_response.completion_text
                 }]
-            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['type'])
+            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['id'])
         
     async def forget(self, session_id: str) -> bool:
         self.session_memory[session_id] = []
+        self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['id'])
         return True
 
     def get_current_key(self) -> str:
diff --git a/astrbot/core/provider/sources/llmtuner_source.py b/astrbot/core/provider/sources/llmtuner_source.py
index c395751b4..3b70d94de 100644
--- a/astrbot/core/provider/sources/llmtuner_source.py
+++ b/astrbot/core/provider/sources/llmtuner_source.py
@@ -118,7 +118,7 @@ class LLMTunerModelLoader(Provider):
                     "role": "assistant",
                     "content": llm_response.completion_text
                 }]
-            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['type'])
+            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['id'])
         
     async def forget(self, session_id):
         self.session_memory[session_id] = []
diff --git a/astrbot/core/provider/sources/openai_source.py b/astrbot/core/provider/sources/openai_source.py
index e109ec703..ee9ebbd59 100644
--- a/astrbot/core/provider/sources/openai_source.py
+++ b/astrbot/core/provider/sources/openai_source.py
@@ -210,11 +210,11 @@ class ProviderOpenAIOfficial(Provider):
                     "role": "assistant",
                     "content": llm_response.completion_text
                 }]
-            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['type'])
+            self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['id'])
         
     async def forget(self, session_id: str) -> bool:
         self.session_memory[session_id] = []
-        self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['type'])
+        self.db_helper.update_llm_history(session_id, json.dumps(self.session_memory[session_id]), self.provider_config['id'])
         return True
 
     def get_current_key(self) -> str: