🎨 优化日志输出
This commit is contained in:
@@ -21,6 +21,13 @@ import (
|
||||
|
||||
// ProcessClaudeMessage 处理 Claude 消息请求
|
||||
func (s *AiProxyService) ProcessClaudeMessage(ctx context.Context, req *request.ClaudeMessageRequest) (*response.ClaudeMessageResponse, error) {
|
||||
// 记录请求参数
|
||||
global.GVA_LOG.Info("收到 Claude Messages 请求",
|
||||
zap.String("model", req.Model),
|
||||
zap.Any("messages", req.Messages),
|
||||
zap.Any("full_request", req),
|
||||
)
|
||||
|
||||
// 1. 根据模型获取配置
|
||||
if req.Model == "" {
|
||||
return nil, fmt.Errorf("model 参数不能为空")
|
||||
@@ -32,8 +39,9 @@ func (s *AiProxyService) ProcessClaudeMessage(ctx context.Context, req *request.
|
||||
}
|
||||
|
||||
// 2. 注入预设
|
||||
var injector *PresetInjector
|
||||
if preset != nil {
|
||||
injector := NewPresetInjector(preset)
|
||||
injector = NewPresetInjector(preset)
|
||||
req.Messages = s.convertClaudeMessages(injector.InjectMessages(s.convertToOpenAIMessages(req.Messages)))
|
||||
}
|
||||
|
||||
@@ -43,24 +51,74 @@ func (s *AiProxyService) ProcessClaudeMessage(ctx context.Context, req *request.
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 4. 处理响应
|
||||
if preset != nil && len(resp.Content) > 0 {
|
||||
injector := NewPresetInjector(preset)
|
||||
// 获取 AI 输出内容
|
||||
aiOutput := ""
|
||||
if len(resp.Content) > 0 {
|
||||
aiOutput = resp.Content[0].Text
|
||||
}
|
||||
|
||||
// 4. 处理响应(使用同一个 injector 实例)
|
||||
if injector != nil && len(resp.Content) > 0 {
|
||||
resp.Content[0].Text = injector.ProcessResponse(resp.Content[0].Text)
|
||||
aiOutput = resp.Content[0].Text
|
||||
}
|
||||
|
||||
// 5. 统一填充 standard_usage,转换为 OpenAI 风格的用量统计
|
||||
resp.StandardUsage = &response.ChatCompletionUsage{
|
||||
PromptTokens: resp.Usage.InputTokens,
|
||||
CompletionTokens: resp.Usage.OutputTokens,
|
||||
TotalTokens: resp.Usage.InputTokens + resp.Usage.OutputTokens,
|
||||
if resp.Usage.InputTokens > 0 || resp.Usage.OutputTokens > 0 {
|
||||
resp.StandardUsage = &response.ChatCompletionUsage{
|
||||
PromptTokens: resp.Usage.InputTokens,
|
||||
CompletionTokens: resp.Usage.OutputTokens,
|
||||
TotalTokens: resp.Usage.InputTokens + resp.Usage.OutputTokens,
|
||||
}
|
||||
}
|
||||
|
||||
// 记录响应内容
|
||||
logFields := []zap.Field{
|
||||
zap.String("ai_output", aiOutput),
|
||||
zap.Any("usage", resp.Usage),
|
||||
}
|
||||
|
||||
// 添加正则脚本执行日志(使用同一个 injector 实例)
|
||||
if injector != nil {
|
||||
regexLogs := injector.GetRegexLogs()
|
||||
if regexLogs != nil && (regexLogs.TotalMatches > 0 || len(regexLogs.InputScripts) > 0 || len(regexLogs.OutputScripts) > 0) {
|
||||
// 收集触发的脚本名称
|
||||
triggeredScripts := make([]string, 0)
|
||||
for _, scriptLog := range regexLogs.InputScripts {
|
||||
if scriptLog.MatchCount > 0 {
|
||||
triggeredScripts = append(triggeredScripts, fmt.Sprintf("%s(输入:%d次)", scriptLog.ScriptName, scriptLog.MatchCount))
|
||||
}
|
||||
}
|
||||
for _, scriptLog := range regexLogs.OutputScripts {
|
||||
if scriptLog.MatchCount > 0 {
|
||||
triggeredScripts = append(triggeredScripts, fmt.Sprintf("%s(输出:%d次)", scriptLog.ScriptName, scriptLog.MatchCount))
|
||||
}
|
||||
}
|
||||
|
||||
if len(triggeredScripts) > 0 {
|
||||
logFields = append(logFields,
|
||||
zap.Strings("triggered_regex_scripts", triggeredScripts),
|
||||
zap.Int("total_matches", regexLogs.TotalMatches),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
logFields = append(logFields, zap.Any("full_response", resp))
|
||||
global.GVA_LOG.Info("Claude Messages 响应", logFields...)
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
// ProcessClaudeMessageStream 处理 Claude 流式消息请求
|
||||
func (s *AiProxyService) ProcessClaudeMessageStream(c *gin.Context, req *request.ClaudeMessageRequest) {
|
||||
// 记录请求参数
|
||||
global.GVA_LOG.Info("收到 Claude Messages 流式请求",
|
||||
zap.String("model", req.Model),
|
||||
zap.Any("messages", req.Messages),
|
||||
zap.Any("full_request", req),
|
||||
)
|
||||
|
||||
// 1. 根据模型获取配置
|
||||
if req.Model == "" {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "model 参数不能为空"})
|
||||
@@ -142,9 +200,22 @@ func (s *AiProxyService) forwardClaudeStreamRequest(c *gin.Context, provider *ap
|
||||
}
|
||||
defer httpResp.Body.Close()
|
||||
|
||||
if httpResp.StatusCode != http.StatusOK {
|
||||
body, _ := io.ReadAll(httpResp.Body)
|
||||
global.GVA_LOG.Error("Claude 流式请求上游返回错误",
|
||||
zap.Int("status_code", httpResp.StatusCode),
|
||||
zap.String("response_body", string(body)),
|
||||
)
|
||||
return fmt.Errorf("上游返回错误: %d - %s", httpResp.StatusCode, string(body))
|
||||
}
|
||||
|
||||
reader := bufio.NewReader(httpResp.Body)
|
||||
flusher, _ := c.Writer.(http.Flusher)
|
||||
|
||||
// 聚合完整输出用于日志
|
||||
var fullContent bytes.Buffer
|
||||
var totalInputTokens, totalOutputTokens int
|
||||
|
||||
for {
|
||||
line, err := reader.ReadBytes('\n')
|
||||
if err == io.EOF {
|
||||
@@ -157,10 +228,21 @@ func (s *AiProxyService) forwardClaudeStreamRequest(c *gin.Context, provider *ap
|
||||
if bytes.HasPrefix(line, []byte("data: ")) {
|
||||
data := bytes.TrimPrefix(line, []byte("data: "))
|
||||
var chunk response.ClaudeStreamResponse
|
||||
if json.Unmarshal(data, &chunk) == nil && chunk.Delta != nil {
|
||||
if injector != nil {
|
||||
chunk.Delta.Text = injector.ProcessResponse(chunk.Delta.Text)
|
||||
if json.Unmarshal(data, &chunk) == nil {
|
||||
// 收集 usage 信息
|
||||
if chunk.Usage != nil {
|
||||
totalInputTokens = chunk.Usage.InputTokens
|
||||
totalOutputTokens = chunk.Usage.OutputTokens
|
||||
}
|
||||
|
||||
// 处理文本内容
|
||||
if chunk.Delta != nil && chunk.Delta.Text != "" {
|
||||
fullContent.WriteString(chunk.Delta.Text)
|
||||
if injector != nil {
|
||||
chunk.Delta.Text = injector.ProcessResponse(chunk.Delta.Text)
|
||||
}
|
||||
}
|
||||
|
||||
processedData, _ := json.Marshal(chunk)
|
||||
c.Writer.Write([]byte("data: "))
|
||||
c.Writer.Write(processedData)
|
||||
@@ -169,6 +251,43 @@ func (s *AiProxyService) forwardClaudeStreamRequest(c *gin.Context, provider *ap
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 记录完整的流式响应日志
|
||||
logFields := []zap.Field{
|
||||
zap.String("ai_output", fullContent.String()),
|
||||
zap.Int("input_tokens", totalInputTokens),
|
||||
zap.Int("output_tokens", totalOutputTokens),
|
||||
zap.Int("total_tokens", totalInputTokens+totalOutputTokens),
|
||||
}
|
||||
|
||||
// 添加正则脚本执行日志
|
||||
if injector != nil {
|
||||
regexLogs := injector.GetRegexLogs()
|
||||
if regexLogs != nil && (regexLogs.TotalMatches > 0 || len(regexLogs.InputScripts) > 0 || len(regexLogs.OutputScripts) > 0) {
|
||||
// 收集触发的脚本名称
|
||||
triggeredScripts := make([]string, 0)
|
||||
for _, scriptLog := range regexLogs.InputScripts {
|
||||
if scriptLog.MatchCount > 0 {
|
||||
triggeredScripts = append(triggeredScripts, fmt.Sprintf("%s(输入:%d次)", scriptLog.ScriptName, scriptLog.MatchCount))
|
||||
}
|
||||
}
|
||||
for _, scriptLog := range regexLogs.OutputScripts {
|
||||
if scriptLog.MatchCount > 0 {
|
||||
triggeredScripts = append(triggeredScripts, fmt.Sprintf("%s(输出:%d次)", scriptLog.ScriptName, scriptLog.MatchCount))
|
||||
}
|
||||
}
|
||||
|
||||
if len(triggeredScripts) > 0 {
|
||||
logFields = append(logFields,
|
||||
zap.Strings("triggered_regex_scripts", triggeredScripts),
|
||||
zap.Int("total_matches", regexLogs.TotalMatches),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
global.GVA_LOG.Info("Claude Messages 流式响应完成", logFields...)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user