Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

Go: refactor embed and rerank interface (#18240)

Jin Hai811f9dd0df1e
diff --git a/internal/entity/models/302ai.go b/internal/entity/models/302ai.go
index d899e16a9d..f63aabad1a 100644
--- a/internal/entity/models/302ai.go
+++ b/internal/entity/models/302ai.go
@@ -171,11 +171,11 @@ func (a *AI302Model) ChatStreamlyWithSender(ctx context.Context, modelName strin
})
}
-func (a *AI302Model) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (a *AI302Model) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := a.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
model, err := validateAI302ModelName(modelName)
@@ -192,7 +192,7 @@ func (a *AI302Model) Embed(ctx context.Context, modelName *string, texts []strin
reqBody := map[string]interface{}{
"model": model,
- "input": texts,
+ "input": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -252,11 +252,14 @@ func (a *AI302Model) Embed(ctx context.Context, modelName *string, texts []strin
return embeddings, nil
}
-func (a *AI302Model) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (a *AI302Model) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := a.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
+
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/302ai_test.go b/internal/entity/models/302ai_test.go
index fbb8f52807..9d49ef2b1e 100644
--- a/internal/entity/models/302ai_test.go
+++ b/internal/entity/models/302ai_test.go
@@ -298,7 +298,7 @@ func TestAI302ValidatesInputs(t *testing.T) {
{
name: "embed model",
run: func() error {
- _, err := newAI302ForTest("http://unused").Embed(ctx, nil, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newAI302ForTest("http://unused").Embed(ctx, nil, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
return err
},
want: "model name is required",
@@ -306,7 +306,7 @@ func TestAI302ValidatesInputs(t *testing.T) {
{
name: "rerank api key",
run: func() error {
- _, err := newAI302ForTest("http://unused").Rerank(ctx, &model, "q", []string{"doc"}, nil, nil, nil)
+ _, err := newAI302ForTest("http://unused").Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"doc"}}, nil, nil, nil)
return err
},
want: "api key is required",
@@ -314,7 +314,7 @@ func TestAI302ValidatesInputs(t *testing.T) {
{
name: "rerank query",
run: func() error {
- _, err := newAI302ForTest("http://unused").Rerank(ctx, &model, " ", []string{"doc"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newAI302ForTest("http://unused").Rerank(ctx, &model, RerankRequest{Query: " ", Documents: []string{"doc"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
return err
},
want: "query is required",
diff --git a/internal/entity/models/aliyun.go b/internal/entity/models/aliyun.go
index 59f30f7d8e..7e5350c69a 100644
--- a/internal/entity/models/aliyun.go
+++ b/internal/entity/models/aliyun.go
@@ -202,12 +202,12 @@ type aliyunUsage struct {
}
// Embed embeds a list of texts into embeddings
-func (a *AliyunModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (a *AliyunModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := a.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -225,7 +225,7 @@ func (a *AliyunModel) Embed(ctx context.Context, modelName *string, texts []stri
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -298,10 +298,12 @@ type aliyunRerankResponse struct {
} `json:"usage"`
}
-func (a *AliyunModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (a *AliyunModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := a.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
diff --git a/internal/entity/models/anthropic.go b/internal/entity/models/anthropic.go
index 251d6ba624..50d26eb2f3 100644
--- a/internal/entity/models/anthropic.go
+++ b/internal/entity/models/anthropic.go
@@ -583,11 +583,11 @@ func (a *AnthropicModel) ChatStreamlyWithSender(ctx context.Context, modelName s
return sender(&endOfStream, nil)
}
-func (a *AnthropicModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (a *AnthropicModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", a.Name())
}
-func (a *AnthropicModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (a *AnthropicModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", a.Name())
}
diff --git a/internal/entity/models/anthropic_test.go b/internal/entity/models/anthropic_test.go
index 8540f456af..ff1c420f2b 100644
--- a/internal/entity/models/anthropic_test.go
+++ b/internal/entity/models/anthropic_test.go
@@ -482,10 +482,10 @@ func TestAnthropicUnsupportedMethods(t *testing.T) {
m := newAnthropicForTest("http://unused")
apiKey := "test-key"
modelName := "claude"
- if _, err := m.Embed(ctx, &modelName, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Embed(ctx, &modelName, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Embed: got %v", err)
}
- if _, err := m.Rerank(ctx, &modelName, "q", []string{"d"}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: []string{"d"}}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: got %v", err)
}
if _, err := m.Balance(ctx, &APIConfig{ApiKey: &apiKey}); err == nil || !strings.Contains(err.Error(), "no such method") {
diff --git a/internal/entity/models/astraflow.go b/internal/entity/models/astraflow.go
index f526f93432..25e49f212b 100644
--- a/internal/entity/models/astraflow.go
+++ b/internal/entity/models/astraflow.go
@@ -181,12 +181,12 @@ func (a *AstraflowModel) CheckConnection(ctx context.Context, apiConfig *APIConf
return err
}
-func (a *AstraflowModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (a *AstraflowModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := a.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -198,7 +198,7 @@ func (a *AstraflowModel) Embed(ctx context.Context, modelName *string, texts []s
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -258,10 +258,12 @@ func (a *AstraflowModel) Embed(ctx context.Context, modelName *string, texts []s
return embeddings, nil
}
-func (a *AstraflowModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (a *AstraflowModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := a.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
diff --git a/internal/entity/models/astraflow_test.go b/internal/entity/models/astraflow_test.go
index c6c25eff7b..baa749e009 100644
--- a/internal/entity/models/astraflow_test.go
+++ b/internal/entity/models/astraflow_test.go
@@ -474,7 +474,7 @@ func TestAstraflowEmbedReturnsNoSuchMethod(t *testing.T) {
// Embed IS implemented (not a stub). It should NOT be blocked by APIConfigCheck.
// With empty input texts it short-circuits to empty result (no error).
apiKey := "test-key"
- embeddings, err := newAstraflowForTest("http://unused").Embed(ctx, nil, nil, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ embeddings, err := newAstraflowForTest("http://unused").Embed(ctx, nil, EmbedRequest{Texts: nil}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil || len(embeddings) != 0 {
t.Errorf("Embed: want empty result (no error), got embeddings=%v err=%v", embeddings, err)
}
diff --git a/internal/entity/models/avian.go b/internal/entity/models/avian.go
index 486abe5429..457c1bb050 100644
--- a/internal/entity/models/avian.go
+++ b/internal/entity/models/avian.go
@@ -183,11 +183,11 @@ func (a *AvianModel) CheckConnection(ctx context.Context, apiConfig *APIConfig)
return err
}
-func (a *AvianModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (a *AvianModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", a.Name())
}
-func (a *AvianModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (a *AvianModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", a.Name())
}
diff --git a/internal/entity/models/avian_test.go b/internal/entity/models/avian_test.go
index 0dac481ae1..1b85b1bc31 100644
--- a/internal/entity/models/avian_test.go
+++ b/internal/entity/models/avian_test.go
@@ -365,10 +365,10 @@ func TestAvianUnsupportedMethodsReturnNoSuchMethod(t *testing.T) {
a := newAvianForTest("http://unused")
model := "deepseek/deepseek-v3.2"
- if _, err := a.Embed(ctx, &model, []string{"x"}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := a.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Embed: expected no such method, got %v", err)
}
- if _, err := a.Rerank(ctx, &model, "q", []string{"d"}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := a.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"d"}}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: expected no such method, got %v", err)
}
if _, err := a.Balance(ctx, &APIConfig{}); err == nil || !strings.Contains(err.Error(), "no such method") {
diff --git a/internal/entity/models/azure_openai.go b/internal/entity/models/azure_openai.go
index aa317d0c8a..104348c88d 100644
--- a/internal/entity/models/azure_openai.go
+++ b/internal/entity/models/azure_openai.go
@@ -177,12 +177,12 @@ type azureEmbeddingResponse struct {
}
// Embed turns a list of texts into embedding vectors
-func (a *AzureOpenAIModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (a *AzureOpenAIModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := a.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -199,7 +199,7 @@ func (a *AzureOpenAIModel) Embed(ctx context.Context, modelName *string, texts [
// As with chat, the deployment is in the URL path, so no "model" field.
reqBody := map[string]interface{}{
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -214,7 +214,7 @@ func (a *AzureOpenAIModel) Embed(ctx context.Context, modelName *string, texts [
if err = json.Unmarshal(body, &parsed); err != nil {
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
for _, d := range parsed.Data {
if d.Index < 0 || d.Index >= len(embeddings) {
return nil, fmt.Errorf("embedding index %d out of range [0,%d)", d.Index, len(embeddings))
@@ -271,7 +271,7 @@ func (a *AzureOpenAIModel) Balance(ctx context.Context, apiConfig *APIConfig) (m
}
// Rerank is not exposed by the Azure OpenAI API.
-func (a *AzureOpenAIModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (a *AzureOpenAIModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", a.Name())
}
diff --git a/internal/entity/models/azure_openai_test.go b/internal/entity/models/azure_openai_test.go
index 80d8ee28ab..a2c0ed3b61 100644
--- a/internal/entity/models/azure_openai_test.go
+++ b/internal/entity/models/azure_openai_test.go
@@ -340,7 +340,7 @@ func TestAzureEmbedHappyPath(t *testing.T) {
embeddings, err := newAzureForTest(srv.URL).Embed(
ctx,
&modelName,
- []string{"hello"},
+ EmbedRequest{Texts: []string{"hello"}},
&APIConfig{ApiKey: &apiKey}, nil, nil,
)
if err != nil {
diff --git a/internal/entity/models/baichuan.go b/internal/entity/models/baichuan.go
index 872f9c11bb..737bd5da0b 100644
--- a/internal/entity/models/baichuan.go
+++ b/internal/entity/models/baichuan.go
@@ -95,12 +95,12 @@ func (b *BaichuanModel) ChatStreamlyWithSender(ctx context.Context, modelName st
})
}
-func (b *BaichuanModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (b *BaichuanModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := b.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -112,7 +112,7 @@ func (b *BaichuanModel) Embed(ctx context.Context, modelName *string, texts []st
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -181,7 +181,7 @@ func (b *BaichuanModel) Embed(ctx context.Context, modelName *string, texts []st
return embeddings, nil
}
-func (b *BaichuanModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (b *BaichuanModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method")
}
diff --git a/internal/entity/models/baidu.go b/internal/entity/models/baidu.go
index 31e4a8b0ae..6f66a041b2 100644
--- a/internal/entity/models/baidu.go
+++ b/internal/entity/models/baidu.go
@@ -205,14 +205,14 @@ type baiduUsage struct {
TotalTokens int `json:"total_tokens"`
}
-func (b *BaiduModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (b *BaiduModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := b.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || *modelName == "" {
return nil, fmt.Errorf("model name is required")
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -224,7 +224,7 @@ func (b *BaiduModel) Embed(ctx context.Context, modelName *string, texts []strin
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -266,18 +266,18 @@ func (b *BaiduModel) Embed(ctx context.Context, modelName *string, texts []strin
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- if len(parsed.Data) != len(texts) {
- return nil, fmt.Errorf("expected %d embeddings, got %d", len(texts), len(parsed.Data))
+ if len(parsed.Data) != len(request.Texts) {
+ return nil, fmt.Errorf("expected %d embeddings, got %d", len(request.Texts), len(parsed.Data))
}
- embeddings := make([]EmbeddingData, len(texts))
- seen := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ seen := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
if item.Index == nil {
return nil, fmt.Errorf("missing index field in embedding item")
}
idx := *item.Index
- if idx < 0 || idx >= len(texts) {
+ if idx < 0 || idx >= len(request.Texts) {
return nil, fmt.Errorf("embedding index %d out of range", idx)
}
if seen[idx] {
@@ -302,11 +302,12 @@ func (b *BaiduModel) Embed(ctx context.Context, modelName *string, texts []strin
return embeddings, nil
}
-func (b *BaiduModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (b *BaiduModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := b.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/bedrock.go b/internal/entity/models/bedrock.go
index 604e7c60eb..bd3ba5e57b 100644
--- a/internal/entity/models/bedrock.go
+++ b/internal/entity/models/bedrock.go
@@ -963,8 +963,8 @@ type bedrockCohereEmbeddingResponse struct {
// InvokeModel. Titan's embedding API accepts one inputText per call,
// while Cohere accepts a texts batch and returns vectors in input
// order.
-func (b *BedrockModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
- if len(texts) == 0 {
+func (b *BedrockModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if apiConfig == nil || apiConfig.ApiKey == nil {
@@ -993,10 +993,10 @@ func (b *BedrockModel) Embed(ctx context.Context, modelName *string, texts []str
}
if strings.HasPrefix(modelID, "amazon.titan-embed-text-") {
- return b.embedTitan(ctx, modelID, texts, region, creds, embeddingConfig, modelUsage)
+ return b.embedTitan(ctx, modelID, request.Texts, region, creds, embeddingConfig, modelUsage)
}
if strings.HasPrefix(modelID, "cohere.embed-") {
- return b.embedCohere(ctx, modelID, texts, region, creds, embeddingConfig, modelUsage)
+ return b.embedCohere(ctx, modelID, request.Texts, region, creds, embeddingConfig, modelUsage)
}
return nil, fmt.Errorf("bedrock: unsupported embedding model %q", modelID)
}
@@ -1125,7 +1125,7 @@ func decodeCohereEmbeddingVectors(raw json.RawMessage) ([][]float64, error) {
}
// Rerank is not exposed by Bedrock.
-func (b *BedrockModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (b *BedrockModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", b.Name())
}
diff --git a/internal/entity/models/bedrock_test.go b/internal/entity/models/bedrock_test.go
index 968636d200..d55d3d0df9 100644
--- a/internal/entity/models/bedrock_test.go
+++ b/internal/entity/models/bedrock_test.go
@@ -749,7 +749,7 @@ func TestBedrockTitanEmbedHappyPath(t *testing.T) {
m := newBedrockForTest(srv.URL)
key := validBedrockKey()
model := "amazon.titan-embed-text-v2:0"
- got, err := m.Embed(ctx, &model, []string{"alpha", "beta"}, &APIConfig{ApiKey: &key}, &EmbeddingConfig{Dimension: 256}, nil)
+ got, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"alpha", "beta"}}, &APIConfig{ApiKey: &key}, &EmbeddingConfig{Dimension: 256}, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -781,7 +781,7 @@ func TestBedrockTitanV1OmitsDimension(t *testing.T) {
m := newBedrockForTest(srv.URL)
key := validBedrockKey()
model := "amazon.titan-embed-text-v1"
- if _, err := m.Embed(ctx, &model, []string{"alpha"}, &APIConfig{ApiKey: &key}, &EmbeddingConfig{Dimension: 256}, nil); err != nil {
+ if _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"alpha"}}, &APIConfig{ApiKey: &key}, &EmbeddingConfig{Dimension: 256}, nil); err != nil {
t.Fatalf("Embed: %v", err)
}
}
@@ -815,7 +815,7 @@ func TestBedrockCohereEmbedHappyPath(t *testing.T) {
m := newBedrockForTest(srv.URL)
key := validBedrockKey()
model := "cohere.embed-english-v3"
- got, err := m.Embed(ctx, &model, []string{"first", "second"}, &APIConfig{ApiKey: &key}, &EmbeddingConfig{Dimension: 128}, nil)
+ got, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"first", "second"}}, &APIConfig{ApiKey: &key}, &EmbeddingConfig{Dimension: 128}, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -846,7 +846,7 @@ func TestBedrockCohereV4ForwardsDimensionAndParsesTypedResponse(t *testing.T) {
m := newBedrockForTest(srv.URL)
key := validBedrockKey()
model := "cohere.embed-v4:0"
- got, err := m.Embed(ctx, &model, []string{"first"}, &APIConfig{ApiKey: &key}, &EmbeddingConfig{Dimension: 512}, nil)
+ got, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"first"}}, &APIConfig{ApiKey: &key}, &EmbeddingConfig{Dimension: 512}, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -859,7 +859,7 @@ func TestBedrockEmbedShortCircuitsEmptyInput(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
m := newBedrockForTest("http://unused")
- got, err := m.Embed(ctx, nil, nil, nil, nil, nil)
+ got, err := m.Embed(ctx, nil, EmbedRequest{}, nil, nil, nil)
if err != nil {
t.Fatalf("Embed empty: %v", err)
}
@@ -873,12 +873,12 @@ func TestBedrockEmbedRequiresAPIKeyAndModel(t *testing.T) {
ctx := t.Context()
m := newBedrockForTest("http://unused")
model := "x"
- if _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
+ if _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("Embed: want api-key error, got %v", err)
}
key := validBedrockKey()
blank := " "
- if _, err := m.Embed(ctx, &blank, []string{"a"}, &APIConfig{ApiKey: &key}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
+ if _, err := m.Embed(ctx, &blank, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &key}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("Embed: want model-required error, got %v", err)
}
}
@@ -889,7 +889,7 @@ func TestBedrockEmbedRejectsUnsupportedModel(t *testing.T) {
m := newBedrockForTest("http://unused")
key := validBedrockKey()
model := "anthropic.claude-3-haiku-20240307-v1:0"
- if _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{ApiKey: &key}, nil, nil); err == nil || !strings.Contains(err.Error(), "unsupported embedding model") {
+ if _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &key}, nil, nil); err == nil || !strings.Contains(err.Error(), "unsupported embedding model") {
t.Errorf("Embed: want unsupported-model error, got %v", err)
}
}
@@ -908,7 +908,7 @@ func TestBedrockEmbedPropagatesHTTPError(t *testing.T) {
m := newBedrockForTest(srv.URL)
key := validBedrockKey()
model := "amazon.titan-embed-text-v2:0"
- if _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{ApiKey: &key}, nil, nil); err == nil || !strings.Contains(err.Error(), "400") || !strings.Contains(err.Error(), "bad input") {
+ if _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &key}, nil, nil); err == nil || !strings.Contains(err.Error(), "400") || !strings.Contains(err.Error(), "bad input") {
t.Errorf("Embed: want HTTP error with body, got %v", err)
}
}
@@ -918,7 +918,7 @@ func TestBedrockRerankReturnsNoSuchMethod(t *testing.T) {
ctx := t.Context()
m := newBedrockForTest("http://unused")
model := "x"
- if _, err := m.Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{}, &RerankConfig{TopN: 1}, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, &RerankConfig{TopN: 1}, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: want no-such-method, got %v", err)
}
}
diff --git a/internal/entity/models/builtin.go b/internal/entity/models/builtin.go
index 48b2e1a51f..b198e553d5 100644
--- a/internal/entity/models/builtin.go
+++ b/internal/entity/models/builtin.go
@@ -57,8 +57,8 @@ func (b *BuiltinModel) ChatStreamlyWithSender(ctx context.Context, modelName str
}
// Embed sends texts to a TEI (Text Embeddings Inference) server and returns embeddings
-func (b *BuiltinModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
- if len(texts) == 0 {
+func (b *BuiltinModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -70,7 +70,7 @@ func (b *BuiltinModel) Embed(ctx context.Context, modelName *string, texts []str
url := fmt.Sprintf("%s/embed", baseURL)
reqBody := map[string]interface{}{
- "inputs": texts,
+ "inputs": request.Texts,
}
// Add dimension if specified
@@ -123,7 +123,7 @@ func (b *BuiltinModel) Embed(ctx context.Context, modelName *string, texts []str
return result, nil
}
-func (b *BuiltinModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (b *BuiltinModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("builtin model does not support rerank")
}
@@ -165,7 +165,7 @@ func (b *BuiltinModel) Balance(ctx context.Context, apiConfig *APIConfig) (map[s
func (b *BuiltinModel) CheckConnection(ctx context.Context, apiConfig *APIConfig) error {
// Try to get model info to verify connection
- _, err := b.Embed(ctx, nil, []string{"test"}, apiConfig, nil, nil)
+ _, err := b.Embed(ctx, nil, EmbedRequest{Texts: []string{"test"}}, apiConfig, nil, nil)
return err
}
diff --git a/internal/entity/models/cohere.go b/internal/entity/models/cohere.go
index d493338586..20b5d30126 100644
--- a/internal/entity/models/cohere.go
+++ b/internal/entity/models/cohere.go
@@ -357,12 +357,12 @@ func (c *CoHereModel) ChatStreamlyWithSender(ctx context.Context, modelName stri
return sender(&endOfStream, nil)
}
-func (c *CoHereModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (c *CoHereModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := c.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -376,7 +376,7 @@ func (c *CoHereModel) Embed(ctx context.Context, modelName *string, texts []stri
reqBody := map[string]interface{}{
"model": *modelName,
- "texts": texts,
+ "texts": request.Texts,
"input_type": "search_document",
"embedding_types": []string{"float"},
}
@@ -449,11 +449,12 @@ func (c *CoHereModel) Embed(ctx context.Context, modelName *string, texts []stri
return embeddings, nil
}
-func (c *CoHereModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (c *CoHereModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := c.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/cometapi.go b/internal/entity/models/cometapi.go
index 952a661919..4760447dd5 100644
--- a/internal/entity/models/cometapi.go
+++ b/internal/entity/models/cometapi.go
@@ -193,12 +193,12 @@ type cometapiEmbeddingResponse struct {
}
// Embed turns a list of texts into embedding vectors
-func (c *CometAPIModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (c *CometAPIModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := c.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -213,7 +213,7 @@ func (c *CometAPIModel) Embed(ctx context.Context, modelName *string, texts []st
reqBody := map[string]any{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -229,11 +229,11 @@ func (c *CometAPIModel) Embed(ctx context.Context, modelName *string, texts []st
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("cometapi: response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("cometapi: response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("cometapi: duplicate embedding index %d in response", item.Index)
@@ -344,7 +344,7 @@ func (c *CometAPIModel) CheckConnection(ctx context.Context, apiConfig *APIConfi
}
// Rerank calculates similarity scores between query and documents.
-func (c *CometAPIModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (c *CometAPIModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method")
}
diff --git a/internal/entity/models/cometapi_test.go b/internal/entity/models/cometapi_test.go
index a682e1b750..f7866b8540 100644
--- a/internal/entity/models/cometapi_test.go
+++ b/internal/entity/models/cometapi_test.go
@@ -324,7 +324,7 @@ func TestCometAPIBaseURLNormalizesSlashes(t *testing.T) {
path: "/v1/embeddings",
run: func(m *CometAPIModel, apiConfig *APIConfig) error {
model := "text-embedding-3-small"
- _, err := m.Embed(ctx, &model, []string{"x"}, apiConfig, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, apiConfig, nil, nil)
return err
},
},
@@ -593,7 +593,7 @@ func TestCometAPIRerankReturnsNoSuchMethod(t *testing.T) {
ctx := t.Context()
m := newCometAPIForTest("http://unused")
q := "gpt-5"
- _, err := m.Rerank(ctx, &q, "what is rag?", []string{"a", "b"}, &APIConfig{}, &RerankConfig{TopN: 2}, nil)
+ _, err := m.Rerank(ctx, &q, RerankRequest{Query: "what is rag?", Documents: []string{"a", "b"}}, &APIConfig{}, &RerankConfig{TopN: 2}, nil)
if err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: expected 'no such method', got %v", err)
}
@@ -626,7 +626,7 @@ func TestCometAPIEmbedHappyPath(t *testing.T) {
m := newCometAPIForTest(srv.URL)
apiKey := "test-key"
model := "text-embedding-3-small"
- vecs, err := m.Embed(ctx, &model, []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, &EmbeddingConfig{Dimension: 256}, nil)
+ vecs, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, &EmbeddingConfig{Dimension: 256}, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -657,7 +657,7 @@ func TestCometAPIEmbedReordersByIndex(t *testing.T) {
m := newCometAPIForTest(srv.URL)
apiKey := "test-key"
model := "text-embedding-3-small"
- vecs, err := m.Embed(ctx, &model, []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -682,7 +682,7 @@ func TestCometAPIEmbedEmptyInputShortCircuits(t *testing.T) {
m := newCometAPIForTest(srv.URL)
apiKey := "test-key"
model := "text-embedding-3-small"
- vecs, err := m.Embed(ctx, &model, []string{}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed([]): %v", err)
}
@@ -696,7 +696,7 @@ func TestCometAPIEmbedRequiresAPIKey(t *testing.T) {
ctx := t.Context()
m := newCometAPIForTest("http://unused")
model := "text-embedding-3-small"
- _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("expected api-key error, got %v", err)
}
@@ -707,12 +707,12 @@ func TestCometAPIEmbedRequiresModelName(t *testing.T) {
ctx := t.Context()
m := newCometAPIForTest("http://unused")
apiKey := "test-key"
- _, err := m.Embed(ctx, nil, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, nil, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("expected model-name error, got %v", err)
}
empty := ""
- _, err = m.Embed(ctx, &empty, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err = m.Embed(ctx, &empty, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("empty model: expected model-name error, got %v", err)
}
@@ -736,7 +736,7 @@ func TestCometAPIEmbedRejectsDuplicateIndex(t *testing.T) {
m := newCometAPIForTest(srv.URL)
apiKey := "test-key"
model := "text-embedding-3-small"
- _, err := m.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate embedding index 0") {
t.Errorf("expected duplicate-index error, got %v", err)
}
@@ -757,7 +757,7 @@ func TestCometAPIEmbedRejectsOutOfRangeIndex(t *testing.T) {
m := newCometAPIForTest(srv.URL)
apiKey := "test-key"
model := "text-embedding-3-small"
- _, err := m.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("expected out-of-range error, got %v", err)
}
@@ -779,7 +779,7 @@ func TestCometAPIEmbedRejectsMissingSlot(t *testing.T) {
m := newCometAPIForTest(srv.URL)
apiKey := "test-key"
model := "text-embedding-3-small"
- _, err := m.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "missing embedding for input index 1") {
t.Errorf("expected missing-embedding error for slot 1, got %v", err)
}
@@ -797,7 +797,7 @@ func TestCometAPIEmbedRejectsHTTPError(t *testing.T) {
m := newCometAPIForTest(srv.URL)
apiKey := "test-key"
model := "text-embedding-3-small"
- _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "status 401") {
t.Errorf("expected embeddings API error for HTTP 401, got %v", err)
}
diff --git a/internal/entity/models/deepinfra.go b/internal/entity/models/deepinfra.go
index cbaee44386..fa1c568912 100644
--- a/internal/entity/models/deepinfra.go
+++ b/internal/entity/models/deepinfra.go
@@ -135,12 +135,12 @@ func (d *DeepInfraModel) ChatStreamlyWithSender(ctx context.Context, modelName s
})
}
-func (d *DeepInfraModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (d *DeepInfraModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := d.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, fmt.Errorf("texts is empty")
}
@@ -152,7 +152,7 @@ func (d *DeepInfraModel) Embed(ctx context.Context, modelName *string, texts []s
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension >= 32 {
@@ -218,11 +218,12 @@ type deepinfraRerankResponse struct {
}
// Rerank scores documents against a query using DeepInfra's inference endpoint.
-func (d *DeepInfraModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (d *DeepInfraModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := d.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/deepinfra_test.go b/internal/entity/models/deepinfra_test.go
index 177a798a1f..6341c6665b 100644
--- a/internal/entity/models/deepinfra_test.go
+++ b/internal/entity/models/deepinfra_test.go
@@ -63,8 +63,10 @@ func TestDeepInfraRerankHappyPath(t *testing.T) {
resp, err := newDeepInfraForTest(srv.URL).Rerank(
ctx,
&model,
- "capital of France?",
- []string{"Paris is the capital.", "Berlin is the capital."},
+ RerankRequest{
+ Query: "capital of France?",
+ Documents: []string{"Paris is the capital.", "Berlin is the capital."},
+ },
&APIConfig{ApiKey: &apiKey},
&RerankConfig{TopN: 1},
nil,
@@ -94,8 +96,10 @@ func TestDeepInfraRerankNoTopNLimit(t *testing.T) {
resp, err := newDeepInfraForTest(srv.URL).Rerank(
ctx,
&model,
- "capital of France?",
- []string{"Paris is the capital.", "Berlin is the capital."},
+ RerankRequest{
+ Query: "capital of France?",
+ Documents: []string{"Paris is the capital.", "Berlin is the capital."},
+ },
&APIConfig{ApiKey: &apiKey},
nil,
nil,
@@ -116,7 +120,11 @@ func TestDeepInfraRerankEmptyDocuments(t *testing.T) {
ctx := t.Context()
apiKey := "test-key"
model := "Qwen/Qwen3-Reranker-4B"
- resp, err := newDeepInfraForTest("http://unused").Rerank(ctx, &model, "q", nil, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ request := RerankRequest{
+ Query: "q",
+ Documents: nil,
+ }
+ resp, err := newDeepInfraForTest("http://unused").Rerank(ctx, &model, request, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
@@ -130,7 +138,11 @@ func TestDeepInfraRerankRequiresAPIKey(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
model := "Qwen/Qwen3-Reranker-4B"
- _, err := newDeepInfraForTest("http://unused").Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{}, nil, nil)
+ request := RerankRequest{
+ Query: "q",
+ Documents: []string{"a"},
+ }
+ _, err := newDeepInfraForTest("http://unused").Rerank(ctx, &model, request, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("expected api-key error, got %v", err)
}
@@ -147,8 +159,12 @@ func TestDeepInfraRerankRejectsScoreCountMismatch(t *testing.T) {
apiKey := "test-key"
model := "cross-encoder/ms-marco-MiniLM-L-12-v2"
+ request := RerankRequest{
+ Query: "q",
+ Documents: []string{"a", "b"},
+ }
_, err := newDeepInfraForTest(srv.URL).Rerank(
- ctx, &model, "q", []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ ctx, &model, request, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "expected 2 scores") {
t.Errorf("expected score-count error, got %v", err)
}
diff --git a/internal/entity/models/deepseek.go b/internal/entity/models/deepseek.go
index f34f277845..d90c888123 100644
--- a/internal/entity/models/deepseek.go
+++ b/internal/entity/models/deepseek.go
@@ -202,7 +202,7 @@ func (d *DeepSeekModel) ChatStreamlyWithSender(ctx context.Context, modelName st
}
// Embed embeds a list of texts into embeddings
-func (d *DeepSeekModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (d *DeepSeekModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", d.Name())
}
@@ -346,7 +346,7 @@ func (d *DeepSeekModel) CheckConnection(ctx context.Context, apiConfig *APIConfi
}
// Rerank calculates similarity scores between query and documents
-func (d *DeepSeekModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (d *DeepSeekModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, Rerank not implemented", d.Name())
}
diff --git a/internal/entity/models/dummy.go b/internal/entity/models/dummy.go
index 4cc08b57ea..ef88bf4018 100644
--- a/internal/entity/models/dummy.go
+++ b/internal/entity/models/dummy.go
@@ -50,30 +50,22 @@ func (d *DummyModel) ChatWithMessages(ctx context.Context, modelName string, mes
return nil, fmt.Errorf("not implemented")
}
-// ChatStreamlyWithSender sends messages and streams response via sender function (best performance, no channel)
+// ChatStreamlyWithSender sends messages and streams response via sender function (the best performance, no channel)
func (d *DummyModel) ChatStreamlyWithSender(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, modelConfig *ChatConfig, modelUsage *common.ModelUsage, sender func(*string, *string) error) error {
return fmt.Errorf("not implemented")
}
-// Embed embeds a list of texts into embeddings
-func (d *DummyModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
- return nil, fmt.Errorf("not implemented")
+type EmbedInput struct {
+ Texts []string
}
-func (d *DummyModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]ListModelResponse, error) {
+// Embed embeds a list of texts into embeddings
+func (d *DummyModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("not implemented")
}
-func (d *DummyModel) Balance(ctx context.Context, apiConfig *APIConfig) (map[string]interface{}, error) {
- return nil, fmt.Errorf("no such method")
-}
-
-func (d *DummyModel) CheckConnection(ctx context.Context, apiConfig *APIConfig) error {
- return fmt.Errorf("no such method")
-}
-
// Rerank calculates similarity scores between query and documents
-func (d *DummyModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (d *DummyModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, Rerank not implemented", d.Name())
}
@@ -105,6 +97,18 @@ func (d *DummyModel) ParseFile(ctx context.Context, modelName *string, content [
return nil, fmt.Errorf("%s, no such method", d.Name())
}
+func (d *DummyModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]ListModelResponse, error) {
+ return nil, fmt.Errorf("not implemented")
+}
+
+func (d *DummyModel) Balance(ctx context.Context, apiConfig *APIConfig) (map[string]interface{}, error) {
+ return nil, fmt.Errorf("no such method")
+}
+
+func (d *DummyModel) CheckConnection(ctx context.Context, apiConfig *APIConfig) error {
+ return fmt.Errorf("no such method")
+}
+
func (d *DummyModel) ListTasks(ctx context.Context, apiConfig *APIConfig) ([]ListTaskStatus, error) {
return nil, fmt.Errorf("%s, no such method", d.Name())
}
diff --git a/internal/entity/models/fishaudio.go b/internal/entity/models/fishaudio.go
index a80d08e635..c642520a1f 100644
--- a/internal/entity/models/fishaudio.go
+++ b/internal/entity/models/fishaudio.go
@@ -62,11 +62,11 @@ func (f *FishAudioModel) ChatStreamlyWithSender(ctx context.Context, modelName s
return fmt.Errorf("%s, no such method", f.Name())
}
-func (f *FishAudioModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (f *FishAudioModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("no such method")
}
-func (f *FishAudioModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (f *FishAudioModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method")
}
diff --git a/internal/entity/models/funasr.go b/internal/entity/models/funasr.go
index c4b7cbfc86..15989bd694 100644
--- a/internal/entity/models/funasr.go
+++ b/internal/entity/models/funasr.go
@@ -62,11 +62,11 @@ func (f *FunASR) ChatStreamlyWithSender(ctx context.Context, modelName string, m
return fmt.Errorf("%s no such method", f.Name())
}
-func (f *FunASR) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (f *FunASR) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s no such method", f.Name())
}
-func (f *FunASR) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (f *FunASR) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s no such method", f.Name())
}
diff --git a/internal/entity/models/futurmix.go b/internal/entity/models/futurmix.go
index 5e22ad738b..9a9dfde737 100644
--- a/internal/entity/models/futurmix.go
+++ b/internal/entity/models/futurmix.go
@@ -132,12 +132,12 @@ func (f *FuturMixModel) ChatStreamlyWithSender(ctx context.Context, modelName st
}
// Embed is not exposed by the FuturMix API per the public docs.
-func (f *FuturMixModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (f *FuturMixModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", f.Name())
}
// Rerank is not exposed by the FuturMix API per the public docs.
-func (f *FuturMixModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (f *FuturMixModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", f.Name())
}
diff --git a/internal/entity/models/gitee.go b/internal/entity/models/gitee.go
index ea873075cd..c1a9f14faf 100644
--- a/internal/entity/models/gitee.go
+++ b/internal/entity/models/gitee.go
@@ -152,12 +152,12 @@ type GiteeEmbeddingResponse struct {
}
// Embed embeds a list of texts into embeddings
-func (g *GiteeModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (g *GiteeModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := g.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -175,7 +175,7 @@ func (g *GiteeModel) Embed(ctx context.Context, modelName *string, texts []strin
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -260,11 +260,12 @@ type GiteeRerankResponse struct {
}
// Rerank calculates similarity scores between query and documents
-func (g *GiteeModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (g *GiteeModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := g.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/google.go b/internal/entity/models/google.go
index 958addcebc..f4b68c6912 100644
--- a/internal/entity/models/google.go
+++ b/internal/entity/models/google.go
@@ -610,14 +610,14 @@ func (g *GoogleModel) ChatStreamlyWithSender(ctx context.Context, modelName stri
// Embed generates embeddings for a batch of texts using the Gemini embeddings API.
// The SDK routes to batchEmbedContents internally, so all texts are sent in one request.
-func (g *GoogleModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (g *GoogleModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := g.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || *modelName == "" {
return nil, fmt.Errorf("model name is required")
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return nil, fmt.Errorf("texts is empty")
}
@@ -629,8 +629,8 @@ func (g *GoogleModel) Embed(ctx context.Context, modelName *string, texts []stri
return nil, fmt.Errorf("failed to create client: %w", err)
}
- contents := make([]*genai.Content, len(texts))
- for i, text := range texts {
+ contents := make([]*genai.Content, len(request.Texts))
+ for i, text := range request.Texts {
contents[i] = genai.NewContentFromText(text, genai.RoleUser)
}
@@ -645,8 +645,8 @@ func (g *GoogleModel) Embed(ctx context.Context, modelName *string, texts []stri
return nil, fmt.Errorf("failed to embed content: %w", err)
}
- if len(resp.Embeddings) != len(texts) {
- return nil, fmt.Errorf("expected %d embeddings, got %d", len(texts), len(resp.Embeddings))
+ if len(resp.Embeddings) != len(request.Texts) {
+ return nil, fmt.Errorf("expected %d embeddings, got %d", len(request.Texts), len(resp.Embeddings))
}
result := make([]EmbeddingData, len(resp.Embeddings))
@@ -682,7 +682,7 @@ func (g *GoogleModel) CheckConnection(ctx context.Context, apiConfig *APIConfig)
}
// Rerank calculates similarity scores between query and documents
-func (g *GoogleModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (g *GoogleModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, Rerank not implemented", g.Name())
}
diff --git a/internal/entity/models/gpustack.go b/internal/entity/models/gpustack.go
index bb740b6b19..5043f7bce6 100644
--- a/internal/entity/models/gpustack.go
+++ b/internal/entity/models/gpustack.go
@@ -186,7 +186,7 @@ type gpustackEmbeddingResponse struct {
func (g *GPUStackModel) Embed(
ctx context.Context,
modelName *string,
- texts []string,
+ request EmbedRequest,
apiConfig *APIConfig,
embeddingConfig *EmbeddingConfig,
modelUsage *common.ModelUsage,
@@ -195,7 +195,7 @@ func (g *GPUStackModel) Embed(
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || strings.TrimSpace(*modelName) == "" {
@@ -214,7 +214,7 @@ func (g *GPUStackModel) Embed(
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -256,15 +256,15 @@ func (g *GPUStackModel) Embed(
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
if item.Index == nil {
return nil, fmt.Errorf("gpustack: missing embedding index in response item")
}
idx := *item.Index
- if idx < 0 || idx >= len(texts) {
- return nil, fmt.Errorf("gpustack: embedding response index %d out of range for %d inputs", idx, len(texts))
+ if idx < 0 || idx >= len(request.Texts) {
+ return nil, fmt.Errorf("gpustack: embedding response index %d out of range for %d inputs", idx, len(request.Texts))
}
if filled[idx] {
return nil, fmt.Errorf("gpustack: duplicate embedding index %d in response", idx)
@@ -286,7 +286,7 @@ func (g *GPUStackModel) Embed(
return embeddings, nil
}
-func (g *GPUStackModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (g *GPUStackModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", g.Name())
}
diff --git a/internal/entity/models/gpustack_test.go b/internal/entity/models/gpustack_test.go
index 84c2ad13fd..82b0bacd89 100644
--- a/internal/entity/models/gpustack_test.go
+++ b/internal/entity/models/gpustack_test.go
@@ -530,8 +530,7 @@ func TestGPUStackEmbedHappyPath(t *testing.T) {
apiKey := "test-key"
model := "bge-m3"
ctx := t.Context()
- vecs, err := newGPUStackForTest(srv.URL).Embed(
- ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, &EmbeddingConfig{Dimension: 512}, nil)
+ vecs, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, &EmbeddingConfig{Dimension: 512}, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -560,8 +559,7 @@ func TestGPUStackEmbedReordersByIndex(t *testing.T) {
apiKey := "test-key"
model := "bge-m3"
ctx := t.Context()
- vecs, err := newGPUStackForTest(srv.URL).Embed(
- ctx, &model, []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -585,7 +583,7 @@ func TestGPUStackEmbedEmptyInputShortCircuits(t *testing.T) {
model := "bge-m3"
ctx := t.Context()
vecs, err := newGPUStackForTest(srv.URL).Embed(
- ctx, &model, []string{}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ ctx, &model, EmbedRequest{Texts: []string{}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed([]): %v", err)
}
@@ -599,7 +597,7 @@ func TestGPUStackEmbedAllowsEmptyAPIKey(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
model := "bge-m3"
- _, err := newGPUStackForTest("http://unused").Embed(ctx, &model, []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := newGPUStackForTest("http://unused").Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || strings.Contains(err.Error(), "api key is required") {
t.Errorf("self-hosted model should not require api key, got %v", err)
}
@@ -621,7 +619,7 @@ func TestGPUStackEmbedRejectsDuplicateIndex(t *testing.T) {
apiKey := "test-key"
model := "bge-m3"
ctx := t.Context()
- _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate") {
t.Errorf("expected duplicate-index error, got %v", err)
}
@@ -642,7 +640,7 @@ func TestGPUStackEmbedRejectsOutOfRangeIndex(t *testing.T) {
apiKey := "test-key"
model := "bge-m3"
ctx := t.Context()
- _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("expected out-of-range error, got %v", err)
}
@@ -663,7 +661,7 @@ func TestGPUStackEmbedRejectsMissingIndex(t *testing.T) {
apiKey := "test-key"
model := "bge-m3"
ctx := t.Context()
- _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "missing embedding index") {
t.Errorf("expected missing-index error, got %v", err)
}
@@ -684,7 +682,7 @@ func TestGPUStackEmbedRejectsEmptyVector(t *testing.T) {
apiKey := "test-key"
model := "bge-m3"
ctx := t.Context()
- _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "empty embedding vector") {
t.Errorf("expected empty-vector error, got %v", err)
}
@@ -705,7 +703,7 @@ func TestGPUStackEmbedRejectsMissingSlot(t *testing.T) {
apiKey := "test-key"
model := "bge-m3"
ctx := t.Context()
- _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newGPUStackForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "missing embedding for input index") {
t.Errorf("expected missing-slot error, got %v", err)
}
@@ -716,7 +714,7 @@ func TestGPUStackUnsupportedMethods(t *testing.T) {
ctx := t.Context()
m := newGPUStackForTest("http://unused")
model := "x"
- if _, err := m.Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{}, &RerankConfig{TopN: 1}, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, &RerankConfig{TopN: 1}, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: %v", err)
}
if _, err := m.Balance(ctx, &APIConfig{}); err == nil || !strings.Contains(err.Error(), "no such method") {
diff --git a/internal/entity/models/groq.go b/internal/entity/models/groq.go
index e6451ce8d2..e8294b21b8 100644
--- a/internal/entity/models/groq.go
+++ b/internal/entity/models/groq.go
@@ -221,11 +221,11 @@ func (g *GroqModel) CheckConnection(ctx context.Context, apiConfig *APIConfig) e
return err
}
-func (g *GroqModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (g *GroqModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", g.Name())
}
-func (g *GroqModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (g *GroqModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", g.Name())
}
diff --git a/internal/entity/models/groq_test.go b/internal/entity/models/groq_test.go
index f1511b67dd..54d7f17e14 100644
--- a/internal/entity/models/groq_test.go
+++ b/internal/entity/models/groq_test.go
@@ -440,10 +440,10 @@ func TestGroqUnsupportedMethods(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
m := newGroqForTest("http://unused")
- if _, err := m.Embed(ctx, nil, nil, nil, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Embed(ctx, nil, EmbedRequest{}, nil, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Embed error=%v", err)
}
- if _, err := m.Rerank(ctx, nil, "", nil, nil, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Rerank(ctx, nil, RerankRequest{}, nil, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank error=%v", err)
}
if _, err := m.Balance(ctx, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
diff --git a/internal/entity/models/huaweicloud.go b/internal/entity/models/huaweicloud.go
index 350dc673df..5bc45e6838 100644
--- a/internal/entity/models/huaweicloud.go
+++ b/internal/entity/models/huaweicloud.go
@@ -261,14 +261,14 @@ type huaweiCloudRerankResponse struct {
} `json:"usage"`
}
-func (h *HuaweiCloudModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (h *HuaweiCloudModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := h.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || *modelName == "" {
return nil, fmt.Errorf("model name is required")
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -285,7 +285,7 @@ func (h *HuaweiCloudModel) Embed(ctx context.Context, modelName *string, texts [
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
"encoding_format": "float",
}
@@ -322,18 +322,18 @@ func (h *HuaweiCloudModel) Embed(ctx context.Context, modelName *string, texts [
if err = json.Unmarshal(body, &parsed); err != nil {
return nil, fmt.Errorf("failed to decode response: %w", err)
}
- if len(parsed.Data) != len(texts) {
- return nil, fmt.Errorf("expected %d embeddings, got %d", len(texts), len(parsed.Data))
+ if len(parsed.Data) != len(request.Texts) {
+ return nil, fmt.Errorf("expected %d embeddings, got %d", len(request.Texts), len(parsed.Data))
}
- embeddings := make([]EmbeddingData, len(texts))
- seen := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ seen := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
if item.Index == nil {
return nil, fmt.Errorf("missing index field in embedding item")
}
idx := *item.Index
- if idx < 0 || idx >= len(texts) {
+ if idx < 0 || idx >= len(request.Texts) {
return nil, fmt.Errorf("embedding index %d out of range", idx)
}
if seen[idx] {
@@ -362,13 +362,17 @@ func (h *HuaweiCloudModel) Embed(ctx context.Context, modelName *string, texts [
return embeddings, nil
}
-func (h *HuaweiCloudModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (h *HuaweiCloudModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := h.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || *modelName == "" {
return nil, fmt.Errorf("model name is required")
}
+
+ documents := request.Documents
+ query := request.Query
+
if query == "" {
return nil, fmt.Errorf("query is required")
}
diff --git a/internal/entity/models/huggingface.go b/internal/entity/models/huggingface.go
index 974fb2b903..62efdab69f 100644
--- a/internal/entity/models/huggingface.go
+++ b/internal/entity/models/huggingface.go
@@ -122,12 +122,12 @@ func (h *HuggingFaceModel) ChatStreamlyWithSender(ctx context.Context, modelName
})
}
-func (h *HuggingFaceModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (h *HuggingFaceModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := h.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -136,7 +136,7 @@ func (h *HuggingFaceModel) Embed(ctx context.Context, modelName *string, texts [
}
reqBody := map[string]interface{}{
- "inputs": texts,
+ "inputs": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -192,7 +192,7 @@ func (h *HuggingFaceModel) Embed(ctx context.Context, modelName *string, texts [
return embeddings, nil
}
-func (h *HuggingFaceModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (h *HuggingFaceModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method")
}
diff --git a/internal/entity/models/hunyuan.go b/internal/entity/models/hunyuan.go
index 085ac55568..0ac018b997 100644
--- a/internal/entity/models/hunyuan.go
+++ b/internal/entity/models/hunyuan.go
@@ -178,12 +178,12 @@ func (h *HunyuanModel) CheckConnection(ctx context.Context, apiConfig *APIConfig
return err
}
-func (h *HunyuanModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (h *HunyuanModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := h.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || *modelName == "" {
@@ -199,7 +199,7 @@ func (h *HunyuanModel) Embed(ctx context.Context, modelName *string, texts []str
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -259,7 +259,7 @@ func (h *HunyuanModel) Embed(ctx context.Context, modelName *string, texts []str
return embeddings, nil
}
-func (h *HunyuanModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (h *HunyuanModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", h.Name())
}
diff --git a/internal/entity/models/hunyuan_test.go b/internal/entity/models/hunyuan_test.go
index 3fa6e7084b..99b7697522 100644
--- a/internal/entity/models/hunyuan_test.go
+++ b/internal/entity/models/hunyuan_test.go
@@ -529,7 +529,7 @@ func TestHunyuanEmbedHappyPath(t *testing.T) {
apiKey := "test-key"
model := "hunyuan-embedding"
- embeddings, err := newHunyuanForTest(srv.URL).Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ embeddings, err := newHunyuanForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -544,24 +544,24 @@ func TestHunyuanEmbedValidatesInputs(t *testing.T) {
apiKey := "test-key"
model := "hunyuan-embedding"
- if embeddings, err := newHunyuanForTest("http://unused").Embed(ctx, nil, nil, &APIConfig{ApiKey: &apiKey}, nil, nil); err != nil || len(embeddings) != 0 {
+ if embeddings, err := newHunyuanForTest("http://unused").Embed(ctx, nil, EmbedRequest{}, &APIConfig{ApiKey: &apiKey}, nil, nil); err != nil || len(embeddings) != 0 {
t.Errorf("empty input: embeddings=%+v err=%v", embeddings, err)
}
- if _, err := newHunyuanForTest("http://unused").Embed(ctx, nil, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
+ if _, err := newHunyuanForTest("http://unused").Embed(ctx, nil, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("nil model: %v", err)
}
emptyModel := ""
- if _, err := newHunyuanForTest("http://unused").Embed(ctx, &emptyModel, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
+ if _, err := newHunyuanForTest("http://unused").Embed(ctx, &emptyModel, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("empty model: %v", err)
}
- if _, err := newHunyuanForTest("http://unused").Embed(ctx, &model, []string{"x"}, nil, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
+ if _, err := newHunyuanForTest("http://unused").Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, nil, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("nil api config: %v", err)
}
- if _, err := newHunyuanForTest("http://unused").Embed(ctx, &model, []string{"x"}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
+ if _, err := newHunyuanForTest("http://unused").Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("missing api key: %v", err)
}
emptyKey := ""
- if _, err := newHunyuanForTest("http://unused").Embed(ctx, &model, []string{"x"}, &APIConfig{ApiKey: &emptyKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
+ if _, err := newHunyuanForTest("http://unused").Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &emptyKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("empty api key: %v", err)
}
}
diff --git a/internal/entity/models/jiekouai.go b/internal/entity/models/jiekouai.go
index 8e6b035a67..436c365d78 100644
--- a/internal/entity/models/jiekouai.go
+++ b/internal/entity/models/jiekouai.go
@@ -171,12 +171,12 @@ func (j *JieKouAIModel) ChatStreamlyWithSender(ctx context.Context, modelName st
})
}
-func (j *JieKouAIModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (j *JieKouAIModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := j.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, fmt.Errorf("texts is empty")
}
model, err := validateJieKouAIModelName(modelName)
@@ -193,7 +193,7 @@ func (j *JieKouAIModel) Embed(ctx context.Context, modelName *string, texts []st
reqBody := map[string]interface{}{
"model": model,
- "input": texts,
+ "input": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -253,11 +253,12 @@ func (j *JieKouAIModel) Embed(ctx context.Context, modelName *string, texts []st
return embeddings, nil
}
-func (j *JieKouAIModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (j *JieKouAIModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := j.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/jiekouai_test.go b/internal/entity/models/jiekouai_test.go
index dca3a2a16d..2b69f9d027 100644
--- a/internal/entity/models/jiekouai_test.go
+++ b/internal/entity/models/jiekouai_test.go
@@ -267,7 +267,7 @@ func TestJieKouAIEmbedSendsValidatedRequest(t *testing.T) {
apiKey := "test-key"
model := " text-embedding-3-large "
- embeddings, err := newJieKouAIForTest(srv.URL).Embed(ctx, &model, []string{"hello"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ embeddings, err := newJieKouAIForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"hello"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -303,7 +303,7 @@ func TestJieKouAIRerankHandlesNilConfig(t *testing.T) {
apiKey := "test-key"
model := " baai/bge-reranker-v2-m3 "
- resp, err := newJieKouAIForTest(srv.URL).Rerank(ctx, &model, " question ", []string{"doc"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ resp, err := newJieKouAIForTest(srv.URL).Rerank(ctx, &model, RerankRequest{Query: " question ", Documents: []string{"doc"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
@@ -358,7 +358,7 @@ func TestJieKouAIValidatesInputs(t *testing.T) {
{
name: "embed model",
run: func() error {
- _, err := newJieKouAIForTest("http://unused").Embed(ctx, nil, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newJieKouAIForTest("http://unused").Embed(ctx, nil, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
return err
},
want: "model name is required",
@@ -366,7 +366,7 @@ func TestJieKouAIValidatesInputs(t *testing.T) {
{
name: "embed api key",
run: func() error {
- _, err := newJieKouAIForTest("http://unused").Embed(ctx, &model, []string{"x"}, nil, nil, nil)
+ _, err := newJieKouAIForTest("http://unused").Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, nil, nil, nil)
return err
},
want: "api key is required",
@@ -374,7 +374,7 @@ func TestJieKouAIValidatesInputs(t *testing.T) {
{
name: "rerank model",
run: func() error {
- _, err := newJieKouAIForTest("http://unused").Rerank(ctx, nil, "q", []string{"doc"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newJieKouAIForTest("http://unused").Rerank(ctx, nil, RerankRequest{Query: "q", Documents: []string{"doc"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
return err
},
want: "model name is required",
@@ -382,7 +382,7 @@ func TestJieKouAIValidatesInputs(t *testing.T) {
{
name: "rerank api key",
run: func() error {
- _, err := newJieKouAIForTest("http://unused").Rerank(ctx, &model, "q", []string{"doc"}, &APIConfig{ApiKey: &emptyKey}, nil, nil)
+ _, err := newJieKouAIForTest("http://unused").Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"doc"}}, &APIConfig{ApiKey: &emptyKey}, nil, nil)
return err
},
want: "api key is required",
@@ -390,7 +390,7 @@ func TestJieKouAIValidatesInputs(t *testing.T) {
{
name: "rerank query",
run: func() error {
- _, err := newJieKouAIForTest("http://unused").Rerank(ctx, &model, " ", []string{"doc"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newJieKouAIForTest("http://unused").Rerank(ctx, &model, RerankRequest{Query: " ", Documents: []string{"doc"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
return err
},
want: "query is required",
diff --git a/internal/entity/models/jina.go b/internal/entity/models/jina.go
index 10c62d5476..9558c969a0 100644
--- a/internal/entity/models/jina.go
+++ b/internal/entity/models/jina.go
@@ -161,12 +161,12 @@ func (j *JinaModel) ChatStreamlyWithSender(ctx context.Context, modelName string
})
}
-func (j *JinaModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (j *JinaModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := j.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || strings.TrimSpace(*modelName) == "" {
@@ -181,7 +181,7 @@ func (j *JinaModel) Embed(ctx context.Context, modelName *string, texts []string
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -262,11 +262,12 @@ func (j *JinaModel) Embed(ctx context.Context, modelName *string, texts []string
return embeddings, nil
}
-func (j *JinaModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (j *JinaModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := j.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/jina_test.go b/internal/entity/models/jina_test.go
index 27d4448e9f..317b6b5dc2 100644
--- a/internal/entity/models/jina_test.go
+++ b/internal/entity/models/jina_test.go
@@ -241,7 +241,7 @@ func TestJinaEmbedMeanPoolsMultivectorResponse(t *testing.T) {
embeddings, err := newJinaForTest(srv.URL).Embed(
t.Context(),
&modelName,
- []string{"text"},
+ EmbedRequest{Texts: []string{"text"}},
&APIConfig{ApiKey: &apiKey},
nil,
nil,
@@ -337,8 +337,7 @@ func TestJinaRerankDefaultsTopNToDocumentCount(t *testing.T) {
_, err := newJinaForTest(srv.URL).Rerank(
t.Context(),
&modelName,
- "weather",
- []string{"sunny", "rainy"},
+ RerankRequest{Query: "weather", Documents: []string{"sunny", "rainy"}},
&APIConfig{ApiKey: &apiKey},
&RerankConfig{},
nil,
diff --git a/internal/entity/models/llm_test.go b/internal/entity/models/llm_test.go
index 9eef1cadba..7e350c1226 100644
--- a/internal/entity/models/llm_test.go
+++ b/internal/entity/models/llm_test.go
@@ -264,10 +264,10 @@ func (d *captureToolDriver) ChatStreamlyWithSender(ctx context.Context, _ string
}
return nil
}
-func (d *captureToolDriver) Embed(ctx context.Context, _ *string, _ []string, _ *APIConfig, _ *EmbeddingConfig, _ *common.ModelUsage) ([]EmbeddingData, error) {
+func (d *captureToolDriver) Embed(ctx context.Context, _ *string, _ EmbedRequest, _ *APIConfig, _ *EmbeddingConfig, _ *common.ModelUsage) ([]EmbeddingData, error) {
return nil, nil
}
-func (d *captureToolDriver) Rerank(ctx context.Context, _ *string, _ string, _ []string, _ *APIConfig, _ *RerankConfig, _ *common.ModelUsage) (*RerankResponse, error) {
+func (d *captureToolDriver) Rerank(ctx context.Context, _ *string, _ RerankRequest, _ *APIConfig, _ *RerankConfig, _ *common.ModelUsage) (*RerankResponse, error) {
return nil, nil
}
func (d *captureToolDriver) TranscribeAudio(ctx context.Context, _ *string, _ *string, _ *APIConfig, _ *ASRConfig, _ *common.ModelUsage) (*ASRResponse, error) {
diff --git a/internal/entity/models/lmstudio.go b/internal/entity/models/lmstudio.go
index 8fa3272a4d..967394b005 100644
--- a/internal/entity/models/lmstudio.go
+++ b/internal/entity/models/lmstudio.go
@@ -139,12 +139,12 @@ func (l *LmStudioModel) ChatStreamlyWithSender(ctx context.Context, modelName st
})
}
-func (l *LmStudioModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (l *LmStudioModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := l.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -168,7 +168,7 @@ func (l *LmStudioModel) Embed(ctx context.Context, modelName *string, texts []st
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -223,7 +223,7 @@ func (l *LmStudioModel) Embed(ctx context.Context, modelName *string, texts []st
return embeddings, nil
}
-func (l *LmStudioModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (l *LmStudioModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method")
}
diff --git a/internal/entity/models/localai.go b/internal/entity/models/localai.go
index 442a67d31d..fb6ff32a08 100644
--- a/internal/entity/models/localai.go
+++ b/internal/entity/models/localai.go
@@ -140,11 +140,11 @@ type localAIEmbeddingResponse struct {
Object string `json:"object"`
}
-func (l *LocalAIModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (l *LocalAIModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := l.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -160,7 +160,7 @@ func (l *LocalAIModel) Embed(ctx context.Context, modelName *string, texts []str
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -204,11 +204,11 @@ func (l *LocalAIModel) Embed(ctx context.Context, modelName *string, texts []str
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("localai: response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("localai: response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("localai: duplicate embedding index %d in response", item.Index)
@@ -242,10 +242,12 @@ type localAIRerankResponse struct {
} `json:"results"`
}
-func (l *LocalAIModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (l *LocalAIModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := l.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/localai_test.go b/internal/entity/models/localai_test.go
index 48ea8af3e5..e031ca8284 100644
--- a/internal/entity/models/localai_test.go
+++ b/internal/entity/models/localai_test.go
@@ -132,7 +132,7 @@ func TestLocalAIEmbedHappyPath(t *testing.T) {
l := newLocalAIForTest(srv.URL)
model := "text-embedding-ada-002"
- vecs, err := l.Embed(ctx, &model, []string{"a", "b", "c"}, &APIConfig{}, nil, nil)
+ vecs, err := l.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -159,7 +159,7 @@ func TestLocalAIEmbedRejectsDuplicateIndex(t *testing.T) {
l := newLocalAIForTest(srv.URL)
model := "text-embedding-ada-002"
- _, err := l.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{}, nil, nil)
+ _, err := l.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate embedding index 0") {
t.Errorf("expected duplicate-index error, got %v", err)
}
@@ -175,7 +175,7 @@ func TestLocalAIEmbedRejectsOutOfRangeIndex(t *testing.T) {
l := newLocalAIForTest(srv.URL)
model := "text-embedding-ada-002"
- _, err := l.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{}, nil, nil)
+ _, err := l.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("expected out-of-range error, got %v", err)
}
@@ -191,7 +191,7 @@ func TestLocalAIEmbedRejectsMissingSlot(t *testing.T) {
l := newLocalAIForTest(srv.URL)
model := "text-embedding-ada-002"
- _, err := l.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{}, nil, nil)
+ _, err := l.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "missing embedding for input index 1") {
t.Errorf("expected missing-slot error, got %v", err)
}
@@ -207,7 +207,7 @@ func TestLocalAIEmbedEmptyInputShortCircuits(t *testing.T) {
l := newLocalAIForTest(srv.URL)
model := "text-embedding-ada-002"
- vecs, err := l.Embed(ctx, &model, []string{}, &APIConfig{}, nil, nil)
+ vecs, err := l.Embed(ctx, &model, EmbedRequest{Texts: []string{}}, &APIConfig{}, nil, nil)
if err != nil || len(vecs) != 0 {
t.Errorf("Embed([])=(%v,%v) want ([],nil)", vecs, err)
}
diff --git a/internal/entity/models/longcat.go b/internal/entity/models/longcat.go
index c594eda989..3a48cc7d11 100644
--- a/internal/entity/models/longcat.go
+++ b/internal/entity/models/longcat.go
@@ -211,12 +211,12 @@ func (l *LongCatModel) CheckConnection(ctx context.Context, apiConfig *APIConfig
return err
}
-func (l *LongCatModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (l *LongCatModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", l.Name())
}
// Rerank is not exposed by the LongCat API.
-func (l *LongCatModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (l *LongCatModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", l.Name())
}
diff --git a/internal/entity/models/longcat_test.go b/internal/entity/models/longcat_test.go
index 37bbb7c0b0..435bc5669f 100644
--- a/internal/entity/models/longcat_test.go
+++ b/internal/entity/models/longcat_test.go
@@ -743,7 +743,7 @@ func TestLongCatEmbedReturnsNoSuchMethod(t *testing.T) {
ctx := t.Context()
m := newLongCatForTest("http://unused")
model := "x"
- _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Embed: want 'no such method', got %v", err)
}
@@ -754,7 +754,7 @@ func TestLongCatRerankReturnsNoSuchMethod(t *testing.T) {
ctx := t.Context()
m := newLongCatForTest("http://unused")
model := "x"
- _, err := m.Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{}, &RerankConfig{TopN: 1}, nil)
+ _, err := m.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, &RerankConfig{TopN: 1}, nil)
if err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: want 'no such method', got %v", err)
}
diff --git a/internal/entity/models/mineru.go b/internal/entity/models/mineru.go
index 403a391bd4..2855124491 100644
--- a/internal/entity/models/mineru.go
+++ b/internal/entity/models/mineru.go
@@ -56,11 +56,11 @@ func (m *MinerUModel) ChatStreamlyWithSender(ctx context.Context, modelName stri
return fmt.Errorf("%s no such method", m.Name())
}
-func (m *MinerUModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (m *MinerUModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s no such method", m.Name())
}
-func (m *MinerUModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (m *MinerUModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s no such method", m.Name())
}
diff --git a/internal/entity/models/mineru_local.go b/internal/entity/models/mineru_local.go
index da18d8cb59..8a5fb042cd 100644
--- a/internal/entity/models/mineru_local.go
+++ b/internal/entity/models/mineru_local.go
@@ -58,11 +58,11 @@ func (m *MinerULocalModel) ChatStreamlyWithSender(ctx context.Context, modelName
return fmt.Errorf("%s no such method", m.Name())
}
-func (m *MinerULocalModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (m *MinerULocalModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s no such method", m.Name())
}
-func (m *MinerULocalModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (m *MinerULocalModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s no such method", m.Name())
}
diff --git a/internal/entity/models/minimax.go b/internal/entity/models/minimax.go
index a5fbb04bb6..57057bfc04 100644
--- a/internal/entity/models/minimax.go
+++ b/internal/entity/models/minimax.go
@@ -258,7 +258,7 @@ func (m *MinimaxModel) ChatStreamlyWithSender(ctx context.Context, modelName str
}
// Embed embeds a list of texts into embeddings
-func (m *MinimaxModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (m *MinimaxModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("not implemented")
}
@@ -325,7 +325,7 @@ func (m *MinimaxModel) CheckConnection(ctx context.Context, apiConfig *APIConfig
}
// Rerank calculates similarity scores between query and documents
-func (m *MinimaxModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (m *MinimaxModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, Rerank not implemented", m.Name())
}
diff --git a/internal/entity/models/mistral.go b/internal/entity/models/mistral.go
index 217cce4cad..4cf94553f0 100644
--- a/internal/entity/models/mistral.go
+++ b/internal/entity/models/mistral.go
@@ -211,12 +211,12 @@ type mistralEmbeddingResponse struct {
}
// Embed turns a list of texts into embedding vectors
-func (m *MistralModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (m *MistralModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := m.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -233,7 +233,7 @@ func (m *MistralModel) Embed(ctx context.Context, modelName *string, texts []str
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["output_dimension"] = embeddingConfig.Dimension
@@ -275,11 +275,11 @@ func (m *MistralModel) Embed(ctx context.Context, modelName *string, texts []str
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("mistral: response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("mistral: response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("mistral: duplicate embedding index %d in response", item.Index)
@@ -361,7 +361,7 @@ func (m *MistralModel) CheckConnection(ctx context.Context, apiConfig *APIConfig
}
// Rerank calculates similarity scores between query and documents
-func (m *MistralModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (m *MistralModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", m.Name())
}
diff --git a/internal/entity/models/mistral_test.go b/internal/entity/models/mistral_test.go
index d4be9bf8e9..0e6b470e84 100644
--- a/internal/entity/models/mistral_test.go
+++ b/internal/entity/models/mistral_test.go
@@ -422,7 +422,7 @@ func TestMistralRerankReturnsNoSuchMethod(t *testing.T) {
ctx := t.Context()
m := newMistralForTest("http://unused")
q := "mistral-large-latest"
- _, err := m.Rerank(ctx, &q, "what is rag?", []string{"a", "b"}, &APIConfig{}, &RerankConfig{TopN: 2}, nil)
+ _, err := m.Rerank(ctx, &q, RerankRequest{Query: "what is rag?", Documents: []string{"a", "b"}}, &APIConfig{}, &RerankConfig{TopN: 2}, nil)
if err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: expected 'no such method', got %v", err)
}
@@ -588,7 +588,7 @@ func TestMistralEmbedHappyPath(t *testing.T) {
m := newMistralForTest(srv.URL)
apiKey := "test-key"
model := "mistral-embed"
- vecs, err := m.Embed(ctx, &model, []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -619,7 +619,7 @@ func TestMistralEmbedReordersByIndex(t *testing.T) {
m := newMistralForTest(srv.URL)
apiKey := "test-key"
model := "mistral-embed"
- vecs, err := m.Embed(ctx, &model, []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -644,7 +644,7 @@ func TestMistralEmbedEmptyInputShortCircuits(t *testing.T) {
m := newMistralForTest(srv.URL)
apiKey := "test-key"
model := "mistral-embed"
- vecs, err := m.Embed(ctx, &model, []string{}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed([]): %v", err)
}
@@ -658,7 +658,7 @@ func TestMistralEmbedRequiresAPIKey(t *testing.T) {
ctx := t.Context()
m := newMistralForTest("http://unused")
model := "mistral-embed"
- _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("expected api-key error, got %v", err)
}
@@ -669,12 +669,12 @@ func TestMistralEmbedRequiresModelName(t *testing.T) {
ctx := t.Context()
m := newMistralForTest("http://unused")
apiKey := "test-key"
- _, err := m.Embed(ctx, nil, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, nil, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("expected model-name error, got %v", err)
}
empty := ""
- _, err = m.Embed(ctx, &empty, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err = m.Embed(ctx, &empty, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("empty model: expected model-name error, got %v", err)
}
@@ -698,7 +698,7 @@ func TestMistralEmbedRejectsDuplicateIndex(t *testing.T) {
m := newMistralForTest(srv.URL)
apiKey := "test-key"
model := "mistral-embed"
- _, err := m.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate embedding index 0") {
t.Errorf("expected duplicate-index error, got %v", err)
}
@@ -719,7 +719,7 @@ func TestMistralEmbedRejectsOutOfRangeIndex(t *testing.T) {
m := newMistralForTest(srv.URL)
apiKey := "test-key"
model := "mistral-embed"
- _, err := m.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("expected out-of-range error, got %v", err)
}
@@ -741,7 +741,7 @@ func TestMistralEmbedRejectsMissingSlot(t *testing.T) {
m := newMistralForTest(srv.URL)
apiKey := "test-key"
model := "mistral-embed"
- _, err := m.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "missing embedding for input index 1") {
t.Errorf("expected missing-embedding error for slot 1, got %v", err)
}
@@ -759,7 +759,7 @@ func TestMistralEmbedRejectsHTTPError(t *testing.T) {
m := newMistralForTest(srv.URL)
apiKey := "test-key"
model := "mistral-embed"
- _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "Mistral embeddings API error") {
t.Errorf("expected Mistral embeddings API error, got %v", err)
}
diff --git a/internal/entity/models/modelscope.go b/internal/entity/models/modelscope.go
index 0aceb193dd..1ff6302ab0 100644
--- a/internal/entity/models/modelscope.go
+++ b/internal/entity/models/modelscope.go
@@ -124,11 +124,11 @@ func (m *ModelScopeModel) ChatStreamlyWithSender(ctx context.Context, modelName
})
}
-func (m *ModelScopeModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (m *ModelScopeModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", m.Name())
}
-func (m *ModelScopeModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (m *ModelScopeModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", m.Name())
}
diff --git a/internal/entity/models/modelscope_test.go b/internal/entity/models/modelscope_test.go
index 3a963efb60..7ccdd2a876 100644
--- a/internal/entity/models/modelscope_test.go
+++ b/internal/entity/models/modelscope_test.go
@@ -305,10 +305,10 @@ func TestModelScopeUnsupportedMethodsReturnNoSuchMethod(t *testing.T) {
m := newModelScopeForTest("http://unused")
model := "Qwen/Qwen2.5-7B-Instruct"
- if _, err := m.Embed(ctx, &model, []string{"x"}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Embed: expected no such method, got %v", err)
}
- if _, err := m.Rerank(ctx, &model, "q", []string{"d"}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"d"}}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: expected no such method, got %v", err)
}
if _, err := m.Balance(ctx, &APIConfig{}); err == nil || !strings.Contains(err.Error(), "no such method") {
diff --git a/internal/entity/models/moonshot.go b/internal/entity/models/moonshot.go
index 40ae62e327..dc72cc7157 100644
--- a/internal/entity/models/moonshot.go
+++ b/internal/entity/models/moonshot.go
@@ -165,7 +165,7 @@ func (m *MoonshotModel) ChatStreamlyWithSender(ctx context.Context, modelName st
}
// Embed embeds a list of texts into embeddings
-func (m *MoonshotModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (m *MoonshotModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("not implemented")
}
@@ -289,7 +289,7 @@ func (m *MoonshotModel) CheckConnection(ctx context.Context, apiConfig *APIConfi
}
// Rerank calculates similarity scores between query and documents
-func (m *MoonshotModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (m *MoonshotModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, Rerank not implemented", m.Name())
}
diff --git a/internal/entity/models/mws.go b/internal/entity/models/mws.go
index 75db29b6dc..595a639932 100644
--- a/internal/entity/models/mws.go
+++ b/internal/entity/models/mws.go
@@ -210,12 +210,12 @@ type mwsEmbeddingResponse struct {
Usage TokenUsage `json:"usage"`
}
-func (m *MWSModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, _ *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (m *MWSModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, _ *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
endpoint, err := m.endpoint(apiConfig, "openai/v1/embeddings")
if err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || strings.TrimSpace(*modelName) == "" {
@@ -224,7 +224,7 @@ func (m *MWSModel) Embed(ctx context.Context, modelName *string, texts []string,
body, err := m.baseModel.doRequest(ctx, endpoint, apiConfig, map[string]any{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}, nonStreamCallTimeout)
if err != nil {
return nil, err
@@ -234,15 +234,15 @@ func (m *MWSModel) Embed(ctx context.Context, modelName *string, texts []string,
if err = json.Unmarshal(body, &response); err != nil {
return nil, fmt.Errorf("failed to parse MWS embedding response: %w", err)
}
- if len(response.Data) != len(texts) {
- return nil, fmt.Errorf("MWS embedding response returned %d vectors for %d inputs", len(response.Data), len(texts))
+ if len(response.Data) != len(request.Texts) {
+ return nil, fmt.Errorf("MWS embedding response returned %d vectors for %d inputs", len(response.Data), len(request.Texts))
}
- embeddings := make([]EmbeddingData, len(texts))
- seen := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ seen := make([]bool, len(request.Texts))
for _, item := range response.Data {
- if item.Index < 0 || item.Index >= len(texts) || seen[item.Index] {
- return nil, fmt.Errorf("unexpected MWS embedding index %d for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) || seen[item.Index] {
+ return nil, fmt.Errorf("unexpected MWS embedding index %d for %d inputs", item.Index, len(request.Texts))
}
seen[item.Index] = true
embeddings[item.Index] = EmbeddingData{Index: item.Index, Embedding: item.Embedding}
@@ -264,11 +264,13 @@ type mwsRerankResponse struct {
} `json:"meta"`
}
-func (m *MWSModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, _ *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (m *MWSModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, _ *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
endpoint, err := m.endpoint(apiConfig, "cohere/v2/rerank")
if err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/mws_test.go b/internal/entity/models/mws_test.go
index 2419bacd9c..35d77195e8 100644
--- a/internal/entity/models/mws_test.go
+++ b/internal/entity/models/mws_test.go
@@ -219,7 +219,7 @@ func TestMWSEmbedSendsOnlyDocumentedFieldsAndOrdersVectors(t *testing.T) {
driver, apiConfig := newMWSTestDriver(server.URL)
modelName := "bge-m3"
- embeddings, err := driver.Embed(context.Background(), &modelName, []string{"first", "second"}, apiConfig, &EmbeddingConfig{Dimension: 256}, nil)
+ embeddings, err := driver.Embed(context.Background(), &modelName, EmbedRequest{Texts: []string{"first", "second"}}, apiConfig, &EmbeddingConfig{Dimension: 256}, nil)
if err != nil {
t.Fatalf("embed: %v", err)
}
@@ -250,7 +250,7 @@ func TestMWSRerankUsesCohereEndpointAndOriginalIndexOrder(t *testing.T) {
driver, apiConfig := newMWSTestDriver(server.URL)
modelName := "bge-reranker-v2-m3"
- result, err := driver.Rerank(context.Background(), &modelName, "query", []string{"first", "second"}, apiConfig, &RerankConfig{TopN: 1}, nil)
+ result, err := driver.Rerank(context.Background(), &modelName, RerankRequest{Query: "query", Documents: []string{"first", "second"}}, apiConfig, &RerankConfig{TopN: 1}, nil)
if err != nil {
t.Fatalf("rerank: %v", err)
}
@@ -270,7 +270,7 @@ func TestMWSRejectsEmptyTokenWithoutRequest(t *testing.T) {
empty := " "
apiConfig.ApiKey = &empty
modelName := "bge-m3"
- _, err := driver.Embed(context.Background(), &modelName, []string{"text"}, apiConfig, nil, nil)
+ _, err := driver.Embed(context.Background(), &modelName, EmbedRequest{Texts: []string{"text"}}, apiConfig, nil, nil)
if err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Fatalf("expected an API key error, got %v", err)
}
@@ -288,11 +288,11 @@ func TestMWSEmptyInputsDoNotSendRequests(t *testing.T) {
driver, apiConfig := newMWSTestDriver(server.URL)
modelName := "bge-m3"
- embeddings, err := driver.Embed(context.Background(), &modelName, []string{}, apiConfig, nil, nil)
+ embeddings, err := driver.Embed(context.Background(), &modelName, EmbedRequest{Texts: []string{}}, apiConfig, nil, nil)
if err != nil || len(embeddings) != 0 {
t.Fatalf("empty embedding input: data=%#v err=%v", embeddings, err)
}
- ranked, err := driver.Rerank(context.Background(), &modelName, "query", []string{}, apiConfig, nil, nil)
+ ranked, err := driver.Rerank(context.Background(), &modelName, RerankRequest{Query: "query", Documents: []string{}}, apiConfig, nil, nil)
if err != nil || len(ranked.Data) != 0 {
t.Fatalf("empty rerank input: data=%#v err=%v", ranked, err)
}
@@ -309,7 +309,7 @@ func TestMWSErrorResponseIsReturned(t *testing.T) {
driver, apiConfig := newMWSTestDriver(server.URL)
modelName := "bge-m3"
- _, err := driver.Embed(context.Background(), &modelName, []string{"text"}, apiConfig, nil, nil)
+ _, err := driver.Embed(context.Background(), &modelName, EmbedRequest{Texts: []string{"text"}}, apiConfig, nil, nil)
if err == nil || !strings.Contains(err.Error(), "status 503") || !strings.Contains(err.Error(), "MWS unavailable") {
t.Fatalf("unexpected MWS error: %v", err)
}
diff --git a/internal/entity/models/n1n.go b/internal/entity/models/n1n.go
index 44a4c5cba9..08f0d46e13 100644
--- a/internal/entity/models/n1n.go
+++ b/internal/entity/models/n1n.go
@@ -181,12 +181,12 @@ type n1nEmbeddingRequest struct {
}
// Embed turns a list of texts into embedding vectors
-func (n *N1NModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (n *N1NModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := n.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
apiKey := *apiConfig.ApiKey
@@ -201,7 +201,7 @@ func (n *N1NModel) Embed(ctx context.Context, modelName *string, texts []string,
reqBody := n1nEmbeddingRequest{
Model: *modelName,
- Input: texts,
+ Input: request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody.Dimensions = embeddingConfig.Dimension
@@ -230,15 +230,15 @@ func (n *N1NModel) Embed(ctx context.Context, modelName *string, texts []string,
}
var parsed n1nEmbeddingResponse
- if err := json.Unmarshal(body, &parsed); err != nil {
+ if err = json.Unmarshal(body, &parsed); err != nil {
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("n1n: embedding response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("n1n: embedding response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("n1n: duplicate embedding index %d in response", item.Index)
@@ -275,11 +275,12 @@ type n1nRerankRequest struct {
// Rerank scores a query against a list of documents using
// n1n.ai's /v1/rerank endpoint (Cohere-shaped response).
-func (n *N1NModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (n *N1NModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := n.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/non_chat_usage_test.go b/internal/entity/models/non_chat_usage_test.go
index aa46038238..5cd0976fac 100644
--- a/internal/entity/models/non_chat_usage_test.go
+++ b/internal/entity/models/non_chat_usage_test.go
@@ -148,7 +148,7 @@ func TestProviderEmbeddingAndRerankUsage(t *testing.T) {
model := tc.newModel(server.URL)
embeddingUsage := &common.ModelUsage{}
- embeddings, err := model.Embed(t.Context(), &modelName, []string{"document"}, &APIConfig{ApiKey: &apiKey}, &EmbeddingConfig{}, embeddingUsage)
+ embeddings, err := model.Embed(t.Context(), &modelName, EmbedRequest{Texts: []string{"document"}}, &APIConfig{ApiKey: &apiKey}, &EmbeddingConfig{}, embeddingUsage)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -164,7 +164,7 @@ func TestProviderEmbeddingAndRerankUsage(t *testing.T) {
}
rerankUsage := &common.ModelUsage{}
- reranked, err := model.Rerank(t.Context(), &modelName, "query", []string{"document"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 1}, rerankUsage)
+ reranked, err := model.Rerank(t.Context(), &modelName, RerankRequest{Query: "query", Documents: []string{"document"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 1}, rerankUsage)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
diff --git a/internal/entity/models/novita.go b/internal/entity/models/novita.go
index 6684e05c34..90a2533478 100644
--- a/internal/entity/models/novita.go
+++ b/internal/entity/models/novita.go
@@ -375,12 +375,12 @@ type novitaEmbeddingResponse struct {
// Embed turns a list of texts into embedding vectors using the Novita
// /v3/embeddings endpoint. The output has one vector per input, in the
// same order the inputs were given.
-func (n *NovitaModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (n *NovitaModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := n.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -397,7 +397,7 @@ func (n *NovitaModel) Embed(ctx context.Context, modelName *string, texts []stri
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -439,11 +439,11 @@ func (n *NovitaModel) Embed(ctx context.Context, modelName *string, texts []stri
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("novita: response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("novita: response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("novita: duplicate embedding index %d in response", item.Index)
@@ -489,11 +489,12 @@ type novitaRerankResponse struct {
// /openai/v1/rerank endpoint and returns one RerankResult per scored
// document in the API's ranking order. Caller may sort by Index to
// recover original input order.
-func (n *NovitaModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (n *NovitaModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := n.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/novita_test.go b/internal/entity/models/novita_test.go
index 419e8d9721..bc20adc07a 100644
--- a/internal/entity/models/novita_test.go
+++ b/internal/entity/models/novita_test.go
@@ -646,7 +646,7 @@ func TestNovitaRerankHappyPathReordersByIndex(t *testing.T) {
apiKey := "test-key"
model := "baai/bge-reranker-v2-m3"
- resp, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, "what is rag", []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ resp, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, RerankRequest{Query: "what is rag", Documents: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
@@ -674,7 +674,7 @@ func TestNovitaRerankRespectsTopNConfig(t *testing.T) {
apiKey := "test-key"
model := "baai/bge-reranker-v2-m3"
- if _, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, "q", []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 2}, nil); err != nil {
+ if _, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 2}, nil); err != nil {
t.Fatalf("Rerank: %v", err)
}
}
@@ -684,7 +684,7 @@ func TestNovitaRerankEmptyDocumentsShortCircuits(t *testing.T) {
ctx := t.Context()
apiKey := "test-key"
model := "x"
- resp, err := newNovitaForTest("http://unused").Rerank(ctx, &model, "q", nil, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ resp, err := newNovitaForTest("http://unused").Rerank(ctx, &model, RerankRequest{Query: "q", Documents: nil}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("expected nil error for empty docs, got %v", err)
}
@@ -697,7 +697,7 @@ func TestNovitaRerankRequiresApiKey(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
model := "x"
- _, err := newNovitaForTest("http://unused").Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := newNovitaForTest("http://unused").Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("got %v", err)
}
@@ -707,7 +707,7 @@ func TestNovitaRerankRequiresModelName(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
apiKey := "test-key"
- _, err := newNovitaForTest("http://unused").Rerank(ctx, nil, "q", []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newNovitaForTest("http://unused").Rerank(ctx, nil, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("got %v", err)
}
@@ -723,7 +723,7 @@ func TestNovitaRerankRejectsOutOfRangeIndex(t *testing.T) {
apiKey := "test-key"
model := "x"
- _, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, "q", []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("got %v", err)
}
@@ -739,7 +739,7 @@ func TestNovitaRerankRejectsDuplicateIndex(t *testing.T) {
apiKey := "test-key"
model := "x"
- _, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, "q", []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate") {
t.Errorf("got %v", err)
}
@@ -756,7 +756,7 @@ func TestNovitaRerankSurfacesHTTPError(t *testing.T) {
apiKey := "test-key"
model := "x"
- _, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newNovitaForTest(srv.URL).Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "Novita rerank API error") {
t.Errorf("got %v", err)
}
@@ -771,7 +771,7 @@ func TestNovitaRerankRejectsMissingRerankSuffix(t *testing.T) {
map[string]string{"default": "http://unused"},
URLSuffix{Chat: "openai/v1/chat/completions"},
)
- _, err := driver.Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := driver.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "no rerank URL suffix configured") {
t.Errorf("got %v", err)
}
diff --git a/internal/entity/models/nvidia.go b/internal/entity/models/nvidia.go
index 02da13f467..d37345c4c8 100644
--- a/internal/entity/models/nvidia.go
+++ b/internal/entity/models/nvidia.go
@@ -161,12 +161,12 @@ type nvidiaEmbeddingResponse struct {
} `json:"data"`
}
-func (n *NvidiaModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (n *NvidiaModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := n.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -181,7 +181,7 @@ func (n *NvidiaModel) Embed(ctx context.Context, modelName *string, texts []stri
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
"input_type": "query",
"encoding_format": "float",
"truncate": "END",
@@ -272,11 +272,12 @@ type nvidiaRerankResponse struct {
// RerankResult entries are in the API's ranking order; callers that
// need original-input order should sort by Index. Same return-shape
// contract as the Aliyun and ZhipuAI Rerank drivers.
-func (n *NvidiaModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (n *NvidiaModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := n.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/nvidia_rerank_test.go b/internal/entity/models/nvidia_rerank_test.go
index 9e7a35397c..0a4b055406 100644
--- a/internal/entity/models/nvidia_rerank_test.go
+++ b/internal/entity/models/nvidia_rerank_test.go
@@ -90,8 +90,7 @@ func TestNvidiaRerankHappyPath(t *testing.T) {
resp, err := model.Rerank(
ctx,
&modelName,
- "What is RAPTOR?",
- []string{"doc-zero", "doc-one", "doc-two"},
+ RerankRequest{Query: "What is RAPTOR?", Documents: []string{"doc-zero", "doc-one", "doc-two"}},
&APIConfig{ApiKey: &apiKey},
&RerankConfig{},
nil,
@@ -126,8 +125,8 @@ func TestNvidiaRerankTopNClamp(t *testing.T) {
modelName := "nvidia/nv-rerankqa-mistral-4b-v3"
if _, err := model.Rerank(
ctx,
- &modelName, "q",
- []string{"a", "b", "c", "d"},
+ &modelName,
+ RerankRequest{Query: "q", Documents: []string{"a", "b", "c", "d"}},
&APIConfig{ApiKey: &apiKey},
&RerankConfig{TopN: 2},
nil,
@@ -142,7 +141,7 @@ func TestNvidiaRerankEmptyDocuments(t *testing.T) {
model := newNvidiaModelForTest("http://unused")
apiKey := "test-key"
modelName := "nvidia/nv-rerankqa-mistral-4b-v3"
- resp, err := model.Rerank(ctx, &modelName, "q", nil, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
+ resp, err := model.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: nil}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err != nil {
t.Fatalf("expected nil error for empty documents, got %v", err)
}
@@ -156,7 +155,7 @@ func TestNvidiaRerankRequiresAPIKey(t *testing.T) {
ctx := t.Context()
model := newNvidiaModelForTest("http://unused")
modelName := "nvidia/nv-rerankqa-mistral-4b-v3"
- _, err := model.Rerank(ctx, &modelName, "q", []string{"a"}, &APIConfig{}, &RerankConfig{}, nil)
+ _, err := model.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, &RerankConfig{}, nil)
if err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("expected api-key error, got %v", err)
}
@@ -167,7 +166,7 @@ func TestNvidiaRerankRequiresModelName(t *testing.T) {
ctx := t.Context()
model := newNvidiaModelForTest("http://unused")
apiKey := "test-key"
- _, err := model.Rerank(ctx, nil, "q", []string{"a"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
+ _, err := model.Rerank(ctx, nil, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("expected model-name error, got %v", err)
}
@@ -185,7 +184,7 @@ func TestNvidiaRerankRejectsHTTPError(t *testing.T) {
model := newNvidiaModelForTest(srv.URL)
apiKey := "test-key"
modelName := "nvidia/nv-rerankqa-mistral-4b-v3"
- _, err := model.Rerank(ctx, &modelName, "q", []string{"a"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
+ _, err := model.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err == nil || !strings.Contains(err.Error(), "Nvidia rerank API error") {
t.Errorf("expected API error, got %v", err)
}
@@ -206,7 +205,7 @@ func TestNvidiaRerankRejectsOutOfRangeIndex(t *testing.T) {
model := newNvidiaModelForTest(srv.URL)
apiKey := "test-key"
modelName := "nvidia/nv-rerankqa-mistral-4b-v3"
- _, err := model.Rerank(ctx, &modelName, "q", []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
+ _, err := model.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err == nil || !strings.Contains(err.Error(), "unexpected rerank index") {
t.Errorf("expected out-of-range error, got %v", err)
}
diff --git a/internal/entity/models/nvidia_test.go b/internal/entity/models/nvidia_test.go
index e02e9a969d..ac86b71b7b 100644
--- a/internal/entity/models/nvidia_test.go
+++ b/internal/entity/models/nvidia_test.go
@@ -372,7 +372,7 @@ func TestNvidiaEmbedUsesModelSpecificURL(t *testing.T) {
got, err := driver.Embed(
context.Background(),
&namePtr,
- []string{"hello"},
+ EmbedRequest{Texts: []string{"hello"}},
&APIConfig{ApiKey: ptr(apiKey)},
nil,
nil,
diff --git a/internal/entity/models/ollama.go b/internal/entity/models/ollama.go
index 3ee2b82136..e82fa29bef 100644
--- a/internal/entity/models/ollama.go
+++ b/internal/entity/models/ollama.go
@@ -127,12 +127,12 @@ func (o *OllamaModel) ChatStreamlyWithSender(ctx context.Context, modelName stri
})
}
-func (o *OllamaModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (o *OllamaModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := o.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -156,7 +156,7 @@ func (o *OllamaModel) Embed(ctx context.Context, modelName *string, texts []stri
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -224,7 +224,7 @@ func (o *OllamaModel) Embed(ctx context.Context, modelName *string, texts []stri
return embeddings, nil
}
-func (o *OllamaModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (o *OllamaModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method")
}
diff --git a/internal/entity/models/openai.go b/internal/entity/models/openai.go
index eee9373192..3cfb4fa7a1 100644
--- a/internal/entity/models/openai.go
+++ b/internal/entity/models/openai.go
@@ -154,12 +154,12 @@ type openaiUsage struct {
TotalTokens int `json:"total_tokens"`
}
-func (o *OpenAIModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (o *OpenAIModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := o.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -176,7 +176,7 @@ func (o *OpenAIModel) Embed(ctx context.Context, modelName *string, texts []stri
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -296,7 +296,7 @@ func (o *OpenAIModel) CheckConnection(ctx context.Context, apiConfig *APIConfig)
// Rerank calculates similarity scores between query and documents. OpenAI does
// not expose a rerank API, so this is left unimplemented.
-func (o *OpenAIModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (o *OpenAIModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, Rerank not implemented", o.Name())
}
diff --git a/internal/entity/models/openrouter.go b/internal/entity/models/openrouter.go
index ef5c0ae4d5..dc7300c090 100644
--- a/internal/entity/models/openrouter.go
+++ b/internal/entity/models/openrouter.go
@@ -144,12 +144,12 @@ type OpenRouterEmbeddingResponse struct {
} `json:"usage"`
}
-func (o *OpenRouterModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (o *OpenRouterModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := o.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || *modelName == "" {
@@ -164,7 +164,7 @@ func (o *OpenRouterModel) Embed(ctx context.Context, modelName *string, texts []
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
@@ -249,11 +249,12 @@ type OpenRouterRerankResponse struct {
} `json:"usage"`
}
-func (o *OpenRouterModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (o *OpenRouterModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := o.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/orcarouter.go b/internal/entity/models/orcarouter.go
index f1d8d20998..7f9e80590d 100644
--- a/internal/entity/models/orcarouter.go
+++ b/internal/entity/models/orcarouter.go
@@ -106,11 +106,11 @@ func (o *OrcaRouterModel) ChatStreamlyWithSender(ctx context.Context, modelName
})
}
-func (o *OrcaRouterModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (o *OrcaRouterModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s no such method", o.Name())
}
-func (o *OrcaRouterModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (o *OrcaRouterModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s no such method", o.Name())
}
diff --git a/internal/entity/models/paddleocr.go b/internal/entity/models/paddleocr.go
index e036e097ed..0ff2c6561a 100644
--- a/internal/entity/models/paddleocr.go
+++ b/internal/entity/models/paddleocr.go
@@ -61,11 +61,11 @@ func (p *PaddleOCRModel) ChatStreamlyWithSender(ctx context.Context, modelName s
return fmt.Errorf("%s, no such method", p.Name())
}
-func (p *PaddleOCRModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (p *PaddleOCRModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", p.Name())
}
-func (p *PaddleOCRModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (p *PaddleOCRModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", p.Name())
}
diff --git a/internal/entity/models/paddleocr_local.go b/internal/entity/models/paddleocr_local.go
index e195db04fb..4a153db226 100644
--- a/internal/entity/models/paddleocr_local.go
+++ b/internal/entity/models/paddleocr_local.go
@@ -58,11 +58,11 @@ func (p *PaddleOCRLocalModel) ChatStreamlyWithSender(ctx context.Context, modelN
return fmt.Errorf("%s no such method", p.Name())
}
-func (p *PaddleOCRLocalModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (p *PaddleOCRLocalModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s no such method", p.Name())
}
-func (p *PaddleOCRLocalModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (p *PaddleOCRLocalModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s no such method", p.Name())
}
diff --git a/internal/entity/models/perplexity.go b/internal/entity/models/perplexity.go
index 428297bf1b..4c83f86f74 100644
--- a/internal/entity/models/perplexity.go
+++ b/internal/entity/models/perplexity.go
@@ -198,12 +198,12 @@ type perplexityEmbeddingResponse struct {
Error interface{} `json:"error"`
}
-func (p *PerplexityModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (p *PerplexityModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := p.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || *modelName == "" {
@@ -219,7 +219,7 @@ func (p *PerplexityModel) Embed(ctx context.Context, modelName *string, texts []
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -272,7 +272,7 @@ func (p *PerplexityModel) Embed(ctx context.Context, modelName *string, texts []
return embeddings, nil
}
-func (p *PerplexityModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (p *PerplexityModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", p.Name())
}
diff --git a/internal/entity/models/perplexity_test.go b/internal/entity/models/perplexity_test.go
index f361276e7e..107a2c6d56 100644
--- a/internal/entity/models/perplexity_test.go
+++ b/internal/entity/models/perplexity_test.go
@@ -339,7 +339,7 @@ func TestPerplexityEmbedHappyPath(t *testing.T) {
out, err := newPerplexityForTest(srv.URL).Embed(
ctx,
&modelName,
- []string{"hello", "world"},
+ EmbedRequest{Texts: []string{"hello", "world"}},
&APIConfig{ApiKey: &apiKey},
&EmbeddingConfig{Dimension: 16},
nil,
@@ -363,7 +363,7 @@ func TestPerplexityEmbedEmptyTextsReturnsEmpty(t *testing.T) {
ctx := t.Context()
modelName := "pplx-embed-v1-0.6b"
apiKey := "test-key"
- out, err := newPerplexityForTest("http://unused").Embed(ctx, &modelName, nil, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ out, err := newPerplexityForTest("http://unused").Embed(ctx, &modelName, EmbedRequest{Texts: nil}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -376,7 +376,7 @@ func TestPerplexityEmbedRequiresModelName(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
apiKey := "test-key"
- _, err := newPerplexityForTest("http://unused").Embed(ctx, nil, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := newPerplexityForTest("http://unused").Embed(ctx, nil, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("expected model-name error, got %v", err)
}
@@ -386,7 +386,7 @@ func TestPerplexityUnsupportedMethods(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
m := newPerplexityForTest("http://unused")
- if _, err := m.Rerank(ctx, nil, "", nil, nil, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Rerank(ctx, nil, RerankRequest{Query: "", Documents: nil}, nil, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank error=%v", err)
}
if _, err := m.Balance(ctx, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
diff --git a/internal/entity/models/ppio.go b/internal/entity/models/ppio.go
index 76668efb53..9667cc6b2f 100644
--- a/internal/entity/models/ppio.go
+++ b/internal/entity/models/ppio.go
@@ -190,12 +190,12 @@ type PPIOEmbeddingResponse struct {
} `json:"usage"`
}
-func (p *PPIOModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (p *PPIOModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := p.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -212,7 +212,7 @@ func (p *PPIOModel) Embed(ctx context.Context, modelName *string, texts []string
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
"encoding_format": "float",
}
if embeddingConfig != nil && embeddingConfig.EncodingFormat != "" {
@@ -255,11 +255,11 @@ func (p *PPIOModel) Embed(ctx context.Context, modelName *string, texts []string
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("ppio: response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("ppio: response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("ppio: duplicate embedding index %d in response", item.Index)
@@ -283,10 +283,12 @@ func (p *PPIOModel) Embed(ctx context.Context, modelName *string, texts []string
return embeddings, nil
}
-func (p *PPIOModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (p *PPIOModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := p.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
diff --git a/internal/entity/models/ppio_test.go b/internal/entity/models/ppio_test.go
index 8e632d6f73..4b7a932446 100644
--- a/internal/entity/models/ppio_test.go
+++ b/internal/entity/models/ppio_test.go
@@ -305,7 +305,7 @@ func TestPPIOEmbedRecordsUsage(t *testing.T) {
apiKey := "test-key"
modelName := "embedding-model"
usage := &common.ModelUsage{}
- embeddings, err := newPPIOForTest(srv.URL).Embed(ctx, &modelName, []string{"document"}, &APIConfig{ApiKey: &apiKey}, nil, usage)
+ embeddings, err := newPPIOForTest(srv.URL).Embed(ctx, &modelName, EmbedRequest{Texts: []string{"document"}}, &APIConfig{ApiKey: &apiKey}, nil, usage)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -346,7 +346,7 @@ func TestPPIORerankRecordsUsage(t *testing.T) {
apiKey := "test-key"
modelName := "rerank-model"
usage := &common.ModelUsage{}
- reranked, err := newPPIOForTest(srv.URL).Rerank(ctx, &modelName, "query", []string{"document"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 1}, usage)
+ reranked, err := newPPIOForTest(srv.URL).Rerank(ctx, &modelName, RerankRequest{Query: "query", Documents: []string{"document"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 1}, usage)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
diff --git a/internal/entity/models/qiniu.go b/internal/entity/models/qiniu.go
index a922a9e3b2..c40d8be208 100644
--- a/internal/entity/models/qiniu.go
+++ b/internal/entity/models/qiniu.go
@@ -195,11 +195,11 @@ func (q *QiniuModel) ChatStreamlyWithSender(ctx context.Context, modelName strin
})
}
-func (q *QiniuModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (q *QiniuModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", q.Name())
}
-func (q *QiniuModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (q *QiniuModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", q.Name())
}
diff --git a/internal/entity/models/ragcon.go b/internal/entity/models/ragcon.go
index eda6066624..a3176b7339 100644
--- a/internal/entity/models/ragcon.go
+++ b/internal/entity/models/ragcon.go
@@ -135,14 +135,14 @@ type ragconEmbeddingResponse struct {
} `json:"data"`
}
-func (r *RAGconModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (r *RAGconModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := r.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || strings.TrimSpace(*modelName) == "" {
return nil, fmt.Errorf("model name is required")
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -155,7 +155,7 @@ func (r *RAGconModel) Embed(ctx context.Context, modelName *string, texts []stri
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -203,13 +203,15 @@ func (r *RAGconModel) Embed(ctx context.Context, modelName *string, texts []stri
}
// Rerank POSTs to RAGcon's /rerank endpoint (LiteLLM proxy passthrough).
-func (r *RAGconModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (r *RAGconModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := r.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || strings.TrimSpace(*modelName) == "" {
return nil, fmt.Errorf("model name is required")
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/ragcon_test.go b/internal/entity/models/ragcon_test.go
index bd41323038..6ff406f795 100644
--- a/internal/entity/models/ragcon_test.go
+++ b/internal/entity/models/ragcon_test.go
@@ -279,7 +279,7 @@ func TestRAGconEmbed(t *testing.T) {
apiKey := "test-key"
model := "text-embedding-3-small"
- embeddings, err := newRAGconForTest(srv.URL).Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ embeddings, err := newRAGconForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -309,7 +309,7 @@ func TestRAGconRerank(t *testing.T) {
apiKey := "test-key"
model := "rerank-v1"
- resp, err := newRAGconForTest(srv.URL).Rerank(ctx, &model, "q", []string{"doc0", "doc1"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 2}, nil)
+ resp, err := newRAGconForTest(srv.URL).Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"doc0", "doc1"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 2}, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
diff --git a/internal/entity/models/replicate.go b/internal/entity/models/replicate.go
index 93b653d14d..976277e634 100644
--- a/internal/entity/models/replicate.go
+++ b/internal/entity/models/replicate.go
@@ -671,12 +671,12 @@ func replicateKeys(m map[string]interface{}) []string {
}
// Embed turns a list of texts into embedding vectors via Replicate's
-func (r *ReplicateModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (r *ReplicateModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := r.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || strings.TrimSpace(*modelName) == "" {
@@ -688,7 +688,7 @@ func (r *ReplicateModel) Embed(ctx context.Context, modelName *string, texts []s
return nil, err
}
- input, err := replicateEmbedInput(texts)
+ input, err := replicateEmbedInput(request.Texts)
if err != nil {
return nil, err
}
@@ -708,7 +708,7 @@ func (r *ReplicateModel) Embed(ctx context.Context, modelName *string, texts []s
return nil, fmt.Errorf("replicate: prediction ended with status %q", prediction.Status)
}
- return replicateEmbedOutputToVectors(prediction.Output, len(texts))
+ return replicateEmbedOutputToVectors(prediction.Output, len(request.Texts))
}
// replicateRerankInput shapes the request body
@@ -762,11 +762,12 @@ func replicateScoresFromInterface(arr []interface{}, n int) ([]float64, error) {
}
// Rerank scores a query against a list of documents
-func (r *ReplicateModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (r *ReplicateModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := r.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/replicate_test.go b/internal/entity/models/replicate_test.go
index 8ea68352b1..fa575eb056 100644
--- a/internal/entity/models/replicate_test.go
+++ b/internal/entity/models/replicate_test.go
@@ -326,7 +326,7 @@ func TestReplicateUnsupportedMethods(t *testing.T) {
apiKey := "test-key"
// Rerank IS implemented; with empty documents it short-circuits (no error).
// Pass non-empty docs + nil modelName to trigger model-name validation.
- if _, err := m.Rerank(ctx, nil, "", []string{"d"}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
+ if _, err := m.Rerank(ctx, nil, RerankRequest{Query: "q", Documents: []string{"d"}}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("Rerank error=%v", err)
}
// Balance IS a stub → "no such method"
diff --git a/internal/entity/models/siliconflow.go b/internal/entity/models/siliconflow.go
index 4b9b1cae91..96ff7e31f1 100644
--- a/internal/entity/models/siliconflow.go
+++ b/internal/entity/models/siliconflow.go
@@ -140,12 +140,12 @@ type siliconflowEmbeddingResponse struct {
}
// Embed embeds a list of texts into embeddings
-func (s *SiliconflowModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (s *SiliconflowModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := s.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
// Per-request input cap: resolved from the provider capability (batch_size
@@ -156,7 +156,7 @@ func (s *SiliconflowModel) Embed(ctx context.Context, modelName *string, texts [
modelNameStr = *modelName
}
maxBatch := GetEmbeddingBatchSize(modelNameStr)
- if len(texts) > maxBatch {
+ if len(request.Texts) > maxBatch {
return nil, fmt.Errorf("siliconflow supports a maximum of %d inputs per request", maxBatch)
}
@@ -174,7 +174,7 @@ func (s *SiliconflowModel) Embed(ctx context.Context, modelName *string, texts [
reqBody := map[string]interface{}{
"model": modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -413,11 +413,12 @@ type SiliconflowRerankRequest struct {
}
// Rerank calculates similarity scores between query and documents
-func (s *SiliconflowModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (s *SiliconflowModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := s.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
-
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
}
diff --git a/internal/entity/models/stepfun.go b/internal/entity/models/stepfun.go
index c707d01f2a..ffcdf77a0c 100644
--- a/internal/entity/models/stepfun.go
+++ b/internal/entity/models/stepfun.go
@@ -109,7 +109,7 @@ func (s *StepFunModel) ChatStreamlyWithSender(ctx context.Context, modelName str
}
// Embed is left as a stub.
-func (s *StepFunModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (s *StepFunModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("not implemented")
}
@@ -179,7 +179,7 @@ func (s *StepFunModel) CheckConnection(ctx context.Context, apiConfig *APIConfig
// Rerank calculates similarity scores between query and documents. StepFun
// does not expose a public rerank API, so this returns "no such method".
-func (s *StepFunModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (s *StepFunModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method")
}
diff --git a/internal/entity/models/stepfun_test.go b/internal/entity/models/stepfun_test.go
index cf89e4e5df..0c3947aba3 100644
--- a/internal/entity/models/stepfun_test.go
+++ b/internal/entity/models/stepfun_test.go
@@ -943,7 +943,7 @@ func TestStepFunEmbedReturnsNotImplemented(t *testing.T) {
ctx := t.Context()
m := newStepFunForTest("http://unused")
model := "x"
- _, err := m.Embed(ctx, &model, []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "not implemented") {
t.Errorf("Embed: want 'not implemented', got %v", err)
}
@@ -954,7 +954,7 @@ func TestStepFunRerankReturnsNoSuchMethod(t *testing.T) {
ctx := t.Context()
m := newStepFunForTest("http://unused")
model := "x"
- _, err := m.Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{}, &RerankConfig{TopN: 1}, nil)
+ _, err := m.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, &RerankConfig{TopN: 1}, nil)
if err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: want 'no such method', got %v", err)
}
diff --git a/internal/entity/models/togetherai.go b/internal/entity/models/togetherai.go
index 0c68b60143..dce137aaea 100644
--- a/internal/entity/models/togetherai.go
+++ b/internal/entity/models/togetherai.go
@@ -208,12 +208,12 @@ type togetherAIEmbeddingResponse struct {
Object string `json:"object"`
}
-func (t *TogetherAIModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (t *TogetherAIModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := t.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -230,7 +230,7 @@ func (t *TogetherAIModel) Embed(ctx context.Context, modelName *string, texts []
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -272,11 +272,11 @@ func (t *TogetherAIModel) Embed(ctx context.Context, modelName *string, texts []
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("togetherai: response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("togetherai: response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("togetherai: duplicate embedding index %d in response", item.Index)
@@ -296,10 +296,12 @@ func (t *TogetherAIModel) Embed(ctx context.Context, modelName *string, texts []
return embeddings, nil
}
-func (t *TogetherAIModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (t *TogetherAIModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := t.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
diff --git a/internal/entity/models/togetherai_test.go b/internal/entity/models/togetherai_test.go
index bbb9a487d9..fb763e5abb 100644
--- a/internal/entity/models/togetherai_test.go
+++ b/internal/entity/models/togetherai_test.go
@@ -288,7 +288,7 @@ func TestTogetherAIUnsupportedMethods(t *testing.T) {
apiKey := "test-key"
// Rerank IS implemented; with nil documents it short-circuits to empty response (no error).
// It should NOT be blocked by APIConfigCheck.
- if _, err := m.Rerank(ctx, nil, "", nil, &APIConfig{ApiKey: &apiKey}, nil, nil); err != nil {
+ if _, err := m.Rerank(ctx, nil, RerankRequest{Query: "q", Documents: nil}, &APIConfig{ApiKey: &apiKey}, nil, nil); err != nil {
t.Errorf("Rerank error=%v (expected no error for empty documents)", err)
}
// Balance IS a stub → "no such method"
diff --git a/internal/entity/models/tokenhub.go b/internal/entity/models/tokenhub.go
index 43d38a1ba1..4eaa0d4238 100644
--- a/internal/entity/models/tokenhub.go
+++ b/internal/entity/models/tokenhub.go
@@ -110,12 +110,12 @@ func (t *TokenHubModel) ChatStreamlyWithSender(ctx context.Context, modelName st
})
}
-func (t *TokenHubModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (t *TokenHubModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := t.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || *modelName == "" {
@@ -130,7 +130,7 @@ func (t *TokenHubModel) Embed(ctx context.Context, modelName *string, texts []st
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -190,7 +190,7 @@ func (t *TokenHubModel) Embed(ctx context.Context, modelName *string, texts []st
return embeddings, nil
}
-func (t *TokenHubModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (t *TokenHubModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s no such method", t.Name())
}
diff --git a/internal/entity/models/tokenhub_test.go b/internal/entity/models/tokenhub_test.go
index 457797bb28..5379ee9ee4 100644
--- a/internal/entity/models/tokenhub_test.go
+++ b/internal/entity/models/tokenhub_test.go
@@ -293,7 +293,7 @@ func TestTokenHubEmbedHappyPath(t *testing.T) {
apiKey := "test-key"
model := "text-embedding-3-small"
- embeddings, err := newTokenHubForTest(srv.URL).Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ embeddings, err := newTokenHubForTest(srv.URL).Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -306,14 +306,14 @@ func TestTokenHubEmbedValidatesInputs(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
apiKey := "test-key"
- if embeddings, err := newTokenHubForTest("http://unused").Embed(ctx, nil, nil, &APIConfig{ApiKey: &apiKey}, nil, nil); err != nil || len(embeddings) != 0 {
+ if embeddings, err := newTokenHubForTest("http://unused").Embed(ctx, nil, EmbedRequest{Texts: nil}, &APIConfig{ApiKey: &apiKey}, nil, nil); err != nil || len(embeddings) != 0 {
t.Fatalf("empty input should return empty embeddings, got %#v err=%v", embeddings, err)
}
- if _, err := newTokenHubForTest("http://unused").Embed(ctx, nil, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
+ if _, err := newTokenHubForTest("http://unused").Embed(ctx, nil, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil); err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Fatalf("expected model-name error, got %v", err)
}
model := "text-embedding-3-small"
- if _, err := newTokenHubForTest("http://unused").Embed(ctx, &model, []string{"x"}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
+ if _, err := newTokenHubForTest("http://unused").Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, nil, nil); err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Fatalf("expected api-key error, got %v", err)
}
}
diff --git a/internal/entity/models/tokenpony.go b/internal/entity/models/tokenpony.go
index 4dcf177b8c..5d9644784e 100644
--- a/internal/entity/models/tokenpony.go
+++ b/internal/entity/models/tokenpony.go
@@ -158,11 +158,11 @@ func (t *TokenPonyModel) CheckConnection(ctx context.Context, apiConfig *APIConf
return err
}
-func (t *TokenPonyModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (t *TokenPonyModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", t.Name())
}
-func (t *TokenPonyModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (t *TokenPonyModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", t.Name())
}
diff --git a/internal/entity/models/tokenpony_test.go b/internal/entity/models/tokenpony_test.go
index cb3f51e059..55da1435a6 100644
--- a/internal/entity/models/tokenpony_test.go
+++ b/internal/entity/models/tokenpony_test.go
@@ -472,7 +472,7 @@ func TestTokenPonyEmbedReturnsNoSuchMethod(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
model := "x"
- _, err := newTokenPonyForTest("http://unused").Embed(ctx, &model, []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := newTokenPonyForTest("http://unused").Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Embed: want 'no such method', got %v", err)
}
diff --git a/internal/entity/models/types.go b/internal/entity/models/types.go
index e284f8247d..22ba50636f 100644
--- a/internal/entity/models/types.go
+++ b/internal/entity/models/types.go
@@ -35,9 +35,9 @@ type ModelDriver interface {
// ChatStreamlyWithSender sends multiple messages asynchronously
ChatStreamlyWithSender(ctx context.Context, modelName string, messages []Message, apiConfig *APIConfig, modelConfig *ChatConfig, modelUsage *common.ModelUsage, sender func(*string, *string) error) error
// Embed a list of texts into embeddings
- Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error)
+ Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error)
// Rerank calculates similarity scores between query and texts
- Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error)
+ Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error)
// TranscribeAudio transcribe audio
TranscribeAudio(ctx context.Context, modelName *string, file *string, apiConfig *APIConfig, asrConfig *ASRConfig, modelUsage *common.ModelUsage) (*ASRResponse, error)
TranscribeAudioWithSender(ctx context.Context, modelName *string, file *string, apiConfig *APIConfig, asrConfig *ASRConfig, modelUsage *common.ModelUsage, sender func(*string, *string) error) error
@@ -192,11 +192,27 @@ type APIConfig struct {
BaseURL *string
}
+type EmbedRequest struct {
+ Texts []string // for text
+ Images [][]byte // for image
+ Urls []string // for image
+}
+
type EmbeddingConfig struct {
Dimension int
EncodingFormat string
}
+type RerankRequest struct {
+ Query string // for text question
+ ImageQuery []byte // for image
+ ImageQueryURL *string // for image
+
+ Documents []string // for text candidates
+ Images [][]byte // for image candidates
+ ImageURLs []string // for image candidates
+}
+
type RerankConfig struct {
TopN int
}
@@ -270,8 +286,8 @@ func NewRerankModel(driver ModelDriver, modelName *string, apiConfig *APIConfig)
}
// Rerank calculates similarity between query and texts
-func (r *RerankModel) Rerank(ctx context.Context, query string, texts []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
- return r.ModelDriver.Rerank(ctx, r.ModelName, query, texts, apiConfig, rerankConfig, modelUsage)
+func (r *RerankModel) Rerank(ctx context.Context, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+ return r.ModelDriver.Rerank(ctx, r.ModelName, request, apiConfig, rerankConfig, modelUsage)
}
// ToolConfig bundles tool-calling configuration for a ChatModel.
diff --git a/internal/entity/models/upstage.go b/internal/entity/models/upstage.go
index 80ac2647f2..5a43ca0af0 100644
--- a/internal/entity/models/upstage.go
+++ b/internal/entity/models/upstage.go
@@ -136,12 +136,12 @@ type upstageEmbeddingResponse struct {
}
// Embed turns a list of texts into embedding vectors
-func (u *UpstageModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (u *UpstageModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := u.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -158,7 +158,7 @@ func (u *UpstageModel) Embed(ctx context.Context, modelName *string, texts []str
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
jsonData, err := json.Marshal(reqBody)
@@ -197,11 +197,11 @@ func (u *UpstageModel) Embed(ctx context.Context, modelName *string, texts []str
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("upstage: response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("upstage: response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("upstage: duplicate embedding index %d in response", item.Index)
@@ -287,7 +287,7 @@ func (u *UpstageModel) CheckConnection(ctx context.Context, apiConfig *APIConfig
// Rerank calculates similarity scores between query and documents. Upstage
// does not expose a public rerank API, so this returns "no such method".
-func (u *UpstageModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (u *UpstageModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method")
}
diff --git a/internal/entity/models/upstage_test.go b/internal/entity/models/upstage_test.go
index 56f5521fc8..25495be610 100644
--- a/internal/entity/models/upstage_test.go
+++ b/internal/entity/models/upstage_test.go
@@ -240,7 +240,7 @@ func TestUpstageEmbedRejectsDuplicateIndex(t *testing.T) {
u := newUpstageForTest(srv.URL)
apiKey := "test-key"
model := "solar-embedding-1-large-passage"
- _, err := u.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := u.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate embedding index 0") {
t.Errorf("expected duplicate-index error, got %v", err)
}
@@ -257,7 +257,7 @@ func TestUpstageEmbedRejectsOutOfRangeIndex(t *testing.T) {
u := newUpstageForTest(srv.URL)
apiKey := "test-key"
model := "solar-embedding-1-large-passage"
- _, err := u.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := u.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("expected out-of-range error, got %v", err)
}
@@ -278,7 +278,7 @@ func TestUpstageEmbedHappyPathReordersByIndex(t *testing.T) {
u := newUpstageForTest(srv.URL)
apiKey := "test-key"
model := "solar-embedding-1-large-passage"
- vecs, err := u.Embed(ctx, &model, []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := u.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
diff --git a/internal/entity/models/vllm.go b/internal/entity/models/vllm.go
index 2187554e4c..8db20d9fbc 100644
--- a/internal/entity/models/vllm.go
+++ b/internal/entity/models/vllm.go
@@ -150,12 +150,12 @@ type vllmEmbeddingResponse struct {
}
// Embed embeds a list of texts into embeddings
-func (v *VllmModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (v *VllmModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := v.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -179,7 +179,7 @@ func (v *VllmModel) Embed(ctx context.Context, modelName *string, texts []string
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -340,10 +340,12 @@ type vllmRerankResponse struct {
// Authorization header is sent only when APIConfig.ApiKey is non-empty,
// matching the existing Embed/ListModels behaviour for this local
// driver.
-func (v *VllmModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (v *VllmModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := v.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
diff --git a/internal/entity/models/vllm_rerank_test.go b/internal/entity/models/vllm_rerank_test.go
index e4733bdb8c..03be2f9f44 100644
--- a/internal/entity/models/vllm_rerank_test.go
+++ b/internal/entity/models/vllm_rerank_test.go
@@ -89,8 +89,7 @@ func TestVllmRerankHappyPath(t *testing.T) {
resp, err := model.Rerank(
ctx,
&modelName,
- "What is RAPTOR?",
- []string{"doc-zero", "doc-one", "doc-two"},
+ RerankRequest{Query: "What is RAPTOR?", Documents: []string{"doc-zero", "doc-one", "doc-two"}},
&APIConfig{ApiKey: &apiKey},
&RerankConfig{},
nil,
@@ -125,8 +124,8 @@ func TestVllmRerankTopNClamp(t *testing.T) {
modelName := "BAAI/bge-reranker-v2-m3"
if _, err := model.Rerank(
ctx,
- &modelName, "q",
- []string{"a", "b", "c", "d"},
+ &modelName,
+ RerankRequest{Query: "q", Documents: []string{"a", "b", "c", "d"}},
&APIConfig{ApiKey: &apiKey},
&RerankConfig{TopN: 2},
nil,
@@ -141,7 +140,7 @@ func TestVllmRerankEmptyDocuments(t *testing.T) {
model := newVllmModelForTest("http://unused")
apiKey := "test-key"
modelName := "BAAI/bge-reranker-v2-m3"
- resp, err := model.Rerank(ctx, &modelName, "q", nil, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
+ resp, err := model.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: nil}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err != nil {
t.Fatalf("expected nil error for empty documents, got %v", err)
}
@@ -167,7 +166,7 @@ func TestVllmRerankWithoutAPIKey(t *testing.T) {
model := newVllmModelForTest(srv.URL)
modelName := "BAAI/bge-reranker-v2-m3"
- resp, err := model.Rerank(ctx, &modelName, "q", []string{"a"}, &APIConfig{}, &RerankConfig{}, nil)
+ resp, err := model.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, &RerankConfig{}, nil)
if err != nil {
t.Fatalf("Rerank failed without api key: %v", err)
}
@@ -181,7 +180,7 @@ func TestVllmRerankRequiresModelName(t *testing.T) {
ctx := t.Context()
model := newVllmModelForTest("http://unused")
apiKey := "test-key"
- _, err := model.Rerank(ctx, nil, "q", []string{"a"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
+ _, err := model.Rerank(ctx, nil, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("expected model-name error, got %v", err)
}
@@ -199,7 +198,7 @@ func TestVllmRerankRejectsHTTPError(t *testing.T) {
model := newVllmModelForTest(srv.URL)
apiKey := "test-key"
modelName := "BAAI/bge-reranker-v2-m3"
- _, err := model.Rerank(ctx, &modelName, "q", []string{"a"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
+ _, err := model.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err == nil || !strings.Contains(err.Error(), "vLLM rerank API error") {
t.Errorf("expected API error, got %v", err)
}
@@ -220,7 +219,7 @@ func TestVllmRerankRejectsOutOfRangeIndex(t *testing.T) {
model := newVllmModelForTest(srv.URL)
apiKey := "test-key"
modelName := "BAAI/bge-reranker-v2-m3"
- _, err := model.Rerank(ctx, &modelName, "q", []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
+ _, err := model.Rerank(ctx, &modelName, RerankRequest{Query: "q", Documents: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err == nil || !strings.Contains(err.Error(), "unexpected rerank index") {
t.Errorf("expected out-of-range error, got %v", err)
}
diff --git a/internal/entity/models/volcengine.go b/internal/entity/models/volcengine.go
index 5304c7fe83..e4e89533da 100644
--- a/internal/entity/models/volcengine.go
+++ b/internal/entity/models/volcengine.go
@@ -261,12 +261,12 @@ type volcenginePromptTokensDetails struct {
}
// Embed embeds a list of texts into embeddings
-func (v *VolcEngine) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (v *VolcEngine) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := v.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || *modelName == "" {
@@ -283,7 +283,7 @@ func (v *VolcEngine) Embed(ctx context.Context, modelName *string, texts []strin
var totalUsage TokenUsage
var requestID string
- for i, text := range texts {
+ for i, text := range request.Texts {
reqBody := map[string]interface{}{
"model": *modelName,
@@ -361,7 +361,7 @@ func (v *VolcEngine) Embed(ctx context.Context, modelName *string, texts []strin
}
// Rerank calculates similarity scores between query and documents
-func (v *VolcEngine) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (v *VolcEngine) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, Rerank not implemented", v.Name())
}
diff --git a/internal/entity/models/voyage.go b/internal/entity/models/voyage.go
index fce90b515c..51006a4b2d 100644
--- a/internal/entity/models/voyage.go
+++ b/internal/entity/models/voyage.go
@@ -63,12 +63,12 @@ type voyageEmbeddingResponse struct {
Model string `json:"model"`
}
-func (v *VoyageModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (v *VoyageModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := v.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -85,7 +85,7 @@ func (v *VoyageModel) Embed(ctx context.Context, modelName *string, texts []stri
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["output_dimension"] = embeddingConfig.Dimension
@@ -127,11 +127,11 @@ func (v *VoyageModel) Embed(ctx context.Context, modelName *string, texts []stri
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- filled := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ filled := make([]bool, len(request.Texts))
for _, item := range parsed.Data {
- if item.Index < 0 || item.Index >= len(texts) {
- return nil, fmt.Errorf("voyage: response index %d out of range for %d inputs", item.Index, len(texts))
+ if item.Index < 0 || item.Index >= len(request.Texts) {
+ return nil, fmt.Errorf("voyage: response index %d out of range for %d inputs", item.Index, len(request.Texts))
}
if filled[item.Index] {
return nil, fmt.Errorf("voyage: duplicate embedding index %d in response", item.Index)
@@ -167,10 +167,12 @@ type voyageRerankResponse struct {
Model string `json:"model"`
}
-func (v *VoyageModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (v *VoyageModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := v.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
diff --git a/internal/entity/models/voyage_test.go b/internal/entity/models/voyage_test.go
index 5f5a7fd853..206ee1d478 100644
--- a/internal/entity/models/voyage_test.go
+++ b/internal/entity/models/voyage_test.go
@@ -87,7 +87,7 @@ func TestVoyageEmbedHappyPath(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "voyage-3.5"
- vecs, err := v.Embed(ctx, &model, []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -124,7 +124,7 @@ func TestVoyageEmbedPropagatesOutputDimension(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "voyage-3.5"
- _, err := v.Embed(ctx, &model, []string{"x"}, &APIConfig{ApiKey: &apiKey},
+ _, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey},
&EmbeddingConfig{Dimension: 256}, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
@@ -150,7 +150,7 @@ func TestVoyageEmbedOmitsOutputDimensionWhenUnset(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "voyage-3.5"
- _, err := v.Embed(ctx, &model, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -173,7 +173,7 @@ func TestVoyageEmbedReordersByIndex(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "voyage-3.5"
- vecs, err := v.Embed(ctx, &model, []string{"a", "b", "c"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b", "c"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -195,7 +195,7 @@ func TestVoyageEmbedEmptyInputShortCircuits(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "voyage-3.5"
- vecs, err := v.Embed(ctx, &model, []string{}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ vecs, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil || len(vecs) != 0 {
t.Errorf("Embed([])=(%v,%v)", vecs, err)
}
@@ -206,7 +206,7 @@ func TestVoyageEmbedRequiresAPIKey(t *testing.T) {
ctx := t.Context()
v := newVoyageForTest("http://unused")
model := "voyage-3.5"
- _, err := v.Embed(ctx, &model, []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "api key is required") {
t.Errorf("expected api-key error, got %v", err)
}
@@ -217,7 +217,7 @@ func TestVoyageEmbedRequiresModelName(t *testing.T) {
ctx := t.Context()
v := newVoyageForTest("http://unused")
apiKey := "test-key"
- _, err := v.Embed(ctx, nil, []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := v.Embed(ctx, nil, EmbedRequest{Texts: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("expected model-name error, got %v", err)
}
@@ -239,7 +239,7 @@ func TestVoyageEmbedRejectsDuplicateIndex(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "voyage-3.5"
- _, err := v.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate embedding index 0") {
t.Errorf("expected duplicate error, got %v", err)
}
@@ -260,7 +260,7 @@ func TestVoyageEmbedRejectsOutOfRangeIndex(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "voyage-3.5"
- _, err := v.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("expected out-of-range error, got %v", err)
}
@@ -281,7 +281,7 @@ func TestVoyageEmbedRejectsMissingSlot(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "voyage-3.5"
- _, err := v.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "missing embedding for input index 1") {
t.Errorf("expected missing-slot error, got %v", err)
}
@@ -313,7 +313,7 @@ func TestVoyageRerankHappyPath(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "rerank-2"
- resp, err := v.Rerank(ctx, &model, "x", []string{"a", "b", "c"},
+ resp, err := v.Rerank(ctx, &model, RerankRequest{Query: "x", Documents: []string{"a", "b", "c"}},
&APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 3}, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
@@ -343,7 +343,7 @@ func TestVoyageRerankTopKDefaultsToLenDocuments(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "rerank-2"
- _, err := v.Rerank(ctx, &model, "x", []string{"a", "b", "c", "d"},
+ _, err := v.Rerank(ctx, &model, RerankRequest{Query: "x", Documents: []string{"a", "b", "c", "d"}},
&APIConfig{ApiKey: &apiKey}, &RerankConfig{}, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
@@ -356,7 +356,7 @@ func TestVoyageRerankEmptyDocuments(t *testing.T) {
v := newVoyageForTest("http://unused")
apiKey := "test-key"
model := "rerank-2"
- resp, err := v.Rerank(ctx, &model, "x", nil,
+ resp, err := v.Rerank(ctx, &model, RerankRequest{Query: "x", Documents: nil},
&APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 0}, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
@@ -381,7 +381,7 @@ func TestVoyageRerankRejectsOutOfRangeIndex(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "rerank-2"
- _, err := v.Rerank(ctx, &model, "x", []string{"a", "b"},
+ _, err := v.Rerank(ctx, &model, RerankRequest{Query: "x", Documents: []string{"a", "b"}},
&APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 2}, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("expected out-of-range error, got %v", err)
@@ -407,7 +407,7 @@ func TestVoyageRerankRejectsDuplicateIndex(t *testing.T) {
v := newVoyageForTest(srv.URL)
apiKey := "test-key"
model := "rerank-2"
- _, err := v.Rerank(ctx, &model, "x", []string{"a", "b"},
+ _, err := v.Rerank(ctx, &model, RerankRequest{Query: "x", Documents: []string{"a", "b"}},
&APIConfig{ApiKey: &apiKey}, &RerankConfig{TopN: 2}, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate rerank index 0") {
t.Errorf("expected duplicate-index error, got %v", err)
@@ -436,7 +436,7 @@ func TestVoyageEmbedTrimsTrailingSlashInBaseURL(t *testing.T) {
)
apiKey := "test-key"
model := "voyage-3.5"
- if _, err := v.Embed(ctx, &model, []string{"x"}, &APIConfig{ApiKey: &apiKey}, nil, nil); err != nil {
+ if _, err := v.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &apiKey}, nil, nil); err != nil {
t.Fatalf("Embed: %v", err)
}
if sawPath != "/v1/embeddings" {
diff --git a/internal/entity/models/xai.go b/internal/entity/models/xai.go
index 3d26b8a1f0..50d3d33804 100644
--- a/internal/entity/models/xai.go
+++ b/internal/entity/models/xai.go
@@ -116,7 +116,7 @@ func (x *XAIModel) ChatStreamlyWithSender(ctx context.Context, modelName string,
// Embed embeds a list of texts into embeddings. xAI does not expose a
// public embedding API yet, so this is left unimplemented.
-func (x *XAIModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (x *XAIModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("not implemented")
}
@@ -169,7 +169,7 @@ func (x *XAIModel) CheckConnection(ctx context.Context, apiConfig *APIConfig) er
}
// Rerank calculates similarity scores between query and documents
-func (x *XAIModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (x *XAIModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, Rerank not implemented", x.Name())
}
diff --git a/internal/entity/models/xiaomi.go b/internal/entity/models/xiaomi.go
index 3065db7e50..2413c0d352 100644
--- a/internal/entity/models/xiaomi.go
+++ b/internal/entity/models/xiaomi.go
@@ -152,11 +152,11 @@ func (x *XiaomiModel) ChatStreamlyWithSender(ctx context.Context, modelName stri
})
}
-func (x *XiaomiModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (x *XiaomiModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("no such method %s", x.Name())
}
-func (x *XiaomiModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (x *XiaomiModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("no such method %s", x.Name())
}
diff --git a/internal/entity/models/xiaomi_test.go b/internal/entity/models/xiaomi_test.go
index 1fe90402b3..c8162e9b4d 100644
--- a/internal/entity/models/xiaomi_test.go
+++ b/internal/entity/models/xiaomi_test.go
@@ -364,10 +364,10 @@ func TestXiaomiUnsupportedMethods(t *testing.T) {
apiKey := "test-key"
cfg := &APIConfig{ApiKey: &apiKey}
- if _, err := m.Embed(ctx, &model, []string{"x"}, cfg, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, cfg, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Embed: %v", err)
}
- if _, err := m.Rerank(ctx, &model, "q", []string{"d"}, cfg, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
+ if _, err := m.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"d"}}, cfg, nil, nil); err == nil || !strings.Contains(err.Error(), "no such method") {
t.Errorf("Rerank: %v", err)
}
// CheckConnection IS implemented — verifies API config and base URL are reachable.
diff --git a/internal/entity/models/xinference.go b/internal/entity/models/xinference.go
index ebd42eeb18..d0ec2f1a7c 100644
--- a/internal/entity/models/xinference.go
+++ b/internal/entity/models/xinference.go
@@ -139,12 +139,12 @@ type xinferenceEmbeddingResponse struct {
}
// Embed POSTs the input texts to the tenant's Xinference
-func (x *XinferenceModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (x *XinferenceModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := x.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
if modelName == nil || *modelName == "" {
@@ -163,7 +163,7 @@ func (x *XinferenceModel) Embed(ctx context.Context, modelName *string, texts []
reqBody := map[string]interface{}{
"model": *modelName,
- "input": texts,
+ "input": request.Texts,
}
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
@@ -205,15 +205,15 @@ func (x *XinferenceModel) Embed(ctx context.Context, modelName *string, texts []
return nil, fmt.Errorf("failed to parse response: %w", err)
}
- embeddings := make([]EmbeddingData, len(texts))
- seen := make([]bool, len(texts))
+ embeddings := make([]EmbeddingData, len(request.Texts))
+ seen := make([]bool, len(request.Texts))
for _, d := range parsed.Data {
if d.Index == nil {
return nil, fmt.Errorf("xinference: missing embedding index in response item")
}
idx := *d.Index
- if idx < 0 || idx >= len(texts) {
- return nil, fmt.Errorf("xinference: embedding index %d out of range for %d inputs", idx, len(texts))
+ if idx < 0 || idx >= len(request.Texts) {
+ return nil, fmt.Errorf("xinference: embedding index %d out of range for %d inputs", idx, len(request.Texts))
}
if len(d.Embedding) == 0 {
return nil, fmt.Errorf("xinference: missing embedding vector for response item at index %d", idx)
@@ -247,10 +247,12 @@ type xinferenceRerankResponse struct {
// in the API's ranking order. Caller may sort by Index to recover
// original input order. Xinference rerank models are launched with
// --model-type rerank and exposed under the OpenAI-compatible base URL.
-func (x *XinferenceModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (x *XinferenceModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := x.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
diff --git a/internal/entity/models/xinference_test.go b/internal/entity/models/xinference_test.go
index 15f573070e..71b28b49eb 100644
--- a/internal/entity/models/xinference_test.go
+++ b/internal/entity/models/xinference_test.go
@@ -293,7 +293,7 @@ func TestXinferenceEmbedHappyPathAndOmitsEmptyAuth(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-m3"
- got, err := x.Embed(ctx, &model, []string{"hello", "world"}, &APIConfig{}, nil, nil)
+ got, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"hello", "world"}}, &APIConfig{}, nil, nil)
if err != nil {
t.Fatalf("Embed: %v", err)
}
@@ -321,7 +321,7 @@ func TestXinferenceEmbedSendsAuthWhenKeyConfigured(t *testing.T) {
x := newXinferenceForTest(srv.URL)
key := "sk-test"
model := "bge-m3"
- if _, err := x.Embed(ctx, &model, []string{"x"}, &APIConfig{ApiKey: &key}, nil, nil); err != nil {
+ if _, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{ApiKey: &key}, nil, nil); err != nil {
t.Fatalf("Embed: %v", err)
}
if gotAuth != "Bearer sk-test" {
@@ -342,7 +342,7 @@ func TestXinferenceEmbedNormalizesBaseURLWithV1Suffix(t *testing.T) {
URLSuffix{Chat: "v1/chat/completions", Embedding: "v1/embeddings", Models: "v1/models"},
)
model := "bge-m3"
- if _, err := x.Embed(ctx, &model, []string{"x"}, &APIConfig{}, nil, nil); err != nil {
+ if _, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, nil, nil); err != nil {
t.Fatalf("Embed: %v", err)
}
}
@@ -360,7 +360,7 @@ func TestXinferenceEmbedForwardsDimension(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-m3"
- if _, err := x.Embed(ctx, &model, []string{"x"}, &APIConfig{}, &EmbeddingConfig{Dimension: 384}, nil); err != nil {
+ if _, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, &EmbeddingConfig{Dimension: 384}, nil); err != nil {
t.Fatalf("Embed: %v", err)
}
}
@@ -375,7 +375,7 @@ func TestXinferenceEmbedRejectsDuplicateIndex(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-m3"
- _, err := x.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{}, nil, nil)
+ _, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate embedding index") {
t.Errorf("expected duplicate-index error, got %v", err)
}
@@ -391,7 +391,7 @@ func TestXinferenceEmbedRejectsOutOfRangeIndex(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-m3"
- _, err := x.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{}, nil, nil)
+ _, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("expected out-of-range error, got %v", err)
}
@@ -408,7 +408,7 @@ func TestXinferenceEmbedRejectsMissingIndex(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-m3"
- _, err := x.Embed(ctx, &model, []string{"a", "b"}, &APIConfig{}, nil, nil)
+ _, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"a", "b"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "missing embedding") {
t.Errorf("expected missing-embedding error, got %v", err)
}
@@ -419,7 +419,7 @@ func TestXinferenceEmbedEmptyTextsShortCircuits(t *testing.T) {
ctx := t.Context()
x := newXinferenceForTest("http://unused")
model := "bge-m3"
- got, err := x.Embed(ctx, &model, nil, &APIConfig{}, nil, nil)
+ got, err := x.Embed(ctx, &model, EmbedRequest{}, &APIConfig{}, nil, nil)
if err != nil {
t.Fatalf("expected nil error for empty inputs, got %v", err)
}
@@ -432,7 +432,7 @@ func TestXinferenceEmbedRequiresModelName(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
x := newXinferenceForTest("http://unused")
- _, err := x.Embed(ctx, nil, []string{"x"}, &APIConfig{}, nil, nil)
+ _, err := x.Embed(ctx, nil, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("expected model-name error, got %v", err)
}
@@ -449,7 +449,7 @@ func TestXinferenceEmbedSurfacesHTTPError(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-m3"
- _, err := x.Embed(ctx, &model, []string{"x"}, &APIConfig{}, nil, nil)
+ _, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "Xinference embeddings API error") {
t.Errorf("expected API error, got %v", err)
}
@@ -463,7 +463,7 @@ func TestXinferenceEmbedRejectsMissingEmbeddingSuffix(t *testing.T) {
URLSuffix{Chat: "v1/chat/completions"}, // no Embedding suffix
)
model := "bge-m3"
- _, err := x.Embed(ctx, &model, []string{"x"}, &APIConfig{}, nil, nil)
+ _, err := x.Embed(ctx, &model, EmbedRequest{Texts: []string{"x"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "no embedding URL suffix configured") {
t.Errorf("expected missing-suffix error, got %v", err)
}
@@ -565,8 +565,10 @@ func TestXinferenceRerankHappyPathReordersByIndex(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-reranker-v2-m3"
- resp, err := x.Rerank(ctx, &model, "capital of France",
- []string{"Paris is the capital of France.", "Eiffel Tower.", "Berlin is the capital of Germany."},
+ resp, err := x.Rerank(ctx, &model, RerankRequest{
+ Query: "capital of France",
+ Documents: []string{"Paris is the capital of France.", "Eiffel Tower.", "Berlin is the capital of Germany."},
+ },
&APIConfig{}, nil, nil,
)
if err != nil {
@@ -597,7 +599,7 @@ func TestXinferenceRerankNormalizesV1BaseURL(t *testing.T) {
)
apiKey := "test-key"
model := "bge-reranker-v2-m3"
- _, err := x.Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{ApiKey: &apiKey}, nil, nil)
+ _, err := x.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{ApiKey: &apiKey}, nil, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
@@ -616,7 +618,7 @@ func TestXinferenceRerankRespectsTopNConfig(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-reranker-v2-m3"
- _, err := x.Rerank(ctx, &model, "q", []string{"a", "b", "c", "d"}, &APIConfig{}, &RerankConfig{TopN: 2}, nil)
+ _, err := x.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a", "b", "c", "d"}}, &APIConfig{}, &RerankConfig{TopN: 2}, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
@@ -627,7 +629,7 @@ func TestXinferenceRerankEmptyDocumentsShortCircuits(t *testing.T) {
ctx := t.Context()
x := newXinferenceForTest("http://unused")
model := "bge-reranker-v2-m3"
- resp, err := x.Rerank(ctx, &model, "q", nil, &APIConfig{}, nil, nil)
+ resp, err := x.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: nil}, &APIConfig{}, nil, nil)
if err != nil {
t.Fatalf("Rerank: %v", err)
}
@@ -640,7 +642,7 @@ func TestXinferenceRerankRequiresModelName(t *testing.T) {
withSSRFBypass(t)
ctx := t.Context()
x := newXinferenceForTest("http://unused")
- _, err := x.Rerank(ctx, nil, "q", []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := x.Rerank(ctx, nil, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "model name is required") {
t.Errorf("err=%v", err)
}
@@ -658,7 +660,7 @@ func TestXinferenceRerankRejectsOutOfRangeIndex(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-reranker-v2-m3"
- _, err := x.Rerank(ctx, &model, "q", []string{"a", "b"}, &APIConfig{}, nil, nil)
+ _, err := x.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a", "b"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "out of range") {
t.Errorf("err=%v", err)
}
@@ -679,7 +681,7 @@ func TestXinferenceRerankRejectsDuplicateIndex(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-reranker-v2-m3"
- _, err := x.Rerank(ctx, &model, "q", []string{"a", "b"}, &APIConfig{}, nil, nil)
+ _, err := x.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a", "b"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "duplicate") {
t.Errorf("err=%v", err)
}
@@ -696,7 +698,7 @@ func TestXinferenceRerankSurfacesHTTPError(t *testing.T) {
x := newXinferenceForTest(srv.URL)
model := "bge-reranker-v2-m3"
- _, err := x.Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := x.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "Xinference rerank API error") {
t.Errorf("err=%v", err)
}
@@ -710,7 +712,7 @@ func TestXinferenceRerankRejectsMissingRerankSuffix(t *testing.T) {
URLSuffix{Chat: "v1/chat/completions"},
)
model := "bge-reranker-v2-m3"
- _, err := x.Rerank(ctx, &model, "q", []string{"a"}, &APIConfig{}, nil, nil)
+ _, err := x.Rerank(ctx, &model, RerankRequest{Query: "q", Documents: []string{"a"}}, &APIConfig{}, nil, nil)
if err == nil || !strings.Contains(err.Error(), "no rerank URL suffix configured") {
t.Errorf("err=%v", err)
}
diff --git a/internal/entity/models/xunfei.go b/internal/entity/models/xunfei.go
index 0f1825ba07..f08a1c33a0 100644
--- a/internal/entity/models/xunfei.go
+++ b/internal/entity/models/xunfei.go
@@ -169,11 +169,11 @@ func (x *XunFeiModel) ChatStreamlyWithSender(ctx context.Context, modelName stri
})
}
-func (x *XunFeiModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (x *XunFeiModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
return nil, fmt.Errorf("%s, no such method", x.Name())
}
-func (x *XunFeiModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (x *XunFeiModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
return nil, fmt.Errorf("%s, no such method", x.Name())
}
diff --git a/internal/entity/models/xunfei_test.go b/internal/entity/models/xunfei_test.go
index a7f0b51a21..80d1b623c1 100644
--- a/internal/entity/models/xunfei_test.go
+++ b/internal/entity/models/xunfei_test.go
@@ -74,11 +74,11 @@ func TestXunFeiUnsupportedMethodsReturnNoSuchMethod(t *testing.T) {
call func() error
}{
{"Embed", func() error {
- _, err := driver.Embed(ctx, &modelName, []string{text}, &APIConfig{}, nil, nil)
+ _, err := driver.Embed(ctx, &modelName, EmbedRequest{Texts: []string{text}}, &APIConfig{}, nil, nil)
return err
}},
{"Rerank", func() error {
- _, err := driver.Rerank(ctx, &modelName, text, []string{text}, &APIConfig{}, nil, nil)
+ _, err := driver.Rerank(ctx, &modelName, RerankRequest{Query: text, Documents: []string{text}}, &APIConfig{}, nil, nil)
return err
}},
{"TranscribeAudio", func() error {
diff --git a/internal/entity/models/zhipu-ai.go b/internal/entity/models/zhipu-ai.go
index 75bebb9ad7..8e2993ed4c 100644
--- a/internal/entity/models/zhipu-ai.go
+++ b/internal/entity/models/zhipu-ai.go
@@ -155,12 +155,12 @@ type zhipuUsage struct {
}
// Embed embeddings a list of texts into embeddings
-func (z *ZhipuAIModel) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
+func (z *ZhipuAIModel) Embed(ctx context.Context, modelName *string, request EmbedRequest, apiConfig *APIConfig, embeddingConfig *EmbeddingConfig, modelUsage *common.ModelUsage) ([]EmbeddingData, error) {
if err := z.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
- if len(texts) == 0 {
+ if len(request.Texts) == 0 {
return []EmbeddingData{}, nil
}
@@ -177,7 +177,7 @@ func (z *ZhipuAIModel) Embed(ctx context.Context, modelName *string, texts []str
reqBody := map[string]interface{}{}
reqBody["model"] = modelName
- reqBody["input"] = texts
+ reqBody["input"] = request.Texts
if embeddingConfig != nil && embeddingConfig.Dimension > 0 {
reqBody["dimensions"] = embeddingConfig.Dimension
}
@@ -358,10 +358,12 @@ type zhipuOCRResponse struct {
// Rerank calculates similarity scores between query and documents using
// the ZhipuAI /rerank endpoint (e.g. glm-rerank). The result is one
// score per input text, in the same order the documents were given.
-func (z *ZhipuAIModel) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
+func (z *ZhipuAIModel) Rerank(ctx context.Context, modelName *string, request RerankRequest, apiConfig *APIConfig, rerankConfig *RerankConfig, modelUsage *common.ModelUsage) (*RerankResponse, error) {
if err := z.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
+ documents := request.Documents
+ query := request.Query
if len(documents) == 0 {
return &RerankResponse{}, nil
diff --git a/internal/ingestion/component/parser_dispatch_test.go b/internal/ingestion/component/parser_dispatch_test.go
index 4153c3d8db..35036258e4 100644
--- a/internal/ingestion/component/parser_dispatch_test.go
+++ b/internal/ingestion/component/parser_dispatch_test.go
@@ -604,11 +604,11 @@ func (d *mineruTestDriver) ChatWithMessages(ctx context.Context, modelName strin
func (d *mineruTestDriver) ChatStreamlyWithSender(ctx context.Context, modelName string, messages []models.Message, apiConfig *models.APIConfig, modelConfig *models.ChatConfig, usage *common.ModelUsage, sender func(*string, *string) error) error {
return fmt.Errorf("not implemented")
}
-func (d *mineruTestDriver) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *models.APIConfig, embeddingConfig *models.EmbeddingConfig, usage *common.ModelUsage) ([]models.EmbeddingData, error) {
+func (d *mineruTestDriver) Embed(ctx context.Context, modelName *string, request models.EmbedRequest, apiConfig *models.APIConfig, embeddingConfig *models.EmbeddingConfig, usage *common.ModelUsage) ([]models.EmbeddingData, error) {
return nil, fmt.Errorf("not implemented")
}
-func (d *mineruTestDriver) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *models.APIConfig, rerankConfig *models.RerankConfig, usage *common.ModelUsage) (*models.RerankResponse, error) {
+func (d *mineruTestDriver) Rerank(ctx context.Context, modelName *string, request models.RerankRequest, apiConfig *models.APIConfig, rerankConfig *models.RerankConfig, usage *common.ModelUsage) (*models.RerankResponse, error) {
return nil, fmt.Errorf("not implemented")
}
func (d *mineruTestDriver) TranscribeAudio(ctx context.Context, modelName *string, file *string, apiConfig *models.APIConfig, asrConfig *models.ASRConfig, usage *common.ModelUsage) (*models.ASRResponse, error) {
diff --git a/internal/ingestion/task/embedder.go b/internal/ingestion/task/embedder.go
index 8bd4ed0a97..a9359c7cd9 100644
--- a/internal/ingestion/task/embedder.go
+++ b/internal/ingestion/task/embedder.go
@@ -50,7 +50,7 @@ func (e *embedder) Encode(ctx context.Context, texts []string) ([]componentpkg.E
return nil, fmt.Errorf("embedder: embedding model driver is nil for model %v", e.model.ModelName)
}
config := &models.EmbeddingConfig{Dimension: 0}
- embeds, err := e.model.ModelDriver.Embed(ctx, e.model.ModelName, texts, e.model.APIConfig, config, nil)
+ embeds, err := e.model.ModelDriver.Embed(ctx, e.model.ModelName, models.EmbedRequest{Texts: texts}, e.model.APIConfig, config, nil)
if err != nil {
return nil, err
}
diff --git a/internal/ingestion/task/embedder_test.go b/internal/ingestion/task/embedder_test.go
index 7df8a57bcc..e3bbe5d730 100644
--- a/internal/ingestion/task/embedder_test.go
+++ b/internal/ingestion/task/embedder_test.go
@@ -77,14 +77,14 @@ type stubDriver struct {
capturedTexts []string
}
-func (d *stubDriver) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *models.APIConfig, embeddingConfig *models.EmbeddingConfig, usage *common.ModelUsage) ([]models.EmbeddingData, error) {
- d.capturedTexts = texts
- result := make([]models.EmbeddingData, len(texts))
- for i := range texts {
+func (d *stubDriver) Embed(ctx context.Context, modelName *string, request models.EmbedRequest, apiConfig *models.APIConfig, embeddingConfig *models.EmbeddingConfig, usage *common.ModelUsage) ([]models.EmbeddingData, error) {
+ d.capturedTexts = request.Texts
+ result := make([]models.EmbeddingData, len(request.Texts))
+ for i := range request.Texts {
result[i] = models.EmbeddingData{
Embedding: []float64{float64(i), 0.1},
Index: i,
- TokenCount: len(texts[i]),
+ TokenCount: len(request.Texts[i]),
}
}
return result, nil
@@ -97,7 +97,7 @@ func (d *stubDriver) ChatWithMessages(ctx context.Context, modelName string, mes
func (d *stubDriver) ChatStreamlyWithSender(ctx context.Context, modelName string, messages []models.Message, apiConfig *models.APIConfig, modelConfig *models.ChatConfig, usage *common.ModelUsage, sender func(*string, *string) error) error {
return nil
}
-func (d *stubDriver) Rerank(ctx context.Context, modelName *string, query string, documents []string, apiConfig *models.APIConfig, rerankConfig *models.RerankConfig, usage *common.ModelUsage) (*models.RerankResponse, error) {
+func (d *stubDriver) Rerank(ctx context.Context, modelName *string, request models.RerankRequest, apiConfig *models.APIConfig, rerankConfig *models.RerankConfig, usage *common.ModelUsage) (*models.RerankResponse, error) {
return nil, nil
}
func (d *stubDriver) TranscribeAudio(ctx context.Context, modelName *string, file *string, apiConfig *models.APIConfig, asrConfig *models.ASRConfig, usage *common.ModelUsage) (*models.ASRResponse, error) {
diff --git a/internal/ingestion/task/knowledge_compiler_wiring.go b/internal/ingestion/task/knowledge_compiler_wiring.go
index 9c9540c9ff..a1023e812b 100644
--- a/internal/ingestion/task/knowledge_compiler_wiring.go
+++ b/internal/ingestion/task/knowledge_compiler_wiring.go
@@ -266,10 +266,11 @@ func (e *kcEmbedder) Encode(ctx context.Context, texts []string) ([][]float32, e
}
batchTexts := texts[start:end]
jobs = append(jobs, func() error {
- if err := ctx.Err(); err != nil {
+ if err = ctx.Err(); err != nil {
return err
}
- embeds, err := mdl.ModelDriver.Embed(ctx, mdl.ModelName, batchTexts, mdl.APIConfig, config, nil)
+ var embeds []models.EmbeddingData
+ embeds, err = mdl.ModelDriver.Embed(ctx, mdl.ModelName, models.EmbedRequest{Texts: batchTexts}, mdl.APIConfig, config, nil)
if err != nil {
return fmt.Errorf("knowledge_compiler: embed: %w", err)
}
@@ -281,7 +282,7 @@ func (e *kcEmbedder) Encode(ctx context.Context, texts []string) ([][]float32, e
return nil
})
}
- if err := knowledge_compile.SubmitCompilerJobs(ctx, jobs); err != nil {
+ if err = knowledge_compile.SubmitCompilerJobs(ctx, jobs); err != nil {
return nil, err
}
// Flatten in input order and derive the vector dimension from the first
diff --git a/internal/service/chat_pipeline.go b/internal/service/chat_pipeline.go
index 05f689eb32..3481ca861e 100644
--- a/internal/service/chat_pipeline.go
+++ b/internal/service/chat_pipeline.go
@@ -2658,7 +2658,7 @@ type embeddingModelEmbedder struct {
func (e *embeddingModelEmbedder) Encode(ctx context.Context, texts []string) ([][]float64, error) {
config := &modelModule.EmbeddingConfig{Dimension: 0}
- embeds, err := e.embModel.ModelDriver.Embed(ctx, e.embModel.ModelName, texts, e.embModel.APIConfig, config, nil)
+ embeds, err := e.embModel.ModelDriver.Embed(ctx, e.embModel.ModelName, modelModule.EmbedRequest{Texts: texts}, e.embModel.APIConfig, config, nil)
if err != nil {
return nil, err
}
diff --git a/internal/service/chunk/chunk.go b/internal/service/chunk/chunk.go
index 0eebfa677e..d18560e463 100644
--- a/internal/service/chunk/chunk.go
+++ b/internal/service/chunk/chunk.go
@@ -1384,7 +1384,7 @@ func (s *ChunkService) AddChunk(ctx context.Context, req *service.AddChunkReques
if len(questionKwd) > 0 {
embeddingText = strings.Join(questionKwd, "\n")
}
- embeddings, err := embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, []string{docName, embeddingText}, embeddingModel.APIConfig, &models.EmbeddingConfig{Dimension: 0}, nil)
+ embeddings, err := embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, models.EmbedRequest{Texts: []string{docName, embeddingText}}, embeddingModel.APIConfig, &models.EmbeddingConfig{Dimension: 0}, nil)
if err != nil {
return nil, addChunkError{code: common.CodeServerError, message: fmt.Sprintf("encode chunk embedding: %v", err)}
}
diff --git a/internal/service/chunk/chunk_test.go b/internal/service/chunk/chunk_test.go
index fe529a0904..0bd56765ee 100644
--- a/internal/service/chunk/chunk_test.go
+++ b/internal/service/chunk/chunk_test.go
@@ -1275,10 +1275,10 @@ func (d *stubEmbeddingDriver) ChatWithMessages(context.Context, string, []models
func (d *stubEmbeddingDriver) ChatStreamlyWithSender(context.Context, string, []models.Message, *models.APIConfig, *models.ChatConfig, *common.ModelUsage, func(*string, *string) error) error {
return nil
}
-func (d *stubEmbeddingDriver) Embed(context.Context, *string, []string, *models.APIConfig, *models.EmbeddingConfig, *common.ModelUsage) ([]models.EmbeddingData, error) {
+func (d *stubEmbeddingDriver) Embed(context.Context, *string, models.EmbedRequest, *models.APIConfig, *models.EmbeddingConfig, *common.ModelUsage) ([]models.EmbeddingData, error) {
return d.embeddings, d.embedErr
}
-func (d *stubEmbeddingDriver) Rerank(context.Context, *string, string, []string, *models.APIConfig, *models.RerankConfig, *common.ModelUsage) (*models.RerankResponse, error) {
+func (d *stubEmbeddingDriver) Rerank(context.Context, *string, models.RerankRequest, *models.APIConfig, *models.RerankConfig, *common.ModelUsage) (*models.RerankResponse, error) {
return nil, nil
}
func (d *stubEmbeddingDriver) TranscribeAudio(context.Context, *string, *string, *models.APIConfig, *models.ASRConfig, *common.ModelUsage) (*models.ASRResponse, error) {
diff --git a/internal/service/dataset/utils.go b/internal/service/dataset/utils.go
index a9cb5eb126..3a953b2983 100644
--- a/internal/service/dataset/utils.go
+++ b/internal/service/dataset/utils.go
@@ -236,7 +236,7 @@ func datasetEncodeEmbedding(ctx context.Context, embeddingModel *modelModule.Emb
cleaned[i] = datasetCleanEmbeddingText(t)
}
embeddingConfig := &modelModule.EmbeddingConfig{Dimension: 0}
- embeddings, err := embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, cleaned, embeddingModel.APIConfig, embeddingConfig, nil)
+ embeddings, err := embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, modelModule.EmbedRequest{Texts: cleaned}, embeddingModel.APIConfig, embeddingConfig, nil)
if err != nil {
return nil, err
}
diff --git a/internal/service/graph/retrieval.go b/internal/service/graph/retrieval.go
index 275bf82dee..8e70b8d11e 100644
--- a/internal/service/graph/retrieval.go
+++ b/internal/service/graph/retrieval.go
@@ -199,7 +199,7 @@ func buildSearchExprs(ctx context.Context, embModel *modelModule.EmbeddingModel,
return []interface{}{matchText}
}
embeddingConfig := &modelModule.EmbeddingConfig{Dimension: 0}
- embeddings, err := embModel.ModelDriver.Embed(ctx, embModel.ModelName, []string{matchText.MatchingText}, embModel.APIConfig, embeddingConfig, nil)
+ embeddings, err := embModel.ModelDriver.Embed(ctx, embModel.ModelName, modelModule.EmbedRequest{Texts: []string{matchText.MatchingText}}, embModel.APIConfig, embeddingConfig, nil)
if err != nil || len(embeddings) == 0 {
return []interface{}{matchText}
}
diff --git a/internal/service/graph/retrieval_test.go b/internal/service/graph/retrieval_test.go
index f105b5fe5e..22bd9d8a8c 100644
--- a/internal/service/graph/retrieval_test.go
+++ b/internal/service/graph/retrieval_test.go
@@ -324,8 +324,8 @@ type spyEmbedDriver struct {
err error
}
-func (s *spyEmbedDriver) Embed(ctx context.Context, _ *string, texts []string, _ *modelModule.APIConfig, _ *modelModule.EmbeddingConfig, _ *common.ModelUsage) ([]modelModule.EmbeddingData, error) {
- s.capturedTexts = texts
+func (s *spyEmbedDriver) Embed(ctx context.Context, _ *string, req modelModule.EmbedRequest, _ *modelModule.APIConfig, _ *modelModule.EmbeddingConfig, _ *common.ModelUsage) ([]modelModule.EmbeddingData, error) {
+ s.capturedTexts = req.Texts
if s.err != nil {
return nil, s.err
}
diff --git a/internal/service/graph/search.go b/internal/service/graph/search.go
index ba27543dd2..7aa028156a 100644
--- a/internal/service/graph/search.go
+++ b/internal/service/graph/search.go
@@ -99,7 +99,7 @@ func buildDenseExpr(ctx context.Context, embModel *modelModule.EmbeddingModel, q
return nil, nil
}
embCfg := &modelModule.EmbeddingConfig{Dimension: 0}
- embeddings, err := embModel.ModelDriver.Embed(ctx, embModel.ModelName, []string{question}, embModel.APIConfig, embCfg, nil)
+ embeddings, err := embModel.ModelDriver.Embed(ctx, embModel.ModelName, modelModule.EmbedRequest{Texts: []string{question}}, embModel.APIConfig, embCfg, nil)
if err != nil {
return nil, fmt.Errorf("KG entity embed failed: %w", err)
}
diff --git a/internal/service/graph/search_test.go b/internal/service/graph/search_test.go
index 6b77bd0c41..57d91724cd 100644
--- a/internal/service/graph/search_test.go
+++ b/internal/service/graph/search_test.go
@@ -344,7 +344,7 @@ type fakeEmbedDriver struct {
func (f *fakeEmbedDriver) Name() string { return f.name }
-func (f *fakeEmbedDriver) Embed(ctx context.Context, modelName *string, texts []string, apiConfig *modelModule.APIConfig, config *modelModule.EmbeddingConfig, usage *common.ModelUsage) ([]modelModule.EmbeddingData, error) {
+func (f *fakeEmbedDriver) Embed(ctx context.Context, modelName *string, request modelModule.EmbedRequest, apiConfig *modelModule.APIConfig, config *modelModule.EmbeddingConfig, usage *common.ModelUsage) ([]modelModule.EmbeddingData, error) {
return []modelModule.EmbeddingData{{Embedding: f.vector}}, nil
}
diff --git a/internal/service/memory.go b/internal/service/memory.go
index 8e3faed147..5b3b621bca 100644
--- a/internal/service/memory.go
+++ b/internal/service/memory.go
@@ -1358,7 +1358,7 @@ func (s *MemoryService) memoryMessageDenseExpr(ctx context.Context, question str
return nil, err
}
embeddingModel := models.NewEmbeddingModel(driver, &modelName, apiConfig, maxTokens)
- embeddings, err := embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, []string{question}, embeddingModel.APIConfig, &models.EmbeddingConfig{Dimension: 0}, nil)
+ embeddings, err := embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, models.EmbedRequest{Texts: []string{question}}, embeddingModel.APIConfig, &models.EmbeddingConfig{Dimension: 0}, nil)
if err != nil {
return nil, err
}
diff --git a/internal/service/memory_message_service.go b/internal/service/memory_message_service.go
index dd3eb6b450..2774b2d5d1 100644
--- a/internal/service/memory_message_service.go
+++ b/internal/service/memory_message_service.go
@@ -261,7 +261,7 @@ func (s *MemoryMessageService) embedAndSaveMessages(ctx context.Context, mem *Cr
return err
}
embeddingModel := models.NewEmbeddingModel(driver, &modelName, apiConfig, maxTokens)
- embeddings, err := embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, contents, embeddingModel.APIConfig, &models.EmbeddingConfig{Dimension: 0}, nil)
+ embeddings, err := embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, models.EmbedRequest{Texts: contents}, embeddingModel.APIConfig, &models.EmbeddingConfig{Dimension: 0}, nil)
if err != nil {
return err
}
diff --git a/internal/service/model_service.go b/internal/service/model_service.go
index e7cc0afb63..53b7f2feeb 100644
--- a/internal/service/model_service.go
+++ b/internal/service/model_service.go
@@ -1196,10 +1196,14 @@ func verifyProviderModel(ctx context.Context, driver modelModule.ModelDriver, pr
err = validateEmbeddingModel(model, requestedDimension, 1)
}
if err == nil {
- _, err = driver.Embed(ctx, &modelName, []string{"test"}, apiConfig, nil, nil)
+ _, err = driver.Embed(ctx, &modelName, modelModule.EmbedRequest{Texts: []string{"test"}}, apiConfig, nil, nil)
}
case "rerank":
- _, err = driver.Rerank(ctx, &modelName, "test", []string{"test"}, apiConfig, &modelModule.RerankConfig{}, nil)
+ rerankRequest := modelModule.RerankRequest{
+ Query: "test",
+ Documents: []string{"test"},
+ }
+ _, err = driver.Rerank(ctx, &modelName, rerankRequest, apiConfig, &modelModule.RerankConfig{}, nil)
case "tts":
content := "hello"
_, err = driver.AudioSpeech(ctx, &modelName, &content, apiConfig, nil, nil)
@@ -2988,7 +2992,7 @@ func (m *ModelProviderService) EmbedText(ctx context.Context, providerName, inst
}
var response []modelModule.EmbeddingData
- response, err = modelDriver.Embed(ctx, &resolvedModelName, texts, info.APIConfig, modelConfig, nil)
+ response, err = modelDriver.Embed(ctx, &resolvedModelName, modelModule.EmbedRequest{Texts: texts}, info.APIConfig, modelConfig, nil)
if err != nil {
return nil, common.CodeServerError, err
}
@@ -3049,8 +3053,13 @@ func (m *ModelProviderService) RerankDocument(ctx context.Context, providerName,
}
}
+ rerankRequest := modelModule.RerankRequest{
+ Query: query,
+ Documents: documents,
+ }
+
var response *modelModule.RerankResponse
- response, err = modelDriver.Rerank(ctx, &resolvedModelName, query, documents, info.APIConfig, modelConfig, nil)
+ response, err = modelDriver.Rerank(ctx, &resolvedModelName, rerankRequest, info.APIConfig, modelConfig, nil)
if err != nil {
return nil, common.CodeServerError, err
}
diff --git a/internal/service/model_service_test.go b/internal/service/model_service_test.go
index c84081cfc9..337d494025 100644
--- a/internal/service/model_service_test.go
+++ b/internal/service/model_service_test.go
@@ -25,7 +25,7 @@ func (d *remoteModelProbeDriver) ListModels(context.Context, *modelModule.APICon
return d.remoteModels, nil
}
-func (d *remoteModelProbeDriver) Embed(context.Context, *string, []string, *modelModule.APIConfig, *modelModule.EmbeddingConfig, *common.ModelUsage) ([]modelModule.EmbeddingData, error) {
+func (d *remoteModelProbeDriver) Embed(context.Context, *string, modelModule.EmbedRequest, *modelModule.APIConfig, *modelModule.EmbeddingConfig, *common.ModelUsage) ([]modelModule.EmbeddingData, error) {
d.embedCalls++
return nil, nil
}
diff --git a/internal/service/nav_embedder.go b/internal/service/nav_embedder.go
index 891e79bff0..f8982d4b7e 100644
--- a/internal/service/nav_embedder.go
+++ b/internal/service/nav_embedder.go
@@ -19,6 +19,7 @@ package service
import (
"context"
"fmt"
+ modelModule "ragflow/internal/entity/models"
"strings"
"ragflow/internal/entity"
@@ -72,7 +73,7 @@ func (e *NavEmbedder) Encode(ctx context.Context, tenantID string, texts []strin
if len(nonEmpty) == 0 {
return nil, nil
}
- embeds, err := model.ModelDriver.Embed(ctx, model.ModelName, nonEmpty, model.APIConfig, nil, nil)
+ embeds, err := model.ModelDriver.Embed(ctx, model.ModelName, modelModule.EmbedRequest{Texts: nonEmpty}, model.APIConfig, nil, nil)
if err != nil {
return nil, err
}
diff --git a/internal/service/nlp/reranker.go b/internal/service/nlp/reranker.go
index 234e54fdee..e9d23ed240 100644
--- a/internal/service/nlp/reranker.go
+++ b/internal/service/nlp/reranker.go
@@ -151,7 +151,7 @@ func RerankByModel(
tsim = TokenSimilarity(keywords, insTw, qb)
// Get similarity scores from reranker model
- rerankResponse, err := rerankModel.ModelDriver.Rerank(ctx, rerankModel.ModelName, query, docs, rerankModel.APIConfig, &models.RerankConfig{}, nil)
+ rerankResponse, err := rerankModel.ModelDriver.Rerank(ctx, rerankModel.ModelName, models.RerankRequest{Query: query, Documents: docs}, rerankModel.APIConfig, &models.RerankConfig{}, nil)
if err != nil {
common.Error("RerankByModel: rerankModel.Rerank failed; falling back to token-only similarity", err)
// If model fails, fall back to token similarity only
diff --git a/internal/service/nlp/retrieval.go b/internal/service/nlp/retrieval.go
index 2a9f085d66..e6f8b4affe 100644
--- a/internal/service/nlp/retrieval.go
+++ b/internal/service/nlp/retrieval.go
@@ -789,7 +789,7 @@ func (s *RetrievalService) GetVector(ctx context.Context, txt string, embModel *
embeddingConfig := &models.EmbeddingConfig{
Dimension: 0,
}
- embeddings, err := embModel.ModelDriver.Embed(ctx, embModel.ModelName, []string{txt}, embModel.APIConfig, embeddingConfig, nil)
+ embeddings, err := embModel.ModelDriver.Embed(ctx, embModel.ModelName, models.EmbedRequest{Texts: []string{txt}}, embModel.APIConfig, embeddingConfig, nil)
if err != nil {
return nil, err
}
diff --git a/internal/service/skill_indexer.go b/internal/service/skill_indexer.go
index 6ab11ef7c6..863287a980 100644
--- a/internal/service/skill_indexer.go
+++ b/internal/service/skill_indexer.go
@@ -935,7 +935,7 @@ func (s *SkillIndexerService) generateEmbedding(ctx context.Context, text, embdI
truncatedText := truncate(text, maxLen-10)
var response []models.EmbeddingData
- response, err = embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, []string{truncatedText}, embeddingModel.APIConfig, nil, nil)
+ response, err = embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, models.EmbedRequest{Texts: []string{truncatedText}}, embeddingModel.APIConfig, nil, nil)
if err != nil {
return nil, fmt.Errorf("failed to encode text: %w", err)
}
@@ -979,7 +979,7 @@ func (s *SkillIndexerService) generateEmbeddings(ctx context.Context, texts []st
common.Info(fmt.Sprintf("Encoding %d texts", len(truncatedTexts)))
// Use batch encode API (consistent with Python's encode(texts: list))
var response []models.EmbeddingData
- response, err = embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, truncatedTexts, embeddingModel.APIConfig, nil, nil)
+ response, err = embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, models.EmbedRequest{Texts: truncatedTexts}, embeddingModel.APIConfig, nil, nil)
if err != nil {
common.Error(fmt.Sprintf("Failed to encode texts: %v", err), err)
return nil, fmt.Errorf("failed to encode texts: %w", err)
@@ -1026,7 +1026,7 @@ func (s *SkillIndexerService) getEmbeddingDimension(ctx context.Context, tenantI
// Use simple test text like Python does: embedding_model.encode(["ok"])
testText := "ok"
var response []models.EmbeddingData
- response, err = embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, []string{testText}, embeddingModel.APIConfig, nil, nil)
+ response, err = embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, models.EmbedRequest{Texts: []string{testText}}, embeddingModel.APIConfig, nil, nil)
if err != nil {
return 0, fmt.Errorf("failed to encode test text: %w", err)
}
diff --git a/internal/service/skill_search.go b/internal/service/skill_search.go
index 6f3409b129..c874565bc3 100644
--- a/internal/service/skill_search.go
+++ b/internal/service/skill_search.go
@@ -680,7 +680,7 @@ func (s *SkillSearchService) getEmbedding(ctx context.Context, text, embdID, ten
truncatedText := truncate(text, maxLen-10)
var response []models.EmbeddingData
- response, err = embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, []string{truncatedText}, embeddingModel.APIConfig, nil, nil)
+ response, err = embeddingModel.ModelDriver.Embed(ctx, embeddingModel.ModelName, models.EmbedRequest{Texts: []string{truncatedText}}, embeddingModel.APIConfig, nil, nil)
if err != nil {
return nil, fmt.Errorf("failed to encode query: %w", err)
}