Merge branch 'release/v1.7.4' into xyc/batch_model_improve

Author: Jasonxia007

backend/agents/create_agent_info.py

@@ -15,7 +15,7 @@
 from services.memory_config_service import build_memory_context
 from database.agent_db import search_agent_info_by_agent_id, query_sub_agents_id_list
 from database.tool_db import search_tools_for_sub_agent
-from database.model_management_db import get_model_records
+from database.model_management_db import get_model_records, get_model_by_model_id
 from utils.model_name_utils import add_repo_to_name
 from utils.prompt_template_utils import get_agent_prompt_template
 from utils.config_utils import tenant_config_manager, get_model_name_from_config
@@ -170,6 +170,11 @@ async def create_agent_config(
     else:
         system_prompt = agent_info.get("prompt", "")
 
+    if agent_info.get("model_id") is not None:
+        model_info = get_model_by_model_id(agent_info.get("model_id"))
+        model_name = model_info["display_name"] if model_info is not None else "main_model"
+    else:
+        model_name = "main_model"
     agent_config = AgentConfig(
         name="undefined" if agent_info["name"] is None else agent_info["name"],
         description="undefined" if agent_info["description"] is None else agent_info["description"],
@@ -180,7 +185,7 @@ async def create_agent_config(
         ),
         tools=tool_list,
         max_steps=agent_info.get("max_steps", 10),
-        model_name=agent_info.get("model_name"),
+        model_name=model_name,
         provide_run_summary=agent_info.get("provide_run_summary", False),
         managed_agents=managed_agents
     )

backend/apps/tenant_config_app.py

@@ -5,7 +5,7 @@
 from fastapi import APIRouter, Body, Header, HTTPException
 from fastapi.responses import JSONResponse
 
-from consts.const import DEPLOYMENT_VERSION
+from consts.const import DEPLOYMENT_VERSION, APP_VERSION
 from services.tenant_config_service import get_selected_knowledge_list, update_selected_knowledge
 from utils.auth_utils import get_current_user_id
 
@@ -22,6 +22,7 @@ def get_deployment_version():
         return JSONResponse(
             status_code=HTTPStatus.OK,
             content={"deployment_version": DEPLOYMENT_VERSION,
+                     "app_version": APP_VERSION,
                      "status": "success"}
         )
     except Exception as e:

backend/apps/tool_config_app.py

@@ -10,7 +10,9 @@
 from services.tool_configuration_service import (
     search_tool_info_impl,
     update_tool_info_impl,
-    update_tool_list, list_all_tools,
+    update_tool_list,
+    list_all_tools,
+    load_last_tool_config_impl,
 )
 from utils.auth_utils import get_current_user_id
 
@@ -78,3 +80,21 @@ async def scan_and_update_tool(
         logger.error(f"Failed to update tool: {e}")
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail="Failed to update tool")
+
+@router.get("/load_config/{tool_id}")
+async def load_last_tool_config(tool_id: int, authorization: Optional[str] = Header(None)):
+    try:
+        user_id, tenant_id = get_current_user_id(authorization)
+        tool_params = load_last_tool_config_impl(tool_id, tenant_id, user_id)
+        return JSONResponse(
+            status_code=HTTPStatus.OK,
+            content={"message": tool_params, "status": "success"}
+        )
+    except ValueError:
+        logger.error(f"Tool configuration not found for tool ID: {tool_id}")
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Tool configuration not found")
+    except Exception as e:
+        logger.error(f"Failed to load tool config: {e}")
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail="Failed to load tool config")

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, signin_user, refresh_user_token, \
-    get_session_by_authorization
+    get_session_by_authorization, revoke_regular_user
 from consts.exceptions import UnauthorizedError
 from utils.auth_utils import get_current_user_id
 
@@ -69,7 +69,7 @@ async def signup(request: UserSignUpRequest):
                             detail="EMAIL_ALREADY_EXISTS")
     except AuthWeakPasswordError as e:
         logging.error(f"User registration failed by weak password: {str(e)}")
-        raise HTTPException(status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+        raise HTTPException(status_code=HTTPStatus.NOT_ACCEPTABLE,
                             detail="WEAK_PASSWORD")
     except Exception as e:
         logging.error(f"User registration failed, unknown error: {str(e)}")
@@ -87,7 +87,7 @@ async def signin(request: UserSignInRequest):
                             content=signin_content)
     except AuthApiError as e:
         logging.error(f"User login failed: {str(e)}")
