mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2026-11-02 16:05:23 +00:00
fix: correct local inference engine operation task logs (#14274)
This commit is contained in:
@@ -350,14 +350,16 @@ func (a *AppInstallService) Operate(req request.AppInstalledOperate) error {
|
||||
}
|
||||
|
||||
func operateAppTask(install model.AppInstall, req request.AppInstalledOperate, onFailure func(error)) error {
|
||||
taskType := task.TaskUpdate
|
||||
var taskType string
|
||||
switch req.Operate {
|
||||
case constant.Start:
|
||||
taskType = "Run"
|
||||
install.Status = constant.StatusStarting
|
||||
case constant.Restart:
|
||||
taskType = task.TaskRestart
|
||||
install.Status = constant.StatusRestarting
|
||||
case constant.Stop:
|
||||
taskType = "Stop"
|
||||
install.Status = constant.StatusWaiting
|
||||
default:
|
||||
return errors.New("lifecycle script operation not supported")
|
||||
@@ -395,7 +397,9 @@ func operateAppTask(install model.AppInstall, req request.AppInstalledOperate, o
|
||||
case constant.Restart:
|
||||
out, err = compose.Restart(install.GetComposePath())
|
||||
}
|
||||
t.Log(out)
|
||||
if strings.TrimSpace(out) != "" {
|
||||
t.Log(out)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -1134,8 +1138,10 @@ func syncAppInstallStatus(appInstall *model.AppInstall, force bool) error {
|
||||
operation = task.TaskBuild
|
||||
case constant.StatusUninstalling:
|
||||
operation = task.TaskUninstall
|
||||
case constant.StatusStarting, constant.StatusWaiting:
|
||||
operation = task.TaskUpdate
|
||||
case constant.StatusStarting:
|
||||
operation = "Run"
|
||||
case constant.StatusWaiting:
|
||||
operation = "Stop"
|
||||
case constant.StatusRestarting:
|
||||
operation = task.TaskRestart
|
||||
}
|
||||
|
||||
@@ -88,6 +88,10 @@ func localEngineTaskStatus(operation, status string) string {
|
||||
return constant.StatusRebuilding
|
||||
case task.TaskRestart:
|
||||
return constant.StatusRestarting
|
||||
case "Run":
|
||||
return constant.StatusStarting
|
||||
case "Stop":
|
||||
return constant.StatusWaiting
|
||||
case task.TaskUpdate:
|
||||
if status == constant.StatusWaiting {
|
||||
return constant.StatusWaiting
|
||||
|
||||
@@ -346,9 +346,16 @@ func (t TensorRTLLMService) Operate(req request.TensorRTLLMOperate) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
operation := task.TaskUpdate
|
||||
if req.Operate == "restart" {
|
||||
var operation string
|
||||
switch req.Operate {
|
||||
case "start":
|
||||
operation = "Run"
|
||||
case "stop":
|
||||
operation = "Stop"
|
||||
case "restart":
|
||||
operation = task.TaskRestart
|
||||
default:
|
||||
return fmt.Errorf("unsupported TensorRT operation: %s", req.Operate)
|
||||
}
|
||||
return runTensorRTLLMTask(tensorrtLLM, operation, req.Operate, req.TaskID)
|
||||
}
|
||||
@@ -393,7 +400,9 @@ func runTensorRTLLMTask(llm *model.TensorRTLLM, operation, action, taskID string
|
||||
out, err = compose.Up(composePath)
|
||||
case "update":
|
||||
out, err = compose.Down(composePath)
|
||||
t.Log(out)
|
||||
if strings.TrimSpace(out) != "" {
|
||||
t.Log(out)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -407,7 +416,9 @@ func runTensorRTLLMTask(llm *model.TensorRTLLM, operation, action, taskID string
|
||||
default:
|
||||
return fmt.Errorf("unsupported TensorRT operation: %s", action)
|
||||
}
|
||||
t.Log(out)
|
||||
if strings.TrimSpace(out) != "" {
|
||||
t.Log(out)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user