diff --git a/backend/apps/chat/task/llm.py b/backend/apps/chat/task/llm.py
index 9062150f..efc31b0f 100644
--- a/backend/apps/chat/task/llm.py
+++ b/backend/apps/chat/task/llm.py
@@ -1,7 +1,7 @@
 import logging
 import traceback
 import warnings
-from typing import Any, List, Union, Dict
+from typing import Any, List, Optional, Union, Dict
 
 import numpy as np
 import orjson
@@ -23,8 +23,9 @@ from apps.chat.models.chat_model import ChatQuestion, ChatRecord, Chat
 from apps.datasource.crud.datasource import get_table_schema
 from apps.datasource.models.datasource import CoreDatasource
 from apps.db.db import exec_sql
+from apps.system.crud.assistant import get_assistant_ds
 from common.core.config import settings
-from common.core.deps import SessionDep, CurrentUser
+from common.core.deps import CurrentAssistant, SessionDep, CurrentUser
 from common.utils.utils import extract_nested_json
 
 warnings.filterwarnings("ignore")
@@ -42,13 +43,14 @@ class LLMService:
     chart_message: List[Union[BaseMessage, dict[str, Any]]] = []
     history_records: List[ChatRecord] = []
     session: SessionDep
-    _current_user: CurrentUser
+    current_user: CurrentUser
+    current_assistant: Optional[CurrentAssistant] = None
 
-    def __init__(self, session: SessionDep, current_user: CurrentUser, chat_question: ChatQuestion):
+    def __init__(self, session: SessionDep, current_user: CurrentUser, chat_question: ChatQuestion, current_assistant: Optional[CurrentAssistant] = None):
 
         self.session = session
         self.current_user = current_user
-
+        self.current_assistant = current_assistant
         #chat = self.session.query(Chat).filter(Chat.id == chat_question.chat_id).first()
         chat_id = chat_question.chat_id
         chat: Chat = self.session.get(Chat, chat_id)
@@ -332,8 +334,11 @@ class LLMService:
     def select_datasource(self):
         datasource_msg: List[Union[BaseMessage, dict[str, Any]]] = []
         datasource_msg.append(SystemMessage(self.chat_question.datasource_sys_question()))
-        _ds_list = self.session.exec(select(CoreDatasource).options(
-            load_only(CoreDatasource.id, CoreDatasource.name, CoreDatasource.description))).all()
+        if self.current_assistant:
+            _ds_list = get_assistant_ds(session = self.session, assistant = self.current_assistant)
+        else:
+            _ds_list = self.session.exec(select(CoreDatasource).options(
+                load_only(CoreDatasource.id, CoreDatasource.name, CoreDatasource.description))).all()
         _ds_list_dict = []
         for _ds in _ds_list:
             _ds_list_dict.append({'id': _ds[0].id, 'name': _ds[0].name, 'description': _ds[0].description})
diff --git a/backend/apps/system/crud/assistant.py b/backend/apps/system/crud/assistant.py
index 45b55aa4..5bc547bf 100644
--- a/backend/apps/system/crud/assistant.py
+++ b/backend/apps/system/crud/assistant.py
@@ -1,6 +1,7 @@
 
 
-from sqlmodel import Session
+from sqlmodel import Session, select
+from apps.datasource.models.datasource import CoreDatasource
 from apps.system.models.system_model import AssistantModel
 from apps.system.schemas.auth import CacheName, CacheNamespace
 from apps.system.schemas.system_schema import UserInfoDTO
@@ -14,3 +15,11 @@ async def get_assistant_info(*, session: Session, assistant_id: int) -> Assistan
 
 def get_assistant_user(*, id: int):
     return UserInfoDTO(id=id, account="sqlbot-inner-assistant", oid=1, name="sqlbot-inner-assistant", email="sqlbot-inner-assistant@sqlbot.com")
+
+def get_assistant_ds(*, session: Session, assistant: AssistantModel):
+    type = assistant.type
+    if type == 0:
+        db_ds_list = session.exec(select(CoreDatasource.id, CoreDatasource.name, CoreDatasource.description)).all()
+        # filter private ds if offline
+        return db_ds_list
+    pass
diff --git a/frontend/src/views/chat/ChatBlock.vue b/frontend/src/views/chat/ChatBlock.vue
index e339fb9d..1fa34cb6 100644
--- a/frontend/src/views/chat/ChatBlock.vue
+++ b/frontend/src/views/chat/ChatBlock.vue
@@ -11,7 +11,9 @@ defineProps<{
     <div class="chat-block">
       <slot>
         <div class="chat-block-content">
-          <div v-dompurify-html="msg?.content"></div>
+          <!-- <div v-dompurify-html="msg?.content"></div> -->
+          <div v-if="msg?.role === 'user'" v-html="msg.content"></div>
+          <div v-else v-dompurify-html="msg?.content"></div>
         </div>
       </slot>
     </div>
diff --git a/frontend/src/views/chat/index.vue b/frontend/src/views/chat/index.vue
index 2196ad04..3fa327cd 100644
--- a/frontend/src/views/chat/index.vue
+++ b/frontend/src/views/chat/index.vue
@@ -833,6 +833,7 @@ defineExpose({
 
   .chat-record-list {
     padding: 0 0 20px 0;
+    background: rgba(224, 224, 226, 0.29);
   }
 
   .chat-footer {