refactor(logging): 移除自定义logger并改用slog标准库 (#68)

- 删除pkg/log/log.go中的自定义Logger实现
- 在utils/utils.go中移除调试日志
- 修改test/backend/main.go和usecase/modelkit.go使用slog.Logger
- 为ModelKit结构体添加logger字段并传递到相关方法

Author: jiangwel

pkg/log/log.go

@@ -3,23 +3,28 @@ package main
 import (
 	"fmt"
 	"net/http"
+	"log/slog"
+	"os"
 
 	"github.com/labstack/echo/v4/middleware"
 
 	"github.com/chaitin/ModelKit/v2/domain"
-	"github.com/chaitin/ModelKit/v2/pkg/log"
 	"github.com/chaitin/ModelKit/v2/usecase"
 	"github.com/labstack/echo/v4"
 )
 
-type ModelKit struct{}
+type ModelKit struct{
+	logger *slog.Logger
+}
 
 func NewModelKit(
 	echo *echo.Echo,
-	logger *log.Logger,
+	logger *slog.Logger,
 	isApmEnabled bool,
 ) *ModelKit {
-	m := &ModelKit{}
+	m := &ModelKit{
+		logger: logger,
+	}
 
 	// 注册路由
 	g := echo.Group("/api/v1/modelkit")
@@ -39,7 +44,8 @@ func (p *ModelKit) GetModelList(c echo.Context) error {
 		})
 	}
 
