feat: add Google GenAI provider adapter
Streaming via goroutine+channel bridge (range-based iter.Seq2 → pull iterator). Tool use with FunctionCall/FunctionResponse, tool name sanitization, tool name map for FunctionResponse correlation. Stop reason override (Google uses STOP for function calls). Hardcoded model list (gemini-2.5-pro/flash, gemini-2.0-flash). Wired into CLI with GOOGLE_API_KEY + GEMINI_API_KEY env support. Live verified: text streaming + tool calling with gemini-2.5-flash. Four providers now live: Mistral, Anthropic, OpenAI, Google.
This commit is contained in:
@@ -14,6 +14,7 @@ import (
|
||||
"somegit.dev/Owlibou/gnoma/internal/provider"
|
||||
anthropicprov "somegit.dev/Owlibou/gnoma/internal/provider/anthropic"
|
||||
"somegit.dev/Owlibou/gnoma/internal/provider/mistral"
|
||||
googleprov "somegit.dev/Owlibou/gnoma/internal/provider/google"
|
||||
oaiprov "somegit.dev/Owlibou/gnoma/internal/provider/openai"
|
||||
"somegit.dev/Owlibou/gnoma/internal/stream"
|
||||
"somegit.dev/Owlibou/gnoma/internal/tool"
|
||||
@@ -172,6 +173,7 @@ func resolveAPIKey(providerName string) string {
|
||||
// Try common alternatives
|
||||
alternatives := map[string][]string{
|
||||
"anthropic": {"ANTHROPICS_API_KEY"},
|
||||
"google": {"GOOGLE_API_KEY"},
|
||||
}
|
||||
for _, alt := range alternatives[providerName] {
|
||||
if key := os.Getenv(alt); key != "" {
|
||||
@@ -194,8 +196,10 @@ func createProvider(name, apiKey, model string) (provider.Provider, error) {
|
||||
return anthropicprov.New(cfg)
|
||||
case "openai":
|
||||
return oaiprov.New(cfg)
|
||||
case "google":
|
||||
return googleprov.New(cfg)
|
||||
default:
|
||||
return nil, fmt.Errorf("unknown provider %q (supports: mistral, anthropic, openai)", name)
|
||||
return nil, fmt.Errorf("unknown provider %q (supports: mistral, anthropic, openai, google)", name)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
17
go.mod
17
go.mod
@@ -6,12 +6,29 @@ require (
|
||||
github.com/VikingOwl91/mistral-go-sdk v1.2.1
|
||||
github.com/anthropics/anthropic-sdk-go v1.29.0
|
||||
github.com/openai/openai-go v1.12.0
|
||||
google.golang.org/genai v1.52.1
|
||||
)
|
||||
|
||||
require (
|
||||
cloud.google.com/go v0.116.0 // indirect
|
||||
cloud.google.com/go/auth v0.9.3 // indirect
|
||||
cloud.google.com/go/compute/metadata v0.5.0 // indirect
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||
github.com/google/go-cmp v0.6.0 // indirect
|
||||
github.com/google/s2a-go v0.1.8 // indirect
|
||||
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
|
||||
github.com/gorilla/websocket v1.5.3 // indirect
|
||||
github.com/tidwall/gjson v1.18.0 // indirect
|
||||
github.com/tidwall/match v1.1.1 // indirect
|
||||
github.com/tidwall/pretty v1.2.1 // indirect
|
||||
github.com/tidwall/sjson v1.2.5 // indirect
|
||||
go.opencensus.io v0.24.0 // indirect
|
||||
golang.org/x/crypto v0.40.0 // indirect
|
||||
golang.org/x/net v0.41.0 // indirect
|
||||
golang.org/x/sync v0.16.0 // indirect
|
||||
golang.org/x/sys v0.34.0 // indirect
|
||||
golang.org/x/text v0.27.0 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
|
||||
google.golang.org/grpc v1.66.2 // indirect
|
||||
google.golang.org/protobuf v1.34.2 // indirect
|
||||
)
|
||||
|
||||
121
go.sum
121
go.sum
@@ -1,15 +1,67 @@
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
|
||||
cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
|
||||
cloud.google.com/go/auth v0.9.3 h1:VOEUIAADkkLtyfr3BLa3R8Ed/j6w1jTBmARx+wb5w5U=
|
||||
cloud.google.com/go/auth v0.9.3/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk=
|
||||
cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
|
||||
cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/VikingOwl91/mistral-go-sdk v1.2.1 h1:6OQMtOzJUFcvFUEtbX9VlglUPBn+dKOrQPnyoVKlpkA=
|
||||
github.com/VikingOwl91/mistral-go-sdk v1.2.1/go.mod h1:f4emNtHUx2zSqY3V0LBz6lNI1jE6q/zh+SEU+/hJ0i4=
|
||||
github.com/anthropics/anthropic-sdk-go v1.29.0 h1:7h1ZyRflhtxyuFkdwkVuJ1LdFAYdmizvgg0gd1uvOfI=
|
||||
github.com/anthropics/anthropic-sdk-go v1.29.0/go.mod h1:dSIO7kSrOI7MA4fE6RRVaw8tyWP7HNQU5/H/KS4cax8=
|
||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
|
||||
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
|
||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
|
||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
||||
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
||||
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
|
||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
|
||||
github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
|
||||
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw=
|
||||
github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA=
|
||||
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
|
||||
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/openai/openai-go v1.12.0 h1:NBQCnXzqOTv5wsgNC36PrFEiskGfO5wccfCWDo9S1U0=
|
||||
github.com/openai/openai-go v1.12.0/go.mod h1:g461MYGXEXBVdV5SaR/5tNzNbSfwTBBefwc+LlDCK0Y=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
||||
@@ -22,9 +74,78 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
|
||||
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
|
||||
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
|
||||
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
|
||||
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
|
||||
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
|
||||
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
||||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
|
||||
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
|
||||
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
|
||||
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
|
||||
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/genai v1.52.1 h1:dYoljKtLDXMiBdVaClSJ/ZPwZ7j1N0lGjMhwOKOQUlk=
|
||||
google.golang.org/genai v1.52.1/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
|
||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
|
||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
||||
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
|
||||
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
||||
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
|
||||
google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
|
||||
google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
|
||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
||||
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
||||
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
|
||||
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
|
||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
|
||||
94
internal/provider/google/provider.go
Normal file
94
internal/provider/google/provider.go
Normal file
@@ -0,0 +1,94 @@
|
||||
package google
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"somegit.dev/Owlibou/gnoma/internal/provider"
|
||||
"somegit.dev/Owlibou/gnoma/internal/stream"
|
||||
|
||||
"google.golang.org/genai"
|
||||
)
|
||||
|
||||
const defaultModel = "gemini-2.5-flash"
|
||||
|
||||
// Provider implements provider.Provider for Google's Gemini API.
|
||||
type Provider struct {
|
||||
client *genai.Client
|
||||
name string
|
||||
model string
|
||||
}
|
||||
|
||||
// New creates a Google GenAI provider from config.
|
||||
func New(cfg provider.ProviderConfig) (provider.Provider, error) {
|
||||
if cfg.APIKey == "" {
|
||||
return nil, fmt.Errorf("google: api key required")
|
||||
}
|
||||
|
||||
client, err := genai.NewClient(context.Background(), &genai.ClientConfig{
|
||||
APIKey: cfg.APIKey,
|
||||
Backend: genai.BackendGeminiAPI,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("google: create client: %w", err)
|
||||
}
|
||||
|
||||
model := cfg.Model
|
||||
if model == "" {
|
||||
model = defaultModel
|
||||
}
|
||||
|
||||
return &Provider{
|
||||
client: client,
|
||||
name: "google",
|
||||
model: model,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// Stream initiates a streaming content generation request.
|
||||
func (p *Provider) Stream(ctx context.Context, req provider.Request) (stream.Stream, error) {
|
||||
model := req.Model
|
||||
if model == "" {
|
||||
model = p.model
|
||||
}
|
||||
|
||||
contents := translateContents(req.Messages)
|
||||
config := translateConfig(req)
|
||||
|
||||
iter := p.client.Models.GenerateContentStream(ctx, model, contents, config)
|
||||
|
||||
return newGoogleStream(ctx, iter, model), nil
|
||||
}
|
||||
|
||||
// Name returns "google".
|
||||
func (p *Provider) Name() string { return p.name }
|
||||
|
||||
// DefaultModel returns the configured default model.
|
||||
func (p *Provider) DefaultModel() string { return p.model }
|
||||
|
||||
// Models returns known Google models with capabilities.
|
||||
func (p *Provider) Models(_ context.Context) ([]provider.ModelInfo, error) {
|
||||
return []provider.ModelInfo{
|
||||
{
|
||||
ID: "gemini-2.5-pro", Name: "Gemini 2.5 Pro", Provider: p.name,
|
||||
Capabilities: provider.Capabilities{
|
||||
ToolUse: true, JSONOutput: true, Thinking: true, Vision: true,
|
||||
ContextWindow: 1048576, MaxOutput: 65536,
|
||||
},
|
||||
},
|
||||
{
|
||||
ID: "gemini-2.5-flash", Name: "Gemini 2.5 Flash", Provider: p.name,
|
||||
Capabilities: provider.Capabilities{
|
||||
ToolUse: true, JSONOutput: true, Thinking: true, Vision: true,
|
||||
ContextWindow: 1048576, MaxOutput: 65536,
|
||||
},
|
||||
},
|
||||
{
|
||||
ID: "gemini-2.0-flash", Name: "Gemini 2.0 Flash", Provider: p.name,
|
||||
Capabilities: provider.Capabilities{
|
||||
ToolUse: true, JSONOutput: true, Vision: true,
|
||||
ContextWindow: 1048576, MaxOutput: 8192,
|
||||
},
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
140
internal/provider/google/stream.go
Normal file
140
internal/provider/google/stream.go
Normal file
@@ -0,0 +1,140 @@
|
||||
package google
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"iter"
|
||||
|
||||
"somegit.dev/Owlibou/gnoma/internal/message"
|
||||
"somegit.dev/Owlibou/gnoma/internal/stream"
|
||||
|
||||
"google.golang.org/genai"
|
||||
)
|
||||
|
||||
// googleStream bridges Google's range-based iterator to gnoma's pull-based Stream.
|
||||
// Uses a goroutine + channel to convert iter.Seq2 → Next()/Current().
|
||||
type googleStream struct {
|
||||
events chan stream.Event
|
||||
cancel context.CancelFunc
|
||||
cur stream.Event
|
||||
err error
|
||||
done bool
|
||||
}
|
||||
|
||||
func newGoogleStream(ctx context.Context, iter iter.Seq2[*genai.GenerateContentResponse, error], model string) *googleStream {
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
s := &googleStream{
|
||||
events: make(chan stream.Event, 16),
|
||||
cancel: cancel,
|
||||
}
|
||||
|
||||
go func() {
|
||||
defer close(s.events)
|
||||
var stopReason message.StopReason
|
||||
hadFunctionCalls := false
|
||||
|
||||
for resp, err := range iter {
|
||||
if err != nil {
|
||||
select {
|
||||
case s.events <- stream.Event{Type: stream.EventError, Err: err}:
|
||||
case <-ctx.Done():
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if len(resp.Candidates) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
candidate := resp.Candidates[0]
|
||||
if candidate.FinishReason != "" {
|
||||
stopReason = translateFinishReason(candidate.FinishReason)
|
||||
}
|
||||
|
||||
if candidate.Content == nil {
|
||||
continue
|
||||
}
|
||||
|
||||
for _, part := range candidate.Content.Parts {
|
||||
var evt stream.Event
|
||||
|
||||
if part.FunctionCall != nil {
|
||||
// Google sends complete function calls, not deltas
|
||||
fc := part.FunctionCall
|
||||
args, _ := json.Marshal(fc.Args)
|
||||
hadFunctionCalls = true
|
||||
evt = stream.Event{
|
||||
Type: stream.EventToolCallDone,
|
||||
ToolCallID: fc.ID,
|
||||
ToolCallName: unsanitizeToolName(fc.Name),
|
||||
Args: args,
|
||||
}
|
||||
} else if part.Thought {
|
||||
evt = stream.Event{
|
||||
Type: stream.EventThinkingDelta,
|
||||
Text: part.Text,
|
||||
}
|
||||
} else if part.Text != "" {
|
||||
evt = stream.Event{
|
||||
Type: stream.EventTextDelta,
|
||||
Text: part.Text,
|
||||
}
|
||||
} else {
|
||||
continue
|
||||
}
|
||||
|
||||
select {
|
||||
case s.events <- evt:
|
||||
case <-ctx.Done():
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Override stop reason if function calls were emitted
|
||||
// (Google uses STOP even when returning function calls)
|
||||
if hadFunctionCalls {
|
||||
stopReason = message.StopToolUse
|
||||
} else if stopReason == "" {
|
||||
stopReason = message.StopEndTurn
|
||||
}
|
||||
select {
|
||||
case s.events <- stream.Event{
|
||||
Type: stream.EventTextDelta,
|
||||
StopReason: stopReason,
|
||||
Model: model,
|
||||
}:
|
||||
case <-ctx.Done():
|
||||
}
|
||||
}()
|
||||
|
||||
return s
|
||||
}
|
||||
|
||||
func (s *googleStream) Next() bool {
|
||||
if s.done {
|
||||
return false
|
||||
}
|
||||
evt, ok := <-s.events
|
||||
if !ok {
|
||||
s.done = true
|
||||
return false
|
||||
}
|
||||
if evt.Type == stream.EventError {
|
||||
s.err = evt.Err
|
||||
s.done = true
|
||||
return false
|
||||
}
|
||||
s.cur = evt
|
||||
return true
|
||||
}
|
||||
|
||||
func (s *googleStream) Current() stream.Event { return s.cur }
|
||||
func (s *googleStream) Err() error { return s.err }
|
||||
func (s *googleStream) Close() error {
|
||||
s.cancel()
|
||||
// Drain channel to let goroutine exit
|
||||
for range s.events {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
208
internal/provider/google/translate.go
Normal file
208
internal/provider/google/translate.go
Normal file
@@ -0,0 +1,208 @@
|
||||
package google
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
|
||||
"somegit.dev/Owlibou/gnoma/internal/message"
|
||||
"somegit.dev/Owlibou/gnoma/internal/provider"
|
||||
|
||||
"google.golang.org/genai"
|
||||
)
|
||||
|
||||
// --- gnoma → Google ---
|
||||
|
||||
func translateContents(msgs []message.Message) []*genai.Content {
|
||||
// Build a tool call ID → name map from history for FunctionResponse correlation
|
||||
toolNameMap := buildToolNameMap(msgs)
|
||||
|
||||
var out []*genai.Content
|
||||
for _, m := range msgs {
|
||||
if m.Role == message.RoleSystem {
|
||||
continue
|
||||
}
|
||||
c := translateContent(m, toolNameMap)
|
||||
if c != nil {
|
||||
out = append(out, c)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// buildToolNameMap scans message history for tool calls and maps ID → name.
|
||||
func buildToolNameMap(msgs []message.Message) map[string]string {
|
||||
m := make(map[string]string)
|
||||
for _, msg := range msgs {
|
||||
for _, c := range msg.Content {
|
||||
if c.Type == message.ContentToolCall && c.ToolCall != nil {
|
||||
m[c.ToolCall.ID] = c.ToolCall.Name
|
||||
}
|
||||
}
|
||||
}
|
||||
return m
|
||||
}
|
||||
|
||||
func translateContent(m message.Message, toolNameMap map[string]string) *genai.Content {
|
||||
role := "user"
|
||||
if m.Role == message.RoleAssistant {
|
||||
role = "model"
|
||||
}
|
||||
|
||||
var parts []*genai.Part
|
||||
for _, c := range m.Content {
|
||||
switch c.Type {
|
||||
case message.ContentText:
|
||||
if c.Text != "" {
|
||||
parts = append(parts, &genai.Part{Text: c.Text})
|
||||
}
|
||||
case message.ContentToolCall:
|
||||
if c.ToolCall != nil {
|
||||
var args map[string]any
|
||||
if c.ToolCall.Arguments != nil {
|
||||
_ = json.Unmarshal(c.ToolCall.Arguments, &args)
|
||||
}
|
||||
parts = append(parts, &genai.Part{
|
||||
FunctionCall: &genai.FunctionCall{
|
||||
ID: c.ToolCall.ID,
|
||||
Name: sanitizeToolName(c.ToolCall.Name),
|
||||
Args: args,
|
||||
},
|
||||
})
|
||||
}
|
||||
case message.ContentToolResult:
|
||||
if c.ToolResult != nil {
|
||||
result := map[string]any{"output": c.ToolResult.Content}
|
||||
if c.ToolResult.IsError {
|
||||
result["error"] = true
|
||||
}
|
||||
// Google requires the function name for correlation.
|
||||
name := sanitizeToolName(toolNameMap[c.ToolResult.ToolCallID])
|
||||
parts = append(parts, &genai.Part{
|
||||
FunctionResponse: &genai.FunctionResponse{
|
||||
ID: c.ToolResult.ToolCallID,
|
||||
Name: name,
|
||||
Response: result,
|
||||
},
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(parts) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &genai.Content{Role: role, Parts: parts}
|
||||
}
|
||||
|
||||
func translateTools(defs []provider.ToolDefinition) []*genai.Tool {
|
||||
if len(defs) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
var funcs []*genai.FunctionDeclaration
|
||||
for _, d := range defs {
|
||||
// Parse JSON Schema into the OpenAPI-style schema Google expects
|
||||
var schema map[string]any
|
||||
if d.Parameters != nil {
|
||||
_ = json.Unmarshal(d.Parameters, &schema)
|
||||
}
|
||||
|
||||
funcs = append(funcs, &genai.FunctionDeclaration{
|
||||
Name: sanitizeToolName(d.Name),
|
||||
Description: d.Description,
|
||||
Parameters: schemaFromMap(schema),
|
||||
})
|
||||
}
|
||||
|
||||
return []*genai.Tool{{FunctionDeclarations: funcs}}
|
||||
}
|
||||
|
||||
// schemaFromMap converts a JSON Schema map to genai.Schema.
|
||||
func schemaFromMap(m map[string]any) *genai.Schema {
|
||||
if m == nil {
|
||||
return nil
|
||||
}
|
||||
s := &genai.Schema{}
|
||||
if t, ok := m["type"].(string); ok {
|
||||
s.Type = genai.Type(strings.ToUpper(t))
|
||||
}
|
||||
if desc, ok := m["description"].(string); ok {
|
||||
s.Description = desc
|
||||
}
|
||||
if props, ok := m["properties"].(map[string]any); ok {
|
||||
s.Properties = make(map[string]*genai.Schema)
|
||||
for k, v := range props {
|
||||
if pm, ok := v.(map[string]any); ok {
|
||||
s.Properties[k] = schemaFromMap(pm)
|
||||
}
|
||||
}
|
||||
}
|
||||
if req, ok := m["required"].([]any); ok {
|
||||
for _, r := range req {
|
||||
if rs, ok := r.(string); ok {
|
||||
s.Required = append(s.Required, rs)
|
||||
}
|
||||
}
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func translateConfig(req provider.Request) *genai.GenerateContentConfig {
|
||||
cfg := &genai.GenerateContentConfig{
|
||||
Tools: translateTools(req.Tools),
|
||||
}
|
||||
|
||||
if req.SystemPrompt != "" {
|
||||
cfg.SystemInstruction = &genai.Content{
|
||||
Parts: []*genai.Part{{Text: req.SystemPrompt}},
|
||||
}
|
||||
}
|
||||
if req.MaxTokens > 0 {
|
||||
mt := int32(req.MaxTokens)
|
||||
cfg.MaxOutputTokens = mt
|
||||
}
|
||||
if req.Temperature != nil {
|
||||
t := float32(*req.Temperature)
|
||||
cfg.Temperature = &t
|
||||
}
|
||||
if req.TopP != nil {
|
||||
p := float32(*req.TopP)
|
||||
cfg.TopP = &p
|
||||
}
|
||||
if req.TopK != nil {
|
||||
k := float32(*req.TopK)
|
||||
cfg.TopK = &k
|
||||
}
|
||||
if len(req.StopSequences) > 0 {
|
||||
cfg.StopSequences = req.StopSequences
|
||||
}
|
||||
|
||||
return cfg
|
||||
}
|
||||
|
||||
// --- Google → gnoma ---
|
||||
|
||||
func translateFinishReason(fr genai.FinishReason) message.StopReason {
|
||||
switch fr {
|
||||
case genai.FinishReasonStop:
|
||||
return message.StopEndTurn
|
||||
case genai.FinishReasonMaxTokens:
|
||||
return message.StopMaxTokens
|
||||
default:
|
||||
return message.StopEndTurn
|
||||
}
|
||||
}
|
||||
|
||||
// --- Tool name sanitization ---
|
||||
|
||||
func sanitizeToolName(name string) string {
|
||||
return strings.ReplaceAll(name, ".", "_")
|
||||
}
|
||||
|
||||
func unsanitizeToolName(name string) string {
|
||||
if strings.HasPrefix(name, "fs_") {
|
||||
return "fs." + name[3:]
|
||||
}
|
||||
return name
|
||||
}
|
||||
Reference in New Issue
Block a user