8248e4f · crush · git.iko.soy

git.iko.soy/crush

on main help sign in

fix: use anthropic provider for vertexAI (#398)

8248e4fKujtim Hoxha1 year ago

go.mod+5

compare with main

unifiedsplit

@@ -49,11 +49,16 @@ require (

49)

51require (

52+ cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect

52 github.com/bahlo/generic-list-go v0.2.0 // indirect

53 github.com/bahlo/generic-list-go v0.2.0 // indirect

53 github.com/buger/jsonparser v1.1.1 // indirect

54 github.com/buger/jsonparser v1.1.1 // indirect

54 github.com/mailru/easyjson v0.7.7 // indirect

55 github.com/mailru/easyjson v0.7.7 // indirect

55 github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect

56 github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect

57+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect

56 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect

58 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect

59+ golang.org/x/oauth2 v0.25.0 // indirect

60+ golang.org/x/time v0.8.0 // indirect

61+ google.golang.org/api v0.211.0 // indirect

57)

62)

59require (

64require (

go.sum+10

@@ -2,6 +2,8 @@ cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=

2cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=

3cloud.google.com/go/auth v0.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs=

4cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q=

5+cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU=

6+cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=

5cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=

7cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=

6cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=

8cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=

7github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=

9github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=

@@ -290,6 +292,8 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=

290github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=

292github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=

291go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=

293go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=

292go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=

294go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=

295+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc=

296+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI=

293go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=

297go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=

294go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=

298go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=

295go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=

299go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=

@@ -328,6 +332,8 @@ golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=

328golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=

332golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=

329golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=

333golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=

330golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=

334golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=

335+golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=

336+golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=

331golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

337golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

332golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

338golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

333golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

339golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

@@ -367,11 +373,15 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=

367golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=

373golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=

368golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=

374golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=

369golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=

375golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=

376+golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=

377+golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=

370golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

378golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

371golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

379golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

372golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

380golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

373golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=

381golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=

374golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

382golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

383+google.golang.org/api v0.211.0 h1:IUpLjq09jxBSV1lACO33CGY3jsRcbctfGzhj+ZSE/Bg=

384+google.golang.org/api v0.211.0/go.mod h1:XOloB4MXFH4UTlQSGuNUxw0UT74qdENK8d6JNsXKLi0=

375google.golang.org/genai v1.3.0 h1:tXhPJF30skOjnnDY7ZnjK3q7IKy4PuAlEA0fk7uEaEI=

385google.golang.org/genai v1.3.0 h1:tXhPJF30skOjnnDY7ZnjK3q7IKy4PuAlEA0fk7uEaEI=

376google.golang.org/genai v1.3.0/go.mod h1:TyfOKRz/QyCaj6f/ZDt505x+YreXnY40l2I6k8TvgqY=

386google.golang.org/genai v1.3.0/go.mod h1:TyfOKRz/QyCaj6f/ZDt505x+YreXnY40l2I6k8TvgqY=

377google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=

387google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=

internal/llm/provider/anthropic.go+21−6

@@ -15,6 +15,7 @@ import (

15 "github.com/anthropics/anthropic-sdk-go"

16 "github.com/anthropics/anthropic-sdk-go/bedrock"

17 "github.com/anthropics/anthropic-sdk-go/option"

18+ "github.com/anthropics/anthropic-sdk-go/vertex"

18 "github.com/charmbracelet/catwalk/pkg/catwalk"

19 "github.com/charmbracelet/catwalk/pkg/catwalk"

19 "github.com/charmbracelet/crush/internal/config"

20 "github.com/charmbracelet/crush/internal/config"

20 "github.com/charmbracelet/crush/internal/llm/tools"

21 "github.com/charmbracelet/crush/internal/llm/tools"

@@ -26,21 +27,30 @@ var contextLimitRegex = regexp.MustCompile(`input length and ` + "`max_tokens`"

27type anthropicClient struct {

28type anthropicClient struct {

28 providerOptions providerClientOptions

29 providerOptions providerClientOptions

29− useBedrock bool

30+ tp AnthropicClientType

30 client anthropic.Client

31 client anthropic.Client

31 adjustedMaxTokens int // Used when context limit is hit

32 adjustedMaxTokens int // Used when context limit is hit

32}

33}

34type AnthropicClient ProviderClient

35type AnthropicClient ProviderClient

37+type AnthropicClientType string

38+

39+const (

40+ AnthropicClientTypeNormal AnthropicClientType = "normal"

41+ AnthropicClientTypeBedrock AnthropicClientType = "bedrock"

42+ AnthropicClientTypeVertex AnthropicClientType = "vertex"

43+)

44+

36−func newAnthropicClient(opts providerClientOptions, useBedrock bool) AnthropicClient {

45+func newAnthropicClient(opts providerClientOptions, tp AnthropicClientType) AnthropicClient {

37 return &anthropicClient{

46 return &anthropicClient{

38 providerOptions: opts,

47 providerOptions: opts,

48+ tp: tp,

39− client: createAnthropicClient(opts, useBedrock),

49+ client: createAnthropicClient(opts, tp),

40 }

50 }

41}

51}

43−func createAnthropicClient(opts providerClientOptions, useBedrock bool) anthropic.Client {

53+func createAnthropicClient(opts providerClientOptions, tp AnthropicClientType) anthropic.Client {

44 anthropicClientOptions := []option.RequestOption{}

54 anthropicClientOptions := []option.RequestOption{}

46 // Check if Authorization header is provided in extra headers

56 // Check if Authorization header is provided in extra headers

@@ -67,8 +77,13 @@ func createAnthropicClient(opts providerClientOptions, useBedrock bool) anthropi

67 } else if hasBearerAuth {

77 } else if hasBearerAuth {

68 slog.Debug("Skipping X-Api-Key header because Authorization header is provided")

78 slog.Debug("Skipping X-Api-Key header because Authorization header is provided")

69 }

79 }

70− if useBedrock {

80+ switch tp {

81+ case AnthropicClientTypeBedrock:

71 anthropicClientOptions = append(anthropicClientOptions, bedrock.WithLoadDefaultConfig(context.Background()))

82 anthropicClientOptions = append(anthropicClientOptions, bedrock.WithLoadDefaultConfig(context.Background()))

83+ case AnthropicClientTypeVertex:

84+ project := opts.extraParams["project"]

85+ location := opts.extraParams["location"]

86+ anthropicClientOptions = append(anthropicClientOptions, vertex.WithGoogleAuth(context.Background(), location, project))

72 }

87 }

73 for key, header := range opts.extraHeaders {

88 for key, header := range opts.extraHeaders {

74 anthropicClientOptions = append(anthropicClientOptions, option.WithHeaderAdd(key, header))

89 anthropicClientOptions = append(anthropicClientOptions, option.WithHeaderAdd(key, header))

@@ -478,7 +493,7 @@ func (a *anthropicClient) shouldRetry(attempts int, err error) (bool, int64, err

478 if err != nil {

493 if err != nil {

479 return false, 0, fmt.Errorf("failed to resolve API key: %w", err)

494 return false, 0, fmt.Errorf("failed to resolve API key: %w", err)

480 }

495 }

481− a.client = createAnthropicClient(a.providerOptions, a.useBedrock)

496+ a.client = createAnthropicClient(a.providerOptions, a.tp)

482 return true, 0, nil

497 return true, 0, nil

483 }

498 }

484

499

internal/llm/provider/bedrock.go+1−1

@@ -52,7 +52,7 @@ func newBedrockClient(opts providerClientOptions) BedrockClient {

52 opts.disableCache = true // Disable cache for Bedrock

53 return &bedrockClient{

54 providerOptions: opts,

55− childProvider: newAnthropicClient(anthropicOpts, true),

55+ childProvider: newAnthropicClient(anthropicOpts, AnthropicClientTypeBedrock),

56 }

57 }

internal/llm/provider/provider.go+1−1

@@ -173,7 +173,7 @@ func NewProvider(cfg config.ProviderConfig, opts ...ProviderClientOption) (Provi

173 case catwalk.TypeAnthropic:

174 return &baseProvider[AnthropicClient]{

175 options: clientOptions,

176− client: newAnthropicClient(clientOptions, false),

176+ client: newAnthropicClient(clientOptions, AnthropicClientTypeNormal),

177 }, nil

178 case catwalk.TypeOpenAI:

179 return &baseProvider[OpenAIClient]{

internal/llm/provider/vertexai.go+5

@@ -3,6 +3,7 @@ package provider

3import (

4 "context"

5 "log/slog"

6+ "strings"

7 "google.golang.org/genai"

8 "google.golang.org/genai"

@@ -22,6 +23,10 @@ func newVertexAIClient(opts providerClientOptions) VertexAIClient {

22 return nil

23 return nil

23 }

24 }

26+ model := opts.model(opts.modelType)

27+ if strings.Contains(model.ID, "anthropic") || strings.Contains(model.ID, "claude-sonnet") {

28+ return newAnthropicClient(opts, AnthropicClientTypeVertex)

29+ }

25 return &geminiClient{

30 return &geminiClient{

26 providerOptions: opts,

31 providerOptions: opts,

27 client: client,

32 client: client,