zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-08-24 09:00:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Go: fix context, part2 (#18296)

Browse Source 
Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
Jin Hai
2026-08-14 19:42:41 +08:00
committed by GitHub
parent 01d351b54a
commit fa5762336b
26 changed files with 372 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/entity/models/common_test.go
View File

@@ -1,7 +1,6 @@
package models
import (
"context"
"fmt"
"io"
"net/http"
@@ -36,7 +35,7 @@ func TestBaseModelDoRequestAuthorizationHeader(t *testing.T) {
defer server.Close()
model := &BaseModel{httpClient: server.Client(), AllowEmptyAPIKey: true}
if _, err := model.doRequest(context.Background(), server.URL, tt.apiConfig, map[string]any{"ok": true}, time.Second); err != nil {
if _, err := model.doRequest(t.Context(), server.URL, tt.apiConfig, map[string]any{"ok": true}, time.Second); err != nil {
t.Fatalf("doRequest() error = %v", err)
}
})
@@ -53,7 +52,7 @@ func TestBaseModelDoStreamRequestAllowsMissingAPIKey(t *testing.T) {
defer server.Close()
model := &BaseModel{httpClient: server.Client(), AllowEmptyAPIKey: true}
err := model.doStreamRequest(context.Background(), server.URL, nil, map[string]any{"ok": true}, time.Second, func(body io.ReadCloser) error {
err := model.doStreamRequest(t.Context(), server.URL, nil, map[string]any{"ok": true}, time.Second, func(body io.ReadCloser) error {
_, err := io.ReadAll(body)
return err
})

6
internal/entity/models/google_test.go
View File

@@ -381,7 +381,7 @@ func TestCollectGoogleModelNamesPaginates(t *testing.T) {
}
var pageTokens []string
models, err := collectGoogleModelNames(context.Background(), func(_ context.Context, pageToken string) (googleModelPage, error) {
models, err := collectGoogleModelNames(t.Context(), func(_ context.Context, pageToken string) (googleModelPage, error) {
pageTokens = append(pageTokens, pageToken)
if len(pageTokens) > len(pages) {
t.Fatalf("unexpected extra page request with token %q", pageToken)
@@ -406,7 +406,7 @@ func TestCollectGoogleModelNamesPaginates(t *testing.T) {
}
func TestCollectGoogleModelNamesPreservesEmptyResult(t *testing.T) {
models, err := collectGoogleModelNames(context.Background(), func(context.Context, string) (googleModelPage, error) {
models, err := collectGoogleModelNames(t.Context(), func(context.Context, string) (googleModelPage, error) {
return googleModelPage{}, nil
})
if err != nil {
@@ -421,7 +421,7 @@ func TestCollectGoogleModelNamesReturnsPageError(t *testing.T) {
pageErr := errors.New("next page failed")
calls := 0
_, err := collectGoogleModelNames(context.Background(), func(context.Context, string) (googleModelPage, error) {
_, err := collectGoogleModelNames(t.Context(), func(context.Context, string) (googleModelPage, error) {
calls++
if calls == 1 {
return googleModelPage{items: []ModelListItem{{ID: "Gemini 2.5 Flash", OwnedBy: "Google"}}, nextPageToken: "page-2"}, nil