feat: Compatibility with rerank API output fields
This commit is contained in:
@@ -5,7 +5,7 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
|
||||
"github.com/Tencent/WeKnora/internal/types"
|
||||
)
|
||||
|
||||
@@ -26,17 +26,17 @@ type RankResult struct {
|
||||
Document DocumentInfo `json:"document"`
|
||||
RelevanceScore float64 `json:"relevance_score"`
|
||||
}
|
||||
//Handles the RelevanceScore field by checking if RelevanceScore exists first, otherwise falls back to Score field
|
||||
|
||||
// Handles the RelevanceScore field by checking if RelevanceScore exists first, otherwise falls back to Score field
|
||||
func (r *RankResult) UnmarshalJSON(data []byte) error {
|
||||
|
||||
var temp struct {
|
||||
Index int `json:"index"`
|
||||
Document DocumentInfo `json:"document"`
|
||||
RelevanceScore *float64 `json:"relevance_score"`
|
||||
Score *float64 `json:"score"`
|
||||
Index int `json:"index"`
|
||||
Document DocumentInfo `json:"document"`
|
||||
RelevanceScore *float64 `json:"relevance_score"`
|
||||
Score *float64 `json:"score"`
|
||||
}
|
||||
|
||||
|
||||
if err := json.Unmarshal(data, &temp); err != nil {
|
||||
return fmt.Errorf("failed to unmarshal rank result: %w", err)
|
||||
}
|
||||
@@ -50,7 +50,6 @@ func (r *RankResult) UnmarshalJSON(data []byte) error {
|
||||
r.RelevanceScore = *temp.Score
|
||||
}
|
||||
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -58,6 +57,27 @@ type DocumentInfo struct {
|
||||
Text string `json:"text"`
|
||||
}
|
||||
|
||||
// UnmarshalJSON handles both string and object formats for DocumentInfo
|
||||
func (d *DocumentInfo) UnmarshalJSON(data []byte) error {
|
||||
// First try to unmarshal as a string
|
||||
var text string
|
||||
if err := json.Unmarshal(data, &text); err == nil {
|
||||
d.Text = text
|
||||
return nil
|
||||
}
|
||||
|
||||
// If that fails, try to unmarshal as an object with text field
|
||||
var temp struct {
|
||||
Text string `json:"text"`
|
||||
}
|
||||
if err := json.Unmarshal(data, &temp); err != nil {
|
||||
return fmt.Errorf("failed to unmarshal DocumentInfo: %w", err)
|
||||
}
|
||||
|
||||
d.Text = temp.Text
|
||||
return nil
|
||||
}
|
||||
|
||||
type RerankerConfig struct {
|
||||
APIKey string
|
||||
BaseURL string
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
package rerank
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRankResultUnmarshalJSON(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
expectedText string
|
||||
expectedIndex int
|
||||
expectedScore float64
|
||||
expectError bool
|
||||
}{
|
||||
{
|
||||
name: "document as string with relevance_score",
|
||||
input: `{"index": 0, "document": "This is a document", "relevance_score": 0.95}`,
|
||||
expectedText: "This is a document",
|
||||
expectedIndex: 0,
|
||||
expectedScore: 0.95,
|
||||
expectError: false,
|
||||
},
|
||||
{
|
||||
name: "document as object with relevance_score",
|
||||
input: `{"index": 1, "document": {"text": "This is a document"}, "relevance_score": 0.87}`,
|
||||
expectedText: "This is a document",
|
||||
expectedIndex: 1,
|
||||
expectedScore: 0.87,
|
||||
expectError: false,
|
||||
},
|
||||
{
|
||||
name: "document as string with score field",
|
||||
input: `{"index": 2, "document": "This is a document", "score": 0.92}`,
|
||||
expectedText: "This is a document",
|
||||
expectedIndex: 2,
|
||||
expectedScore: 0.92,
|
||||
expectError: false,
|
||||
},
|
||||
{
|
||||
name: "document as object with score field",
|
||||
input: `{"index": 3, "document": {"text": "This is a document"}, "score": 0.78}`,
|
||||
expectedText: "This is a document",
|
||||
expectedIndex: 3,
|
||||
expectedScore: 0.78,
|
||||
expectError: false,
|
||||
},
|
||||
{
|
||||
name: "document as string with both score fields - relevance_score takes priority",
|
||||
input: `{"index": 4, "document": "This is a document", "relevance_score": 0.95, "score": 0.80}`,
|
||||
expectedText: "This is a document",
|
||||
expectedIndex: 4,
|
||||
expectedScore: 0.95,
|
||||
expectError: false,
|
||||
},
|
||||
{
|
||||
name: "document as object with both score fields - relevance_score takes priority",
|
||||
input: `{"index": 5, "document": {"text": "This is a document"}, "relevance_score": 0.88, "score": 0.75}`,
|
||||
expectedText: "This is a document",
|
||||
expectedIndex: 5,
|
||||
expectedScore: 0.88,
|
||||
expectError: false,
|
||||
},
|
||||
{
|
||||
name: "document as string with no score fields",
|
||||
input: `{"index": 6, "document": "This is a document"}`,
|
||||
expectedText: "This is a document",
|
||||
expectedIndex: 6,
|
||||
expectedScore: 0.0,
|
||||
expectError: false,
|
||||
},
|
||||
{
|
||||
name: "document as object with no score fields",
|
||||
input: `{"index": 7, "document": {"text": "This is a document"}}`,
|
||||
expectedText: "This is a document",
|
||||
expectedIndex: 7,
|
||||
expectedScore: 0.0,
|
||||
expectError: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
var result RankResult
|
||||
err := json.Unmarshal([]byte(tt.input), &result)
|
||||
|
||||
if tt.expectError {
|
||||
if err == nil {
|
||||
t.Errorf("Expected error but got none")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf("Unmarshal failed: %v", err)
|
||||
}
|
||||
|
||||
if result.Document.Text != tt.expectedText {
|
||||
t.Errorf("Expected document text %q, got %q", tt.expectedText, result.Document.Text)
|
||||
}
|
||||
if result.Index != tt.expectedIndex {
|
||||
t.Errorf("Expected index %d, got %d", tt.expectedIndex, result.Index)
|
||||
}
|
||||
if result.RelevanceScore != tt.expectedScore {
|
||||
t.Errorf("Expected score %f, got %f", tt.expectedScore, result.RelevanceScore)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestDocumentInfoMarshalJSON tests that DocumentInfo can be marshaled back to JSON
|
||||
func TestDocumentInfoMarshalJSON(t *testing.T) {
|
||||
doc := DocumentInfo{Text: "Test document content"}
|
||||
|
||||
data, err := json.Marshal(doc)
|
||||
if err != nil {
|
||||
t.Fatalf("Marshal failed: %v", err)
|
||||
}
|
||||
|
||||
expected := `{"text":"Test document content"}`
|
||||
if string(data) != expected {
|
||||
t.Errorf("Expected %s, got %s", expected, string(data))
|
||||
}
|
||||
}
|
||||
|
||||
// TestRankResultMarshalJSON tests that RankResult can be marshaled back to JSON
|
||||
func TestRankResultMarshalJSON(t *testing.T) {
|
||||
result := RankResult{
|
||||
Index: 1,
|
||||
Document: DocumentInfo{Text: "Test document"},
|
||||
RelevanceScore: 0.95,
|
||||
}
|
||||
|
||||
data, err := json.Marshal(result)
|
||||
if err != nil {
|
||||
t.Fatalf("Marshal failed: %v", err)
|
||||
}
|
||||
|
||||
// Parse back to verify structure
|
||||
var parsed RankResult
|
||||
err = json.Unmarshal(data, &parsed)
|
||||
if err != nil {
|
||||
t.Fatalf("Round-trip unmarshal failed: %v", err)
|
||||
}
|
||||
|
||||
if parsed.Index != result.Index {
|
||||
t.Errorf("Index mismatch: expected %d, got %d", result.Index, parsed.Index)
|
||||
}
|
||||
if parsed.Document.Text != result.Document.Text {
|
||||
t.Errorf("Document text mismatch: expected %q, got %q", result.Document.Text, parsed.Document.Text)
|
||||
}
|
||||
if parsed.RelevanceScore != result.RelevanceScore {
|
||||
t.Errorf("Score mismatch: expected %f, got %f", result.RelevanceScore, parsed.RelevanceScore)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user