Release/v1.7.9.1

Release/v1.7.9.1

Author: WMC001

.github/CODEOWNERS

@@ -1,5 +1,2 @@
 # These owners will be the default owners for everything in the repo
-*       @Phinease
-
-doc/docs/zh/opensource-memorial-wall.md  @WMC001
-doc/docs/en/opensource-memorial-wall.md  @WMC001
+*       @Phinease @WMC001

CODE_OF_CONDUCT.md

@@ -61,7 +61,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[chenshuangrui@huawei.com].
+[wanmingchen1@huawei.com].
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

CONTRIBUTING.md

@@ -162,7 +162,7 @@ To contribute：
 Stuck or have questions? We're here to help! Reach out to us via：
 - **GitHub Issues**: Open an issue for discussion.
 - **Discord**: Join our [Nexent Community](https://discord.gg/YXH5C8SQ) for real-time chat.
-- **Email**: Drop us a line at [chenshuangrui@huawei.com](mailto:chenshuangrui@huawei.com).
+- **Email**: Drop us a line at [wanmingchen1@huawei.com](mailto:wanmingchen1@huawei.com).
 
 ## 🎉 Celebrate Your Contribution!
 

LICENSE

@@ -7,7 +7,7 @@ Nexent is permitted to be used commercially, including as a backend service for
 a. Multi-tenant SaaS service: Unless explicitly authorized by Nexent in writing, you may not use the Nexent source code to operate a multi-tenant SaaS service.
 b. LOGO and copyright information: In the process of using Nexent's frontend, you may not remove or modify the LOGO or copyright information in the Nexent console or applications. This restriction is inapplicable to uses of Nexent that do not involve its frontend.
 
-Please contact chenshuangrui@huawei.com by email to inquire about licensing matters.
+Please contact zhenggaoqi@huawei.com by email to inquire about licensing matters.
 
 As a contributor, you should agree that:
 

backend/apps/config_app.py

@@ -10,7 +10,6 @@
 from apps.file_management_app import file_management_config_router as file_manager_router
 from apps.image_app import router as proxy_router
 from apps.knowledge_summary_app import router as summary_router
-from apps.me_model_managment_app import router as me_model_manager_router
 from apps.mock_user_management_app import router as mock_user_management_router
 from apps.model_managment_app import router as model_manager_router
 from apps.prompt_app import router as prompt_router
@@ -37,7 +36,6 @@
     allow_headers=["*"],  # Allows all headers
 )
 
-app.include_router(me_model_manager_router)
 app.include_router(model_manager_router)
 app.include_router(config_sync_router)
 app.include_router(agent_router)

backend/apps/me_model_managment_app.py

@@ -1,11 +1,11 @@
 import logging
 from typing import Optional
 
-from fastapi import APIRouter, Header, HTTPException
+from fastapi import APIRouter, Header, HTTPException, UploadFile, File, Form
 from fastapi.responses import JSONResponse
 from http import HTTPStatus
 
-from consts.const import MCP_DOCKER_IMAGE
+from consts.const import NEXENT_MCP_DOCKER_IMAGE, ENABLE_UPLOAD_IMAGE
 from consts.exceptions import MCPConnectionError, MCPNameIllegal, MCPContainerError
 from consts.model import MCPConfigRequest
 from services.remote_mcp_service import (
@@ -14,7 +14,9 @@
     get_remote_mcp_server_list,
     check_mcp_health_and_update_db,
     delete_mcp_by_container_id,
+    upload_and_start_mcp_image,
 )
+from database.remote_mcp_db import check_mcp_name_exists
 from services.tool_configuration_service import get_tool_from_remote_mcp_server
 from services.mcp_container_service import MCPContainerManager
 from utils.auth_utils import get_current_user_id
