Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

llms(googleai): Fix: Resolve Type Error in googleai convertTools #888

Merged
merged 2 commits into from
Jun 15, 2024
Merged

llms(googleai): Fix: Resolve Type Error in googleai convertTools #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea7a34a
fix: Update required parameter handling with type checking to prevent…
wangjiancn May 29, 2024
b7af783
Merge branch 'tmc:main' into rync/fix-gemini-tools
wangjiancn Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions llms/googleai/googleai.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ func (g *GoogleAI) Call(ctx context.Context, prompt string, options ...llms.Call
}

// GenerateContent implements the [llms.Model] interface.
func (g *GoogleAI) GenerateContent(ctx context.Context, messages []llms.MessageContent, options ...llms.CallOption) (*llms.ContentResponse, error) {
func (g *GoogleAI) GenerateContent(
ctx context.Context,
messages []llms.MessageContent,
options ...llms.CallOption,
) (*llms.ContentResponse, error) {
if g.CallbacksHandler != nil {
g.CallbacksHandler.HandleLLMGenerateContentStart(ctx, messages)
}
Expand Down Expand Up @@ -229,7 +233,12 @@ func convertContent(content llms.MessageContent) (*genai.Content, error) {

// generateFromSingleMessage generates content from the parts of a single
// message.
func generateFromSingleMessage(ctx context.Context, model *genai.GenerativeModel, parts []llms.ContentPart, opts *llms.CallOptions) (*llms.ContentResponse, error) {
func generateFromSingleMessage(
ctx context.Context,
model *genai.GenerativeModel,
parts []llms.ContentPart,
opts *llms.CallOptions,
) (*llms.ContentResponse, error) {
convertedParts, err := convertParts(parts)
if err != nil {
return nil, err
Expand All @@ -252,7 +261,12 @@ func generateFromSingleMessage(ctx context.Context, model *genai.GenerativeModel
return convertAndStreamFromIterator(ctx, iter, opts)
}

func generateFromMessages(ctx context.Context, model *genai.GenerativeModel, messages []llms.MessageContent, opts *llms.CallOptions) (*llms.ContentResponse, error) {
func generateFromMessages(
ctx context.Context,
model *genai.GenerativeModel,
messages []llms.MessageContent,
opts *llms.CallOptions,
) (*llms.ContentResponse, error) {
history := make([]*genai.Content, 0, len(messages))
for _, mc := range messages {
content, err := convertContent(mc)
Expand Down Expand Up @@ -295,7 +309,11 @@ func generateFromMessages(ctx context.Context, model *genai.GenerativeModel, mes
// resulting text into the opts-provided streaming function.
// Note that this is tricky in the face of multiple
// candidates, so this code assumes only a single candidate for now.
func convertAndStreamFromIterator(ctx context.Context, iter *genai.GenerateContentResponseIterator, opts *llms.CallOptions) (*llms.ContentResponse, error) {
func convertAndStreamFromIterator(
ctx context.Context,
iter *genai.GenerateContentResponseIterator,
opts *llms.CallOptions,
) (*llms.ContentResponse, error) {
candidate := &genai.Candidate{
Content: &genai.Content{},
}
Expand Down Expand Up @@ -398,7 +416,15 @@ func convertTools(tools []llms.Tool) ([]*genai.Tool, error) {
}

if required, ok := params["required"]; ok {
rs := required.([]string)
ri := required.([]interface{})
rs := make([]string, 0, len(ri))
for _, r := range ri {
rString, ok := r.(string)
if !ok {
return nil, fmt.Errorf("tool [%d]: expected string for required", i)
}
rs = append(rs, rString)
}
schema.Required = rs
}
genaiFuncDecl.Parameters = schema
Expand Down
36 changes: 31 additions & 5 deletions llms/googleai/vertex/vertex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ func (g *Vertex) Call(ctx context.Context, prompt string, options ...llms.CallOp
}

// GenerateContent implements the [llms.Model] interface.
func (g *Vertex) GenerateContent(ctx context.Context, messages []llms.MessageContent, options ...llms.CallOption) (*llms.ContentResponse, error) {
func (g *Vertex) GenerateContent(
ctx context.Context,
messages []llms.MessageContent,
options ...llms.CallOption,
) (*llms.ContentResponse, error) {
if g.CallbacksHandler != nil {
g.CallbacksHandler.HandleLLMGenerateContentStart(ctx, messages)
}
Expand Down Expand Up @@ -231,7 +235,12 @@ func convertContent(content llms.MessageContent) (*genai.Content, error) {

// generateFromSingleMessage generates content from the parts of a single
// message.
func generateFromSingleMessage(ctx context.Context, model *genai.GenerativeModel, parts []llms.ContentPart, opts *llms.CallOptions) (*llms.ContentResponse, error) {
func generateFromSingleMessage(
ctx context.Context,
model *genai.GenerativeModel,
parts []llms.ContentPart,
opts *llms.CallOptions,
) (*llms.ContentResponse, error) {
convertedParts, err := convertParts(parts)
if err != nil {
return nil, err
Expand All @@ -254,7 +263,12 @@ func generateFromSingleMessage(ctx context.Context, model *genai.GenerativeModel
return convertAndStreamFromIterator(ctx, iter, opts)
}

func generateFromMessages(ctx context.Context, model *genai.GenerativeModel, messages []llms.MessageContent, opts *llms.CallOptions) (*llms.ContentResponse, error) {
func generateFromMessages(
ctx context.Context,
model *genai.GenerativeModel,
messages []llms.MessageContent,
opts *llms.CallOptions,
) (*llms.ContentResponse, error) {
history := make([]*genai.Content, 0, len(messages))
for _, mc := range messages {
content, err := convertContent(mc)
Expand Down Expand Up @@ -293,7 +307,11 @@ func generateFromMessages(ctx context.Context, model *genai.GenerativeModel, mes
// resulting text into the opts-provided streaming function.
// Note that this is tricky in the face of multiple
// candidates, so this code assumes only a single candidate for now.
func convertAndStreamFromIterator(ctx context.Context, iter *genai.GenerateContentResponseIterator, opts *llms.CallOptions) (*llms.ContentResponse, error) {
func convertAndStreamFromIterator(
ctx context.Context,
iter *genai.GenerateContentResponseIterator,
opts *llms.CallOptions,
) (*llms.ContentResponse, error) {
candidate := &genai.Candidate{
Content: &genai.Content{},
}
Expand Down Expand Up @@ -395,7 +413,15 @@ func convertTools(tools []llms.Tool) ([]*genai.Tool, error) {
}

if required, ok := params["required"]; ok {
rs := required.([]string)
ri := required.([]interface{})
rs := make([]string, 0, len(ri))
for _, r := range ri {
rString, ok := r.(string)
if !ok {
return nil, fmt.Errorf("tool [%d]: expected string for required", i)
}
rs = append(rs, rString)
}
schema.Required = rs
}
genaiFuncDecl.Parameters = schema
Expand Down
Loading