git.iko.soy/crush
on main help sign in
fix: fix vertex provider
d2f7bb7Kujtim Hoxha
internal/config/load.go+5−6
compare with main
unifiedsplit
@@ -168,8 +168,8 @@ func (c *Config) configureProviders(env env.Env, resolver VariableResolver, know
168 }
168 }
169 continue
169 continue
170 }
170 }
171− prepared.ExtraParams["project"] = env.Get("GOOGLE_CLOUD_PROJECT")
171+ prepared.ExtraParams["project"] = env.Get("VERTEXAI_PROJECT")
172− prepared.ExtraParams["location"] = env.Get("GOOGLE_CLOUD_LOCATION")
172+ prepared.ExtraParams["location"] = env.Get("VERTEXAI_LOCATION")
173 case catwalk.InferenceProviderAzure:
173 case catwalk.InferenceProviderAzure:
174 endpoint, err := resolver.ResolveValue(p.APIEndpoint)
174 endpoint, err := resolver.ResolveValue(p.APIEndpoint)
175 if err != nil || endpoint == "" {
175 if err != nil || endpoint == "" {
@@ -470,10 +470,9 @@ func loadFromReaders(readers []io.Reader) (*Config, error) {
470}
470}
471
471
472func hasVertexCredentials(env env.Env) bool {
472func hasVertexCredentials(env env.Env) bool {
473− useVertex := env.Get("GOOGLE_GENAI_USE_VERTEXAI") == "true"
474− hasProject := env.Get("GOOGLE_CLOUD_PROJECT") != ""
473+ hasProject := env.Get("VERTEXAI_PROJECT") != ""
475− hasLocation := env.Get("GOOGLE_CLOUD_LOCATION") != ""
474+ hasLocation := env.Get("VERTEXAI_LOCATION") != ""
476− return useVertex && hasProject && hasLocation
475+ return hasProject && hasLocation
477}
476}
478
477
479func hasAWSCredentials(env env.Env) bool {
478func hasAWSCredentials(env env.Env) bool {
internal/llm/provider/vertexai.go+2−2
@@ -10,8 +10,8 @@ import (
10type VertexAIClient ProviderClient
10type VertexAIClient ProviderClient
11
11
12func newVertexAIClient(opts providerClientOptions) VertexAIClient {
12func newVertexAIClient(opts providerClientOptions) VertexAIClient {
13− project := opts.extraHeaders["project"]
13+ project := opts.extraParams["project"]
14− location := opts.extraHeaders["location"]
14+ location := opts.extraParams["location"]
15 client, err := genai.NewClient(context.Background(), &genai.ClientConfig{
15 client, err := genai.NewClient(context.Background(), &genai.ClientConfig{
16 Project: project,
16 Project: project,
17 Location: location,
17 Location: location,