mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-07 12:00:44 +08:00
e178c81bb4
### What problem does this PR solve? Part of #15853 (provider model-list refactor). Refactors **Ollama** `ListModels` onto the shared `ParseListModel` pattern and fixes two correctness issues: - **Endpoint:** switch the models suffix from `api/ps` (only currently-running models) to `api/tags` (all installed models) — the latter is what a model picker should show. - **Parsing:** Ollama returns `{"models":[{"name","model"}]}`, a non-OpenAI shape. Decode it into a typed struct, map the names into `ModelList`, then enrich through `ParseListModel`. This removes the previous unchecked type assertions (`result["models"].([]interface{})` / `.(map[string]interface{})` / `.(string)`) that **panicked** when the body was missing the `models` array or any field, and adds a fallback to the `model` field when `name` is blank. - Drops the no-op GET request body and a dead base-URL reassignment. #### Drive-by fix Shared gitee_test.go `DSModelList` -> `ModelList` compile fix (renamed in #15900) so the models test package builds; auto-resolves against the sibling #15853 PRs. ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) - [x] Refactoring
92 lines
3.1 KiB
Go
92 lines
3.1 KiB
Go
//
|
|
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
package models
|
|
|
|
import (
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
)
|
|
|
|
func newOllamaForListModelsTest(baseURL string) *OllamaModel {
|
|
return NewOllamaModel(map[string]string{"default": baseURL}, URLSuffix{Models: "api/tags"})
|
|
}
|
|
|
|
func TestOllamaListModels(t *testing.T) {
|
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
t.Errorf("method=%s, want GET", r.Method)
|
|
}
|
|
if r.URL.Path != "/api/tags" {
|
|
t.Errorf("path=%s, want /api/tags", r.URL.Path)
|
|
}
|
|
// Ollama's /api/tags response shape (name + model fields).
|
|
_, _ = io.WriteString(w, `{"models":[{"name":"llama3:latest","model":"llama3:latest"},{"name":"qwen3:8b","model":"qwen3:8b"}]}`)
|
|
}))
|
|
defer srv.Close()
|
|
|
|
models, err := newOllamaForListModelsTest(srv.URL).ListModels(&APIConfig{})
|
|
if err != nil {
|
|
t.Fatalf("ListModels: %v", err)
|
|
}
|
|
if len(models) != 2 {
|
|
t.Fatalf("len(models)=%d, want 2", len(models))
|
|
}
|
|
if models[0].Name != "llama3:latest" || models[1].Name != "qwen3:8b" {
|
|
t.Fatalf("names=%v, want [llama3:latest qwen3:8b]", []string{models[0].Name, models[1].Name})
|
|
}
|
|
}
|
|
|
|
func TestOllamaListModelsFallsBackToModelField(t *testing.T) {
|
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
// Some entries may carry only the "model" field; it should be used as the name.
|
|
_, _ = io.WriteString(w, `{"models":[{"model":"phi3:mini"},{"name":""},{"name":" "}]}`)
|
|
}))
|
|
defer srv.Close()
|
|
|
|
models, err := newOllamaForListModelsTest(srv.URL).ListModels(&APIConfig{})
|
|
if err != nil {
|
|
t.Fatalf("ListModels: %v", err)
|
|
}
|
|
if len(models) != 1 {
|
|
t.Fatalf("len(models)=%d, want 1 (blank names skipped)", len(models))
|
|
}
|
|
if models[0].Name != "phi3:mini" {
|
|
t.Fatalf("Name=%q, want phi3:mini", models[0].Name)
|
|
}
|
|
}
|
|
|
|
func TestOllamaListModelsRejectsHTTPError(t *testing.T) {
|
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
_, _ = io.WriteString(w, `boom`)
|
|
}))
|
|
defer srv.Close()
|
|
|
|
if _, err := newOllamaForListModelsTest(srv.URL).ListModels(&APIConfig{}); err == nil {
|
|
t.Fatal("ListModels: expected error for HTTP 500, got nil")
|
|
}
|
|
}
|
|
|
|
func TestOllamaListModelsRequiresBaseURL(t *testing.T) {
|
|
m := NewOllamaModel(map[string]string{}, URLSuffix{Models: "api/tags"})
|
|
if _, err := m.ListModels(&APIConfig{}); err == nil {
|
|
t.Fatal("ListModels: expected error for missing base URL, got nil")
|
|
}
|
|
}
|