feat: ollama后台启动,Run()会一直卡住，只能用Start()

Author: yexinf

extension/api/engine_manage_api.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"oadin/extension/api/dto"
@@ -17,6 +18,7 @@ import (
 	"oadin/internal/types"
 	dto2 "oadin/internal/api/dto"
 	"oadin/internal/logger"
+	provider2 "oadin/internal/provider"
 )
 
 type EngineApi struct {
@@ -71,6 +73,32 @@ func (e *EngineApi) install(c *gin.Context) {
 	dto.Success(c, "引擎安装成功")
 }
 
+func waitEngineReady(modelEngine provider2.ModelServiceProvider) error {
+	// 启动成功后，增加就绪检测，启动后轮询健康检查直到成功或超时，再返回。这样接口只在服务就绪时响应
+	const (
+        maxWait   = 5 * time.Second
+        interval  = 200 * time.Millisecond
+    )
+    start := time.Now()
+    for {
+		err := modelEngine.HealthCheck()
+        if err == nil {
+            break
+        }
+        if time.Since(start) >= maxWait {
+            break
+        }
+        time.Sleep(interval)
+    }
+
+	err := modelEngine.HealthCheck()
+    if err != nil {
+        logger.EngineLogger.Error("waitEngineReady: Failed to start engine.")
+        return err
+    }
+	return nil
+}
+
 // 根据引擎名称下载引擎，流式返回下载进度
 func (e *EngineApi) DownloadStreamEngine(c *gin.Context) {
 	request := dto.EngineDownloadRequest{}
@@ -113,12 +141,21 @@ func (e *EngineApi) DownloadStreamEngine(c *gin.Context) {
 			err = modelEngine.InitEnv()
 			if err != nil {
 				res.Status = "error"
+				res.Data = "init env error"
 				logger.EngineLogger.Error("DownloadStreamEngine InitEnv error 1: ", err)
 			} else {
 				err = modelEngine.StartEngine(types.EngineStartModeDaemon)
 				if err != nil {
 					res.Status = "error"
+					res.Data = "start engine error"
 					logger.EngineLogger.Error("DownloadStreamEngine StartEngine error 1: ", err)
+				} else {
+					err = waitEngineReady(modelEngine)
+					if err != nil {
+						res.Status = "error"
+						res.Data = "engine not ready error"
+						logger.EngineLogger.Error("DownloadStreamEngine waitEngineReady error 1: ", err)
+					}
 				}
 			}
 		}
@@ -148,12 +185,21 @@ func (e *EngineApi) DownloadStreamEngine(c *gin.Context) {
 						err = modelEngine.InitEnv()
 						if err != nil {
 							res.Status = "error"
+							res.Data = "init env error"
 							logger.EngineLogger.Error("DownloadStreamEngine InitEnv error 2: ", err)
 						} else {
 							err = modelEngine.StartEngine(types.EngineStartModeDaemon)
 							if err != nil {
 								res.Status = "error"
+								res.Data = "start engine error"
 								logger.EngineLogger.Error("DownloadStreamEngine StartEngine error 2: ", err)
+							} else {
+								err = waitEngineReady(modelEngine)
+								if err != nil {
+									res.Status = "error"
+									res.Data = "engine not ready error"
+									logger.EngineLogger.Error("DownloadStreamEngine waitEngineReady error 2: ", err)
+								}
 							}
 						}
 					}

internal/provider/engine/llamacpp.go

@@ -222,7 +222,7 @@ func (l *llamacppProvider) StartEngine(mode string) error {
 		LlamaSwapConfigFilePath := filepath.Join(l.EngineConfig.ExecPath, LlamaSwapConfigFile)
 		logger.EngineLogger.Info("[llamacpp] exec file path: ", execFile, l.EngineConfig.Host, LlamaSwapConfigFilePath)
 		cmd := exec.Command(execFile, "-listen", l.EngineConfig.Host, "-config", LlamaSwapConfigFilePath)
-		err := cmd.Run()
+		err := cmd.Start()
 		if err != nil {
 			logger.EngineLogger.Error("[llamacpp] failed to start llamacpp-server: " + err.Error())
 			return fmt.Errorf("failed to start llamacpp-server: %v", err)

internal/provider/engine/ollama.go

@@ -164,7 +164,7 @@ func (o *OllamaProvider) StartEngine(mode string) error {
 		if runtime.GOOS == "windows" {
 			utils.SetCmdSysProcAttr(cmd)
 		}
-		err := cmd.Run()
+		err := cmd.Start()
 		if err != nil {
 			logger.EngineLogger.Error("[Ollama] failed to start ollama: " + err.Error())
 			return fmt.Errorf("failed to start ollama: %v", err)
@@ -181,13 +181,17 @@ func (o *OllamaProvider) StartEngine(mode string) error {
 			logger.EngineLogger.Error("[Ollama] failed to write pid file: " + err.Error())
 			return fmt.Errorf("failed to write pid file: %v", err)
 		}
+
+		go func() {
+			cmd.Wait()
+		}()
 	} else {
 		if utils.IpexOllamaSupportGPUStatus() {
 			cmd := exec.Command(o.EngineConfig.ExecPath + "/" + OllamaBatchFile)
 			if runtime.GOOS == "windows" {
 				utils.SetCmdSysProcAttr(cmd)
 			}
-			err := cmd.Run()
+			err := cmd.Start()
 			if err != nil {
 				logger.EngineLogger.Error("[Ollama] failed to start ollama: " + err.Error())
 				return fmt.Errorf("failed to start ollama: %v", err)
@@ -197,7 +201,7 @@ func (o *OllamaProvider) StartEngine(mode string) error {
 			if runtime.GOOS == "windows" {
 				utils.SetCmdSysProcAttr(cmd)
 			}
-			err := cmd.Run()
+			err := cmd.Start()
 			if err != nil {
 				logger.EngineLogger.Error("[Ollama] failed to start ollama: " + err.Error())
 				return fmt.Errorf("failed to start ollama: %v", err)