mirror of
https://github.com/googleapis/genai-toolbox.git
synced 2026-05-02 03:00:36 -04:00
This PR introduces a significant update to the Toolbox configuration file format, which is one of the primary **breaking changes** required for the implementation of the Advanced Control Plane. # Summary of Changes The configuration schema has been updated to enforce resource isolation and facilitate atomic, incremental updates. * Resource Isolation: Resource definitions are now separated into individual blocks, using a distinct structure for each resource type (Source, Tool, Toolset, etc.). This improves readability, management, and auditing of configuration files. * Field Name Modification: Internal field names have been modified to align with declarative methodologies. Specifically, the configuration now separates kind (general resource type, e.g., Source) from type (specific implementation, e.g., Postgres). # User Impact Existing tools.yaml configuration files are now in an outdated format. Users must eventually update their files to the new YAML format. # Mitigation & Compatibility Backward compatibility is maintained during this transition to ensure no immediate user action is required for existing files. * Immediate Backward Compatibility: The source code includes a pre-processing layer that automatically detects outdated configuration files (v1 format) and converts them to the new v2 format under the hood. * [COMING SOON] Migration Support: The new toolbox migrate subcommand will be introduced to allow users to automatically convert their old configuration files to the latest format. # Example Example for config file v2: ``` kind: sources name: my-pg-instance type: cloud-sql-postgres project: my-project region: my-region instance: my-instance database: my_db user: my_user password: my_pass --- kind: authServices name: my-google-auth type: google clientId: testing-id --- kind: tools name: example_tool type: postgres-sql source: my-pg-instance description: some description statement: SELECT * FROM SQL_STATEMENT; parameters: - name: country type: string description: some description --- kind: tools name: example_tool_2 type: postgres-sql source: my-pg-instance description: returning the number one statement: SELECT 1; --- kind: toolsets name: example_toolset tools: - example_tool ``` --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Averi Kitsch <akitsch@google.com>
202 lines
5.5 KiB
Go
202 lines
5.5 KiB
Go
// Copyright 2025 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
package redis
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/goccy/go-yaml"
|
|
"github.com/googleapis/genai-toolbox/internal/sources"
|
|
"github.com/redis/go-redis/v9"
|
|
"go.opentelemetry.io/otel/trace"
|
|
)
|
|
|
|
const SourceType string = "redis"
|
|
|
|
// validate interface
|
|
var _ sources.SourceConfig = Config{}
|
|
|
|
func init() {
|
|
if !sources.Register(SourceType, newConfig) {
|
|
panic(fmt.Sprintf("source type %q already registered", SourceType))
|
|
}
|
|
}
|
|
|
|
func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources.SourceConfig, error) {
|
|
actual := Config{Name: name}
|
|
if err := decoder.DecodeContext(ctx, &actual); err != nil {
|
|
return nil, err
|
|
}
|
|
return actual, nil
|
|
}
|
|
|
|
type Config struct {
|
|
Name string `yaml:"name" validate:"required"`
|
|
Type string `yaml:"type" validate:"required"`
|
|
Address []string `yaml:"address" validate:"required"`
|
|
Username string `yaml:"username"`
|
|
Password string `yaml:"password"`
|
|
Database int `yaml:"database"`
|
|
UseGCPIAM bool `yaml:"useGCPIAM"`
|
|
ClusterEnabled bool `yaml:"clusterEnabled"`
|
|
}
|
|
|
|
func (r Config) SourceConfigType() string {
|
|
return SourceType
|
|
}
|
|
|
|
// RedisClient is an interface for `redis.Client` and `redis.ClusterClient
|
|
type RedisClient interface {
|
|
Do(context.Context, ...any) *redis.Cmd
|
|
}
|
|
|
|
var _ RedisClient = (*redis.Client)(nil)
|
|
var _ RedisClient = (*redis.ClusterClient)(nil)
|
|
|
|
func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
|
|
client, err := initRedisClient(ctx, r)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error initializing Redis client: %s", err)
|
|
}
|
|
s := &Source{
|
|
Config: r,
|
|
Client: client,
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
func initRedisClient(ctx context.Context, r Config) (RedisClient, error) {
|
|
var authFn func(ctx context.Context) (username string, password string, err error)
|
|
if r.UseGCPIAM {
|
|
// Pass in an access token getter fn for IAM auth
|
|
authFn = func(ctx context.Context) (username string, password string, err error) {
|
|
token, err := sources.GetIAMAccessToken(ctx)
|
|
if err != nil {
|
|
return "", "", err
|
|
}
|
|
return "default", token, nil
|
|
}
|
|
}
|
|
|
|
var client RedisClient
|
|
var err error
|
|
if r.ClusterEnabled {
|
|
// Create a new Redis Cluster client
|
|
clusterClient := redis.NewClusterClient(&redis.ClusterOptions{
|
|
Addrs: r.Address,
|
|
// PoolSize applies per cluster node and not for the whole cluster.
|
|
PoolSize: 10,
|
|
ConnMaxIdleTime: 60 * time.Second,
|
|
MinIdleConns: 1,
|
|
CredentialsProviderContext: authFn,
|
|
Username: r.Username,
|
|
Password: r.Password,
|
|
})
|
|
err = clusterClient.ForEachShard(ctx, func(ctx context.Context, shard *redis.Client) error {
|
|
return shard.Ping(ctx).Err()
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to connect to redis cluster: %s", err)
|
|
}
|
|
client = clusterClient
|
|
return client, nil
|
|
}
|
|
|
|
// Create a new Redis client
|
|
standaloneClient := redis.NewClient(&redis.Options{
|
|
Addr: r.Address[0],
|
|
PoolSize: 10,
|
|
ConnMaxIdleTime: 60 * time.Second,
|
|
MinIdleConns: 1,
|
|
DB: r.Database,
|
|
CredentialsProviderContext: authFn,
|
|
Username: r.Username,
|
|
Password: r.Password,
|
|
})
|
|
_, err = standaloneClient.Ping(ctx).Result()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to connect to redis: %s", err)
|
|
}
|
|
client = standaloneClient
|
|
return client, nil
|
|
}
|
|
|
|
var _ sources.Source = &Source{}
|
|
|
|
type Source struct {
|
|
Config
|
|
Client RedisClient
|
|
}
|
|
|
|
func (s *Source) SourceType() string {
|
|
return SourceType
|
|
}
|
|
|
|
func (s *Source) ToConfig() sources.SourceConfig {
|
|
return s.Config
|
|
}
|
|
|
|
func (s *Source) RedisClient() RedisClient {
|
|
return s.Client
|
|
}
|
|
|
|
func (s *Source) RunCommand(ctx context.Context, cmds [][]any) (any, error) {
|
|
// Execute commands
|
|
responses := make([]*redis.Cmd, len(cmds))
|
|
for i, cmd := range cmds {
|
|
responses[i] = s.RedisClient().Do(ctx, cmd...)
|
|
}
|
|
// Parse responses
|
|
out := make([]any, len(cmds))
|
|
for i, resp := range responses {
|
|
if err := resp.Err(); err != nil {
|
|
// Add error from each command to `errSum`
|
|
errString := fmt.Sprintf("error from executing command at index %d: %s", i, err)
|
|
out[i] = errString
|
|
continue
|
|
}
|
|
val, err := resp.Result()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error getting result: %s", err)
|
|
}
|
|
out[i] = convertRedisResult(val)
|
|
}
|
|
|
|
return out, nil
|
|
}
|
|
|
|
// convertRedisResult recursively converts redis results (map[any]any) to be
|
|
// JSON-marshallable (map[string]any).
|
|
// It converts map[any]any to map[string]any and handles nested structures.
|
|
func convertRedisResult(v any) any {
|
|
switch val := v.(type) {
|
|
case map[any]any:
|
|
m := make(map[string]any)
|
|
for k, v := range val {
|
|
m[fmt.Sprint(k)] = convertRedisResult(v)
|
|
}
|
|
return m
|
|
case []any:
|
|
s := make([]any, len(val))
|
|
for i, v := range val {
|
|
s[i] = convertRedisResult(v)
|
|
}
|
|
return s
|
|
default:
|
|
return v
|
|
}
|
|
}
|