mirror of
https://github.com/googleapis/genai-toolbox.git
synced 2026-02-11 07:35:05 -05: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>
200 lines
5.0 KiB
Go
200 lines
5.0 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 bigtable
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"cloud.google.com/go/bigtable"
|
|
"github.com/goccy/go-yaml"
|
|
"github.com/googleapis/genai-toolbox/internal/sources"
|
|
"github.com/googleapis/genai-toolbox/internal/util"
|
|
"github.com/googleapis/genai-toolbox/internal/util/parameters"
|
|
"go.opentelemetry.io/otel/trace"
|
|
"google.golang.org/api/option"
|
|
)
|
|
|
|
const SourceType string = "bigtable"
|
|
|
|
// 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"`
|
|
Project string `yaml:"project" validate:"required"`
|
|
Instance string `yaml:"instance" validate:"required"`
|
|
}
|
|
|
|
func (r Config) SourceConfigType() string {
|
|
return SourceType
|
|
}
|
|
|
|
func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
|
|
client, err := initBigtableClient(ctx, tracer, r.Name, r.Project, r.Instance)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to create client: %w", err)
|
|
}
|
|
|
|
s := &Source{
|
|
Config: r,
|
|
Client: client,
|
|
}
|
|
return s, nil
|
|
}
|
|
|
|
var _ sources.Source = &Source{}
|
|
|
|
type Source struct {
|
|
Config
|
|
Client *bigtable.Client
|
|
}
|
|
|
|
func (s *Source) SourceType() string {
|
|
return SourceType
|
|
}
|
|
|
|
func (s *Source) ToConfig() sources.SourceConfig {
|
|
return s.Config
|
|
}
|
|
|
|
func (s *Source) BigtableClient() *bigtable.Client {
|
|
return s.Client
|
|
}
|
|
|
|
func getBigtableType(paramType string) (bigtable.SQLType, error) {
|
|
switch paramType {
|
|
case "boolean":
|
|
return bigtable.BoolSQLType{}, nil
|
|
case "string":
|
|
return bigtable.StringSQLType{}, nil
|
|
case "integer":
|
|
return bigtable.Int64SQLType{}, nil
|
|
case "float":
|
|
return bigtable.Float64SQLType{}, nil
|
|
case "array":
|
|
return bigtable.ArraySQLType{}, nil
|
|
default:
|
|
return nil, fmt.Errorf("unknow param type %s", paramType)
|
|
}
|
|
}
|
|
|
|
func getMapParamsType(tparams parameters.Parameters) (map[string]bigtable.SQLType, error) {
|
|
btParamTypes := make(map[string]bigtable.SQLType)
|
|
for _, p := range tparams {
|
|
if p.GetType() == "array" {
|
|
itemType, err := getBigtableType(p.Manifest().Items.Type)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
btParamTypes[p.GetName()] = bigtable.ArraySQLType{
|
|
ElemType: itemType,
|
|
}
|
|
continue
|
|
}
|
|
paramType, err := getBigtableType(p.GetType())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
btParamTypes[p.GetName()] = paramType
|
|
}
|
|
return btParamTypes, nil
|
|
}
|
|
|
|
func (s *Source) RunSQL(ctx context.Context, statement string, configParam parameters.Parameters, params parameters.ParamValues) (any, error) {
|
|
mapParamsType, err := getMapParamsType(configParam)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("fail to get map params: %w", err)
|
|
}
|
|
|
|
ps, err := s.BigtableClient().PrepareStatement(
|
|
ctx,
|
|
statement,
|
|
mapParamsType,
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to prepare statement: %w", err)
|
|
}
|
|
|
|
bs, err := ps.Bind(params.AsMap())
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to bind: %w", err)
|
|
}
|
|
|
|
var out []any
|
|
var rowErr error
|
|
err = bs.Execute(ctx, func(resultRow bigtable.ResultRow) bool {
|
|
vMap := make(map[string]any)
|
|
cols := resultRow.Metadata.Columns
|
|
|
|
for _, c := range cols {
|
|
var columValue any
|
|
if err = resultRow.GetByName(c.Name, &columValue); err != nil {
|
|
rowErr = err
|
|
return false
|
|
}
|
|
vMap[c.Name] = columValue
|
|
}
|
|
|
|
out = append(out, vMap)
|
|
|
|
return true
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to execute client: %w", err)
|
|
}
|
|
if rowErr != nil {
|
|
return nil, fmt.Errorf("error processing row: %w", rowErr)
|
|
}
|
|
|
|
return out, nil
|
|
}
|
|
|
|
func initBigtableClient(ctx context.Context, tracer trace.Tracer, name, project, instance string) (*bigtable.Client, error) {
|
|
//nolint:all // Reassigned ctx
|
|
ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
|
|
defer span.End()
|
|
|
|
// Set up Bigtable data operations client.
|
|
poolSize := 10
|
|
userAgent, err := util.UserAgentFromContext(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
client, err := bigtable.NewClient(ctx, project, instance, option.WithUserAgent(userAgent), option.WithGRPCConnectionPool(poolSize))
|
|
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to create bigtable.NewClient: %w", err)
|
|
}
|
|
|
|
return client, nil
|
|
}
|