Merge pull request #49 from longbingljw/fix-make-stop

fix: make stop command can't stop db container

Author: frf12

README.md

@@ -112,9 +112,7 @@ Notes: If you are participating in the OceanBase AI Workshop, you can skip steps
 
 ## Building the Chatbot
 
-### Quick Start with Docker (Recommended)
-
-If you want to quickly deploy the chatbot using Docker, see [Docker Deployment Guide](./docker/README.md).
+### Quick Start (Recommended)
 
 ```bash
 # 1. Configure environment

README_zh.md

@@ -112,9 +112,7 @@ RAG 的主要优势有：
 
 ## 构建聊天机器人
 
-### Docker 快速启动（推荐）
-
-如果您想使用 Docker 快速部署聊天机器人，请参见 [Docker 部署指南](./docker/README.md)。
+### 快速启动（推荐）
 
 ```bash
 # 1. 配置环境变量

docker/README.md

@@ -51,7 +51,7 @@ fi
 
 # Download Docker images based on DB_STORE
 if [ "${DB_STORE}" = "seekdb" ]; then
-    docker_name="seekdb"
+    docker_name="chatbot-seekdb"
     # Check if container already exists
     if sudo docker ps -a --format "{{.Names}}" | grep -q "^${docker_name}$"; then
         echo "Container '${docker_name}' already exists."
@@ -64,10 +64,10 @@ if [ "${DB_STORE}" = "seekdb" ]; then
     else
         echo "Downloading latest seekdb docker image..."
         export ROOT_PASSWORD=${DB_PASSWORD}
-        sudo docker run --name seekdb -e ROOT_PASSWORD=${DB_PASSWORD} -d -p 2881:2881 -p 2886:2886 oceanbase/seekdb
+        sudo docker run --name "${docker_name}" -e ROOT_PASSWORD=${DB_PASSWORD} -d -p 2881:2881 -p 2886:2886 oceanbase/seekdb
     fi
 elif [ "${DB_STORE}" = "oceanbase" ]; then
-    docker_name="oceanbase-ce"
+    docker_name="chatbot-oceanbase"
     # Check if container already exists
     if sudo docker ps -a --format "{{.Names}}" | grep -q "^${docker_name}$"; then
         echo "Container '${docker_name}' already exists."
@@ -80,11 +80,10 @@ elif [ "${DB_STORE}" = "oceanbase" ]; then
     else
         echo "Downloading latest oceanbase-ce docker image..."
         export OB_TENANT_PASSWORD=${DB_PASSWORD}
-        sudo docker run -p 2881:2881 --name oceanbase-ce -e OB_TENANT_PASSWORD=${DB_PASSWORD} -e datafile_size=10G -d oceanbase/oceanbase-ce
+        sudo docker run -p 2881:2881 --name "${docker_name}" -e OB_TENANT_PASSWORD=${DB_PASSWORD} -e datafile_size=10G -d oceanbase/oceanbase-ce:4.4.1.0-100010012025120515
     fi
 else
     echo "Warning: Unknown DB_STORE value: ${DB_STORE}. Skipping docker image download."
-    exit 0
 fi
 
 # Wait for download to complete
@@ -129,9 +128,9 @@ if [ "$connection_failed" = true ]; then
 
     # Determine docker_name based on DB_STORE
     if [ "${DB_STORE}" = "seekdb" ]; then
-        docker_name="seekdb"
+        docker_name="chatbot-seekdb"
     elif [ "${DB_STORE}" = "oceanbase" ]; then
-        docker_name="oceanbase-ce"
+        docker_name="chatbot-oceanbase"
     else
         echo "Warning: Unknown DB_STORE value: ${DB_STORE}. Cannot determine docker name."
         exit 1

scripts/init_docker.sh

@@ -16,26 +16,51 @@ echo "Stopping ChatBot UI service..."
 # Find and kill streamlit processes running chat_ui.py or flow_ui.py
 PIDS=$(ps aux | grep -E "streamlit.*chat_ui\.py|streamlit.*flow_ui\.py" | grep -v grep | awk '{print $2}')
 
-if [ -z "$PIDS" ]; then
+if [ -n "$PIDS" ]; then
+    for PID in $PIDS; do
+        echo "Stopping process $PID..."
+        kill "$PID" 2>/dev/null || true
+    done
+
+    # Wait a bit for processes to terminate
+    sleep 2
+
+    # Force kill if still running
+    PIDS=$(ps aux | grep -E "streamlit.*chat_ui\.py|streamlit.*flow_ui\.py" | grep -v grep | awk '{print $2}')
+    if [ -n "$PIDS" ]; then
+        for PID in $PIDS; do
+            echo "Force stopping process $PID..."
+            kill -9 "$PID" 2>/dev/null || true
+        done
+    fi
+else
     echo "No ChatBot UI service is running."
-    exit 0
 fi
 
