mirror of
https://github.com/googleapis/genai-toolbox.git
synced 2026-02-05 12:45:11 -05:00
967a72da11
This PR update the linking mechanism between Source and Tool.
Tools are directly linked to their Source, either by pointing to the
Source's functions or by assigning values from the source during Tool's
initialization. However, the existing approach means that any
modification to the Source after Tool's initialization might not be
reflected. To address this limitation, each tool should only store a
name reference to the Source, rather than direct link or assigned
values.
Tools will provide interface for `compatibleSource`. This will be used
to determine if a Source is compatible with the Tool.
```
type compatibleSource interface{
Client() http.Client
ProjectID() string
}
```
During `Invoke()`, the tool will run the following operations:
* retrieve Source from the `resourceManager` with source's named defined
in Tool's config
* validate Source via `compatibleSource interface{}`
* run the remaining `Invoke()` function. Fields that are needed is
retrieved directly from the source.
With this update, resource manager is also added as input to other
Tool's function that require access to source (e.g.
`RequiresClientAuthorization()`).
100 lines
3.4 KiB
Go
100 lines
3.4 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 createbatch
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
dataproc "cloud.google.com/go/dataproc/v2/apiv1"
|
|
dataprocpb "cloud.google.com/go/dataproc/v2/apiv1/dataprocpb"
|
|
"github.com/goccy/go-yaml"
|
|
"google.golang.org/protobuf/encoding/protojson"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
// unmarshalProto is a helper function to unmarshal a generic interface{} into a proto.Message.
|
|
func unmarshalProto(data any, m proto.Message) error {
|
|
jsonData, err := json.Marshal(data)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal to JSON: %w", err)
|
|
}
|
|
return protojson.Unmarshal(jsonData, m)
|
|
}
|
|
|
|
type compatibleSource interface {
|
|
GetBatchControllerClient() *dataproc.BatchControllerClient
|
|
GetProject() string
|
|
GetLocation() string
|
|
}
|
|
|
|
// Config is a common config that can be used with any type of create batch tool. However, each tool
|
|
// will still need its own config type, embedding this Config, so it can provide a type-specific
|
|
// Initialize implementation.
|
|
type Config struct {
|
|
Name string `yaml:"name" validate:"required"`
|
|
Kind string `yaml:"kind" validate:"required"`
|
|
Source string `yaml:"source" validate:"required"`
|
|
Description string `yaml:"description"`
|
|
RuntimeConfig *dataprocpb.RuntimeConfig `yaml:"runtimeConfig"`
|
|
EnvironmentConfig *dataprocpb.EnvironmentConfig `yaml:"environmentConfig"`
|
|
AuthRequired []string `yaml:"authRequired"`
|
|
}
|
|
|
|
func NewConfig(ctx context.Context, name string, decoder *yaml.Decoder) (Config, error) {
|
|
// Use a temporary struct to decode the YAML, so that we can handle the proto
|
|
// conversion for RuntimeConfig and EnvironmentConfig.
|
|
var ymlCfg struct {
|
|
Name string `yaml:"name"`
|
|
Kind string `yaml:"kind"`
|
|
Source string `yaml:"source"`
|
|
Description string `yaml:"description"`
|
|
RuntimeConfig any `yaml:"runtimeConfig"`
|
|
EnvironmentConfig any `yaml:"environmentConfig"`
|
|
AuthRequired []string `yaml:"authRequired"`
|
|
}
|
|
|
|
if err := decoder.DecodeContext(ctx, &ymlCfg); err != nil {
|
|
return Config{}, err
|
|
}
|
|
|
|
cfg := Config{
|
|
Name: name,
|
|
Kind: ymlCfg.Kind,
|
|
Source: ymlCfg.Source,
|
|
Description: ymlCfg.Description,
|
|
AuthRequired: ymlCfg.AuthRequired,
|
|
}
|
|
|
|
if ymlCfg.RuntimeConfig != nil {
|
|
rc := &dataprocpb.RuntimeConfig{}
|
|
if err := unmarshalProto(ymlCfg.RuntimeConfig, rc); err != nil {
|
|
return Config{}, fmt.Errorf("failed to unmarshal runtimeConfig: %w", err)
|
|
}
|
|
cfg.RuntimeConfig = rc
|
|
}
|
|
|
|
if ymlCfg.EnvironmentConfig != nil {
|
|
ec := &dataprocpb.EnvironmentConfig{}
|
|
if err := unmarshalProto(ymlCfg.EnvironmentConfig, ec); err != nil {
|
|
return Config{}, fmt.Errorf("failed to unmarshal environmentConfig: %w", err)
|
|
}
|
|
cfg.EnvironmentConfig = ec
|
|
}
|
|
|
|
return cfg, nil
|
|
}
|