-        raise HTTPException(status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+        raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED,
                             detail="Email or password error")
     except Exception as e:
         logging.error(f"User login failed, unknown error: {str(e)}")
@@ -200,3 +200,48 @@ async def get_user_id(request: Request):
         logging.error(f"Get user ID failed: {str(e)}")
         raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
                             detail="Get user ID failed")
+
+
+@router.post("/revoke")
+async def revoke_user_account(request: Request):
+    """Delete current regular user's account and purge related data.
+
+    Notes:
+    - Tenant admin (role=admin) is not allowed to be revoked via this endpoint.
+    - Idempotent: local deletions are soft deletes; Supabase deletion may already have occurred.
+    """
+    authorization = request.headers.get("Authorization")
+    if not authorization:
+        raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED,
+                            detail="No authorization token provided")
+    try:
+        # Identify current user and tenant
+        user_id, tenant_id = get_current_user_id(authorization)
+
+        # Determine role via token validation
+        is_valid, user = validate_token(authorization.replace("Bearer ", ""))
+        if not is_valid or not user:
+            raise UnauthorizedError("User not logged in or session invalid")
+
+        # Extract role from user metadata
+        user_role = "user"
+        if getattr(user, "user_metadata", None) and 'role' in user.user_metadata:
+            user_role = user.user_metadata['role']
+
+        # Disallow admin revocation by this endpoint
+        if user_role == "admin":
+            raise HTTPException(status_code=HTTPStatus.FORBIDDEN,
+                                detail="Admin account cannot be deleted via this endpoint")
+
+        # Orchestrate revoke for regular user
+        await revoke_regular_user(user_id=user_id, tenant_id=tenant_id)
+
+        return JSONResponse(status_code=HTTPStatus.OK, content={"message": "User account revoked"})
+    except UnauthorizedError as e:
+        raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail=str(e))
+    except HTTPException:
+        raise
+    except Exception as e:
+        logging.error(f"User revoke failed: {str(e)}")
+        raise HTTPException(
+            status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail="User revoke failed")

backend/consts/const.py

@@ -37,6 +37,7 @@
 # Supabase Configuration
 SUPABASE_URL = os.getenv('SUPABASE_URL')
 SUPABASE_KEY = os.getenv('SUPABASE_KEY')
+SERVICE_ROLE_KEY = os.getenv('SERVICE_ROLE_KEY', SUPABASE_KEY)
 
 
 # ===== To be migrated to frontend configuration =====
@@ -69,8 +70,6 @@
 DEFAULT_APP_DESCRIPTION_EN = "Nexent is an open-source agent SDK and platform, which can convert a single prompt into a complete multi-modal service - without orchestration, without complex drag-and-drop. Built on the MCP tool ecosystem, Nexent provides flexible model integration, scalable data processing, and powerful knowledge base management. Our goal is simple: to integrate data, models, and tools into a central intelligence hub, allowing anyone to easily integrate Nexent into their projects, making daily workflows smarter and more interconnected."
 DEFAULT_APP_NAME_ZH = "Nexent 智能体"
 DEFAULT_APP_NAME_EN = "Nexent Agent"
