Skip to content

fix(embedding): respect server_url for openai embedding provider #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sci-fiBrain wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

fix(embedding): respect server_url for openai embedding provider #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/embedding/embeddings_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func EmbeddingsHandler(c *gin.Context) {
case "qianfan":
oaiResp, err = baiduqianfan.BaiduQianfanEmbedding(&oaiEmbReq, apiKey, secretKey, proxyTransport)
case "openai":
oaiResp, err = oai.OpenAIEmbedding(&oaiEmbReq, apiKey, proxyTransport)
oaiResp, err = oai.OpenAIEmbedding(&oaiEmbReq, apiKey, s.ServerURL, proxyTransport)
default:
mylog.Logger.Error("Unsupported service", zap.String("service", s.ServiceName))
c.JSON(http.StatusBadRequest, gin.H{"error": "Unsupported service"})
Expand Down
10 changes: 8 additions & 2 deletions pkg/embedding/oai/oai_embedding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ import (
"fmt"
"io"
"net/http"
"strings"
"time"
)

// GenerateEmbedding 生成文本的嵌入向量
func OpenAIEmbedding(embReq *EmbeddingRequest, apiKey string, proxyTransport *http.Transport) (*EmbeddingResponse, error) {
func OpenAIEmbedding(embReq *EmbeddingRequest, apiKey string, serverURL string, proxyTransport *http.Transport) (*EmbeddingResponse, error) {

url := "https://api.openai.com/v1/embeddings"
url := serverURL
if url == "" {
url = "https://api.openai.com/v1/embeddings"
} else {
url = strings.TrimRight(url, "/") + "/embeddings"
}
Comment on lines +16 to +21
requestBody, err := json.Marshal(embReq)
if err != nil {
return nil, fmt.Errorf("JSON 编码错误: %v", err)
Expand Down