(improvement)(project) rename llm to llmParser and optimizing python start scripts and optimizing and optimizing build/start scripts (#91)

2025-12-15 22:46:49 +00:00 · 2023-09-14 22:30:06 +08:00
parent bc69d2221a
commit 30f5fc9ab1
35 changed files with 237 additions and 507 deletions
--- a/assembly/bin/supersonic-build.sh
+++ b/assembly/bin/supersonic-build.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash

+# pip path
+pip_path="/usr/local/bin/pip3"
+
 sbinDir=$(cd "$(dirname "$0")"; pwd)
 baseDir=$(cd "$sbinDir/.." && pwd -P)
 runtimeDir=$baseDir/runtime
@@ -14,7 +17,9 @@ rm -fr dist
 mvn -f $baseDir/../ clean package -DskipTests

 #2. move package to build
-cp $baseDir/../launchers/standalone/target/*.tar.gz ${buildDir}/supersonic.tar.gz
+cp $baseDir/../launchers/semantic/target/*.tar.gz ${buildDir}/supersonic-semantic.tar.gz
+cp $baseDir/../launchers/chat/target/*.tar.gz ${buildDir}/supersonic-chat.tar.gz
+cp $baseDir/../launchers/standalone/target/*.tar.gz ${buildDir}/supersonic-standalone.tar.gz

 #3. build frontend webapp
 chmod +x $baseDir/../webapp/start-fe-prod.sh
@@ -27,3 +32,8 @@ cd $buildDir
 tar xvf supersonic-webapp.tar.gz
 mv supersonic-webapp webapp
 mv webapp ../../launchers/standalone/target/classes
+
+#5. build backend python modules
+requirementPath=$baseDir/../chat/core/src/main/python/requirements.txt
+${pip_path}  install -r ${requirementPath}
+echo "install python modules success"
--- a/assembly/bin/supersonic-daemon.sh
+++ b/assembly/bin/supersonic-daemon.sh
@@ -1,5 +1,15 @@
 #!/usr/bin/env bash

+python_path="/usr/local/bin/python3"
+readonly CHAT_APP_NAME="supersonic_chat"
+readonly SEMANTIC_APP_NAME="supersonic_semantic"
+readonly LLMPARSER_APP_NAME="supersonic_llmparser"
+readonly STANDALONE_APP_NAME="supersonic_standalone"
+readonly CHAT_SERVICE="chat"
+readonly SEMANTIC_SERVICE="semantic"
+readonly LLMPARSER_SERVICE="llmparser"
+readonly STANDALONE_SERVICE="standalone"
+
 sbinDir=$(cd "$(dirname "$0")"; pwd)
 baseDir=$(cd "$sbinDir/.." && pwd -P)
 runtimeDir=$baseDir/../runtime
@@ -8,91 +18,203 @@ buildDir=$baseDir/build
 command=$1
 service=$2

+if [ -z "$service"  ]; then
+  service=${STANDALONE_SERVICE}
+fi
+
+app_name=$STANDALONE_APP_NAME
+main_class="com.tencent.supersonic.StandaloneLauncher"
+model_name=$service
+
+if [ "$service" == "llmparser" ]; then
+  model_name=${STANDALONE_SERVICE}
+fi
+
 cd $baseDir
-if [[ "$service" == "semantic" || -z "$service"  ]] && [ "$command" != "stop"  ]; then
-   #1. clear file
-   mkdir -p ${runtimeDir}
-   rm -fr ${runtimeDir}/*

-   #2. package lib
-   tar -zxvf ${buildDir}/supersonic.tar.gz  -C ${runtimeDir}
-   mv ${runtimeDir}/launchers-standalone-* ${runtimeDir}/supersonic-standalone
-   tar -zxvf ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
-   mkdir -p ${runtimeDir}/supersonic-standalone/webapp
-   cp -fr  ${buildDir}/supersonic-webapp/* ${runtimeDir}/supersonic-standalone/webapp
-   rm -fr  ${buildDir}/supersonic-webapp
-fi
-if [[ "$service" == "semantic"  ]]; then
-   json=$(cat ${runtimeDir}/supersonic-semantic/webapp/supersonic.config.json)
-   json=$(echo $json | jq '.env="semantic"')
-   echo $json > ${runtimeDir}/supersonic-semantic/webapp/supersonic.config.json
-fi
+function setMainClass {
+  if [ "$service" == $CHAT_SERVICE ]; then
+    main_class="com.tencent.supersonic.ChatLauncher"
+  elif [ "$service" == $SEMANTIC_SERVICE ]; then
+    main_class="com.tencent.supersonic.SemanticLauncher"
+  fi
+}
+
+function setAppName {
+  if [ "$service" == $CHAT_SERVICE ]; then
+    app_name=$CHAT_APP_NAME
+  elif [ "$service" == $SEMANTIC_SERVICE ]; then
+    app_name=$SEMANTIC_APP_NAME
+  elif [ "$service" == $LLMPARSER_SERVICE ]; then
+    app_name=$LLMPARSER_APP_NAME
+  fi
+}
+
+function setEnvToWeb {
+  if [[ "$service" == $CHAT_SERVICE  || "$service" == $SEMANTIC_SERVICE ]]; then
+     json='{"env": "'$service'"}'
+     echo $json > ${runtimeDir}/supersonic-${model_name}/webapp/supersonic.config.json
+  fi
+}
+
+function resetEnvironment {
+  if [[ "$command" == "start" || "$command" == "restart" ]]; then
+     #1. clear file
+     mkdir -p ${runtimeDir}
+     rm -fr ${runtimeDir}/supersonic-${model_name}
+     #2. package lib
+     tar -zxvf ${buildDir}/supersonic-${model_name}.tar.gz  -C ${runtimeDir}
+     mv ${runtimeDir}/launchers-${model_name}-* ${runtimeDir}/supersonic-${model_name}
+
+     tar -zxvf ${buildDir}/supersonic-webapp.tar.gz  -C ${buildDir}
+     mkdir -p ${runtimeDir}/supersonic-${model_name}/webapp
+     cp -fr  ${buildDir}/supersonic-webapp/* ${runtimeDir}/supersonic-${model_name}/webapp
+     rm -fr  ${buildDir}/supersonic-webapp
+  fi
+}
+
+setAppName
+resetEnvironment
+setEnvToWeb
+setMainClass
+
+function runJavaService {
+  javaRunDir=${runtimeDir}/supersonic-${model_name}
+  local_app_name=$1
+  libDir=$javaRunDir/lib
+  confDir=$javaRunDir/conf
+
+  CLASSPATH=""
+  CLASSPATH=$CLASSPATH:$confDir
+
+  for jarPath in $libDir/*.jar; do
+   CLASSPATH=$CLASSPATH:$jarPath
+  done
+
+  export CLASSPATH
+  export LANG="zh_CN.UTF-8"
+
+  cd $javaRunDir
+  if [[ "$JAVA_HOME" == "" ]]; then
+    JAVA_HOME=$(ls /usr/jdk64/jdk* -d 2>/dev/null | xargs | awk '{print "'$local_app_name'"}')
+  fi
+  export PATH=$JAVA_HOME/bin:$PATH
+  command="-Dfile.encoding="UTF-8"  -Duser.language="Zh" -Duser.region="CN" -Duser.timezone="GMT+08" -Dapp_name=${local_app_name} -Xms1024m -Xmx2048m "$main_class
+
+  mkdir -p $javaRunDir/logs
+  if [[ "$is_test" == "true" ]]; then
+    java -Dspring.profiles.active="dev" $command >/dev/null 2>$javaRunDir/logs/error.log &
+  else
+    java  $command $javaRunDir >/dev/null 2>$javaRunDir/logs/error.log &
+  fi
+}
+
+function runPythonService {
+  pythonRunDir=${runtimeDir}/supersonic-${model_name}/llmparser
+  cd $pythonRunDir
+  nohup ${python_path} supersonic_llmparser.py  > $pythonRunDir/llmparser.log  2>&1   &
+  sleep 4
+}
+
+function reloadExamples {
+  pythonRunDir=${runtimeDir}/supersonic-${model_name}/llmparser
+  cd $pythonRunDir/sql
+  ${python_path} examples_reload_run.py
+}
+
+function getProcesName {
+  process_name=$main_class
+  if [[ ${app_name} == $LLMPARSER_APP_NAME ]]; then
+    process_name=$app_name
+  fi
+  echo $process_name
+}
+
+function start()
+{
+  local_app_name=$1
+  pid=$(ps aux |grep ${local_app_name} | grep -v grep | awk '{print $2}')
+  if [[ "$pid" == "" ]]; then
+    if [[ ${local_app_name} == $LLMPARSER_APP_NAME ]]; then
+      runPythonService ${local_app_name}
+    else
+      runJavaService ${local_app_name}
+    fi
+  else
+    echo "Process (PID = $pid) is running."
+    return 1
+  fi
+}
+
+function stop()
+{
+  pid=$(ps aux | grep $1 | grep -v grep | awk '{print $2}')
+  if [[ "$pid" == "" ]]; then
+    echo "Process $1 is not running !"
+    return 1
+  else
+    kill -9 $pid
+    echo "Process (PID = $pid) is killed !"
+    return 0
+  fi
+}
+
+function reload()
+{
+  if [[ $1 == $LLMPARSER_APP_NAME ]]; then
+    reloadExamples
+  fi
+}

-if [[ "$service" == "chat"  ]]; then
-   json=$(cat ${runtimeDir}/supersonic-chat/webapp/supersonic.config.json)
-   json=$(echo $json | jq '.env="chat"')
-   echo $json > ${runtimeDir}/supersonic-chat/webapp/supersonic.config.json
-fi
-echo $command
-echo $service
 case "$command" in
  start)
-        if [[ "$service" == "semantic"  ]];then
-          echo -e "Starting semantic java service"
-          sh ${runtimeDir}/supersonic-semantic/bin/service.sh start
-        elif [[ "$service" == "chat"  ]];then
-          echo -e "Starting chat java service"
-          sh ${runtimeDir}/supersonic-chat/bin/service.sh start
-        elif [[ "$service" == "llmparser"  ]];then
-          echo -e "Starting llmparser python service"
-          sh ${runtimeDir}/supersonic-standalone/llm/bin/service.sh  start
-        elif [[ -z "$service"  ]]; then
-          echo -e "Starting supersonic services"
-          sh ${runtimeDir}/supersonic-standalone/bin/service.sh start
-          sh ${runtimeDir}/supersonic-standalone/llm/bin/service.sh start
+        if [ "$service" == $STANDALONE_SERVICE ]; then
+          echo  "Starting $LLMPARSER_APP_NAME"
+          start $LLMPARSER_APP_NAME
+          echo  "Starting $app_name"
+          start $app_name
        else
-          echo "Use command {chat|semantic|llmparser} to run."
+          echo  "Starting $app_name"
+          start $app_name
        fi
+        echo  "Start success"
        ;;
  stop)
-        if [[ "$service" == "semantic"  ]];then
-          echo -e "Stopping semantic java service"
-          sh ${runtimeDir}/supersonic-semantic/bin/service.sh stop
-        elif [[ "$service" == "chat"  ]];then
-          echo -e "Stopping chat java service"
-          sh ${runtimeDir}/supersonic-chat/bin/service.sh stop
-        elif [[ "$service" == "llmparser"  ]];then
-          echo -e "Stopping llmparser python service"
-          sh ${runtimeDir}/supersonic-standalone/llm/bin/service.sh  stop
-        elif [[ -z "$service"  ]]; then
-          echo -e "Stopping supersonic services"
-          sh ${runtimeDir}/supersonic-standalone/bin/service.sh stop
-          sh ${runtimeDir}/supersonic-standalone/llm/bin/service.sh stop
+        if [ "$service" == $STANDALONE_SERVICE ]; then
+          echo  "Stopping $LLMPARSER_APP_NAME"
+          stop $LLMPARSER_APP_NAME
+          echo  "Stopping $app_name"
+          stop $app_name
        else
-          echo "Use command {chat|semantic|llmparser} to run."
+          echo  "Stopping $app_name"
+          stop ${app_name}
        fi
+        echo  "Stop success"
+        ;;
+  reload)
+        echo  "Reloading ${app_name}"
+        reload ${app_name}
+        echo  "Reload success"
        ;;
  restart)
-        if [[ "$service" == "semantic"  ]];then
-          echo -e "Restarting semantic java service"
-          sh ${runtimeDir}/supersonic-semantic/bin/service.sh restart
-        elif [[ "$service" == "chat"  ]];then
-          echo -e "Restarting chat java service"
-          sh ${runtimeDir}/supersonic-chat/bin/service.sh restart
-        elif [[ "$service" == "llmparser"  ]];then
-          echo -e "Restarting llmparser python service"
-          sh ${runtimeDir}/supersonic-standalone/llm/bin/service.sh  restart
-        elif [[ -z "$service"  ]]; then
-          echo -e "Restarting supersonic services"
-          sh ${runtimeDir}/supersonic-standalone/bin/service.sh restart
-          sh ${runtimeDir}/supersonic-standalone/llm/bin/service.sh restart
+        if [ "$service" == $STANDALONE_SERVICE ]; then
+          echo  "Stopping ${app_name}"
+          stop ${app_name}
+          echo  "Stopping ${LLMPARSER_APP_NAME}"
+          stop $LLMPARSER_APP_NAME
+          echo  "Starting ${LLMPARSER_APP_NAME}"
+          start $LLMPARSER_APP_NAME
+          echo  "Starting ${app_name}"
+          start ${app_name}
        else
-          echo "Use command {chat|semantic|llmparser} to run."
+          echo  "Stopping ${app_name}"
+          stop ${app_name}
+          echo  "Starting ${app_name}"
+          start ${app_name}
        fi
+        echo  "Restart success"
        ;;
  *)
-        echo "Use command {start|stop|status|restart} to run."
+        echo "Use command {start|stop|restart} to run."
        exit 1
-esac
-
-exit 0
+esac