-DEFAULT_APP_ICON_URL = "data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20shape-rendering%3D%22auto%22%20width%3D%2230%22%20height%3D%2230%22%3E%3Cmetadata%20xmlns%3Ardf%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%22%20xmlns%3Axsi%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXMLSchema-instance%22%20xmlns%3Adc%3D%22http%3A%2F%2Fpurl.org%2Fdc%2Felements%2F1.1%2F%22%20xmlns%3Adcterms%3D%22http%3A%2F%2Fpurl.org%2Fdc%2Fterms%2F%22%3E%3Crdf%3ARDF%3E%3Crdf%3ADescription%3E%3Cdc%3Atitle%3EBootstrap%20Icons%3C%2Fdc%3Atitle%3E%3Cdc%3Acreator%3EThe%20Bootstrap%20Authors%3C%2Fdc%3Acreator%3E%3Cdc%3Asource%20xsi%3Atype%3D%22dcterms%3AURI%22%3Ehttps%3A%2F%2Fgithub.com%2Ftwbs%2Ficons%3C%2Fdc%3Asource%3E%3Cdcterms%3Alicense%20xsi%3Atype%3D%22dcterms%3AURI%22%3Ehttps%3A%2F%2Fgithub.com%2Ftwbs%2Ficons%2Fblob%2Fmain%2FLICENSE%3C%2Fdcterms%3Alicense%3E%3Cdc%3Arights%3E%E2%80%9EBootstrap%20Icons%E2%80%9D%20(https%3A%2F%2Fgithub.com%2Ftwbs%2Ficons)%20by%20%E2%80%9EThe%20Bootstrap%20Authors%E2%80%9D%2C%20licensed%20under%20%E2%80%9EMIT%E2%80%9D%20(https%3A%2F%2Fgithub.com%2Ftwbs%2Ficons%2Fblob%2Fmain%2FLICENSE)%3C%2Fdc%3Arights%3E%3C%2Frdf%3ADescription%3E%3C%2Frdf%3ARDF%3E%3C%2Fmetadata%3E%3Cmask%20id%3D%22viewboxMask%22%3E%3Crect%20width%3D%2224%22%20height%3D%2224%22%20rx%3D%2212%22%20ry%3D%2212%22%20x%3D%220%22%20y%3D%220%22%20fill%3D%22%23fff%22%20%2F%3E%3C%2Fmask%3E%3Cg%20mask%3D%22url(%23viewboxMask)%22%3E%3Crect%20fill%3D%22url(%23backgroundLinear)%22%20width%3D%2224%22%20height%3D%2224%22%20x%3D%220%22%20y%3D%220%22%20%2F%3E%3Cdefs%3E%3ClinearGradient%20id%3D%22backgroundLinear%22%20gradientTransform%3D%22rotate(196%200.5%200.5)%22%3E%3Cstop%20stop-color%3D%22%232689cb%22%2F%3E%3Cstop%20offset%3D%221%22%20stop-color%3D%22%234226cb%22%2F%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Cg%20transform%3D%22translate(2.4000000000000004%202.4000000000000004)%20scale(0.8)%22%3E%3Cg%20transform%3D%22translate(4%204)%22%3E%3Cpath%20d%3D%22M11.742%2010.344a6.5%206.5%200%201%200-1.397%201.398h-.001c.03.04.062.078.098.115l3.85%203.85a1%201%200%200%200%201.415-1.414l-3.85-3.85a1.012%201.012%200%200%200-.115-.1v.001ZM12%206.5a5.5%205.5%200%201%201-11%200%205.5%205.5%200%200%201%2011%200Z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E"
-
 
 # Minio Configuration
 MINIO_ENDPOINT = os.getenv("MINIO_ENDPOINT")
@@ -257,3 +256,6 @@
     os.getenv("LLM_SLOW_REQUEST_THRESHOLD_SECONDS", "5.0"))
 LLM_SLOW_TOKEN_RATE_THRESHOLD = float(
     os.getenv("LLM_SLOW_TOKEN_RATE_THRESHOLD", "10.0"))  # tokens per second
+
+# APP Version
+APP_VERSION = "v1.7.4"

backend/consts/model.py

@@ -204,6 +204,7 @@ class AgentInfoRequest(BaseModel):
     description: Optional[str] = None
     business_description: Optional[str] = None
     model_name: Optional[str] = None
+    model_id: Optional[int] = None
     max_steps: Optional[int] = None
     provide_run_summary: Optional[bool] = None
     duty_prompt: Optional[str] = None
@@ -261,7 +262,6 @@ class ExportAndImportAgentInfo(BaseModel):
     display_name: Optional[str] = None
     description: str
     business_description: str
-    model_name: str
     max_steps: int
     provide_run_summary: bool
     duty_prompt: Optional[str] = None

backend/database/conversation_db.py

@@ -411,6 +411,67 @@ def delete_conversation(conversation_id: int, user_id: Optional[str] = None) ->
         return conversation_result.rowcount > 0
 
 
