Merge pull request #5 from jumpserver/pr@main@keep_chat_model

perf: keep chat model

Author: feng626

.github/workflows/build-release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - master # or whatever branch you want to use
+      - main # or whatever branch you want to use
 
 jobs:
   release:

README.md

@@ -956,7 +956,7 @@ def feishu_oauth_register(oauth: OAuth):
 ENABLE_OLLAMA_API = PersistentConfig(
     "ENABLE_OLLAMA_API",
     "ollama.enable",
-    os.environ.get("ENABLE_OLLAMA_API", "False").lower() == "true",
+    os.environ.get("ENABLE_OLLAMA_API", "True").lower() == "true",
 )
 
 OLLAMA_API_BASE_URL = os.environ.get(
@@ -1114,14 +1114,14 @@ def feishu_oauth_register(oauth: OAuth):
     (
         False
         if not WEBUI_AUTH
-        else os.environ.get("ENABLE_SIGNUP", "False").lower() == "true"
+        else os.environ.get("ENABLE_SIGNUP", "True").lower() == "true"
     ),
 )
 
 ENABLE_LOGIN_FORM = PersistentConfig(
     "ENABLE_LOGIN_FORM",
     "ui.ENABLE_LOGIN_FORM",
-    os.environ.get("ENABLE_LOGIN_FORM", "False").lower() == "true",
+    os.environ.get("ENABLE_LOGIN_FORM", "True").lower() == "true",
 )
 
 
