Merge remote-tracking branch 'origin/main'

Author: XiaJunjie2020

backend/alembic/versions/032_modify_assistant_ddl.py

@@ -0,0 +1,25 @@
+"""032_modify_assistant_ddl
+
+Revision ID: 6549e47f9adc
+Revises: bd2ed188b5bd
+Create Date: 2025-07-22 12:23:16.646665
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlmodel.sql.sqltypes
+
+
+# revision identifiers, used by Alembic.
+revision = '6549e47f9adc'
+down_revision = 'bd2ed188b5bd'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('sys_assistant', sa.Column('description', sa.Text(), nullable=True))
+
+
+def downgrade():
+    op.drop_column('sys_assistant', 'description')

backend/apps/system/api/assistant.py

@@ -45,7 +45,7 @@ async def info(session: SessionDep, id: str, virtual: Optional[int] = Query(None
 
 @router.get("", response_model=list[AssistantModel])
 async def query(session: SessionDep):
-    list_result = session.exec(select(AssistantModel).order_by(AssistantModel.create_time)).all()
+    list_result = session.exec(select(AssistantModel).order_by(AssistantModel.create_time.asc())).all()
     return list_result
 
 @router.post("")

backend/apps/system/api/workspace.py

@@ -29,8 +29,9 @@ async def option_pager(
     pagination = PaginationParams(page=pageNum, size=pageSize)
     paginator = Paginator(session)
     stmt = select(UserModel.id, UserModel.account, UserModel.name).where(
-        ~exists().where(UserWsModel.uid == UserModel.id, UserWsModel.oid == oid)
-    ).order_by(UserModel.create_time)
+        ~exists().where(UserWsModel.uid == UserModel.id, UserWsModel.oid == oid),
+        UserModel.id != 1
+    ).order_by(UserModel.create_time.asc())
 
     if keyword:
         keyword_pattern = f"%{keyword}%"
@@ -51,12 +52,15 @@ async def option_user(
     current_user: CurrentUser,
     keyword: str = Query(description="搜索关键字")
     ):
+    if not keyword:
+        raise HTTPException("keyword is required")
     if (not current_user.isAdmin) and current_user.weight == 0:
         raise RuntimeError("no permission to execute this api")
     oid = current_user.oid
 
     stmt = select(UserModel.id, UserModel.account, UserModel.name).where(
-        ~exists().where(UserWsModel.uid == UserModel.id, UserWsModel.oid == oid)
+        ~exists().where(UserWsModel.uid == UserModel.id, UserWsModel.oid == oid),
+        UserModel.id != 1
     )
 
     if keyword:
@@ -89,7 +93,8 @@ async def pager(
         UserWsModel, UserModel.id == UserWsModel.uid
     ).where(
         UserWsModel.oid == workspace_id,
-    ).order_by(UserModel.create_time)
+        UserModel.id != 1
+    ).order_by(UserModel.create_time.asc())
 
     if keyword:
         keyword_pattern = f"%{keyword}%"
@@ -163,7 +168,7 @@ async def delete(session: SessionDep, current_user: CurrentUser, dto: UserWsBase
 
 @router.get("", response_model=list[WorkspaceModel])
 async def query(session: SessionDep, trans: Trans):
-    list_result = session.exec(select(WorkspaceModel).order_by(WorkspaceModel.create_time)).all()
+    list_result = session.exec(select(WorkspaceModel).order_by(WorkspaceModel.create_time.asc())).all()
     for ws in list_result:
         if ws.name.startswith('i18n'):
             ws.name =  trans(ws.name)
@@ -182,8 +187,7 @@ async def update(session: SessionDep, editor: WorkspaceEditor):
     db_model = session.get(WorkspaceModel, id)
     if not db_model:
         raise HTTPException(f"WorkspaceModel with id {id} not found")
-    update_data = WorkspaceModel.model_validate(editor)
-    db_model.sqlmodel_update(update_data)
+    db_model.name = editor.name
     session.add(db_model)
     session.commit()
 

backend/apps/system/models/system_model.py

@@ -47,6 +47,7 @@ class AssistantBaseModel(SQLModel):
     name: str = Field(max_length=255, nullable=False)
     type: int = Field(nullable=False, default=0)
     domain: str = Field(max_length=255, nullable=False)
+    description: str = Field(sa_type = Text(), nullable=True)
     configuration: Optional[str] = Field(sa_type = Text(), nullable=True)
     create_time: int = Field(default=0, sa_type=BigInteger())
 

backend/apps/system/schemas/system_schema.py

@@ -68,6 +68,7 @@ class AssistantBase(BaseModel):
     domain: str
     type: int = 0
     configuration: Optional[str] = None
+    description: Optional[str] = None
 class AssistantDTO(AssistantBase, BaseCreatorDTO):
     pass
 

backend/common/core/sqlbot_cache.py

@@ -164,11 +164,13 @@ async def wrapper(*args, **kwargs):
             )
 
             async with _get_cache_lock(cache_key):
-                await FastAPICache.clear(key=cache_key)
-                result = await func(*args, **kwargs)
-                logging.info(f"Clearing cache for key: {cache_key}")
-                print(f"Clearing cache for key: {cache_key}")
-                return result
+                if await FastAPICache.get_backend().get(cache_key):
+                    await FastAPICache.clear(key=cache_key)
+                    result = await func(*args, **kwargs)
+                    logging.info(f"Clearing cache for key: {cache_key}")
+                    print(f"Clearing cache for key: {cache_key}")
+                    return result
+                return await func(*args, **kwargs)
 
         return wrapper
     return decorator

frontend/src/api/embedded.ts

@@ -0,0 +1,7 @@
+import { request } from '@/utils/request'
+
+export const getList = () => request.get('/system/assistant')
+export const updateAssistant = (data: any) => request.put('/system/assistant', data)
+export const saveAssistant = (data: any) => request.post('/system/assistant', data)
+export const getOne = (id: any) => request.get(`/system/assistant/${id}`)
+export const delOne = (id: any) => request.delete(`/system/assistant/${id}`)

frontend/src/assets/embedded/icon_copy_outlined.svg

@@ -228,8 +228,8 @@
     "got_it": "Got it",
     "field_original_notes": "Field original notes",
     "field_notes_1": "Field notes",
-    "no_table":"No Table",
-    "go_add":"Add"
+    "no_table": "No Table",
+    "go_add": "Add"
   },
   "model": {
     "default_model": "Default model",
@@ -430,7 +430,12 @@
     "target_credential_name": "Target credential name",
     "target_credential": "Target credential",
     "edit_advanced_applications": "Edit advanced applications",
-    "edit_basic_applications": "Edit basic applications"
+    "edit_basic_applications": "Edit basic applications",
+    "delete": "delete {msg}?",
+    "code_to_embed": "Copy the following code to embed",
+    "floating_window_mode": "Floating window mode",
+    "copy_successful": "Copy successful",
+    "copy_failed": "Copy failed"
   },
   "chat": {
     "type": "Chart Type",
@@ -476,4 +481,4 @@
     "back_community": "Restore to Community Edition",
     "confirm_tips": "Are you sure to restore to Community Edition?"
   }
-}
+}