Chore lint (#91)

jiangwel · web-flow · commit 6e6ad50e549a · 2025-12-15T11:47:19.000+08:00
* refactor(test): 移除未使用的日志函数并清理导入

ci: 添加golangci配置以启用静态代码检查

style(usecase): 重命名MultiContent为UserInputMultiContent并更新结构体字段

* refactor: 重构模型列表和聊天模型创建逻辑

将模型列表过滤逻辑拆分为独立函数，优化代码结构
提取聊天模型创建逻辑到单独方法，减少重复代码
重构请求处理逻辑，分离URL构建和请求体构建
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,36 @@
+version: "2"
+
+linters:
+  default: none
+  enable:
+    # - dupl # 重复代码
+    # - errcheck # 检查是否存在未处理的错误
+    # - govet  
+    # - ineffassign # 检测到对现有变量的赋值未被使用
+    # - staticcheck # 检查 Go 代码中是否存在静态错误
+    # - unused # 检查 Go 代码中未使用的常量、变量、函数和类型
+    # - exhaustive # 检查枚举 switch 语句的详尽性
+    # - exhaustruct # 检查结构体字段是否全部初始化
+    # - goconst # 寻找可使用常量的地方
+    # - gocritic # 检查 Go 代码中的错误
+    # - gosec # 检查源代码中的安全问题
+    # - intrange # 查找 for 循环可以使用的整数范围的位置 
+    # - misspell # 检查拼写错误
+    # - nestif # 检查嵌套的 if 语句 复杂度
+    # - nilnesserr # 报告检查 err != nil，但返回不同 nil 值错误的构造
+    # - unconvert 
+
+    # - funcorder # 没用
+    # - nlreturn # return前要有空行 没用
+    - gocognit # 检查函数 Cognitive Complexity 复杂度
+    # - cyclop # 圈复杂度 没用
+    # - err113 # 没用
+
+  settings:
+    errcheck:
+      exclude-functions:
+        - (io.Closer).Close
+run:
+  tests: false
+  skip-dirs:
+    - '(^|/)test($|/)'
diff --git a/AGENT.md b/AGENT.md
@@ -0,0 +1 @@
+1. 代码写完执行make lint, 必须通过
diff --git a/pkg/request/request.go b/pkg/request/request.go
@@ -53,90 +53,43 @@ func (c *Client) SetTransport(tr *http.Transport) {
 }
 
 func sendRequest[T any](c *Client, method, path string, opts ...Opt) (*T, error) {
-	u := url.URL{
-		Scheme: c.scheme,
-		Host:   c.host,
-		Path:   path,
-	}
 	ctx := &Ctx{}
 	rid := uuid.NewString()
 
 	for _, opt := range opts {
 		opt(ctx)
 	}
 
-	if len(ctx.query) > 0 {
-		values := u.Query()
-		for k, v := range ctx.query {
-			values.Add(k, v)
-		}
-		u.RawQuery = values.Encode()
-	}
-
+	urlStr := buildURL(c, path, ctx.query)
 	if c.debug {
-		log.Printf("[REQ:%s] url: %s", rid, u.String())
+		log.Printf("[REQ:%s] url: %s", rid, urlStr)
 	}
 
-	var body io.Reader
-	var writer *multipart.Writer
-	if ctx.body != nil {
-		bs, err := json.Marshal(ctx.body)
-		if err != nil {
-			return nil, err
-		}
-		switch ctx.contentType {
-		case "multipart/form-data":
-			m := make(map[string]string)
-			if err := json.Unmarshal(bs, &m); err != nil {
-				return nil, err
-			}
-			buf := &bytes.Buffer{}
-			writer = multipart.NewWriter(buf)
-			for k, v := range m {
-				if err := writer.WriteField(k, v); err != nil {
-					return nil, err
-				}
-			}
-			if err := writer.Close(); err != nil {
-				return nil, err
-			}
-			body = buf
-		case "application/x-www-form-urlencoded":
-			m := make(map[string]string)
-			if err := json.Unmarshal(bs, &m); err != nil {
-				return nil, err
-			}
-			data := url.Values{}
-			for k, v := range m {
-				data.Add(k, v)
-			}
-			body = strings.NewReader(data.Encode())
-		default:
-			body = bytes.NewBuffer(bs)
-		}
+	body, contentType, err := buildBodyAndType(ctx)
+	if err != nil {
+		return nil, err
+	}
 
-		if c.debug {
-			buf := &bytes.Buffer{}
-			if err := json.Indent(buf, bs, "", "  "); err != nil {
-				log.Printf("[REQ:%s] body: %s", rid, string(bs))
-			} else {
-				log.Printf("[REQ:%s] body: %s", rid, buf.String())
-			}
+	if c.debug && ctx.body != nil {
+		bs, _ := json.Marshal(ctx.body)
+		buf := &bytes.Buffer{}
+		if err := json.Indent(buf, bs, "", "  "); err != nil {
+			log.Printf("[REQ:%s] body: %s", rid, string(bs))
+		} else {
+			log.Printf("[REQ:%s] body: %s", rid, buf.String())
 		}
 	}
-	req, err := http.NewRequest(method, u.String(), body)
+
+	req, err := http.NewRequest(method, urlStr, body)
 	if err != nil {
 		return nil, err
 	}
 	for k, v := range ctx.header {
 		req.Header.Add(k, v)
 	}
-	switch ctx.contentType {
-	case "multipart/form-data":
-		req.Header.Set("Content-Type", writer.FormDataContentType())
-	case "application/x-www-form-urlencoded":
-		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	default:
+	if contentType != "" {
+		req.Header.Set("Content-Type", contentType)
+	} else {
 		req.Header.Set("Content-Type", "application/json")
 	}
 	if c.debug {
@@ -177,6 +130,58 @@ func sendRequest[T any](c *Client, method, path string, opts ...Opt) (*T, error)
 	return &rr, nil
 }
 
+func buildURL(c *Client, path string, q Query) string {
+	u := url.URL{Scheme: c.scheme, Host: c.host, Path: path}
+	if len(q) > 0 {
+		values := u.Query()
+		for k, v := range q {
+			values.Add(k, v)
+		}
+		u.RawQuery = values.Encode()
+	}
+	return u.String()
+}
+
+func buildBodyAndType(ctx *Ctx) (io.Reader, string, error) {
+	if ctx.body == nil {
+		return nil, "", nil
+	}
+	bs, err := json.Marshal(ctx.body)
+	if err != nil {
+		return nil, "", err
+	}
+	switch ctx.contentType {
+	case "multipart/form-data":
+		m := make(map[string]string)
+		if err := json.Unmarshal(bs, &m); err != nil {
+			return nil, "", err
+		}
+		buf := &bytes.Buffer{}
+		w := multipart.NewWriter(buf)
+		for k, v := range m {
+			if err := w.WriteField(k, v); err != nil {
+				return nil, "", err
+			}
+		}
+		if err := w.Close(); err != nil {
+			return nil, "", err
+		}
+		return buf, w.FormDataContentType(), nil
+	case "application/x-www-form-urlencoded":
+		m := make(map[string]string)
+		if err := json.Unmarshal(bs, &m); err != nil {
+			return nil, "", err
+		}
+		data := url.Values{}
+		for k, v := range m {
+			data.Add(k, v)
+		}
+		return strings.NewReader(data.Encode()), "application/x-www-form-urlencoded", nil
+	default:
+		return bytes.NewBuffer(bs), "application/json", nil
+	}
+}
+
 func Get[T any](c *Client, path string, opts ...Opt) (*T, error) {
 	return sendRequest[T](c, http.MethodGet, path, opts...)
 }
diff --git a/test/embedding_test.go b/test/embedding_test.go
@@ -252,30 +252,6 @@ func TestEmbedderCombinations(t *testing.T) {
 	})
 }
 
-func logHeadFloat(t *testing.T, v []float64) {
-	n := 8
-	if len(v) < n {
-		n = len(v)
-	}
-	s := make([]string, 0, n)
-	for i := 0; i < n; i++ {
-		s = append(s, fmt.Sprintf("%.4f", v[i]))
-	}
-	t.Logf("head: %s", strings.Join(s, " "))
-}
-
-func logSparseEntriesHead(t *testing.T, se []domain.SparseEmbedding) {
-	n := 8
-	if len(se) < n {
-		n = len(se)
-	}
-	parts := make([]string, 0, n)
-	for i := 0; i < n; i++ {
-		parts = append(parts, fmt.Sprintf("%d:%.4f:%s", se[i].Index, se[i].Value, se[i].Token))
-	}
-	t.Logf("sparse_head: %s", strings.Join(parts, " "))
-}
-
 func logFullFloat(t *testing.T, v []float64) {
 	s := make([]string, 0, len(v))
 	for i := 0; i < len(v); i++ {
diff --git a/test/modellist_test.go b/test/modellist_test.go
@@ -0,0 +1,113 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+	"testing"
+
+	"github.com/chaitin/ModelKit/v2/domain"
+	"github.com/chaitin/ModelKit/v2/usecase"
+)
+
+func TestModelList_BaiZhiCloud_ByType(t *testing.T) {
+	ctx := context.Background()
+	mk := usecase.NewModelKit(nil)
+
+	apiKey := strings.TrimSpace(os.Getenv("baizhiapikey"))
+	if apiKey == "" {
+		t.Fatalf("missing baizhiapikey")
+	}
+
+	baseURL := "https://model-square.app.baizhi.cloud/v1"
+	provider := "baizhi-cloud"
+
+	types := []string{"chat", "embedding", "rerank", "code", "analysis", "analysis-vl"}
+
+	for _, tp := range types {
+		tpLocal := tp
+		name := fmt.Sprintf("provider=%s type=%s base_url=%s apiKey=present", provider, tpLocal, baseURL)
+		t.Run(name, func(t *testing.T) {
+			ml, err := mk.ModelList(ctx, &domain.ModelListReq{
+				Provider: provider,
+				BaseURL:  baseURL,
+				APIKey:   apiKey,
+				Type:     tpLocal,
+			})
+			if err != nil {
+				mlJSON, _ := json.Marshal(ml)
+				t.Logf("test case: %s", name)
+				t.Logf("modellist_resp=%s", string(mlJSON))
+				t.Fatalf("ModelList error: %v", err)
+			}
+
+			curlModels, curlErr := curlAllModels(ctx, baseURL, apiKey)
+			if curlErr != nil {
+				mlJSON, _ := json.Marshal(ml)
+				t.Logf("test case: %s", name)
+				t.Logf("modellist_resp=%s", string(mlJSON))
+				t.Fatalf("curl models error: %v", curlErr)
+			}
+
+			filtered := usecase.FilterModelsByType(curlModels, &domain.ModelListReq{Provider: provider, Type: tpLocal})
+
+			mlJSON, _ := json.Marshal(ml)
+			filteredJSON, _ := json.Marshal(filtered)
+			t.Logf("test case: %s", name)
+			t.Logf("modellist_resp=%s", string(mlJSON))
+			t.Logf("curl_filtered=%s", string(filteredJSON))
+
+			if !sameModelSets(ml.Models, filtered) {
+				t.Fatalf("result mismatch: modellist_count=%d curl_filtered_count=%d", len(ml.Models), len(filtered))
+			}
+		})
+	}
+}
+
+func curlAllModels(ctx context.Context, baseURL, apiKey string) ([]domain.ModelListItem, error) {
+	url := strings.TrimSuffix(baseURL, "/") + "/models"
+	cmd := exec.CommandContext(ctx, "curl", "-s", "-H", "Authorization: Bearer "+apiKey, url)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, fmt.Errorf("curl failed: %v, output=%s", err, string(out))
+	}
+	var resp struct {
+		Object string `json:"object"`
+		Data   []struct {
+			ID string `json:"id"`
+		} `json:"data"`
+	}
+	if uerr := json.Unmarshal(out, &resp); uerr != nil {
+		return nil, fmt.Errorf("unmarshal failed: %v, body=%s", uerr, string(out))
+	}
+	items := make([]domain.ModelListItem, 0, len(resp.Data))
+	for _, d := range resp.Data {
+		items = append(items, domain.ModelListItem{Model: d.ID})
+	}
+	return items, nil
+}
+
+func sameModelSets(a, b []domain.ModelListItem) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	m := make(map[string]int, len(a))
+	for _, it := range a {
+		m[it.Model]++
+	}
+	for _, it := range b {
+		if m[it.Model] == 0 {
+			return false
+		}
+		m[it.Model]--
+	}
+	for _, v := range m {
+		if v != 0 {
+			return false
+		}
+	}
+	return true
+}
diff --git a/test/rerank_test.go b/test/rerank_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"strings"
 	"testing"
 
 	"github.com/chaitin/ModelKit/v2/consts"
@@ -92,15 +91,3 @@ func TestRerankerCombinations(t *testing.T) {
 		}
 	})
 }
-
-func logResultsHead(t *testing.T, v []domain.Result) {
-	n := 5
-	if len(v) < n {
-		n = len(v)
-	}
-	s := make([]string, 0, n)
-	for i := 0; i < n; i++ {
-		s = append(s, fmt.Sprintf("%d:%.4f", v[i].Index, v[i].RelevanceScore))
-	}
-	t.Logf("head: %s", strings.Join(s, " "))
-}
diff --git a/usecase/helper.go b/usecase/helper.go
diff --git a/usecase/modelkit.go b/usecase/modelkit.go

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1. 代码写完执行make lint, 必须通过`