+def soft_delete_all_conversations_by_user(user_id: str) -> int:
+    """
+    Soft-delete all conversations and related records created by a user.
+
+    Returns the number of conversations marked as deleted.
+    """
+    with get_db_session() as session:
+        update_data = {
+            "delete_flag": 'Y',
+            "update_time": func.current_timestamp()
+        }
+
+        # 1) Find all conversation ids created by the user
+        conv_ids = session.scalars(
+            select(ConversationRecord.conversation_id).where(
+                ConversationRecord.delete_flag == 'N',
+                ConversationRecord.created_by == user_id,
+            )
+        ).all()
+
+        if not conv_ids:
+            return 0
+
+        # 2) Mark conversations as deleted
+        session.execute(
+            update(ConversationRecord)
+            .where(ConversationRecord.conversation_id.in_(conv_ids), ConversationRecord.delete_flag == 'N')
+            .values(update_data)
+        )
+
+        # 3) Mark messages as deleted
+        session.execute(
+            update(ConversationMessage)
+            .where(ConversationMessage.conversation_id.in_(conv_ids), ConversationMessage.delete_flag == 'N')
+            .values(update_data)
+        )
+
+        # 4) Mark message units as deleted
+        session.execute(
+            update(ConversationMessageUnit)
+            .where(ConversationMessageUnit.conversation_id.in_(conv_ids), ConversationMessageUnit.delete_flag == 'N')
+            .values(update_data)
+        )
+
+        # 5) Mark search sources as deleted
+        session.execute(
+            update(ConversationSourceSearch)
+            .where(ConversationSourceSearch.conversation_id.in_(conv_ids), ConversationSourceSearch.delete_flag == 'N')
+            .values(update_data)
+        )
+
+        # 6) Mark image sources as deleted
+        session.execute(
+            update(ConversationSourceImage)
+            .where(ConversationSourceImage.conversation_id.in_(conv_ids), ConversationSourceImage.delete_flag == 'N')
+            .values(update_data)
+        )
+
+        return len(conv_ids)
+
+
 def update_message_opinion(message_id: int, opinion: str, user_id: Optional[str] = None) -> bool:
     """
     Update message like/dislike status

backend/database/db_models.py

@@ -191,7 +191,8 @@ class AgentInfo(TableBase):
     name = Column(String(100), doc="Agent name")
     display_name = Column(String(100), doc="Agent display name")
     description = Column(Text, doc="Description")
-    model_name = Column(String(100), doc="Name of the model used")
+    model_name = Column(String(100), doc="[DEPRECATED] Name of the model used, use model_id instead")
+    model_id = Column(Integer, doc="Model ID, foreign key reference to model_record_t.model_id")
     max_steps = Column(Integer, doc="Maximum number of steps")
     duty_prompt = Column(Text, doc="Duty prompt content")
     constraint_prompt = Column(Text, doc="Constraint prompt content")

backend/database/memory_config_db.py

@@ -88,3 +88,21 @@ def update_config_by_id(config_id: int, update_data: Dict[str, Any]) -> bool:
         except Exception:
             session.rollback()
             return False
+
+
+def soft_delete_all_configs_by_user_id(user_id: str, actor: str) -> bool:
+    """Soft-delete all memory user config records for a user."""
+    with get_db_session() as session:
+        try:
+            session.query(MemoryUserConfig).filter(
+                MemoryUserConfig.user_id == user_id,
+                MemoryUserConfig.delete_flag == "N",
+            ).update({
+                "delete_flag": "Y",
+                "updated_by": actor,
+            })
+            session.commit()
+            return True
+        except Exception:
+            session.rollback()
+            return False

backend/database/tool_db.py

@@ -213,3 +213,14 @@ def delete_tools_by_agent_id(agent_id, tenant_id, user_id):
         ).update({
             ToolInstance.delete_flag: 'Y', 'updated_by': user_id
         })
+
+def search_last_tool_instance_by_tool_id(tool_id: int, tenant_id: str, user_id: str):
+    with get_db_session() as session:
+        query = session.query(ToolInstance).filter(
+            ToolInstance.tool_id == tool_id,
+            ToolInstance.tenant_id == tenant_id,
+            ToolInstance.user_id == user_id,
+            ToolInstance.delete_flag != 'Y'
+        ).order_by(ToolInstance.update_time.desc()) 
+        tool_instance = query.first()
+        return as_dict(tool_instance) if tool_instance else None