Skip to content

Commit d177345

Browse files
committed
fix lint issues in vertex ai image generation translator
1 parent 555e6f3 commit d177345

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

internal/apischema/gcp/gcp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ type ImageParameters struct {
132132
// ImageOutputOptions specifies the output format and compression for generated images.
133133
type ImageOutputOptions struct {
134134
MIMEType string `json:"mimeType,omitempty"`
135-
CompressionQuality *int `json:"compressionQuality,omitempty"`
135+
CompressionQuality *int `json:"compressionQuality,omitempty"`
136136
}
137137

138138
// ImagePrediction is a single image in the Imagen predict response.

internal/translator/imagegeneration_openai_gcpvertexai.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ import (
1313
"strings"
1414
"time"
1515

16+
"google.golang.org/genai"
17+
1618
"github.com/envoyproxy/ai-gateway/internal/apischema/gcp"
1719
"github.com/envoyproxy/ai-gateway/internal/apischema/openai"
1820
"github.com/envoyproxy/ai-gateway/internal/internalapi"
1921
"github.com/envoyproxy/ai-gateway/internal/json"
2022
"github.com/envoyproxy/ai-gateway/internal/metrics"
2123
"github.com/envoyproxy/ai-gateway/internal/tracing/tracingapi"
22-
"google.golang.org/genai"
2324
)
2425

2526
// NewImageGenerationOpenAIToGCPVertexAITranslator implements [Factory] for OpenAI to GCP Vertex AI
@@ -41,7 +42,7 @@ type openAIToGCPVertexAIImageGenerationTranslator struct {
4142
isImagenModel bool
4243
}
4344

44-
func (o *openAIToGCPVertexAIImageGenerationTranslator) RequestBody(original []byte, openAIReq *openai.ImageGenerationRequest, forceBodyMutation bool) (
45+
func (o *openAIToGCPVertexAIImageGenerationTranslator) RequestBody(_ []byte, openAIReq *openai.ImageGenerationRequest, _ bool) (
4546
newHeaders []internalapi.Header, newBody []byte, err error,
4647
) {
4748
o.requestModel = cmp.Or(o.modelNameOverride, openAIReq.Model)
@@ -58,15 +59,15 @@ func (o *openAIToGCPVertexAIImageGenerationTranslator) RequestBody(original []by
5859
return
5960
}
6061
newBody, err = json.Marshal(imgGenReq)
61-
path = buildGCPModelPathSuffix(gcpModelPublisherGoogle, string(o.requestModel), gcpMethodPredict)
62+
path = buildGCPModelPathSuffix(gcpModelPublisherGoogle, o.requestModel, gcpMethodPredict)
6263
} else {
6364
var geminiReq *gcp.GenerateContentRequest
6465
geminiReq, err = openAIToGeminiRequest(openAIReq)
6566
if err != nil {
6667
return
6768
}
6869
newBody, err = json.Marshal(geminiReq)
69-
path = buildGCPModelPathSuffix(gcpModelPublisherGoogle, string(o.requestModel), gcpMethodGenerateContent)
70+
path = buildGCPModelPathSuffix(gcpModelPublisherGoogle, o.requestModel, gcpMethodGenerateContent)
7071
}
7172
if err != nil {
7273
err = fmt.Errorf("failed to encode request: %w", err)
@@ -148,7 +149,7 @@ func openAIToImagenRequest(req *openai.ImageGenerationRequest) (*gcp.ImagePredic
148149
{Prompt: req.Prompt},
149150
},
150151
Parameters: &gcp.ImageParameters{
151-
SampleCount: int(cmp.Or(req.N, 1)),
152+
SampleCount: cmp.Or(req.N, 1),
152153
AspectRatio: aspectRatio,
153154
SampleImageSize: sampleImageSize,
154155
OutputOptions: outputOptions,
@@ -183,7 +184,7 @@ func openAIToGeminiRequest(req *openai.ImageGenerationRequest) (*gcp.GenerateCon
183184
},
184185
},
185186
GenerationConfig: &genai.GenerationConfig{
186-
CandidateCount: int32(cmp.Or(req.N, 1)),
187+
CandidateCount: int32(cmp.Or(req.N, 1)), //nolint:gosec
187188
},
188189
}, nil
189190
}
@@ -254,9 +255,9 @@ func geminiToOpenAIResponse(resp *genai.GenerateContentResponse, tokenUsage *met
254255
InputTokens: int(inputTokens),
255256
OutputTokens: int(outputTokens),
256257
}
257-
tokenUsage.SetInputTokens(uint32(inputTokens))
258-
tokenUsage.SetOutputTokens(uint32(outputTokens))
259-
tokenUsage.SetTotalTokens(uint32(totalTokens))
258+
tokenUsage.SetInputTokens(uint32(inputTokens)) //nolint:gosec
259+
tokenUsage.SetOutputTokens(uint32(outputTokens)) //nolint:gosec
260+
tokenUsage.SetTotalTokens(uint32(totalTokens)) //nolint:gosec
260261
}
261262

262263
return &openai.ImageGenerationResponse{

internal/translator/imagegeneration_openai_gcpvertexai_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func TestGCPVertexAIImageGeneration_ResponseBody_Imagen(t *testing.T) {
266266
require.NoError(t, err)
267267
require.NotNil(t, headers)
268268
require.Equal(t, contentLengthHeaderName, headers[0].Key())
269-
require.Equal(t, "imagen-4.0-generate-001", string(responseModel))
269+
require.Equal(t, "imagen-4.0-generate-001", responseModel)
270270

271271
var got openai.ImageGenerationResponse
272272
require.NoError(t, json.Unmarshal(body, &got))
@@ -275,7 +275,7 @@ func TestGCPVertexAIImageGeneration_ResponseBody_Imagen(t *testing.T) {
275275
require.Equal(t, "enhanced prompt", got.Data[0].RevisedPrompt)
276276
require.Equal(t, "aW1hZ2VkYXRhMg==", got.Data[1].B64JSON)
277277
require.Equal(t, "png", got.OutputFormat)
278-
require.True(t, got.Created > 0)
278+
require.Positive(t, got.Created)
279279

280280
// Imagen has no token usage.
281281
inputTokens, inputOk := tokenUsage.InputTokens()
@@ -340,7 +340,7 @@ func TestGCPVertexAIImageGeneration_ResponseBody_Gemini(t *testing.T) {
340340

341341
_, body, tokenUsage, responseModel, err := tr.ResponseBody(nil, bytes.NewReader(respBody), false, nil)
342342
require.NoError(t, err)
343-
require.Equal(t, "gemini-2.0-flash-exp", string(responseModel))
343+
require.Equal(t, "gemini-2.0-flash-exp", responseModel)
344344

345345
var got openai.ImageGenerationResponse
346346
require.NoError(t, json.Unmarshal(body, &got))

tests/data-plane/testupstream_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func TestWithTestUpstream(t *testing.T) {
190190
require.Equal(t, "aW1hZ2VkYXRh", resp.Data[0].B64JSON)
191191
require.Equal(t, "aW1hZ2VkYXRhMg==", resp.Data[1].B64JSON)
192192
require.Equal(t, "png", resp.OutputFormat)
193-
require.True(t, resp.Created > 0)
193+
require.Positive(t, resp.Created)
194194
},
195195
},
196196
{

0 commit comments

Comments
 (0)