Update convert.go

convert.go

@@ -24,14 +24,11 @@ func estimateTokens(text string) int {
 func calculateInputTokensFromClaudeRequest(claudeReq *ClaudeRequest) int {
 	totalChars := 0
 
-	// Process system prompt
 	if len(claudeReq.System) > 0 {
-		// Try unmarshaling as string first
 		var systemStr string
 		if err := json.Unmarshal(claudeReq.System, &systemStr); err == nil {
 			totalChars += len(systemStr)
 		} else {
-			// Try unmarshaling as list of blocks
 			var systemBlocks []ClaudeContentBlock
 			if err := json.Unmarshal(claudeReq.System, &systemBlocks); err == nil {
 				for _, block := range systemBlocks {
@@ -40,19 +37,17 @@ func calculateInputTokensFromClaudeRequest(claudeReq *ClaudeRequest) int {
 					}
 				}
 			} else {
+				// Giữ lại: Cảnh báo về việc không parse được system prompt
 				log.Printf("WARN: Could not parse system prompt format: %s", string(claudeReq.System))
 			}
 		}
 	}
 
-	// Process messages
 	for _, msg := range claudeReq.Messages {
-		// Try unmarshaling as string first
 		var contentStr string
 		if err := json.Unmarshal(msg.Content, &contentStr); err == nil {
 			totalChars += len(contentStr)
 		} else {
-			// Try unmarshaling as list of blocks
 			var contentBlocks []ClaudeContentBlock
 			if err := json.Unmarshal(msg.Content, &contentBlocks); err == nil {
 				for _, block := range contentBlocks {
@@ -61,13 +56,15 @@ func calculateInputTokensFromClaudeRequest(claudeReq *ClaudeRequest) int {
 					}
 				}
 			} else {
+				// Giữ lại: Cảnh báo về việc không parse được message content
 				log.Printf("WARN: Could not parse message content format for role %s: %s", msg.Role, string(msg.Content))
 			}
 		}
 	}
 
-	estimated := estimateTokens(fmt.Sprintf("%d", totalChars)) // Pass total chars as string to estimate
-	log.Printf("DEBUG: Estimated input characters: %d, Estimated input tokens: %d", totalChars, estimated)
+	estimated := estimateTokens(fmt.Sprintf("%d", totalChars))
+	// Vô hiệu hóa: Log DEBUG không cần thiết cho hoạt động bình thường
+	// log.Printf("DEBUG: Estimated input characters: %d, Estimated input tokens: %d", totalChars, estimated)
 	return estimated
 }
 
@@ -75,15 +72,12 @@ func calculateInputTokensFromClaudeRequest(claudeReq *ClaudeRequest) int {
 func convertClaudeRequestToOpenAI(claudeReq *ClaudeRequest) (*OpenAIRequest, error) {
 	openAIMessages := []OpenAIMessage{}
 
-	// --- Handle System Prompt ---
 	if len(claudeReq.System) > 0 {
 		systemContent := ""
 		var systemStr string
-		// Try simple string first
 		if err := json.Unmarshal(claudeReq.System, &systemStr); err == nil {
 			systemContent = systemStr
 		} else {
-			// Try list of blocks
 			var systemBlocks []ClaudeContentBlock
 			if err := json.Unmarshal(claudeReq.System, &systemBlocks); err == nil {
 				var parts []string
@@ -94,8 +88,8 @@ func convertClaudeRequestToOpenAI(claudeReq *ClaudeRequest) (*OpenAIRequest, err
 				}
 				systemContent = strings.Join(parts, "\n")
 			} else {
+				// Giữ lại: Cảnh báo
 				log.Printf("WARN: Could not parse system prompt format for conversion: %s", string(claudeReq.System))
-				// Decide how to handle - skip system prompt or return error? Skipping for now.
 			}
 		}
 		if systemContent != "" {
@@ -103,20 +97,18 @@ func convertClaudeRequestToOpenAI(claudeReq *ClaudeRequest) (*OpenAIRequest, err
 		}
 	}
 
-	// --- Handle Messages ---
 	for _, msg := range claudeReq.Messages {
 		if msg.Role != "user" && msg.Role != "assistant" {
+			// Giữ lại: Cảnh báo
 			log.Printf("WARN: Skipping message with unsupported role: %s", msg.Role)
 			continue
 		}
 
 		messageContent := ""
 		var contentStr string
-		// Try simple string first
 		if err := json.Unmarshal(msg.Content, &contentStr); err == nil {
 			messageContent = contentStr
 		} else {
-			// Try list of blocks
 			var contentBlocks []ClaudeContentBlock
 			if err := json.Unmarshal(msg.Content, &contentBlocks); err == nil {
 				var parts []string
@@ -124,20 +116,22 @@ func convertClaudeRequestToOpenAI(claudeReq *ClaudeRequest) (*OpenAIRequest, err
 					if block.Type == "text" {
 						parts = append(parts, block.Text)
 					} else {
+						// Giữ lại: Cảnh báo
 						log.Printf("WARN: Skipping non-text content block type '%s' in message for role %s", block.Type, msg.Role)
 					}
 				}
 				messageContent = strings.Join(parts, "\n")
 			} else {
+				// Giữ lại: Cảnh báo
 				log.Printf("WARN: Could not parse message content format for role %s during conversion: %s", msg.Role, string(msg.Content))
-				// Skip message if content parsing fails
 				continue
 			}
 		}
 
-		if messageContent != "" || msg.Role == "assistant" { // Allow empty assistant messages if needed? Check OpenAI spec. Usually needs content.
+		if messageContent != "" || msg.Role == "assistant" { 
 			openAIMessages = append(openAIMessages, OpenAIMessage{Role: msg.Role, Content: messageContent})
 		} else {
+			// Giữ lại: Cảnh báo
 			log.Printf("WARN: Skipping message for role %s with no valid text content after parsing.", msg.Role)
 		}
 	}
@@ -146,28 +140,25 @@ func convertClaudeRequestToOpenAI(claudeReq *ClaudeRequest) (*OpenAIRequest, err
 		return nil, errors.New("conversion resulted in no valid messages for OpenAI request")
 	}
 
-	// --- Construct OpenAI Request ---
 	openAIReq := &OpenAIRequest{
-		Model:       claudeReq.Model, // Use the model specified in Claude request
+		Model:       claudeReq.Model, 
 		Messages:    openAIMessages,
 		Stream:      claudeReq.Stream,
 		MaxTokens:   claudeReq.MaxTokens,
 		Temperature: claudeReq.Temperature,
 		TopP:        claudeReq.TopP,
-		TopK:        claudeReq.TopK, // <<<<< GÁN GIÁ TRỊ TopK TỪ YÊU CẦU CLAUDE
-		// Stop sequences mapping
+		TopK:        claudeReq.TopK, 
 		Stop: claudeReq.StopSequences,
 	}
 
-	// Default model if not provided
 	if openAIReq.Model == "" {
-		openAIReq.Model = "gpt-3.5-turbo" // Or get from config
+		openAIReq.Model = "gpt-3.5-turbo" 
 	}
 
-	// Ghi log nếu TopK được gửi đi (để tiện debug)
-	if openAIReq.TopK != nil {
-		log.Printf("INFO: Attempting to send non-standard 'top_k': %d to upstream OpenAI endpoint.", *openAIReq.TopK)
-	}
+	// Vô hiệu hóa: Log INFO này có thể hữu ích khi debug TopK, nhưng không cần thiết cho hoạt động bình thường
+	// if openAIReq.TopK != nil {
+	// 	log.Printf("INFO: Attempting to send non-standard 'top_k': %d to upstream OpenAI endpoint.", *openAIReq.TopK)
+	// }
 
 	return openAIReq, nil
 }
@@ -175,7 +166,7 @@ func convertClaudeRequestToOpenAI(claudeReq *ClaudeRequest) (*OpenAIRequest, err
 // mapOpenAIFinishReasonToClaude maps OpenAI finish reason to Claude stop reason
 func mapOpenAIFinishReasonToClaude(openAIFinishReason *string) string {
 	if openAIFinishReason == nil {
-		return "end_turn" // Default if nil
+		return "end_turn" 
 	}
 	reason := *openAIFinishReason
 	switch reason {
@@ -186,10 +177,11 @@ func mapOpenAIFinishReasonToClaude(openAIFinishReason *string) string {
 	case "function_call", "tool_calls":
 		return "tool_use"
 	case "content_filter":
-		return "stop_sequence" // Or maybe map to an error type?
+		return "stop_sequence" 
 	default:
+		// Giữ lại: Cảnh báo về lý do không xác định
 		log.Printf("WARN: Unknown OpenAI finish reason '%s', mapping to 'end_turn'", reason)
-		return "end_turn" // Default for unknown reasons
+		return "end_turn" 
 	}
 }
 
@@ -202,41 +194,38 @@ func convertOpenAIResponseToClaude(openAIResp *OpenAIResponse, claudeRequestID s
 	choice := openAIResp.Choices[0]
 	claudeStopReason := mapOpenAIFinishReasonToClaude(choice.FinishReason)
 
-	// --- Prepare Usage ---
 	claudeUsage := ClaudeUsage{}
 	if openAIResp.Usage != nil {
 		claudeUsage.InputTokens = openAIResp.Usage.PromptTokens
 		claudeUsage.OutputTokens = openAIResp.Usage.CompletionTokens
 	} else {
+		// Giữ lại: Cảnh báo quan trọng
 		log.Printf("WARN: [%s] Usage data missing in non-streaming OpenAI response", claudeRequestID)
-		// Potentially estimate usage here if critical, otherwise leave as zero
 	}
 
-	// --- Prepare Content ---
 	claudeContent := []ClaudeContentBlock{
 		{
 			Type: "text",
-			Text: choice.Message.Content, // Assuming message content is always text
+			Text: choice.Message.Content, 
 		},
 	}
 
-	// --- Construct Claude Response ---
 	claudeResp := &ClaudeResponse{
-		ID:           openAIResp.ID, // Use OpenAI's response ID
+		ID:           openAIResp.ID, 
 		Type:         "message",
-		Role:         "assistant", // Assuming OpenAI response role is assistant
+		Role:         "assistant", 
 		Content:      claudeContent,
-		Model:        openAIResp.Model, // Use the model OpenAI reported
+		Model:        openAIResp.Model, 
 		StopReason:   claudeStopReason,
-		StopSequence: nil, // Typically null
+		StopSequence: nil, 
 		Usage:        claudeUsage,
 	}
 
-	// Use original request ID if OpenAI ID is missing (shouldn't happen often)
 	if claudeResp.ID == "" {
+		// Giữ lại: Cảnh báo
 		log.Printf("WARN: OpenAI response ID missing, using original request ID: %s", claudeRequestID)
 		claudeResp.ID = claudeRequestID
 	}
 
 	return claudeResp, nil
-}
+}