@@ -116,6 +118,7 @@ async def get_remote_proxies(
         return JSONResponse(
             status_code=HTTPStatus.OK,
             content={"remote_mcp_server_list": remote_mcp_server_list,
+                     "enable_upload_image": ENABLE_UPLOAD_IMAGE,
                      "status": "success"}
         )
     except Exception as e:
@@ -153,7 +156,7 @@ async def add_mcp_from_config(
     """
     Add MCP server by starting a container with command+args config.
     Similar to Cursor's MCP server configuration format.
-    
+
     Example request:
     {
         "mcpServers": {
@@ -167,7 +170,7 @@ async def add_mcp_from_config(
     """
     try:
         user_id, tenant_id = get_current_user_id(authorization)
-        
+
         # Initialize container manager
         try:
             container_manager = MCPContainerManager()
@@ -177,25 +180,30 @@ async def add_mcp_from_config(
                 status_code=HTTPStatus.SERVICE_UNAVAILABLE,
                 detail="Docker service unavailable. Please ensure Docker socket is mounted."
             )
-        
+
         results = []
         errors = []
-        
+
         for service_name, config in mcp_config.mcpServers.items():
             try:
                 command = config.command
                 args = config.args or []
                 env_vars = config.env or {}
                 port = config.port
-                
+
                 if not command:
                     errors.append(f"{service_name}: command is required")
                     continue
-                
+
                 if port is None:
                     errors.append(f"{service_name}: port is required")
                     continue
 
+                # Check if MCP service name already exists before starting container
+                if check_mcp_name_exists(mcp_name=service_name, tenant_id=tenant_id):
+                    errors.append(f"{service_name}: MCP name already exists")
+                    continue
+
                 # Build full command to run inside nexent/nexent-mcp image
                 full_command = [
                     "python",
@@ -219,28 +227,19 @@ async def add_mcp_from_config(
                     user_id=user_id,
                     env_vars=env_vars,
                     host_port=port,
-                    image=config.image or MCP_DOCKER_IMAGE,
+                    image=config.image or NEXENT_MCP_DOCKER_IMAGE,
                     full_command=full_command,
                 )
-                
+
                 # Register to remote MCP server list
-                try:
-                    await add_remote_mcp_server_list(
-                        tenant_id=tenant_id,
-                        user_id=user_id,
-                        remote_mcp_server=container_info["mcp_url"],
-                        remote_mcp_server_name=service_name,
-                        container_id=container_info["container_id"],
-                    )
-                except MCPNameIllegal:
-                    # If name already exists, try to stop the container we just created
-                    try:
-                        await container_manager.stop_mcp_container(container_info["container_id"])
-                    except Exception:
-                        pass
-                    errors.append(f"{service_name}: MCP name already exists")
-                    continue
-                
+                await add_remote_mcp_server_list(
+                    tenant_id=tenant_id,
+                    user_id=user_id,
+                    remote_mcp_server=container_info["mcp_url"],
+                    remote_mcp_server_name=service_name,
+                    container_id=container_info["container_id"],
+                )
+
                 results.append({
                     "service_name": service_name,
                     "status": "success",
@@ -249,20 +248,22 @@ async def add_mcp_from_config(
                     "container_name": container_info.get("container_name"),
                     "host_port": container_info.get("host_port")
                 })
-                
+
             except MCPContainerError as e:
-                logger.error(f"Failed to start MCP container {service_name}: {e}")
+                logger.error(
+                    f"Failed to start MCP container {service_name}: {e}")
                 errors.append(f"{service_name}: {str(e)}")
             except Exception as e:
-                logger.error(f"Unexpected error adding MCP {service_name}: {e}")
+                logger.error(
+                    f"Unexpected error adding MCP {service_name}: {e}")
                 errors.append(f"{service_name}: {str(e)}")
-        
+
         if errors and not results:
             raise HTTPException(
                 status_code=HTTPStatus.BAD_REQUEST,
                 detail=f"All MCP servers failed: {errors}"
             )
-        
+
         return JSONResponse(
             status_code=HTTPStatus.OK,
             content={
@@ -272,7 +273,7 @@ async def add_mcp_from_config(
                 "status": "success"
             }
         )
-    
+
     except HTTPException:
         raise
     except Exception as e:
@@ -291,7 +292,7 @@ async def stop_mcp_container(
     """ Stop and remove MCP container """
     try:
         user_id, tenant_id = get_current_user_id(authorization)
-        
+
         try:
             container_manager = MCPContainerManager()
         except MCPContainerError as e:
@@ -339,7 +340,7 @@ async def list_mcp_containers(
     """ List all MCP containers for the current tenant """
     try:
         user_id, tenant_id = get_current_user_id(authorization)
-        
+
         try:
             container_manager = MCPContainerManager()
         except MCPContainerError as e:
@@ -348,9 +349,9 @@ async def list_mcp_containers(
                 status_code=HTTPStatus.SERVICE_UNAVAILABLE,
                 detail="Docker service unavailable"
             )
-        
+
         containers = container_manager.list_mcp_containers(tenant_id=tenant_id)
-        
+
         return JSONResponse(
             status_code=HTTPStatus.OK,
             content={
@@ -377,7 +378,7 @@ async def get_container_logs(
     """ Get logs from MCP container """
     try:
         user_id, tenant_id = get_current_user_id(authorization)
-        
+
         try:
             container_manager = MCPContainerManager()
         except MCPContainerError as e:
@@ -386,9 +387,9 @@ async def get_container_logs(
                 status_code=HTTPStatus.SERVICE_UNAVAILABLE,
                 detail="Docker service unavailable"
             )
-        
+
         logs = container_manager.get_container_logs(container_id, tail=tail)
-        
+
         return JSONResponse(
             status_code=HTTPStatus.OK,
             content={
@@ -404,3 +405,62 @@ async def get_container_logs(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
             detail=f"Failed to get container logs: {str(e)}"
         )
+
+
+# Conditionally add upload-image route based on ENABLE_UPLOAD_IMAGE setting
+if ENABLE_UPLOAD_IMAGE:
+    @router.post("/upload-image")
+    async def upload_mcp_image(
+        file: UploadFile = File(..., description="Docker image tar file"),
+        port: int = Form(..., ge=1, le=65535,
+                         description="Host port to expose the MCP server on (1-65535)"),
+        service_name: Optional[str] = Form(
+            None, description="Name for the MCP service (auto-generated if not provided)"),
+        env_vars: Optional[str] = Form(
+            None, description="Environment variables as JSON string"),
+        authorization: Optional[str] = Header(None)
+    ):
+        """
+        Upload Docker image tar file and start MCP container.
+
+        Container naming: {filename-without-extension}-{tenant-id[:8]}-{user-id[:8]}
+        """
+        try:
+            user_id, tenant_id = get_current_user_id(authorization)
+
+            # Read file content
+            content = await file.read()
+
+            # Call service layer to handle the business logic
+            result = await upload_and_start_mcp_image(
+                tenant_id=tenant_id,
+                user_id=user_id,
+                file_content=content,
+                filename=file.filename,
+                port=port,
+                service_name=service_name,
+                env_vars=env_vars,
+            )
+
+            return JSONResponse(status_code=HTTPStatus.OK, content=result)
+
+        except ValueError as e:
+            logger.error(f"Validation error: {e}")
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST, detail=str(e))
+        except MCPNameIllegal as e:
+            logger.error(f"MCP name conflict: {e}")
+            raise HTTPException(status_code=HTTPStatus.CONFLICT, detail=str(e))
+        except MCPContainerError as e:
+            logger.error(f"Container error: {e}")
+            raise HTTPException(
+                status_code=HTTPStatus.SERVICE_UNAVAILABLE, detail=str(e))
+        except Exception as e:
+            logger.error(f"Failed to upload and start MCP container: {e}")
+            raise HTTPException(
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+                detail=f"Failed to upload and start MCP container: {str(e)}"
+            )
+else:
+    logger.info(
+        "MCP image upload feature is disabled (ENABLE_UPLOAD_IMAGE=false)")

backend/apps/remote_mcp_app.py

@@ -129,8 +129,8 @@ class VectorDatabaseType(str, Enum):
 DISABLE_CELERY_FLOWER = os.getenv(
     "DISABLE_CELERY_FLOWER", "false").lower() == "true"
 DOCKER_ENVIRONMENT = os.getenv("DOCKER_ENVIRONMENT", "false").lower() == "true"
-DOCKER_HOST = os.getenv("DOCKER_HOST")
-MCP_DOCKER_IMAGE = os.getenv("MCP_DOCKER_IMAGE", "nexent/nexent-mcp:latest")
+NEXENT_MCP_DOCKER_IMAGE = os.getenv("NEXENT_MCP_DOCKER_IMAGE", "nexent/nexent-mcp:latest")
+ENABLE_UPLOAD_IMAGE = os.getenv("ENABLE_UPLOAD_IMAGE", "false").lower() == "true"
 
 
 # Celery Configuration
@@ -287,4 +287,4 @@ class VectorDatabaseType(str, Enum):
 
 
 # APP Version
-APP_VERSION = "v1.7.9"
+APP_VERSION = "v1.7.9.1"