Skip to content

Commit b365574

Browse files
ManuInNZcicoyle
andauthored
feat: Add GoogleAI component for conversation to support Google AI models usage (dapr#8572)
* feat: ✨ Add GoogleAI component for conversation to support Google AI models usage Signed-off-by: Emmanuel Auffray <[email protected]> * temp fix to pseudo branch and override Signed-off-by: Emmanuel Auffray <[email protected]> * interim pseudo version Signed-off-by: Emmanuel Auffray <[email protected]> * add indirect dependency for user namespace support Signed-off-by: Emmanuel Auffray <[email protected]> * update components-contrib dependency to specific commit version removing replace Signed-off-by: Emmanuel Auffray <[email protected]> * Remove indirect dependency on github.com/moby/sys/userns from go.mod Signed-off-by: Emmanuel Auffray <[email protected]> --------- Signed-off-by: Emmanuel Auffray <[email protected]> Co-authored-by: Cassie Coyle <[email protected]>
1 parent 617423e commit b365574

File tree

3 files changed

+45
-6
lines changed

3 files changed

+45
-6
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
//go:build allcomponents
2+
3+
/*
4+
Copyright 2024 The Dapr Authors
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
*/
17+
18+
package components
19+
20+
import (
21+
"github.com/dapr/components-contrib/conversation/googleai"
22+
"github.com/dapr/dapr/pkg/components/conversation"
23+
)
24+
25+
func init() {
26+
conversation.DefaultRegistry.RegisterComponent(googleai.NewGoogleAI, "googleai")
27+
}

go.mod

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/argoproj/argo-rollouts v1.4.1
1212
github.com/cenkalti/backoff/v4 v4.3.0
1313
github.com/cloudevents/sdk-go/v2 v2.15.2
14-
github.com/dapr/components-contrib v1.15.1-0.20250323163817-47947d8770b9
14+
github.com/dapr/components-contrib v1.15.1-0.20250409220637-70c99725fd12
1515
github.com/dapr/durabletask-go v0.6.5
1616
github.com/dapr/kit v0.15.1
1717
github.com/diagridio/go-etcd-cron v0.4.4
@@ -88,14 +88,18 @@ require (
8888

8989
require (
9090
cloud.google.com/go v0.115.1 // indirect
91+
cloud.google.com/go/ai v0.6.0 // indirect
92+
cloud.google.com/go/aiplatform v1.68.0 // indirect
9193
cloud.google.com/go/auth v0.9.3 // indirect
9294
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
9395
cloud.google.com/go/compute/metadata v0.5.2 // indirect
9496
cloud.google.com/go/datastore v1.19.0 // indirect
9597
cloud.google.com/go/iam v1.2.1 // indirect
98+
cloud.google.com/go/longrunning v0.6.1 // indirect
9699
cloud.google.com/go/pubsub v1.43.0 // indirect
97100
cloud.google.com/go/secretmanager v1.14.1 // indirect
98101
cloud.google.com/go/storage v1.43.0 // indirect
102+
cloud.google.com/go/vertexai v0.10.0 // indirect
99103
dubbo.apache.org/dubbo-go/v3 v3.0.3-0.20230118042253-4f159a2b38f3 // indirect
100104
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
101105
github.com/99designs/keyring v1.2.1 // indirect
@@ -260,6 +264,7 @@ require (
260264
github.com/golang/snappy v0.0.4 // indirect
261265
github.com/google/btree v1.1.3 // indirect
262266
github.com/google/flatbuffers v23.5.26+incompatible // indirect
267+
github.com/google/generative-ai-go v0.14.0 // indirect
263268
github.com/google/gnostic-models v0.6.8 // indirect
264269
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
265270
github.com/google/s2a-go v0.1.8 // indirect
@@ -337,7 +342,6 @@ require (
337342
github.com/mitchellh/go-homedir v1.1.0 // indirect
338343
github.com/mitchellh/reflectwalk v1.0.2 // indirect
339344
github.com/moby/spdystream v0.4.0 // indirect
340-
github.com/moby/sys/userns v0.1.0 // indirect
341345
github.com/moby/term v0.5.0 // indirect
342346
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
343347
github.com/modern-go/reflect2 v1.0.2 // indirect

go.sum

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY
1515
cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
1616
cloud.google.com/go v0.115.1 h1:Jo0SM9cQnSkYfp44+v+NQXHpcHqlnRJk2qxh6yvxxxQ=
1717
cloud.google.com/go v0.115.1/go.mod h1:DuujITeaufu3gL68/lOFIirVNJwQeyf5UXyi+Wbgknc=
18+
cloud.google.com/go/ai v0.6.0 h1:QWjb2UoaM15e51IMeLuIUFyWxooKOKDb66Mk47zZ2/g=
19+
cloud.google.com/go/ai v0.6.0/go.mod h1:6/mrRq6aJdK7MZH76ZvcMpESiAiha5aRvurmroiOrgI=
20+
cloud.google.com/go/aiplatform v1.68.0 h1:EPPqgHDJpBZKRvv+OsB3cr0jYz3EL2pZ+802rBPcG8U=
21+
cloud.google.com/go/aiplatform v1.68.0/go.mod h1:105MFA3svHjC3Oazl7yjXAmIR89LKhRAeNdnDKJczME=
1822
cloud.google.com/go/auth v0.9.3 h1:VOEUIAADkkLtyfr3BLa3R8Ed/j6w1jTBmARx+wb5w5U=
1923
cloud.google.com/go/auth v0.9.3/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk=
2024
cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY=
@@ -53,6 +57,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
5357
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
5458
cloud.google.com/go/storage v1.43.0 h1:CcxnSohZwizt4LCzQHWvBf1/kvtHUn7gk9QERXPyXFs=
5559
cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502JwstCcYv0Q0=
60+
cloud.google.com/go/vertexai v0.10.0 h1:k157bLrtyajGtAAZnqdEn8lwFlUTG3BgHc7kvWbP/3s=
61+
cloud.google.com/go/vertexai v0.10.0/go.mod h1:w/Zb22QvOVvxx5CGM4fPzH3WA6gwUkId9juA7pigzFI=
5662
contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U=
5763
contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg=
5864
contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ=
@@ -478,8 +484,8 @@ github.com/dancannon/gorethink v4.0.0+incompatible h1:KFV7Gha3AuqT+gr0B/eKvGhbjm
478484
github.com/dancannon/gorethink v4.0.0+incompatible/go.mod h1:BLvkat9KmZc1efyYwhz3WnybhRZtgF1K929FD8z1avU=
479485
github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=
480486
github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0=
481-
github.com/dapr/components-contrib v1.15.1-0.20250323163817-47947d8770b9 h1:YLS2i/DhqbxvNuAEB3WNCMUrMFI7dGsbA3N064h7fqg=
482-
github.com/dapr/components-contrib v1.15.1-0.20250323163817-47947d8770b9/go.mod h1:xfQwDGC8O7/6BRhc7u0Zqg9ObuavQFoTR1p8+qqsN5w=
487+
github.com/dapr/components-contrib v1.15.1-0.20250409220637-70c99725fd12 h1:VETULsWb8KIjzuqmEiXCv6BHw0QVgkjMkP7tztIv9NI=
488+
github.com/dapr/components-contrib v1.15.1-0.20250409220637-70c99725fd12/go.mod h1:0yFCUv1c6TMWvC6sQYdv0FMWmdCeEpWGE8AYp9cb6Ic=
483489
github.com/dapr/durabletask-go v0.6.5 h1:aWcxMfYudojpgRjJRdUr7yyZ7rGcvLtWXUuA4cGHBR0=
484490
github.com/dapr/durabletask-go v0.6.5/go.mod h1:nTZ5fCbJLnZbVdi6Z2YxdDF1OgQZL3LroogGuetrwuA=
485491
github.com/dapr/kit v0.15.1 h1:WInC8IBveslveCBE2DDeaXh62Si4Wr2Fdv2yJ/7hrDQ=
@@ -637,8 +643,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
637643
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
638644
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
639645
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
640-
github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA=
641-
github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
646+
github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
647+
github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
642648
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
643649
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
644650
github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo=
@@ -809,6 +815,8 @@ github.com/google/cel-go v0.20.1/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u
809815
github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
810816
github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
811817
github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
818+
github.com/google/generative-ai-go v0.14.0 h1:2GwFKXui9LmG+PukQwYk9KpJUIemmQ9NJ46BV9VIw38=
819+
github.com/google/generative-ai-go v0.14.0/go.mod h1:hOzbW3cB5hRV2x05McOwJS4GsqSluYwejjk5tSfb6YY=
812820
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
813821
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
814822
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

0 commit comments

Comments
 (0)