Skip to content

Commit ef69e2a

Browse files
fuyaozonglyingbug
authored andcommitted
将各个判断模型是否可用的逻辑和接口/api/v1/initialization/ollama/models/check的逻辑统一:对于没有指定版本的模型,默认添加":latest",避免误判导致反复调用pull模型接口
1 parent 07c3453 commit ef69e2a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

internal/handler/initialization.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,7 @@ func (h *InitializationHandler) CheckOllamaModels(c *gin.Context) {
556556

557557
// 检查每个模型是否存在
558558
for _, modelName := range req.Models {
559-
checkModelName := modelName
560-
if !strings.Contains(modelName, ":") {
561-
checkModelName = modelName + ":latest"
562-
}
563-
available, err := h.ollamaService.IsModelAvailable(ctx, checkModelName)
559+
available, err := h.ollamaService.IsModelAvailable(ctx, modelName)
564560
if err != nil {
565561
logger.ErrorWithFields(ctx, err, map[string]interface{}{
566562
"model_name": modelName,

internal/models/utils/ollama/ollama.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,14 @@ func (s *OllamaService) IsModelAvailable(ctx context.Context, modelName string)
107107
return false, fmt.Errorf("failed to get model list: %w", err)
108108
}
109109

110+
// If no version is specified for the model, add ":latest" by default
111+
checkModelName := modelName
112+
if !strings.Contains(modelName, ":") {
113+
checkModelName = modelName + ":latest"
114+
}
110115
// Check if model is in the list
111116
for _, model := range listResp.Models {
112-
if model.Name == modelName {
117+
if model.Name == checkModelName {
113118
return true, nil
114119
}
115120
}

0 commit comments

Comments
 (0)