🐛 Bugfix: Do not display the terminal tool when this tool is not selected during deployment #1019

Author: WMC001

backend/services/tool_configuration_service.py

@@ -10,16 +10,20 @@
 import jsonref
 from mcpadapt.smolagents_adapter import _sanitize_function_name
 
-from database.tool_db import create_or_update_tool_by_tool_info, query_tool_instances_by_id, \
-    update_tool_table_from_scan_tool_list, query_all_tools
-from consts.model import ToolInstanceInfoRequest, ToolInfo, ToolSourceEnum
 from consts.const import LOCAL_MCP_SERVER
-from database.remote_mcp_db import get_mcp_records_by_tenant
-
 from consts.exceptions import MCPConnectionError
+from consts.model import ToolInstanceInfoRequest, ToolInfo, ToolSourceEnum
+from database.remote_mcp_db import get_mcp_records_by_tenant
+from database.tool_db import (
+    create_or_update_tool_by_tool_info,
+    query_all_tools,
+    query_tool_instances_by_id,
+    update_tool_table_from_scan_tool_list
+)
 
 logger = logging.getLogger("tool_configuration_service")
 
+
 def python_type_to_json_schema(annotation: Any) -> str:
     """
     Convert Python type annotations to JSON Schema types
@@ -55,6 +59,7 @@ def python_type_to_json_schema(annotation: Any) -> str:
     # Return mapped type, or original type name if no mapping exists
     return type_mapping.get(type_name, type_name)
 
+
 def get_local_tools() -> List[ToolInfo]:
     """
     Get metadata for all locally available tools
@@ -340,5 +345,5 @@ async def list_all_tools(tenant_id: str):
             "params": tool.get("params", [])
         }
         formatted_tools.append(formatted_tool)
-    
+
     return formatted_tools

docker/deploy.sh

@@ -76,17 +76,8 @@ generate_minio_ak_sk() {
   export MINIO_ACCESS_KEY=$ACCESS_KEY
   export MINIO_SECRET_KEY=$SECRET_KEY
 
-  if grep -q "^MINIO_ACCESS_KEY=" .env; then
-    sed -i.bak "s~^MINIO_ACCESS_KEY=.*~MINIO_ACCESS_KEY=$ACCESS_KEY~" .env
-  else
-    echo "MINIO_ACCESS_KEY=$ACCESS_KEY" >> .env
-  fi
-
-  if grep -q "^MINIO_SECRET_KEY=" .env; then
-    sed -i.bak "s~^MINIO_SECRET_KEY=.*~MINIO_SECRET_KEY=$SECRET_KEY~" .env
-  else
-    echo "MINIO_SECRET_KEY=$SECRET_KEY" >> .env
-  fi
+  update_env_var "MINIO_ACCESS_KEY" "$ACCESS_KEY"
+  update_env_var "MINIO_SECRET_KEY" "$SECRET_KEY"
 
   echo "   ✅ MinIO keys generated successfully"
 }
