diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | argv.go | 27 | ||||
| -rw-r--r-- | argvAutoshell.go | 4 | ||||
| -rw-r--r-- | doConnect.go | 31 | ||||
| -rw-r--r-- | doGetNextAutoTopic.go | 3 | ||||
| -rw-r--r-- | doImport.go | 56 | ||||
| -rw-r--r-- | doInput.go | 56 | ||||
| -rw-r--r-- | doInteract.go (renamed from doEditor.go) | 2 | ||||
| -rw-r--r-- | doNewChat.go | 2 | ||||
| -rw-r--r-- | doStats.go | 8 | ||||
| -rw-r--r-- | main.go | 79 |
12 files changed, 50 insertions, 223 deletions
@@ -4,3 +4,4 @@ go.sum /resources/*.so /files/* regex +/tmp/* @@ -2,7 +2,7 @@ VERSION = $(shell git describe --tags) BUILDTIME = $(shell date +%Y.%m.%d_%H%M) default: install - regex --json /tmp/regex.55128216-e93b-4339-8854-622ca11af890.gemini-api-request.99.json connect + regex --json /tmp/regex.55128216-e93b-4339-8854-622ca11af890.gemini-api-request.128.json vet: @GO111MODULE=off go vet @@ -55,5 +55,5 @@ playback: regex playback # regex playback --uuid a1b2c3d4-e5f6-4a5b-8c9d-1e2f3a4b5c6d -tmp: +tmpfiles: ls -tl /tmp/regex.* |head @@ -10,24 +10,15 @@ package main var argv args type args struct { - Add string `arg:"--add" help:"add a new chat"` - Format *EmptyCmd `arg:"subcommand:format" help:"add a conversation"` - Connect *EmptyCmd `arg:"subcommand:connect" help:"connect to gemini AI"` - Playback *PlaybackCmd `arg:"subcommand:playback" help:"dump your prior conversations to the terminal'"` - Output string `arg:"--output" help:"should get a string from regex-cli"` - Input string `arg:"--input" help:"should get a string from regex-cli"` - Editor *EmptyCmd `arg:"subcommand:interact" help:"open env EDITOR"` - ImportFile string `arg:"--import" help:"import a file from regex-cli"` - JsonFile string `arg:"--json" help:"import a JSON file from gemini-cli"` - Uuid string `arg:"--uuid" help:"look at this uuid"` - Topic string `arg:"--topic" help:"the topic"` - Stats []string `arg:"--stats" help:"add stats to a chat"` - NewChat *EmptyCmd `arg:"subcommand:newchat" help:"create a new chat"` - GetNextAutoTopic bool `arg:"--get-next-auto-topic" help:"get the next auto topic name"` - Force bool `arg:"--force" help:"try to strong arm things"` - Verbose bool `arg:"--verbose" help:"show more output"` - Bash bool `arg:"--bash" help:"generate bash completion"` - BashAuto []string `arg:"--auto-complete" help:"todo: move this to go-arg"` + Uuid string `arg:"--uuid" help:"look at this uuid"` + JsonFile string `arg:"--json" help:"import a JSON file from gemini-cli"` + Interact *EmptyCmd `arg:"subcommand:interact" help:"open env EDITOR"` + Playback *PlaybackCmd `arg:"subcommand:playback" help:"dump your prior conversations to the terminal'"` + Stats string `arg:"--stats" help:"add stats to a chat"` + Force bool `arg:"--force" help:"try to strong arm things"` + Verbose bool `arg:"--verbose" help:"show more output"` + Bash bool `arg:"--bash" help:"generate bash completion"` + BashAuto []string `arg:"--auto-complete" help:"todo: move this to go-arg"` } type EmptyCmd struct { diff --git a/argvAutoshell.go b/argvAutoshell.go index 4bdb79d..3611411 100644 --- a/argvAutoshell.go +++ b/argvAutoshell.go @@ -21,7 +21,7 @@ func deleteMatch() { } func (args) doBashAuto() { - argv.doBashHelp() + // argv.doBashHelp() switch argv.BashAuto[0] { case "playback": fmt.Println("long --uuid") @@ -30,7 +30,7 @@ func (args) doBashAuto() { default: if argv.BashAuto[0] == ARGNAME { // list the subcommands here - fmt.Println("--add connect format interact playback") + fmt.Println("--json interact playback") } } os.Exit(0) diff --git a/doConnect.go b/doConnect.go index 2285f0b..b7abd40 100644 --- a/doConnect.go +++ b/doConnect.go @@ -10,42 +10,23 @@ import ( ) // doConnect initializes the Gemini client and handles the request flow. -func doConnect() error { +func doConnect() (*genai.Client, error) { apiKey := os.Getenv("GEMINI_API_KEY") if apiKey == "" { - return log.Errorf("GEMINI_API_KEY environment variable not set") + return nil, log.Errorf("GEMINI_API_KEY environment variable not set") } ctx := context.Background() client, err := genai.NewClient(ctx, &genai.ClientConfig{APIKey: apiKey}) if err != nil { - return log.Errorf("failed to create new genai client: %w", err) + return nil, log.Errorf("failed to create new genai client: %w", err) } - if argv.JsonFile != "" { - req, err := parseJSON(argv.JsonFile) - if err != nil { - return err - } - log.Info("parseJSON() ok. model =", req.Model) - - genaiContent, err := convertToGenai(req) - if err != nil { - return log.Errorf("failed to convert to genai.Content: %w", err) - } - log.Info("Successfully converted JSON to genai.Content") - // Here you would now use the 'genaiContent' to send to the API - _ = genaiContent // Prevent unused variable error for now - - return nil - } - - log.Info("doing sampleHello()") - return sampleHello(client) + return client, err } // sampleHello sends a hardcoded prompt to the model and prints the response. -func sampleHello(client *genai.Client) error { +func simpleHello(client *genai.Client) error { log.Info("Sending 'hello, how are you' to the Gemini API...") ctx := context.Background() @@ -56,7 +37,7 @@ func sampleHello(client *genai.Client) error { content := []*genai.Content{{Parts: parts}} - resp, err := client.Models.GenerateContent(ctx, "gemini-1.5-flash-latest", content, nil) + resp, err := client.Models.GenerateContent(ctx, "gemini-2.5-flash", content, nil) if err != nil { return log.Errorf("error sending message: %v", err) } diff --git a/doGetNextAutoTopic.go b/doGetNextAutoTopic.go index 647d209..75060a7 100644 --- a/doGetNextAutoTopic.go +++ b/doGetNextAutoTopic.go @@ -8,9 +8,6 @@ import ( ) func doGetNextAutoTopic() { - if err := me.chats.ConfigLoad(); err != nil { - badExit(err) - } max := 0 for _, chat := range me.chats.GetChats() { if strings.HasPrefix(chat.GetChatName(), "Auto ") { diff --git a/doImport.go b/doImport.go deleted file mode 100644 index def0071..0000000 --- a/doImport.go +++ /dev/null @@ -1,56 +0,0 @@ -package main - -import ( - "io/ioutil" - "time" - - "go.wit.com/lib/protobuf/chatpb" - "go.wit.com/log" - "google.golang.org/protobuf/types/known/timestamppb" -) - -func doImport(filename string) { - content, err := ioutil.ReadFile(filename) - if err != nil { - log.Warn("Error reading import file:", err) - return - } - - s := string(content) - - // Load the existing chats. - all := chatpb.NewChats() - if err := all.ConfigLoad(); err != nil { - log.Warn("Error loading config, can't add to auto chat:", err) - return - } - - // Find the "auto" chat. - var autoChat *chatpb.Chat - for _, chat := range all.GetChats() { - if chat.GetChatName() == "auto" { - autoChat = chat - break - } - } - - // If the "auto" chat is found, add the new entry. - if autoChat != nil { - newEntry := &chatpb.ChatEntry{ - From: chatpb.Who_REGEX, - Ctime: timestamppb.New(time.Now()), - ToolCalls: []*chatpb.ToolCall{ - { - Name: "Shell", - Input: s, - }, - }, - } - autoChat.Entries = append(autoChat.Entries, newEntry) - if err := all.ConfigSave(); err != nil { - log.Warn("Error saving config after adding to auto chat:", err) - } else { - log.Info("Added new entry to 'auto' chat.") - } - } -} diff --git a/doInput.go b/doInput.go deleted file mode 100644 index fe7cf21..0000000 --- a/doInput.go +++ /dev/null @@ -1,56 +0,0 @@ -package main - -import ( - "os" - "time" - - "go.wit.com/lib/protobuf/chatpb" - "go.wit.com/log" - "google.golang.org/protobuf/types/known/timestamppb" -) - -func doInput(s string) { - filename := "/tmp/regex-input.log" - f, err := os.OpenFile(filename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) - if err != nil { - log.Println(err) - return - } - defer f.Close() - if _, err := f.WriteString(s + "\n"); err != nil { - log.Println(err) - } - - log.Info("INPUT LOGGED TO", filename) - - // Load the existing chats. - all := chatpb.NewChats() - if err := all.ConfigLoad(); err != nil { - log.Warn("Error loading config, can't add to auto chat:", err) - return - } - - // Find the "auto" chat. - var autoChat *chatpb.Chat - for _, chat := range all.GetChats() { - if chat.GetChatName() == "auto" { - autoChat = chat - break - } - } - - // If the "auto" chat is found, add the new entry. - if autoChat != nil { - newEntry := &chatpb.ChatEntry{ - From: chatpb.Who_USER, - Content: s, - Ctime: timestamppb.New(time.Now()), - } - autoChat.Entries = append(autoChat.Entries, newEntry) - if err := all.ConfigSave(); err != nil { - log.Warn("Error saving config after adding to auto chat:", err) - } else { - log.Info("Added new entry to 'auto' chat.") - } - } -} diff --git a/doEditor.go b/doInteract.go index acaf75c..f99b3d9 100644 --- a/doEditor.go +++ b/doInteract.go @@ -10,7 +10,7 @@ import ( "go.wit.com/log" ) -func doEditor() error { +func doInteract() error { for { filename, err := doEditorOnce() if err != nil { diff --git a/doNewChat.go b/doNewChat.go index f9793d1..adb0ee3 100644 --- a/doNewChat.go +++ b/doNewChat.go @@ -9,7 +9,7 @@ import ( func doNewChat() { chat := &chatpb.Chat{ Uuid: argv.Uuid, - ChatName: argv.Topic, + ChatName: "todo: set this", Ctime: timestamppb.Now(), } @@ -9,12 +9,8 @@ import ( ) func doStats() { - if len(argv.Stats) != 2 { - log.Warn("expected 2 arguments for --stats") - return - } - sessionUuid := argv.Stats[0] - statsString := argv.Stats[1] + sessionUuid := argv.Uuid + statsString := "todo: set this somehow" // Find the "auto" chat, or create it if it doesn't exist. var autoChat *chatpb.Chat @@ -47,70 +47,54 @@ func main() { os.Exit(0) } + // load the default chat protobuf me.chats = chatpb.NewChats() if err := me.chats.ConfigLoad(); err != nil { badExit(err) } + + // verify all the chats have Uuid's if verifyUuids(me.chats) { me.chats.ConfigSave() } - if argv.GetNextAutoTopic { - doGetNextAutoTopic() - okExit("") + aiClient, err := doConnect() + if err != nil { + badExit(err) } + _ = aiClient - if argv.Connect != nil { - err := doConnect() + if argv.JsonFile != "" { + req, err := parseJSON(argv.JsonFile) if err != nil { badExit(err) } - okExit("") - } - - if argv.Editor != nil { - doEditor() - okExit("") - } - - if argv.NewChat != nil { - doNewChat() - okExit("") - } - - if argv.Stats != nil { - doStats() - okExit("") - } + log.Info("parseJSON() ok. model =", req.Model) - if argv.Output != "" { - doOutput(argv.Output) - okExit("") - } - - if argv.Input != "" { - doInput(argv.Input) - okExit("") - } + genaiContent, err := convertToGenai(req) + if err != nil { + badExit(err) + } + log.Info("Successfully converted JSON to genai.Content") + // Here you would now use the 'genaiContent' to send to the API + _ = genaiContent // Prevent unused variable error for now - if argv.ImportFile != "" { - doImport(argv.ImportFile) okExit("") } - if argv.Add != "" { - newChats, err := addFile(argv.Add) + if argv.Interact != nil { + log.Info("testing AI client with simpleHello()") + err = simpleHello(aiClient) if err != nil { badExit(err) } - verifyUuids(newChats) - for _, newChat := range newChats.GetChats() { - me.chats.AppendByUuid(newChat) - log.Info("Attempting to add chat", newChat.ChatName) - } + doInteract() + okExit("") + } - me.chats.ConfigSave() + if argv.Stats != "" { + doStats() okExit("") } @@ -123,21 +107,10 @@ func main() { okExit("") } - /* - // if opening the GUI, always check git for dirty repos - log.Info("look for 'auto' here") - // Find the "auto" chat. - for _, chat := range me.chats.GetChats() { - if chat.GetChatName() == "auto" { - prettyFormatChat(chat) - okExit("") - } - } - */ // doGui() // by default, start interacting with gemini-cli - doEditor() + me.pp.WriteHelp(os.Stdout) okExit("") } |