@@ -1322,11 +1322,11 @@ def feishu_oauth_register(oauth: OAuth):
 )
 
 USER_PERMISSIONS_CHAT_TTS = (
-    os.environ.get("USER_PERMISSIONS_CHAT_TTS", "False").lower() == "true"
+    os.environ.get("USER_PERMISSIONS_CHAT_TTS", "True").lower() == "true"
 )
 
 USER_PERMISSIONS_CHAT_CALL = (
-    os.environ.get("USER_PERMISSIONS_CHAT_CALL", "False").lower() == "true"
+    os.environ.get("USER_PERMISSIONS_CHAT_CALL", "True").lower() == "true"
 )
 
 USER_PERMISSIONS_CHAT_MULTIPLE_MODELS = (
@@ -1426,13 +1426,13 @@ def feishu_oauth_register(oauth: OAuth):
 ENABLE_NOTES = PersistentConfig(
     "ENABLE_NOTES",
     "notes.enable",
-    os.environ.get("ENABLE_NOTES", "False").lower() == "true",
+    os.environ.get("ENABLE_NOTES", "True").lower() == "true",
 )
 
 ENABLE_EVALUATION_ARENA_MODELS = PersistentConfig(
     "ENABLE_EVALUATION_ARENA_MODELS",
     "evaluation.arena.enable",
-    os.environ.get("ENABLE_EVALUATION_ARENA_MODELS", "False").lower() == "true",
+    os.environ.get("ENABLE_EVALUATION_ARENA_MODELS", "True").lower() == "true",
 )
 EVALUATION_ARENA_MODELS = PersistentConfig(
     "EVALUATION_ARENA_MODELS",
@@ -1475,7 +1475,7 @@ def feishu_oauth_register(oauth: OAuth):
 ENABLE_COMMUNITY_SHARING = PersistentConfig(
     "ENABLE_COMMUNITY_SHARING",
     "ui.enable_community_sharing",
-    os.environ.get("ENABLE_COMMUNITY_SHARING", "False").lower() == "true",
+    os.environ.get("ENABLE_COMMUNITY_SHARING", "True").lower() == "true",
 )
 
 ENABLE_MESSAGE_RATING = PersistentConfig(
@@ -1595,49 +1595,26 @@ class BannerModel(BaseModel):
     "task.title.prompt_template",
     os.environ.get("TITLE_GENERATION_PROMPT_TEMPLATE", ""),
 )
-# TODO: re-enable examples after testing
-# DEFAULT_TITLE_GENERATION_PROMPT_TEMPLATE = """### Task:
-# Generate a concise, 3-5 word title with an emoji summarizing the chat history.
-# ### Guidelines:
-# - The title should clearly represent the main theme or subject of the conversation.
-# - Use emojis that enhance understanding of the topic, but avoid quotation marks or special formatting.
-# - Write the title in the chat's primary language; default to English if multilingual.
-# - Prioritize accuracy over excessive creativity; keep it clear and simple.
-# - Your entire response must consist solely of the JSON object, without any introductory or concluding text.
-# - The output must be a single, raw JSON object, without any markdown code fences or other encapsulating text.
-# - Ensure no conversational text, affirmations, or explanations precede or follow the raw JSON output, as this will cause direct parsing failure.
-# ### Output:
-# JSON format: { "title": "your concise title here" }
-# ### Examples:
-# - { "title": "📉 Stock Market Trends" },
-# - { "title": "🍪 Perfect Chocolate Chip Recipe" },
-# - { "title": "Evolution of Music Streaming" },
-# - { "title": "Remote Work Productivity Tips" },
-# - { "title": "Artificial Intelligence in Healthcare" },
-# - { "title": "🎮 Video Game Development Insights" }
-# ### Chat History:
-# <chat_history>
-# {{MESSAGES:END:2}}
-# </chat_history>"""
 
 DEFAULT_TITLE_GENERATION_PROMPT_TEMPLATE = """### Task:
-Generate a concise, 3-5 word title.
+Generate a concise, 3-5 word title with an emoji summarizing the chat history.
 ### Guidelines:
 - The title should clearly represent the main theme or subject of the conversation.
-- Use the primary language of the chat to write the title; if the chat contains multiple languages, generate the title in the primary language used.
+- Use emojis that enhance understanding of the topic, but avoid quotation marks or special formatting.
+- Write the title in the chat's primary language; default to English if multilingual.
 - Prioritize accuracy over excessive creativity; keep it clear and simple.
 - Your entire response must consist solely of the JSON object, without any introductory or concluding text.
 - The output must be a single, raw JSON object, without any markdown code fences or other encapsulating text.
 - Ensure no conversational text, affirmations, or explanations precede or follow the raw JSON output, as this will cause direct parsing failure.
 ### Output:
 JSON format: { "title": "your concise title here" }
 ### Examples:
-- { "title": "Stock Market Trends" },
-- { "title": "Perfect Chocolate Chip Recipe" },
+- { "title": "📉 Stock Market Trends" },
+- { "title": "🍪 Perfect Chocolate Chip Recipe" },
 - { "title": "Evolution of Music Streaming" },
 - { "title": "Remote Work Productivity Tips" },
 - { "title": "Artificial Intelligence in Healthcare" },
-- { "title": "Video Game Development Insights" }
+- { "title": "🎮 Video Game Development Insights" }
 ### Chat History:
 <chat_history>
 {{MESSAGES:END:2}}

backend/open_webui/config.py

@@ -111,7 +111,7 @@
 
 log.setLevel(SRC_LOG_LEVELS["CONFIG"])
 
-WEBUI_NAME = os.environ.get("WEBUI_NAME", "JumpServer Chat AI &")
+WEBUI_NAME = os.environ.get("WEBUI_NAME", "Open WebUI")
 if WEBUI_NAME != "Open WebUI":
     WEBUI_NAME += " (Open WebUI)"
 

backend/open_webui/env.py

@@ -18,25 +18,25 @@ class ChatHandler(BaseWisp):
     def list(self, query: Optional[Dict[str, Any]] = None) -> List[dict]:
         query = self._normalize_query(query)
         resp = self._request("GET", CHAT_URL, query=query, action="list chats")
-        return self._loads(CHAT_URL, resp.body)
+        return self._loads(resp.body)
 
     def retrieve(self, chat_id: str) -> dict:
         self._ensure_id(chat_id)
         path = f"{CHAT_URL}{chat_id}/"
         resp = self._request("GET", path, action=f"retrieve chat {chat_id}")
-        return self._loads(path, resp.body)
+        return self._loads(resp.body)
 
     def create(self, data: Dict[str, Any]) -> dict:
         body = self._dumps(data)
         resp = self._request("POST", CHAT_URL, body=body, action="create chat")
-        return self._loads(CHAT_URL, resp.body)
+        return self._loads(resp.body)
 
     def update(self, chat_id: Optional[str] = None, data: Dict[str, Any] = None, query: Dict[str, Any] = None) -> dict:
         self._ensure_id(chat_id)
         path = f"{CHAT_URL}{chat_id}/"
         body = self._dumps(data)
         resp = self._request("PATCH", path, query=query, body=body, action=f"update chat {chat_id}")
-        return self._loads(path, resp.body)
+        return self._loads(resp.body)
 
     def destroy(self, chat_id: Optional[str] = None, query: Dict[str, Any] = None) -> None:
         """
@@ -100,11 +100,11 @@ def _dumps(data: Dict[str, Any]) -> bytes:
             raise WispError(f"Failed to serialize request body: {e}") from e
 
     @staticmethod
-    def _loads(path: str, b: bytes) -> Any:
+    def _loads(b: bytes) -> Any:
         try:
             return json.loads(b.decode("utf-8")) if b else None
         except (UnicodeDecodeError, json.JSONDecodeError) as e:
-            raise WispError(f"Failed to parse response body: {e} path {path}") from e
+            raise WispError(f"Failed to parse response body: {e}") from e
 
     @staticmethod
     def _safe_decode(b: Optional[bytes]) -> str:

backend/open_webui/jms/chat.py

@@ -114,7 +114,6 @@ class ChatResponse(BaseModel):
     archived: bool
     pinned: Optional[bool] = False
     meta: dict = {}
-    session_info: dict = {}
     folder_id: Optional[str] = None
 
 
@@ -151,7 +150,7 @@ def insert_new_chat(self, form_data: ChatForm, sid: str, request: Request, user:
             'title': form_data.chat['title'] if 'title' in form_data.chat else 'New Chat',
             'chat': form_data.chat,
             'socket_id': sid,
-            'folder_id': form_data.folder_id or '',
+            'folder_id': form_data.folder_id,
             'session_info': {
                 'org_id': session.org_id,
                 'asset': session.asset,
@@ -195,7 +194,7 @@ def import_chat(
                 }
             )
 
-            result = Chat(**chat)
+            result = Chat(**chat.model_dump())
             db.add(result)
             db.commit()
             db.refresh(result)
@@ -231,7 +230,7 @@ def update_chat_tags_by_id(
 
         self.delete_all_tags_by_id_and_user_id(id, user.id)
 
-        for tag in chat['meta'].get("tags", []):
+        for tag in chat.meta.get("tags", []):
             if self.count_chats_by_tag_name_and_user_id(tag, user.id) == 0:
                 Tags.delete_tag_by_name_and_user_id(tag, user.id)
 
@@ -316,19 +315,19 @@ def insert_shared_chat_by_chat_id(self, chat_id: str) -> Optional[ChatModel]:
             # Get the existing chat to share
             chat = db.get(Chat, chat_id)
             # Check if the chat is already shared
-            if chat['share_id']:
-                return self.get_chat_by_id_and_user_id(chat['share_id'], "shared")
+            if chat.share_id:
+                return self.get_chat_by_id_and_user_id(chat.share_id, "shared")
             # Create a new chat with the same data, but with a new ID
             shared_chat = ChatModel(
                 **{
                     "id": str(uuid.uuid4()),
                     "user_id": f"shared-{chat_id}",
-                    "title": chat['title'],
-                    "chat": chat['chat'],
-                    "meta": chat['meta'],
-                    "pinned": chat['pinned'],
-                    "folder_id": chat['folder_id'],
-                    "created_at": chat['created_at'],
+                    "title": chat.title,
+                    "chat": chat.chat,
+                    "meta": chat.meta,
+                    "pinned": chat.pinned,
+                    "folder_id": chat.folder_id,
+                    "created_at": chat.created_at,
                     "updated_at": int(time.time()),
                 }
             )
@@ -358,11 +357,11 @@ def update_shared_chat_by_chat_id(self, chat_id: str) -> Optional[ChatModel]:
                 if shared_chat is None:
                     return self.insert_shared_chat_by_chat_id(chat_id)
 
-                shared_chat.title = chat['title']
-                shared_chat.chat = chat['chat']
-                shared_chat.meta = chat['meta']
-                shared_chat.pinned = chat['pinned']
-                shared_chat.folder_id = chat['folder_id']
+                shared_chat.title = chat.title
+                shared_chat.chat = chat.chat
+                shared_chat.meta = chat.meta
+                shared_chat.pinned = chat.pinned
+                shared_chat.folder_id = chat.folder_id
                 shared_chat.updated_at = int(time.time())
                 db.commit()
                 db.refresh(shared_chat)
@@ -703,7 +702,7 @@ def update_chat_folder_id_by_id_and_user_id(
     def get_chat_tags_by_id_and_user_id(self, id: str, user_id: str) -> list[TagModel]:
         with get_db() as db:
             chat = db.get(Chat, id)
-            tags = chat['meta'].get("tags", [])
+            tags = chat.meta.get("tags", [])
             return [Tags.get_tag_by_name_and_user_id(tag, user_id) for tag in tags]
 
     # TODO
@@ -750,10 +749,10 @@ def add_chat_tag_by_id_and_user_id_and_tag_name(
                 chat = db.get(Chat, _id)
 
                 tag_id = tag.id
-                if tag_id not in chat['meta'].get("tags", []):
+                if tag_id not in chat.meta.get("tags", []):
                     chat.meta = {
-                        **chat['meta'],
-                        "tags": list(set(chat['meta'].get("tags", []) + [tag_id])),
+                        **chat.meta,
+                        "tags": list(set(chat.meta.get("tags", []) + [tag_id])),
                     }
 
                 db.commit()
@@ -883,7 +882,7 @@ def delete_shared_chats_by_user_id(self, user_id: str) -> bool:
         try:
             with get_db() as db:
                 chats_by_user = db.query(Chat).filter_by(user_id=user_id).all()
-                shared_chat_ids = [f"shared-{chat['id']}" for chat in chats_by_user]
+                shared_chat_ids = [f"shared-{chat.id}" for chat in chats_by_user]
 
                 db.query(Chat).filter(Chat.user_id.in_(shared_chat_ids)).delete()
                 db.commit()

backend/open_webui/models/chats.py

@@ -49,8 +49,8 @@ def predict(
                         {
                             "X-OpenWebUI-User-Name": quote(user.name, safe=" "),
                             "X-OpenWebUI-User-Id": user.id,
-                            "X-OpenWebUI-User-Username": user.username,
-                            "X-OpenWebUI-User-Role": 'admin',
+                            "X-OpenWebUI-User-Email": user.email,
+                            "X-OpenWebUI-User-Role": user.role,
                         }
                         if ENABLE_FORWARD_USER_INFO_HEADERS and user
                         else {}

backend/open_webui/retrieval/models/external.py

@@ -595,9 +595,9 @@ def get_sources_from_items(
             # Chat Attached
             chat = Chats.get_chat_by_id(item.get("id"))
 
-            if chat and (user.role == "admin" or chat['user_id'] == user.id):
-                messages_map = chat['chat'].get("history", {}).get("messages", {})
-                message_id = chat['chat'].get("history", {}).get("currentId")
+            if chat and (user.role == "admin" or chat.user_id == user.id):
+                messages_map = chat.chat.get("history", {}).get("messages", {})
+                message_id = chat.chat.get("history", {}).get("currentId")
 
                 if messages_map and message_id:
                     # Reconstruct the message list in order
@@ -612,7 +612,7 @@ def get_sources_from_items(
                     # User has access to the chat
                     query_result = {
                         "documents": [[message_history]],
-                        "metadatas": [[{"file_id": chat['id'], "name": chat['title']}]],
+                        "metadatas": [[{"file_id": chat.id, "name": chat.title}]],
                     }
 
         elif item.get("type") == "url":
@@ -797,7 +797,6 @@ def get_sources_from_items(
 
 def get_model_path(model: str, update_model: bool = False):
     # Construct huggingface_hub kwargs with local_files_only to return the snapshot path
-    return
     cache_dir = os.getenv("SENTENCE_TRANSFORMERS_HOME")
 
     local_files_only = not update_model
@@ -862,8 +861,8 @@ def generate_openai_batch_embeddings(
                     {
                         "X-OpenWebUI-User-Name": quote(user.name, safe=" "),
                         "X-OpenWebUI-User-Id": user.id,
-                        "X-OpenWebUI-User-Username": user.username,
-                        "X-OpenWebUI-User-Role": 'admin',
+                        "X-OpenWebUI-User-Email": user.email,
+                        "X-OpenWebUI-User-Role": user.role,
                     }
                     if ENABLE_FORWARD_USER_INFO_HEADERS and user
                     else {}
@@ -911,8 +910,8 @@ def generate_azure_openai_batch_embeddings(
                         {
                             "X-OpenWebUI-User-Name": quote(user.name, safe=" "),
                             "X-OpenWebUI-User-Id": user.id,
-                            "X-OpenWebUI-User-Username": user.username,
-                            "X-OpenWebUI-User-Role": 'admin',
+                            "X-OpenWebUI-User-Email": user.email,
+                            "X-OpenWebUI-User-Role": user.role,
                         }
                         if ENABLE_FORWARD_USER_INFO_HEADERS and user
                         else {}
@@ -961,8 +960,8 @@ def generate_ollama_batch_embeddings(
                     {
                         "X-OpenWebUI-User-Name": quote(user.name, safe=" "),
                         "X-OpenWebUI-User-Id": user.id,
-                        "X-OpenWebUI-User-Username": user.username,
-                        "X-OpenWebUI-User-Role": 'admin',
+                        "X-OpenWebUI-User-Email": user.email,
+                        "X-OpenWebUI-User-Role": user.role,
                     }
                     if ENABLE_FORWARD_USER_INFO_HEADERS
                     else {}

backend/open_webui/retrieval/utils.py

@@ -374,8 +374,8 @@ async def speech(request: Request, user=Depends(get_verified_user)):
                             {
                                 "X-OpenWebUI-User-Name": quote(user.name, safe=" "),
                                 "X-OpenWebUI-User-Id": user.id,
-                                "X-OpenWebUI-User-Username": user.username,
-                                "X-OpenWebUI-User-Role": 'admin',
+                                "X-OpenWebUI-User-Email": user.email,
+                                "X-OpenWebUI-User-Role": user.role,
                             }
                             if ENABLE_FORWARD_USER_INFO_HEADERS
                             else {}