@@ -159,11 +150,7 @@ generate_ssh_keys() {
           export SSH_PRIVATE_KEY_PATH
 
           # Add to .env file
-          if grep -q "^SSH_PRIVATE_KEY_PATH=" .env; then
-              sed -i.bak "s~^SSH_PRIVATE_KEY_PATH=.*~SSH_PRIVATE_KEY_PATH=$SSH_PRIVATE_KEY_PATH~" .env
-          else
-              echo "SSH_PRIVATE_KEY_PATH=$SSH_PRIVATE_KEY_PATH" >> .env
-          fi
+          update_env_var "SSH_PRIVATE_KEY_PATH" "$SSH_PRIVATE_KEY_PATH"
 
           echo ""
           echo "--------------------------------"
@@ -226,11 +213,7 @@ generate_ssh_keys() {
               export SSH_PRIVATE_KEY_PATH
 
               # Add to .env file
-              if grep -q "^SSH_PRIVATE_KEY_PATH=" .env; then
-                  sed -i.bak "s~^SSH_PRIVATE_KEY_PATH=.*~SSH_PRIVATE_KEY_PATH=$SSH_PRIVATE_KEY_PATH~" .env
-              else
-                  echo "SSH_PRIVATE_KEY_PATH=$SSH_PRIVATE_KEY_PATH" >> .env
-              fi
+              update_env_var "SSH_PRIVATE_KEY_PATH" "$SSH_PRIVATE_KEY_PATH"
 
               # Fix SSH host key permissions (must be 600)
               find "$ROOT_DIR/openssh-server/config" -name "*_key" -type f -exec chmod 600 {} \; 2>/dev/null || true
@@ -278,13 +261,7 @@ generate_elasticsearch_api_key() {
   ELASTICSEARCH_API_KEY=$(echo "$API_KEY_JSON" | grep -o '"encoded":"[^"]*"' | awk -F'"' '{print $4}')
   echo "✅ ELASTICSEARCH_API_KEY Generated: $ELASTICSEARCH_API_KEY"
   if [ -n "$ELASTICSEARCH_API_KEY" ]; then
-    if grep -q "^ELASTICSEARCH_API_KEY=" .env; then
-      # Use ~ as a separator in sed to avoid conflicts with special characters in the API key.
-      sed -i.bak "s~^ELASTICSEARCH_API_KEY=.*~ELASTICSEARCH_API_KEY=$ELASTICSEARCH_API_KEY~" .env
-    else
-      echo "" >> .env
-      echo "ELASTICSEARCH_API_KEY=$ELASTICSEARCH_API_KEY" >> .env
-    fi
+    update_env_var "ELASTICSEARCH_API_KEY" "$ELASTICSEARCH_API_KEY"
   fi
 }
 
@@ -351,17 +328,8 @@ get_compose_version() {
 }
 
 disable_dashboard() {
-  if grep -q "^DISABLE_RAY_DASHBOARD=" .env; then
-    sed -i.bak "s~^DISABLE_RAY_DASHBOARD=.*~DISABLE_RAY_DASHBOARD=true~" .env
-  else
-    echo "DISABLE_RAY_DASHBOARD=true" >> .env
-  fi
-            
-  if grep -q "^DISABLE_CELERY_FLOWER=" .env; then
-    sed -i.bak "s~^DISABLE_CELERY_FLOWER=.*~DISABLE_CELERY_FLOWER=true~" .env
-  else
-    echo "DISABLE_CELERY_FLOWER=true" >> .env
-  fi
+  update_env_var "DISABLE_RAY_DASHBOARD" "true"
+  update_env_var "DISABLE_CELERY_FLOWER" "true"
 }
 
 select_deployment_mode() {
@@ -566,7 +534,7 @@ deploy_infrastructure() {
       fi
 
       # Start Supabase services
-      if ! $docker_compose_command -p nexent -f "docker-compose-supabase${COMPOSE_FILE_SUFFIX}" up -d; then
+      if ! ${docker_compose_command} -p nexent -f "docker-compose-supabase${COMPOSE_FILE_SUFFIX}" up -d; then
           echo "   ❌ ERROR Failed to start supabase services"
           ERROR_OCCURRED=1
           return 1
@@ -699,20 +667,15 @@ select_terminal_tool() {
 
         # Save to environment variables
         export TERMINAL_MOUNT_DIR
-        
-        # Add to .env file
-        if grep -q "^TERMINAL_MOUNT_DIR=" .env; then
-            sed -i.bak "s~^TERMINAL_MOUNT_DIR=.*~TERMINAL_MOUNT_DIR=$TERMINAL_MOUNT_DIR~" .env
-        else
-            echo "TERMINAL_MOUNT_DIR=$TERMINAL_MOUNT_DIR" >> .env
-        fi
+        update_env_var "TERMINAL_MOUNT_DIR" "$TERMINAL_MOUNT_DIR"
 
         echo "   📁 Terminal mount configuration:"
         echo "      • Host: $TERMINAL_MOUNT_DIR"
         echo "      • Container: /opt/terminal"
     else
         export ENABLE_TERMINAL_TOOL="false"
         echo "🚫 Terminal tool disabled"
+
     fi
     echo ""
     echo "--------------------------------"