Merge remote-tracking branch 'origin/main'

# Conflicts:
#	frontend/src/i18n/en.json
#	frontend/src/i18n/zh-CN.json

Author: ziyujiahao

backend/alembic/versions/8dc3b1bdbfef_010_upgrade_user_language.py

@@ -0,0 +1,33 @@
+"""010_upgrade_user_language
+
+Revision ID: 8dc3b1bdbfef
+Revises: 804b08ac329d
+Create Date: 2025-06-10 11:21:35.257604
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '8dc3b1bdbfef'
+down_revision = '804b08ac329d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    
+    op.add_column('sys_user', sa.Column('language', sa.VARCHAR(length=255), server_default=sa.text("'zh-CN'::character varying"), nullable=False))
+   
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    
+    op.drop_column('sys_user', 'language')
+   
+    # ### end Alembic commands ###

backend/apps/chat/api/chat.py

@@ -1,4 +1,5 @@
 import json
+import orjson
 import traceback
 from typing import List
 
@@ -138,7 +139,7 @@ def run_task():
             # execute sql
             result = llm_service.execute_sql(sql=sql)
             llm_service.save_sql_data(session=session, data_obj=result)
-            yield json.dumps({'content': json.dumps(result, ensure_ascii=False), 'type': 'sql-data'}) + '\n\n'
+            yield json.dumps({'content': orjson.dumps(result).decode(), 'type': 'sql-data'}) + '\n\n'
 
             # generate chart
             chart_res = llm_service.generate_chart(session=session)

backend/apps/chat/task/llm.py

@@ -1,4 +1,5 @@
 import json
+import orjson
 import logging
 import warnings
 from typing import Any, List, Union, Dict
@@ -218,7 +219,7 @@ def save_error(self, session: SessionDep, message: str):
 
     def save_sql_data(self, session: SessionDep, data_obj: Dict[str, Any]):
         return save_sql_exec_data(session=session, record_id=self.record.id,
-                                  data=json.dumps(data_obj, ensure_ascii=False))
+                                  data=orjson.dumps(data_obj).decode())
 
     def finish(self, session: SessionDep):
         return finish_record(session=session, record_id=self.record.id)

backend/apps/datasource/api/datasource.py

@@ -18,7 +18,7 @@
 path = "/opt/sqlbot/data/excel"
 
 
-@router.get("/list")
+@router.get("/list", operation_id="get_datasource_list")
 async def datasource_list(session: SessionDep):
     return get_datasource_list(session=session)
 

backend/apps/system/api/user.py

@@ -1,5 +1,7 @@
 from fastapi import APIRouter, Depends, Request    
+from apps.system.crud.user import get_user_info
 from apps.system.models.user import user_grid
+from apps.system.schemas.system_schema import UserLanguage
 from common.core.deps import CurrentUser, SessionDep
 from common.core.pagination import Paginator
 from common.core.schemas import PaginatedResponse, PaginationParams
@@ -8,8 +10,12 @@
 
 
 @router.get("/info")
-async def user_info(current_user: CurrentUser):
-    return current_user.to_dict()
+async def user_info(session: SessionDep, current_user: CurrentUser):
+    db_user = get_user_info(session=session, user_id=current_user.id)
+    if not db_user:
+        return {"message": "User not found"}
+    db_user.password = None
+    return db_user
 
 
 @router.get("/pager/{pageNum}/{pageSize}", response_model=PaginatedResponse[user_grid])
@@ -24,4 +30,17 @@ async def pager(
     return await paginator.get_paginated_response(
         model=user_grid,
         pagination=pagination,
-        **filters)
+        **filters)
+    
+@router.put("/language")
+async def langChange(session: SessionDep, current_user: CurrentUser, language: UserLanguage):
+    lang = language.language
+    if lang not in ["zh-CN", "en"]:
+        return {"message": "Language not supported"}
+    db_user = get_user_info(session=session, user_id=current_user.id)
+    if not db_user:
+        return {"message": "User not found"}
+    db_user.language = lang
+    session.add(db_user)
+    session.commit()
+    return {"message": "Language changed successfully", "language": lang}

backend/apps/system/crud/user.py

@@ -10,6 +10,12 @@ def get_user_by_account(*, session: Session, account: str) -> sys_user | None:
     result_user = sys_user.model_validate(session_user)
     return result_user
 
+def get_user_info(*, session: Session, user_id: int) -> sys_user | None:
+    db_user = session.get(user_grid, user_id)
+    if not db_user:
+        return None
+    return db_user
+
 def authenticate(*, session: Session, account: str, password: str) -> sys_user | None:
     db_user = get_user_by_account(session=session, account=account)
     if not db_user:

backend/apps/system/models/user.py

@@ -21,4 +21,5 @@ class user_grid(sys_user, table=True):
     email: str
     status: int
     create_time: int
+    language: str = Field(max_length=255, default="zh-CN")
 

backend/apps/system/schemas/system_schema.py

@@ -2,4 +2,8 @@
 
 class model_status(BaseModel):
     status: bool
-    ids: list[int]
+    ids: list[int]
+    
+
+class UserLanguage(BaseModel):
+    language: str

backend/apps/template/template.py

@@ -4,7 +4,7 @@
 
 
 def load():
-    with open('./template.yaml', 'r') as f:
+    with open('./template.yaml', 'r', encoding='utf-8') as f:
         global base_template
         base_template = yaml.load(f, Loader=yaml.SafeLoader)
 

backend/common/utils/whitelist.py

@@ -20,7 +20,9 @@
     "*.woff2",
     "*.ttf",
     "*.eot",
-    "*.otf"
+    "*.otf",
+    "/mcp",
+    "/mcp/message"
 ]
 
 class WhitelistChecker: