From a64d48439f55a7095b8d2b1e47827373e5b5c88f Mon Sep 17 00:00:00 2001 From: tbphp Date: Wed, 16 Jul 2025 22:39:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=97=E4=BD=99=E6=97=A5=E5=BF=97grou?= =?UTF-8?q?p=E5=92=8Ckey=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/handler/log_handler.go | 92 ++---------------------- internal/models/types.go | 3 +- internal/proxy/server.go | 21 +++--- internal/services/request_log_service.go | 18 ++--- internal/types/types.go | 2 +- 5 files changed, 30 insertions(+), 106 deletions(-) diff --git a/internal/handler/log_handler.go b/internal/handler/log_handler.go index 1691616..898a0c1 100644 --- a/internal/handler/log_handler.go +++ b/internal/handler/log_handler.go @@ -4,50 +4,29 @@ import ( "strconv" "time" - "github.com/gin-gonic/gin" "gpt-load/internal/db" app_errors "gpt-load/internal/errors" "gpt-load/internal/models" "gpt-load/internal/response" + + "github.com/gin-gonic/gin" ) -// LogResponse defines the structure for log entries in the API response, -// enriching the base log with related data. +// LogResponse defines the structure for log entries in the API response type LogResponse struct { models.RequestLog - GroupName string `json:"group_name"` - KeyValue string `json:"key_value"` } // GetLogs Get request logs func GetLogs(c *gin.Context) { - // --- 1. Build WHERE conditions --- query := db.DB.Model(&models.RequestLog{}) if groupName := c.Query("group_name"); groupName != "" { - var groupIDs []uint - db.DB.Model(&models.Group{}).Where("name LIKE ? OR display_name LIKE ?", "%"+groupName+"%", "%"+groupName+"%").Pluck("id", &groupIDs) - if len(groupIDs) == 0 { - response.Success(c, &response.PaginatedResponse{ - Items: []LogResponse{}, - Pagination: response.Pagination{TotalItems: 0, Page: 1, PageSize: response.DefaultPageSize}, - }) - return - } - query = query.Where("group_id IN ?", groupIDs) + query = query.Where("group_name LIKE ?", "%"+groupName+"%") } if keyValue := c.Query("key_value"); keyValue != "" { - var keyIDs []uint likePattern := "%" + keyValue[1:len(keyValue)-1] + "%" - db.DB.Model(&models.APIKey{}).Where("key_value LIKE ?", likePattern).Pluck("id", &keyIDs) - if len(keyIDs) == 0 { - response.Success(c, &response.PaginatedResponse{ - Items: []LogResponse{}, - Pagination: response.Pagination{TotalItems: 0, Page: 1, PageSize: response.DefaultPageSize}, - }) - return - } - query = query.Where("key_id IN ?", keyIDs) + query = query.Where("key_value LIKE ?", likePattern) } if isSuccessStr := c.Query("is_success"); isSuccessStr != "" { if isSuccess, err := strconv.ParseBool(isSuccessStr); err == nil { @@ -76,71 +55,14 @@ func GetLogs(c *gin.Context) { } } - // --- 2. Get Paginated Logs --- var logs []models.RequestLog - query = query.Order("timestamp desc") // Apply ordering before pagination + query = query.Order("timestamp desc") pagination, err := response.Paginate(c, query, &logs) if err != nil { response.Error(c, app_errors.ParseDBError(err)) return } - // --- 3. Enrich Logs with GroupName and KeyValue --- - if len(logs) == 0 { - response.Success(c, pagination) // Return empty pagination response - return - } - - // Collect IDs for enrichment - groupIds := make(map[uint]bool) - keyIds := make(map[uint]bool) - for _, log := range logs { - if log.GroupID != 0 { - groupIds[log.GroupID] = true - } - if log.KeyID != 0 { - keyIds[log.KeyID] = true - } - } - - // Fetch enrichment data - groupMap := make(map[uint]string) - if len(groupIds) > 0 { - var groups []models.Group - var ids []uint - for id := range groupIds { - ids = append(ids, id) - } - db.DB.Where("id IN ?", ids).Find(&groups) - for _, group := range groups { - groupMap[group.ID] = group.Name - } - } - - keyMap := make(map[uint]string) - if len(keyIds) > 0 { - var keys []models.APIKey - var ids []uint - for id := range keyIds { - ids = append(ids, id) - } - db.DB.Where("id IN ?", ids).Find(&keys) - for _, key := range keys { - keyMap[key.ID] = key.KeyValue - } - } - - // Build final response - logResponses := make([]LogResponse, len(logs)) - for i, log := range logs { - logResponses[i] = LogResponse{ - RequestLog: log, - GroupName: groupMap[log.GroupID], - KeyValue: keyMap[log.KeyID], - } - } - - // --- 4. Send Response --- - pagination.Items = logResponses + pagination.Items = logs response.Success(c, pagination) } diff --git a/internal/models/types.go b/internal/models/types.go index f619f37..ef2db1d 100644 --- a/internal/models/types.go +++ b/internal/models/types.go @@ -76,7 +76,8 @@ type RequestLog struct { ID string `gorm:"type:varchar(36);primaryKey" json:"id"` Timestamp time.Time `gorm:"type:datetime(3);not null;index" json:"timestamp"` GroupID uint `gorm:"not null;index" json:"group_id"` - KeyID uint `gorm:"not null;index" json:"key_id"` + GroupName string `gorm:"type:varchar(255);index" json:"group_name"` + KeyValue string `gorm:"type:varchar(512)" json:"key_value"` IsSuccess bool `gorm:"not null" json:"is_success"` SourceIP string `gorm:"type:varchar(45)" json:"source_ip"` StatusCode int `gorm:"not null" json:"status_code"` diff --git a/internal/proxy/server.go b/internal/proxy/server.go index 0437eb3..52ae8e3 100644 --- a/internal/proxy/server.go +++ b/internal/proxy/server.go @@ -9,7 +9,6 @@ import ( "fmt" "io" "net/http" - "strconv" "time" "gpt-load/internal/channel" @@ -115,12 +114,11 @@ func (ps *ProxyServer) executeRequestWithRetry( } logrus.Debugf("Max retries exceeded for group %s after %d attempts. Parsed Error: %s", group.Name, retryCount, logMessage) - keyID, _ := strconv.ParseUint(lastError.KeyID, 10, 64) - ps.logRequest(c, group, uint(keyID), startTime, lastError.StatusCode, retryCount, errors.New(logMessage), isStream, lastError.UpstreamAddr) + ps.logRequest(c, group, &models.APIKey{KeyValue: lastError.KeyValue}, startTime, lastError.StatusCode, retryCount, errors.New(logMessage), isStream, lastError.UpstreamAddr) } else { response.Error(c, app_errors.ErrMaxRetriesExceeded) logrus.Debugf("Max retries exceeded for group %s after %d attempts.", group.Name, retryCount) - ps.logRequest(c, group, 0, startTime, http.StatusServiceUnavailable, retryCount, app_errors.ErrMaxRetriesExceeded, isStream, "") + ps.logRequest(c, group, nil, startTime, http.StatusServiceUnavailable, retryCount, app_errors.ErrMaxRetriesExceeded, isStream, "") } return } @@ -129,7 +127,7 @@ func (ps *ProxyServer) executeRequestWithRetry( if err != nil { logrus.Errorf("Failed to select a key for group %s on attempt %d: %v", group.Name, retryCount+1, err) response.Error(c, app_errors.NewAPIError(app_errors.ErrNoKeysAvailable, err.Error())) - ps.logRequest(c, group, 0, startTime, http.StatusServiceUnavailable, retryCount, err, isStream, "") + ps.logRequest(c, group, nil, startTime, http.StatusServiceUnavailable, retryCount, err, isStream, "") return } @@ -177,7 +175,7 @@ func (ps *ProxyServer) executeRequestWithRetry( if err != nil || (resp != nil && resp.StatusCode >= 400) { if err != nil && app_errors.IsIgnorableError(err) { logrus.Debugf("Client-side ignorable error for key %s, aborting retries: %v", utils.MaskAPIKey(apiKey.KeyValue), err) - ps.logRequest(c, group, apiKey.ID, startTime, 499, retryCount+1, err, isStream, upstreamURL) + ps.logRequest(c, group, apiKey, startTime, 499, retryCount+1, err, isStream, upstreamURL) return } @@ -210,7 +208,7 @@ func (ps *ProxyServer) executeRequestWithRetry( StatusCode: statusCode, ErrorMessage: errorMessage, ParsedErrorMessage: parsedError, - KeyID: fmt.Sprintf("%d", apiKey.ID), + KeyValue: apiKey.KeyValue, Attempt: retryCount + 1, UpstreamAddr: upstreamURL, }) @@ -220,7 +218,7 @@ func (ps *ProxyServer) executeRequestWithRetry( // ps.keyProvider.UpdateStatus(apiKey, group, true) // 请求成功不再重置成功次数，减少IO消耗 logrus.Debugf("Request for group %s succeeded on attempt %d with key %s", group.Name, retryCount+1, utils.MaskAPIKey(apiKey.KeyValue)) - ps.logRequest(c, group, apiKey.ID, startTime, resp.StatusCode, retryCount+1, nil, isStream, upstreamURL) + ps.logRequest(c, group, apiKey, startTime, resp.StatusCode, retryCount+1, nil, isStream, upstreamURL) for key, values := range resp.Header { for _, value := range values { @@ -240,7 +238,7 @@ func (ps *ProxyServer) executeRequestWithRetry( func (ps *ProxyServer) logRequest( c *gin.Context, group *models.Group, - keyID uint, + apiKey *models.APIKey, startTime time.Time, statusCode int, retries int, @@ -256,7 +254,7 @@ func (ps *ProxyServer) logRequest( logEntry := &models.RequestLog{ GroupID: group.ID, - KeyID: keyID, + GroupName: group.Name, IsSuccess: finalError == nil && statusCode < 400, SourceIP: c.ClientIP(), StatusCode: statusCode, @@ -267,6 +265,9 @@ func (ps *ProxyServer) logRequest( IsStream: isStream, UpstreamAddr: utils.TruncateString(upstreamAddr, 500), } + if apiKey != nil { + logEntry.KeyValue = apiKey.KeyValue + } if finalError != nil { logEntry.ErrorMessage = finalError.Error() diff --git a/internal/services/request_log_service.go b/internal/services/request_log_service.go index dd232f0..26d57e1 100644 --- a/internal/services/request_log_service.go +++ b/internal/services/request_log_service.go @@ -207,24 +207,24 @@ func (s *RequestLogService) writeLogsToDB(logs []*models.RequestLog) error { return fmt.Errorf("failed to batch insert request logs: %w", err) } - keyStats := make(map[uint]int64) + keyStats := make(map[string]int64) for _, log := range logs { - if log.IsSuccess { - keyStats[log.KeyID]++ + if log.IsSuccess && log.KeyValue != "" { + keyStats[log.KeyValue]++ } } if len(keyStats) > 0 { var caseStmt strings.Builder - var keyIDs []uint - caseStmt.WriteString("CASE id ") - for keyID, count := range keyStats { - caseStmt.WriteString(fmt.Sprintf("WHEN %d THEN request_count + %d ", keyID, count)) - keyIDs = append(keyIDs, keyID) + var keyValues []string + caseStmt.WriteString("CASE key_value ") + for keyValue, count := range keyStats { + caseStmt.WriteString(fmt.Sprintf("WHEN '%s' THEN request_count + %d ", keyValue, count)) + keyValues = append(keyValues, keyValue) } caseStmt.WriteString("END") - if err := tx.Model(&models.APIKey{}).Where("id IN ?", keyIDs). + if err := tx.Model(&models.APIKey{}).Where("key_value IN ?", keyValues). Updates(map[string]any{ "request_count": gorm.Expr(caseStmt.String()), "last_used_at": time.Now(), diff --git a/internal/types/types.go b/internal/types/types.go index ccee089..ffa276a 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -85,7 +85,7 @@ type RetryError struct { StatusCode int `json:"status_code"` ErrorMessage string `json:"error_message"` ParsedErrorMessage string `json:"-"` - KeyID string `json:"key_id"` + KeyValue string `json:"key_value"` Attempt int `json:"attempt"` UpstreamAddr string `json:"-"` }