-	resp, err := usecase.ModelList(c.Request().Context(), &req)
+
+	resp, err := usecase.ModelList(c.Request().Context(), &req, p.logger)
 	if err != nil {
 		fmt.Println("err:", err)
 		return c.JSON(http.StatusOK, domain.Response{
@@ -65,7 +71,7 @@ func (p *ModelKit) CheckModel(c echo.Context) error {
 		})
 	}
 
-	resp, err := usecase.CheckModel(c.Request().Context(), &req)
+	resp, err := usecase.CheckModel(c.Request().Context(), &req, p.logger)
 	if err != nil {
 		fmt.Println("err:", err)
 		return c.JSON(http.StatusOK, domain.Response{
@@ -100,10 +106,16 @@ func (p *ModelKit) CheckModel(c echo.Context) error {
 func main() {
 	echo := echo.New()
 
+	// 创建logger
+	logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+		AddSource: true,
+		Level:     slog.LevelInfo,
+	}))
+
 	// 添加CORS中间件
 	echo.Use(middleware.CORS())
 
-	NewModelKit(echo, nil, false)
+	NewModelKit(echo, logger, false)
 
 	err := echo.Start(":8080")
 	if err != nil {

test/backend/main.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 	"log"
 	"maps"
 	"net/http"
@@ -33,8 +34,12 @@ import (
 	"github.com/chaitin/ModelKit/v2/utils"
 )
 
-func ModelList(ctx context.Context, req *domain.ModelListReq) (*domain.ModelListResp, error) {
-	log.Printf("ModelList req: provider=%s, baseURL=%s", req.Provider, req.BaseURL)
+func ModelList(ctx context.Context, req *domain.ModelListReq, logger *slog.Logger) (*domain.ModelListResp, error) {
+	if logger != nil {
+		logger.Info("ModelList req: provider=%s, baseURL=%s", req.Provider, req.BaseURL)
+	} else {
+		log.Printf("ModelList req: provider=%s, baseURL=%s", req.Provider, req.BaseURL)
+	}
 	httpClient := &http.Client{
 		Timeout: time.Second * 30,
 		Transport: &http.Transport{
@@ -64,7 +69,11 @@ func ModelList(ctx context.Context, req *domain.ModelListReq) (*domain.ModelList
 		}
 		defer func() {
 			if closeErr := client.Close(); closeErr != nil {
-				log.Printf("Failed to close gemini client: %v", closeErr)
+				if logger != nil {
+					logger.Error("Failed to close gemini client: %v", slog.Any("error", closeErr))
+				} else {
+					log.Printf("Failed to close gemini client: %v", closeErr)
+				}
 			}
 		}()
 
@@ -168,8 +177,12 @@ func ModelList(ctx context.Context, req *domain.ModelListReq) (*domain.ModelList
 	}
 }
 
-func CheckModel(ctx context.Context, req *domain.CheckModelReq) (*domain.CheckModelResp, error) {
-	log.Printf("CheckModel req: provider=%s, model=%s, baseURL=%s", req.Provider, req.Model, req.BaseURL)
+func CheckModel(ctx context.Context, req *domain.CheckModelReq, logger *slog.Logger) (*domain.CheckModelResp, error) {
+	if logger != nil {
+		logger.Info("CheckModel req", "provider", req.Provider, "model", req.Model, "baseURL", req.BaseURL)
+	} else {
+		log.Printf("CheckModel req: provider=%s, model=%s, baseURL=%s", req.Provider, req.Model, req.BaseURL)
+	}
 	checkResp := &domain.CheckModelResp{}
 	modelType := consts.ParseModelType(req.Type)
 
@@ -218,7 +231,11 @@ func CheckModel(ctx context.Context, req *domain.CheckModelReq) (*domain.CheckMo
 		}
 		defer func() {
 			if closeErr := resp.Body.Close(); closeErr != nil {
-				log.Printf("Failed to close resp body: %v", closeErr)
+				if logger != nil {
+					logger.Error("Failed to close resp body: %v", slog.Any("error", closeErr))
+				} else {
+					log.Printf("Failed to close resp body: %v", closeErr)
+				}
 			}
 		}()
 		if resp.StatusCode != http.StatusOK {
@@ -230,7 +247,7 @@ func CheckModel(ctx context.Context, req *domain.CheckModelReq) (*domain.CheckMo
 	// end
 	provider := consts.ParseModelProvider(req.Provider)
 
-	resp, err := getChatModelGenerateChat(ctx, provider, modelType, req.BaseURL, req)
+	resp, err := getChatModelGenerateChat(ctx, provider, modelType, req.BaseURL, req, nil)
 	// 可编辑url的供应商，尝试修复baseURL
 	if err != nil && (provider == consts.ModelProviderOther || provider == consts.ModelProviderOllama || provider == consts.ModelProviderAzureOpenAI) {
 		msg := generateBaseURLFixSuggestion(err.Error(), req.BaseURL, provider)
@@ -379,7 +396,7 @@ func ollamaListModel(baseURL string, httpClient *http.Client, apiHeader string)
 	return request.Get[domain.ModelListResp](client, u.Path, request.WithHeader(h))
 }
 
-func getChatModelGenerateChat(ctx context.Context, provider consts.ModelProvider, modelType consts.ModelType, baseURL string, req *domain.CheckModelReq) (string, error) {
+func getChatModelGenerateChat(ctx context.Context, provider consts.ModelProvider, modelType consts.ModelType, baseURL string, req *domain.CheckModelReq, logger *log.Logger) (string, error) {
 	chatModel, err := GetChatModel(ctx, &domain.ModelMetadata{
 		Provider:   provider,
 		ModelName:  req.Model,
@@ -399,10 +416,18 @@ func getChatModelGenerateChat(ctx context.Context, provider consts.ModelProvider
 	})
 	// 非流式生成失败，尝试流式生成
 	if err != nil || genResp.Content == "" {
-		log.Printf("Generate chat failed, err: %v", err)
+		if logger != nil {
+			logger.Printf("Generate chat failed, err: %v", err)
+		} else {
+			log.Printf("Generate chat failed, err: %v", err)
+		}
 		streamRes, streamErr := streamCheck(ctx, &chatModel)
 		if streamErr != nil {
-			log.Printf("Stream chat failed, err: %v", streamErr)
+			if logger != nil {
+				logger.Printf("Stream chat failed, err: %v", streamErr)
+			} else {
+				log.Printf("Stream chat failed, err: %v", streamErr)
+			}
 			return "", err
 		}
 		return streamRes, nil
@@ -435,19 +460,6 @@ func streamCheck(ctx context.Context, chatModel *model.BaseChatModel) (string, e
 	return res, nil
 }
 
-// baseURL添加/v1
-func baseURLAddV1(inputURL string) (string, error) {
-	rawURL, err := url.Parse(inputURL)
-	if err != nil {
-		return "", err
-	}
-	// 没有path, 则添加/v1
-	if rawURL.Path == "" {
-		rawURL.Path = "/v1"
-	}
-	return rawURL.String(), nil
-}
-
 // baseURL的host换成host.docker.internal
 func baseURLReplaceHost(inputURL string) (string, error) {
 	rawURL, err := url.Parse(inputURL)

usecase/modelkit.go

@@ -298,7 +298,6 @@ func GetHttpClientWithAPIHeaderMap(header string) *http.Client {
 }
 
 func GetQuery(req *domain.ModelListReq) (request.Query, error) {
-	log.Println("req is: ", req)
 	q := make(request.Query, 0)
 	provider := consts.ParseModelProvider(req.Provider)
 	modelType := consts.ParseModelType(req.Type)
@@ -317,6 +316,5 @@ func GetQuery(req *domain.ModelListReq) (request.Query, error) {
 	if provider == consts.ModelProviderSiliconFlow && modelType == consts.ModelTypeCoder {
 		q["sub_type"] = "chat"
 	}
-	log.Println("query ", q)
 	return q, nil
 }