Release/v1.7.9.3

Release/v1.7.9.3

Author: WMC001

.cursor/rules/frontend/ui_standards_rules.mdc

@@ -0,0 +1,123 @@
+---
+globs: frontend/app/**,frontend/components/**
+alwaysApply: false
+---
+# Frontend UI Standards Rules
+
+## Principle
+Use Ant Design as primary UI library with minimal Tailwind CSS. Prioritize mature Ant Design solutions for responsive layouts. Avoid secondary encapsulation unless necessary.
+
+## Technology Usage Guidelines
+- **Ant Design**: Forms, data display, complex interactions (`<Button>`, `<Modal>`, `<Form>`)
+- **Tailwind CSS**: Spacing, layout, simple styling (`className="flex items-center gap-2 text-sm"`)
+- **Inline Styles**: Special cases (`style={{ fontSize: "48px" }}`)
+- **Override AntD**: Use `<style jsx global>` when necessary
+
+## Layout Standards
+
+### Global Layout
+Use Header, Sider, Footer, Content structure. Reference: https://ant.design/components/layout-cn
+
+```tsx
+const { Header, Footer, Sider, Content } = Layout;
+
+<Layout>
+  <Header>Header</Header>
+  <Layout>
+    <Sider width="25%">Sider</Sider>
+    <Content>Content</Content>
+  </Layout>
+  <Footer>Footer</Footer>
+</Layout>
+```
+
+### Responsive Grid
+Use AntD Grid for responsive layouts. Reference: https://ant.design/components/grid-cn
+
+```tsx
+<Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }}>
+  <Col span={6}>col-6</Col>
+  <Col span={6}>col-6</Col>
+  <Col span={6}>col-6</Col>
+  <Col span={6}>col-6</Col>
+</Row>
+```
+
+### Flex Layout
+Use AntD Flex for component alignment. Reference: https://ant.design/components/flex-cn
+
+```tsx
+<Flex vertical className="h-full overflow-hidden">
+  <Row><Col>Content 1</Col></Row>
+  <Row><Col>Content 2</Col></Row>
+  <Row className="flex:1 min-h-0">
+    <Col><Flex className="h-full overflow-hidden">...</Flex></Col>
+  </Row>
+</Flex>
+```
+
+## Component Standards
+
+### Modals
+1. **Complex Modal**: For reusable modals with custom content
+2. **Simple Modal**: Use `useConfirmModal` for one-time confirmations
+
+#### Modal Standards
+- Use `centered` for positioning
+- Confirm buttons: `type="primary" danger={true}`
+- i18n keys: `common.cancel`, `common.confirm`
+- Icon: `<ExclamationCircleFilled />` aligned with title
+
+```tsx
+// Complex modal
+<Modal
+  open={isOpen}
+  centered
+  okButtonProps={{ type: "primary", danger: true }}
+  okText={t("common.confirm")}
+>
+  <div className="flex items-start gap-4">
+    <ExclamationCircleFilled style={{ color: token.colorWarning, fontSize: '22px' }} />
+    <div>
+      <div className="font-medium">{t("title")}</div>
+      <div className="text-sm">{t("content")}</div>
+    </div>
+  </div>
+</Modal>
+
+// Simple modal
+const { confirm } = useConfirmModal();
+confirm({
+  title: t("delete.confirmTitle"),
+  content: t("delete.confirmContent"),
+  onOk: () => { /* ... */ }
+});
+```
+
+### Icon Library
+- **Primary**: `lucide-react` for consistency
+- **Fallback**: `@ant-design/icons` when lucide-react lacks icons
+
+```tsx
+import { ExternalLink } from "lucide-react";
+import { PlusOutlined } from '@ant-design/icons';
+
+<ExternalLink />
+<PlusOutlined />
+```
+
+## i18n Usage
+
+```tsx
+import { useTranslation, Trans } from "react-i18next";
+
+// Simple text
+t("common.confirm")
+
+// HTML content
+<Trans
+  i18nKey="modal.description"
+  values={{ title }}
+  components={{ strong: <strong /> }}
+/>
+```

backend/agents/create_agent_info.py

@@ -150,6 +150,8 @@ async def create_agent_config(
                     tenant_id=tenant_id, user_id=user_id)
                 if knowledge_info_list:
                     for knowledge_info in knowledge_info_list:
+                        if knowledge_info.get('knowledge_sources') != 'elasticsearch':
+                            continue
                         knowledge_name = knowledge_info.get("index_name")
                         try:
                             message = ElasticSearchService().get_summary(index_name=knowledge_name)
@@ -239,13 +241,22 @@ async def create_tool_config_list(agent_id, tenant_id, user_id):
             knowledge_info_list = get_selected_knowledge_list(
                 tenant_id=tenant_id, user_id=user_id)
             index_names = [knowledge_info.get(
-                "index_name") for knowledge_info in knowledge_info_list]
+                "index_name") for knowledge_info in knowledge_info_list if knowledge_info.get('knowledge_sources') == 'elasticsearch']
             tool_config.metadata = {
                 "index_names": index_names,
                 "vdb_core": get_vector_db_core(),
                 "embedding_model": get_embedding_model(tenant_id=tenant_id),
                 "name_resolver": build_knowledge_name_mapping(tenant_id=tenant_id, user_id=user_id),
             }
+        elif tool_config.class_name == "DataMateSearchTool":
+            knowledge_info_list = get_selected_knowledge_list(
+                tenant_id=tenant_id, user_id=user_id)
+            index_names = [knowledge_info.get(
+                "index_name") for knowledge_info in knowledge_info_list if
+                knowledge_info.get('knowledge_sources') == 'datamate']
+            tool_config.metadata = {
+                "index_names": index_names,
+            }
         elif tool_config.class_name == "AnalyzeTextFileTool":
             tool_config.metadata = {
                 "llm_model": get_llm_model(tenant_id=tenant_id),

backend/apps/config_app.py

@@ -6,6 +6,7 @@
 
 from apps.agent_app import agent_config_router as agent_router
 from apps.config_sync_app import router as config_sync_router
+from apps.datamate_app import router as datamate_router
 from apps.vectordatabase_app import router as vectordatabase_router
 from apps.file_management_app import file_management_config_router as file_manager_router
 from apps.image_app import router as proxy_router
@@ -43,6 +44,7 @@
 app.include_router(config_sync_router)
 app.include_router(agent_router)
 app.include_router(vectordatabase_router)
+app.include_router(datamate_router)
 app.include_router(voice_router)
 app.include_router(file_manager_router)
 app.include_router(proxy_router)

backend/apps/config_sync_app.py

@@ -27,7 +27,8 @@ async def save_config(config: GlobalConfig, authorization: Optional[str] = Heade
         )
     except Exception as e:
         logger.error(f"Failed to save configuration: {str(e)}")
-        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail="Failed to save configuration.")
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
+                            detail="Failed to save configuration.")
 
 
 @router.get("/load_config")
@@ -49,4 +50,5 @@ async def load_config(authorization: Optional[str] = Header(None), request: Requ
         )
     except Exception as e:
         logger.error(f"Failed to load configuration: {str(e)}")
-        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST, detail="Failed to load configuration.")
+        raise HTTPException(status_code=HTTPStatus.BAD_REQUEST,
+                            detail="Failed to load configuration.")

backend/apps/datamate_app.py

@@ -0,0 +1,48 @@
+import logging
+from typing import Optional
+
+from fastapi import APIRouter, Header, HTTPException, Path
+from fastapi.responses import JSONResponse
+from http import HTTPStatus
+
+from services.datamate_service import (
+    sync_datamate_knowledge_bases_and_create_records,
+    fetch_datamate_knowledge_base_file_list
+)
+from utils.auth_utils import get_current_user_id
+
+router = APIRouter(prefix="/datamate")
+logger = logging.getLogger("datamate_app")
+
+
+@router.post("/sync_datamate_knowledges")
+async def sync_datamate_knowledges(
+    authorization: Optional[str] = Header(None)
+):
+    """Sync DataMate knowledge bases and create knowledge records in local database."""
+    try:
+        user_id, tenant_id = get_current_user_id(authorization)
+
+        return await sync_datamate_knowledge_bases_and_create_records(
+            tenant_id=tenant_id,
+            user_id=user_id
+        )
+    except Exception as e:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=f"Error syncing DataMate knowledge bases and creating records: {str(e)}")
+
+
+@router.get("/{knowledge_base_id}/files")
+async def get_datamate_knowledge_base_files_endpoint(
+    knowledge_base_id: str = Path(...,
+                                  description="ID of the DataMate knowledge base"),
+    authorization: Optional[str] = Header(None)
+):
+    """Get all files from a DataMate knowledge base."""
+    try:
+        user_id, tenant_id = get_current_user_id(authorization)
+        result = await fetch_datamate_knowledge_base_file_list(knowledge_base_id, tenant_id)
+        return JSONResponse(status_code=HTTPStatus.OK, content=result)
+    except Exception as e:
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=f"Error fetching DataMate knowledge base files: {str(e)}")

backend/apps/tenant_config_app.py

@@ -6,6 +6,7 @@
 from fastapi.responses import JSONResponse
 
 from consts.const import DEPLOYMENT_VERSION, APP_VERSION
+from consts.model import UpdateKnowledgeListRequest
 from services.tenant_config_service import get_selected_knowledge_list, update_selected_knowledge
 from utils.auth_utils import get_current_user_id
 
@@ -61,16 +62,37 @@ def load_knowledge_list(
 @router.post("/update_knowledge_list")
 def update_knowledge_list(
     authorization: Optional[str] = Header(None),
-    knowledge_list: List[str] = Body(None)
+    request: UpdateKnowledgeListRequest = Body(...)
 ):
     try:
         user_id, tenant_id = get_current_user_id(authorization)
+
+        # Convert grouped request to flat lists
+        knowledge_list = []
+        knowledge_sources = []
+
+        if request.nexent:
+            knowledge_list.extend(request.nexent)
+            knowledge_sources.extend(["nexent"] * len(request.nexent))
+
+        if request.datamate:
+            knowledge_list.extend(request.datamate)
+            knowledge_sources.extend(["datamate"] * len(request.datamate))
+
         result = update_selected_knowledge(
-            tenant_id=tenant_id, user_id=user_id, index_name_list=knowledge_list)
+            tenant_id=tenant_id, user_id=user_id, index_name_list=knowledge_list, knowledge_sources=knowledge_sources)
         if result:
+            # Get updated knowledge base information
+            selected_knowledge_info = get_selected_knowledge_list(
+                tenant_id=tenant_id, user_id=user_id)
+
+            content = {"selectedKbNames": [item["index_name"] for item in selected_knowledge_info],
+                       "selectedKbModels": [item["embedding_model_name"] for item in selected_knowledge_info],
+                       "selectedKbSources": [item["knowledge_sources"] for item in selected_knowledge_info]}
+
             return JSONResponse(
                 status_code=HTTPStatus.OK,
-                content={"message": "update success", "status": "success"}
+                content={"content": content, "message": "update success", "status": "success"}
             )
         else:
             raise HTTPException(

backend/apps/user_management_app.py

@@ -11,7 +11,7 @@
 from consts.exceptions import NoInviteCodeException, IncorrectInviteCodeException, UserRegistrationException
 from services.user_management_service import get_authorized_client, validate_token, \
     check_auth_service_health, signup_user, signup_user_with_invitation, signin_user, refresh_user_token, \
-    get_session_by_authorization, revoke_regular_user, get_user_info, get_permissions_by_role
+    get_session_by_authorization, revoke_regular_user, get_user_info
 from consts.exceptions import UnauthorizedError
 from utils.auth_utils import get_current_user_id
 
@@ -287,32 +287,3 @@ async def revoke_user_account(request: Request):
         logging.error(f"User revoke failed: {str(e)}")
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail="User revoke failed")
-
-
-@router.get("/role_permissions/{user_role}")
-async def get_role_permissions(user_role: str):
-    """
-    Get all permissions for a specific user role.
-
-    Args:
-        user_role (str): User role to query permissions for (SU, ADMIN, DEV, USER)
-
-    Returns:
-        JSONResponse: Permissions data with success message
-    """
-    try:
-        permissions_data = await get_permissions_by_role(user_role)
-
-        return JSONResponse(status_code=HTTPStatus.OK, content={
-            "message": permissions_data["message"],
-            "data": {
-                "user_role": permissions_data["user_role"],
-                "permissions": permissions_data["permissions"],
-                "total_permissions": permissions_data["total_permissions"]
-            }
-        })
-    except Exception as e:
-        logging.error(
-            f"Failed to get role permissions for role {user_role}: {str(e)}")
-        raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-                            detail=f"Failed to retrieve permissions for role {user_role}")

backend/consts/const.py

@@ -14,6 +14,7 @@
 # Vector database providers
 class VectorDatabaseType(str, Enum):
     ELASTICSEARCH = "elasticsearch"
+    DATAMATE = "datamate"
 
 
 # Elasticsearch Configuration
@@ -23,7 +24,6 @@ class VectorDatabaseType(str, Enum):
 ES_USERNAME = "elastic"
 ELASTICSEARCH_SERVICE = os.getenv("ELASTICSEARCH_SERVICE")
 
-
 # Data Processing Service Configuration
 DATA_PROCESS_SERVICE = os.getenv("DATA_PROCESS_SERVICE")
 CLIP_MODEL_PATH = os.getenv("CLIP_MODEL_PATH")
@@ -253,6 +253,7 @@ class VectorDatabaseType(str, Enum):
 TENANT_NAME = "TENANT_NAME"
 TENANT_ID = "TENANT_ID"
 DEFAULT_GROUP_ID = "DEFAULT_GROUP_ID"
+DATAMATE_URL = "DATAMATE_URL"
 
 # Task Status Constants
 TASK_STATUS = {
@@ -293,4 +294,4 @@ class VectorDatabaseType(str, Enum):
 MODEL_ENGINE_ENABLED = os.getenv("MODEL_ENGINE_ENABLED")
 
 # APP Version
-APP_VERSION = "v1.7.9.2"
+APP_VERSION = "v1.7.9.3"

backend/consts/model.py

@@ -106,7 +106,8 @@ class AppConfig(BaseModel):
     iconType: str
     customIconUrl: Optional[str] = None
     avatarUri: Optional[str] = None
-    modelEngineEnabled: bool = True
+    modelEngineEnabled: bool = False
+    datamateUrl: Optional[str] = None
 
 
 class GlobalConfig(BaseModel):
@@ -460,6 +461,14 @@ class MCPConfigRequest(BaseModel):
         ..., description="Dictionary of MCP server configurations")
 
 
+class UpdateKnowledgeListRequest(BaseModel):
+    """Request model for updating user's selected knowledge base list grouped by source"""
+    nexent: Optional[List[str]] = Field(
+        None, description="List of knowledge base index names from nexent source")
+    datamate: Optional[List[str]] = Field(
+        None, description="List of knowledge base index names from datamate source")
+
+
 # Tenant Management Data Models
 # ---------------------------------------------------------------------------
 class TenantCreateRequest(BaseModel):