Skip to content

Model-dependent region configuration in Vertex providers #6

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

Merged
tucnak merged 2 commits into from
Apr 30, 2025
Merged

Model-dependent region configuration in Vertex providers #6

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
5a2102c
vertex: model-depedndent region selection
tucnak Apr 30, 2025
ab4706e
config: a slight test adjustment
tucnak Apr 30, 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
5 changes: 4 additions & 1 deletion config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,10 @@ type Model struct {
Embedding bool `hcl:"embedding,optional"`
Images bool `hcl:"images,optional"`
Videos bool `hcl:"videos,optional"`
Reasoning bool `hcl:"reasoning,optional"`
Thinking bool `hcl:"thinking,optional"`
Batch bool `hcl:"batch,optional"`
// Region is relevant for providers with inconsistent availability.
Region string `hcl:"region,optional"`

ModelDefault
}
Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestParsePath(t *testing.T) {
Name: "api",
Models: []Model{
{Name: "gpt-4o", Alias: list{"4o"}},
{Name: "o3-mini", Alias: list{"o3"}, Reasoning: true},
{Name: "o3-mini", Alias: list{"o3"}, Thinking: true},
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions config/simp.hcl.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ provider "{{ .Driver }}" "{{ .Name }}" {
{{- if .Images }}
images = {{ .Images }}
{{- end }}
{{- if .Reasoning }}
reasoning = {{ .Reasoning }}
{{- if .Thinking }}
thinking = {{ .Thinking }}
{{- end }}
}
{{- end }}
Expand Down
20 changes: 16 additions & 4 deletions driver/vertex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ type Vertex struct {
uploads map[string]string
}

func (v *Vertex) region(ctx context.Context) string {
m, ok := ctx.Value(simp.KeyModel).(config.Model)
if !ok || m.Region == "" {
return v.Region
}
return m.Region
}

func (v *Vertex) List(ctx context.Context) ([]openai.Model, error) {
client, err := v.genaiClient(ctx)
if err != nil {
Expand Down Expand Up @@ -421,10 +429,13 @@ func (v *Vertex) BatchUpload(ctx context.Context, batch *openai.Batch, inputs []
if !v.Batch {
return simp.ErrNotImplemented
}
modelName, ok := ctx.Value(simp.KeyModel).(config.Model)
model, ok := ctx.Value(simp.KeyModel).(config.Model)
if !ok {
return fmt.Errorf("model not found")
}
if !model.Batch {
return fmt.Errorf("model %q does not support batching", model.Name)
}

client, err := v.bigqueryClient(ctx)
if err != nil {
Expand All @@ -451,7 +462,7 @@ func (v *Vertex) BatchUpload(ctx context.Context, batch *openai.Batch, inputs []
contents, config := sect.Contents, sect.Config
// Build the request map with only non-nil values
req := map[string]any{
"model": v.googleModel(modelName.Name),
"model": v.googleModel(model.Name),
"contents": contents,
}
if config.SystemInstruction != nil {
Expand Down Expand Up @@ -524,6 +535,7 @@ func (v *Vertex) BatchUpload(ctx context.Context, batch *openai.Batch, inputs []
}
chunk := rows[input:end]

fmt.Println("inserting chunk", len(chunk), "into", v.Dataset, table)
if err := inserter.Put(ctx, chunk); err != nil {
return fmt.Errorf("failed to insert batch chunk: %w", err)
}
Expand Down Expand Up @@ -777,7 +789,7 @@ func (v *Vertex) genaiClient(ctx context.Context) (*genai.Client, error) {
client, err := genai.NewClient(ctx, &genai.ClientConfig{
Backend: genai.BackendVertexAI,
Project: v.Project,
Location: v.Region,
Location: v.region(ctx),
Credentials: auth.NewCredentials(&auth.CredentialsOptions{
JSON: []byte(v.APIKey),
}),
Expand All @@ -794,7 +806,7 @@ func (v *Vertex) genaiClient(ctx context.Context) (*genai.Client, error) {

func (v *Vertex) jobClient(ctx context.Context) (*aipl.JobClient, error) {
client, err := aipl.NewJobClient(ctx,
option.WithEndpoint(v.Region+"-aiplatform.googleapis.com:443"),
option.WithEndpoint(v.region(ctx)+"-aiplatform.googleapis.com:443"),
v.credentials())
if err != nil {
return nil, fmt.Errorf("cannot make job client: %w", err)
Expand Down