From 0a28521605e96514b1bb7e12093d5e3edc1d1ded Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Mon, 14 Apr 2025 12:57:33 -0400 Subject: swapped https://github.com/google/generative-ai-go for https://github.com/googleapis/go-genai --- main.go | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 4c793fe..8e2aca9 100644 --- a/main.go +++ b/main.go @@ -26,12 +26,12 @@ import ( "github.com/BurntSushi/toml" "github.com/cenkalti/backoff/v5" - "github.com/google/generative-ai-go/genai" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" "github.com/lrstanley/girc" openai "github.com/sashabaranov/go-openai" "golang.org/x/net/proxy" + "google.golang.org/genai" ) var ( @@ -261,21 +261,11 @@ func handleCustomCommand( var geminiMemory []*genai.Content for _, log := range logs { - geminiMemory = append(geminiMemory, &genai.Content{ - Parts: []genai.Part{ - genai.Text(log.Log), - }, - Role: "user", - }) + geminiMemory = append(geminiMemory, genai.NewContentFromText(log.Log, "user")) } for _, customContext := range customCommand.Context { - geminiMemory = append(geminiMemory, &genai.Content{ - Parts: []genai.Part{ - genai.Text(customContext), - }, - Role: "model", - }) + geminiMemory = append(geminiMemory, genai.NewContentFromText(customContext, "model")) } result := GeminiRequestProcessor(appConfig, client, event, &geminiMemory, customCommand.Prompt, customCommand.SystemPrompt) @@ -820,12 +810,7 @@ func runIRC(appConfig TomlConfig) { OllamaHandler(irc, &appConfig, &OllamaMemory) case "gemini": for _, context := range appConfig.Context { - GeminiMemory = append(GeminiMemory, &genai.Content{ - Parts: []genai.Part{ - genai.Text(context), - }, - Role: "model", - }) + GeminiMemory = append(GeminiMemory, genai.NewContentFromText(context, "model")) } GeminiHandler(irc, &appConfig, &GeminiMemory) -- cgit v1.2.3