From 6bd97cd8af31da2b8d6f039955227e7e65d3eee3 Mon Sep 17 00:00:00 2001
From: LXW <1264174498@qq.com>
Date: Mon, 18 Dec 2023 14:07:30 +0800
Subject: [PATCH] (improvement)(script) Update bat script (#529)

Co-authored-by: jolunoluo
---
 assembly/bin/supersonic-build.bat  | 29 ++++++++++++++++++++++++-----
 assembly/bin/supersonic-daemon.bat | 16 ++++++++--------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/assembly/bin/supersonic-build.bat b/assembly/bin/supersonic-build.bat
index 6bfb91b24..204accba6 100644
--- a/assembly/bin/supersonic-build.bat
+++ b/assembly/bin/supersonic-build.bat
@@ -6,11 +6,18 @@ set "baseDir=%~dp0.."
 set "buildDir=%baseDir%\build"
 set "runtimeDir=%baseDir%\..\runtime"
 set "pip_path=pip3"
+set "service=%~1"
+
 
 rem 1. build backend java modules
 del /q "%buildDir%\*.tar.gz" 2>NUL
 call mvn -f "%baseDir%\..\pom.xml" clean package -DskipTests
 
+IF ERRORLEVEL 1 (
+    ECHO Failed to build backend Java modules.
+    EXIT /B 1
+)
+
 rem 2. move package to build
 echo f|xcopy "%baseDir%\..\launchers\standalone\target\*.tar.gz" "%buildDir%\supersonic-standalone.tar.gz"
 
@@ -19,6 +26,11 @@ cd "%baseDir%\..\webapp"
 call start-fe-prod.bat
 copy /y "%baseDir%\..\webapp\supersonic-webapp.tar.gz" "%buildDir%\"
 
+IF ERRORLEVEL 1 (
+    ECHO Failed to build frontend webapp.
+    EXIT /B 1
+)
+
 rem 4. copy webapp to java classpath
 cd "%buildDir%"
 tar -zxvf supersonic-webapp.tar.gz
@@ -26,16 +38,23 @@ move supersonic-webapp webapp
 move webapp ..\..\launchers\standalone\target\classes
 
 rem 5. build backend python modules
-echo "start installing python modules with pip: ${pip_path}"
-set requirementPath="%baseDir%/../chat/python/requirements.txt"
-%pip_path% install -r %requirementPath%
-echo "install python modules success"
+if "%service%"=="pyllm" (
+    echo "start installing python modules with pip: ${pip_path}"
+    set requirementPath="%baseDir%/../chat/python/requirements.txt"
+    %pip_path% install -r %requirementPath%
+    echo "install python modules success"
+)
 
 call :BUILD_RUNTIME
 
 :BUILD_RUNTIME
   rem 6. reset runtime
-  rd /s /q "%runtimeDir%"
+  IF EXIST "%runtimeDir%" (
+      echo begin to delete dir : %runtimeDir%
+      rd /s /q "%runtimeDir%"
+  ) ELSE (
+      echo %runtimeDir% does not exist, create directly
+  )
   mkdir "%runtimeDir%"
   tar -zxvf "%buildDir%\supersonic-standalone.tar.gz" -C "%runtimeDir%"
   for /d %%f in ("%runtimeDir%\launchers-standalone-*") do (
diff --git a/assembly/bin/supersonic-daemon.bat b/assembly/bin/supersonic-daemon.bat
index 2d77ac217..c04ce86fc 100644
--- a/assembly/bin/supersonic-daemon.bat
+++ b/assembly/bin/supersonic-daemon.bat
@@ -21,6 +21,10 @@ if "%service%"=="" (
    set "service=%standalone_service%"
 )
 
+IF "%service%"=="pyllm" (
+  SET "llmProxy=PythonLLMProxy"
+)
+
 call :BUILD_RUNTIME
 
 if "%command%"=="restart" (
@@ -44,17 +48,13 @@ if "%command%"=="restart" (
 :START
     if "%service%"=="%pyllm_service%" (
          call :START_PYTHON
+         call :START_JAVA
          goto :EOF
     )
-    call :START_PYTHON
     call :START_JAVA
     goto :EOF
 
 :STOP
-    if "%service%"=="%pyllm_service%" (
-        call :STOP_PYTHON
-        goto :EOF
-    )
     call :STOP_PYTHON
     call :STOP_JAVA
     goto :EOF
@@ -71,9 +71,9 @@ if "%command%"=="restart" (
   echo 'java service starting, see logs in logs/'
    cd "%javaRunDir%"
    if not exist "%runtimeDir%\supersonic-standalone\logs" mkdir "%runtimeDir%\supersonic-standalone\logs"
-   set "libDir=%runtimeDir%\supersonic-%service%\lib"
-   set "confDir=%runtimeDir%\supersonic-%service%\conf"
-   set "webDir=%runtimeDir%\supersonic-%service%\webapp"
+   set "libDir=%runtimeDir%\supersonic-standalone\lib"
+   set "confDir=%runtimeDir%\supersonic-standalone\conf"
+   set "webDir=%runtimeDir%\supersonic-standalone\webapp"
    set "classpath=%confDir%;%webDir%;%libDir%\*"
    set "java-command=-Dfile.encoding=UTF-8 -Duser.language=Zh -Duser.region=CN -Duser.timezone=GMT+08 -Xms1024m -Xmx2048m -cp %CLASSPATH% %MAIN_CLASS%"
    start /B java %java-command% >nul 2>&1