Skip to content

Commit da9bdfe

Browse files
committed
fix-tests
Signed-off-by: yxia216 <[email protected]>
1 parent 7ffbf93 commit da9bdfe

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

internal/translator/openai_gcpvertexai.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,6 @@ func (o *openAIToGCPVertexAITranslatorV1ChatCompletion) openAIMessageToGeminiMes
361361
if err != nil {
362362
return nil, fmt.Errorf("error converting tool choice: %w", err)
363363
}
364-
if openAIReq.EnterpriseWebSearch {
365-
tools = append(tools, genai.Tool{
366-
EnterpriseWebSearch: &genai.EnterpriseWebSearch{},
367-
})
368-
}
369364

370365
// Convert generation config.
371366
generationConfig, responseMode, err := openAIReqToGeminiGenerationConfig(openAIReq, requestModel)
@@ -411,6 +406,12 @@ func (o *openAIToGCPVertexAITranslatorV1ChatCompletion) applyVendorSpecificField
411406
if gcpVendorFields.SafetySettings != nil {
412407
gcr.SafetySettings = gcpVendorFields.SafetySettings
413408
}
409+
410+
if gcpVendorFields.EnterpriseWebSearch {
411+
gcr.Tools = append(gcr.Tools, genai.Tool{
412+
EnterpriseWebSearch: &genai.EnterpriseWebSearch{},
413+
})
414+
}
414415
}
415416

416417
func (o *openAIToGCPVertexAITranslatorV1ChatCompletion) geminiResponseToOpenAIMessage(gcr genai.GenerateContentResponse, responseModel string) (*openai.ChatCompletionResponse, error) {

internal/translator/openai_gcpvertexai_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ func TestOpenAIToGCPVertexAITranslatorV1ChatCompletion_RequestBody(t *testing.T)
307307
],
308308
"tools": [
309309
{
310-
"enterpriseWebSearch": {},
310+
"enterpriseWebSearch": {}
311311
}
312312
],
313313
"generation_config": {
314314
"maxOutputTokens": 1024,
315315
"temperature": 0.7
316-
},
316+
}
317317
}`)
318318

319319
tests := []struct {
@@ -707,7 +707,7 @@ func TestOpenAIToGCPVertexAITranslatorV1ChatCompletion_RequestBody(t *testing.T)
707707
{
708708
Header: &corev3.HeaderValue{
709709
Key: "Content-Length",
710-
RawValue: []byte("395"),
710+
RawValue: []byte("190"),
711711
},
712712
},
713713
},

0 commit comments

Comments
 (0)