-for PID in $PIDS; do
-    echo "Stopping process $PID..."
-    kill "$PID" 2>/dev/null || true
-done
+# Stop database container only when local DB is managed by make init
+if [ -f "$PROJECT_ROOT/.env" ]; then
+    set -a
+    source "$PROJECT_ROOT/.env"
+    set +a
 
-# Wait a bit for processes to terminate
-sleep 2
+    if [ "${REUSE_CURRENT_DB}" != "true" ]; then
+        docker_name=""
+        if [ "${DB_STORE}" = "seekdb" ]; then
+            docker_name="chatbot-seekdb"
+        elif [ "${DB_STORE}" = "oceanbase" ]; then
+            docker_name="chatbot-oceanbase"
+        fi
 
-# Force kill if still running
-PIDS=$(ps aux | grep -E "streamlit.*chat_ui\.py|streamlit.*flow_ui\.py" | grep -v grep | awk '{print $2}')
-if [ -n "$PIDS" ]; then
-    for PID in $PIDS; do
-        echo "Force stopping process $PID..."
-        kill -9 "$PID" 2>/dev/null || true
-    done
+        if [ -n "$docker_name" ] && command -v docker &> /dev/null; then
+            if docker ps --format "{{.Names}}" 2>/dev/null | grep -q "^${docker_name}$"; then
+                echo "Stopping docker container ${docker_name}..."
+                docker stop "${docker_name}" >/dev/null || true
+            elif sudo docker ps --format "{{.Names}}" 2>/dev/null | grep -q "^${docker_name}$"; then
+                echo "Stopping docker container (sudo) ${docker_name}..."
+                sudo docker stop "${docker_name}" >/dev/null || true
+            fi
+        fi
+    fi
 fi
 
 echo "ChatBot UI service stopped."

scripts/stop.sh

@@ -10,7 +10,6 @@
 """
 import re
 import sys
-import warnings
 from dataclasses import dataclass
 from typing import Optional
 
@@ -353,83 +352,6 @@ def create_pyseekdb_client(params: Optional[ConnectionParams] = None):  # type:
     return client
 
 
-# Default values for deprecated vector memory parameters
-_DEFAULT_VECTOR_MEMORY_LIMIT_PERCENTAGE = 30
-_DEFAULT_QUERY_TIMEOUT = 100000000
-
-
-def ensure_vector_memory_params(
-    client,  # pyseekdb.Client - type ignored due to library typing issues
-    memory_limit_percentage: int = _DEFAULT_VECTOR_MEMORY_LIMIT_PERCENTAGE,
-    query_timeout: int = _DEFAULT_QUERY_TIMEOUT,
-) -> None:
-    """
-    Ensure vector memory parameters are properly configured.
-
-    .. deprecated::
-        This function is deprecated and will be removed in a future version.
-        Database parameters should be configured at the infrastructure level,
-        not in application code.
-
-    Checks and sets the ob_vector_memory_limit_percentage parameter if needed,
-    and sets the ob_query_timeout for the session.
-
-    Args:
-        client: pyseekdb client instance
-        memory_limit_percentage: Target value for ob_vector_memory_limit_percentage
-        query_timeout: Query timeout in microseconds
-
-    Raises:
-        RuntimeError: If parameter check or setting fails
-    """
-    warnings.warn(
-        "ensure_vector_memory_params is deprecated and will be removed in a future version. "
-        "Database parameters should be configured at the infrastructure level.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-
-    logger.info("Checking and setting database parameters")
-
-    # Check ob_vector_memory_limit_percentage
-    vals = []
-    params = client.execute(
-        "SHOW PARAMETERS LIKE '%ob_vector_memory_limit_percentage%'"
-    )
-    for row in params:
-        val = int(row[6])
-        vals.append(val)
-
-    if len(vals) == 0:
-        logger.error("ob_vector_memory_limit_percentage not found in parameters.")
-        raise RuntimeError("ob_vector_memory_limit_percentage not found in parameters.")
-
-    # Set ob_vector_memory_limit_percentage if any value is 0
-    if any(val == 0 for val in vals):
-        try:
-            logger.info(
-                f"Setting ob_vector_memory_limit_percentage to {memory_limit_percentage}"
-            )
-            client.execute(
-                f"ALTER SYSTEM SET ob_vector_memory_limit_percentage = {memory_limit_percentage}"
-            )
-            logger.info(
-                f"Successfully set ob_vector_memory_limit_percentage to {memory_limit_percentage}"
-            )
-        except Exception as e:
-            logger.error(
-                f"Failed to set ob_vector_memory_limit_percentage to {memory_limit_percentage}: {e}"
-            )
-            raise RuntimeError(
-                f"Failed to set ob_vector_memory_limit_percentage: {e}"
-            ) from e
-
-    # Set query timeout
-    logger.info(f"Setting ob_query_timeout to {query_timeout}")
-    client.execute(f"SET ob_query_timeout={query_timeout}")
-    logger.debug("Database parameters configured successfully")
-
-
 # =============================================================================
 # CLI Functions
 # =============================================================================