Skip to content

fix request for embedding #629

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
QinYuuuu wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix request for embedding #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee485e6
style: embedding token counter use interface instead of struct
Dec 18, 2025
b17e331
fix request for embedding
Dec 18, 2025
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
12 changes: 6 additions & 6 deletions _mocks/opencsg.com/csghub-server/aigateway/token/mock_CounterFactory.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

163 changes: 163 additions & 0 deletions _mocks/opencsg.com/csghub-server/aigateway/token/mock_EmbeddingTokenCounter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions aigateway/handler/openai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,15 @@ func (h *OpenAIHandlerImpl) Embedding(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
if req.Input == "" || req.Model == "" {
c.JSON(http.StatusBadRequest, gin.H{"error": "Model and input cannot be empty"})
if req.Model == "" {
c.JSON(http.StatusBadRequest, gin.H{"error": "Model cannot be empty"})
return
}
if req.Input.OfString.String() == "" &&
len(req.Input.OfArrayOfStrings) == 0 &&
len(req.Input.OfArrayOfTokenArrays) == 0 &&
len(req.Input.OfArrayOfTokens) == 0 {
c.JSON(http.StatusBadRequest, gin.H{"error": "Input cannot be empty"})
return
}
modelID := req.Model
Expand Down Expand Up @@ -407,15 +414,17 @@ func (h *OpenAIHandlerImpl) Embedding(c *gin.Context) {
slog.InfoContext(c, "proxy embedding request to model endpoint", slog.Any("target", target), slog.Any("host", host),
slog.Any("user", username), slog.Any("model_id", modelID))
rp, _ := proxy.NewReverseProxy(target)
w := NewResponseWriterWrapperEmbedding(c.Writer)

tokenCounter := h.tokenCounterFactory.NewEmbedding(token.CreateParam{
Endpoint: target,
Host: host,
Model: modelName,
ImageID: model.ImageID,
})
tokenCounter.Input(req.Input)
w := NewResponseWriterWrapperEmbedding(c.Writer, tokenCounter)
if req.Input.OfString.String() != "" {
tokenCounter.Input(req.Input.OfString.Value)
}

rp.ServeHTTP(w, c.Request, "", host)
go func() {
Expand Down
48 changes: 36 additions & 12 deletions aigateway/handler/openai_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,12 @@ func TestOpenAIHandler_Embedding(t *testing.T) {
tester, c, w := setupTest(t)
// Empty Input
embeddingReq := EmbeddingRequest{
Model: "model1:svc1",
Input: "",
EmbeddingNewParams: openai.EmbeddingNewParams{
Model: "model1:svc1",
Input: openai.EmbeddingNewParamsInputUnion{
OfArrayOfStrings: []string{},
},
},
}
body, _ := json.Marshal(embeddingReq)
c.Request.Method = http.MethodPost
Expand All @@ -424,8 +428,12 @@ func TestOpenAIHandler_Embedding(t *testing.T) {
httpbase.SetCurrentUser(c, "testuser")
httpbase.SetCurrentUserUUID(c, "testuuid")
embeddingReq = EmbeddingRequest{
Model: "",
Input: "test input",
EmbeddingNewParams: openai.EmbeddingNewParams{
Model: "",
Input: openai.EmbeddingNewParamsInputUnion{
OfArrayOfStrings: []string{"test input"},
},
},
}
body, _ = json.Marshal(embeddingReq)
c.Request.Body = io.NopCloser(bytes.NewReader(body))
Expand All @@ -438,8 +446,12 @@ func TestOpenAIHandler_Embedding(t *testing.T) {
t.Run("model not found", func(t *testing.T) {
tester, c, w := setupTest(t)
embeddingReq := EmbeddingRequest{
Model: "nonexistent:svc",
Input: "test input",
EmbeddingNewParams: openai.EmbeddingNewParams{
Model: "nonexistent:svc",
Input: openai.EmbeddingNewParamsInputUnion{
OfArrayOfStrings: []string{"test input"},
},
},
}
body, _ := json.Marshal(embeddingReq)
c.Request.Method = http.MethodPost
Expand All @@ -455,8 +467,12 @@ func TestOpenAIHandler_Embedding(t *testing.T) {
t.Run("get model error", func(t *testing.T) {
tester, c, w := setupTest(t)
embeddingReq := EmbeddingRequest{
Model: "model1:svc1",
Input: "test input",
EmbeddingNewParams: openai.EmbeddingNewParams{
Model: "model1:svc1",
Input: openai.EmbeddingNewParamsInputUnion{
OfArrayOfStrings: []string{"test input"},
},
},
}
body, _ := json.Marshal(embeddingReq)
c.Request.Method = http.MethodPost
Expand All @@ -472,8 +488,12 @@ func TestOpenAIHandler_Embedding(t *testing.T) {
t.Run("model not running", func(t *testing.T) {
tester, c, w := setupTest(t)
embeddingReq := EmbeddingRequest{
Model: "model1:svc1",
Input: "test input",
EmbeddingNewParams: openai.EmbeddingNewParams{
Model: "model1:svc1",
Input: openai.EmbeddingNewParamsInputUnion{
OfArrayOfStrings: []string{"test input"},
},
},
}
body, _ := json.Marshal(embeddingReq)
c.Request.Method = http.MethodPost
Expand Down Expand Up @@ -503,8 +523,12 @@ func TestOpenAIHandler_Embedding(t *testing.T) {
t.Run("model without svc name", func(t *testing.T) {
tester, c, _ := setupTest(t)
embeddingReq := EmbeddingRequest{
Model: "model1",
Input: "test input",
EmbeddingNewParams: openai.EmbeddingNewParams{
Model: "model1",
Input: openai.EmbeddingNewParamsInputUnion{
OfArrayOfStrings: []string{"test input"},
},
},
}
body, _ := json.Marshal(embeddingReq)
c.Request.Method = http.MethodPost
Expand Down
Loading
Loading