From ca9a2ea804f48be8dbead1d90c62742a3ccdb9be Mon Sep 17 00:00:00 2001 From: Matt Low Date: Sat, 4 Nov 2023 12:20:13 -0600 Subject: [PATCH] Project restructure Moved source files into cmd/ and pkg/ directories --- go.mod | 2 +- main.go | 134 +------------------------------ pkg/cli/cmd.go | 139 +++++++++++++++++++++++++++++++++ config.go => pkg/cli/config.go | 2 +- openai.go => pkg/cli/openai.go | 2 +- store.go => pkg/cli/store.go | 2 +- util.go => pkg/cli/util.go | 2 +- 7 files changed, 148 insertions(+), 135 deletions(-) create mode 100644 pkg/cli/cmd.go rename config.go => pkg/cli/config.go (99%) rename openai.go => pkg/cli/openai.go (99%) rename store.go => pkg/cli/store.go (99%) rename util.go => pkg/cli/util.go (98%) diff --git a/go.mod b/go.mod index 93837b7..7780f49 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.mlow.ca/mlow/lmcli +module git.mlow.ca/mlow/lm go 1.19 diff --git a/main.go b/main.go index 6881c00..2cafd45 100644 --- a/main.go +++ b/main.go @@ -3,139 +3,13 @@ package main import ( "fmt" "os" - "strings" - "github.com/spf13/cobra" + + "git.mlow.ca/mlow/lm/pkg/cli" ) -var config = LoadConfig() -var store, storeError = InitializeStore() - -func checkStore() { - if storeError != nil { - fmt.Fprintf(os.Stderr, "Error establishing connection to store: %v\n", storeError) - os.Exit(1) - } -} - -var rootCmd = &cobra.Command{ - Use: "lm", - Short: "Interact with Large Language Models", - Long: `lm is a CLI tool to interact with OpenAI's GPT 3.5 and GPT 4.`, - Run: func(cmd *cobra.Command, args []string) { - checkStore() - // execute `lm ls` by default - }, -} - -var lsCmd = &cobra.Command{ - Use: "ls", - Short: "List existing conversations", - Long: `List all existing conversations in descending order of recent activity.`, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Listing conversations...") - // Example output, asterisk to indicate current converation - - // $ lm ls - // last hour: - // 98sg - 12 minutes ago - Project discussion - // last day: - // tj3l - 10 hours ago - Deep learning concepts - // last week: - // bwfm - 2 days ago - Machine learning study - // * 8n3h - 3 days ago - Weekend plans - // f3n7 - 6 days ago - CLI development - // last month: - // 5hn2 - 8 days ago - Book club discussion - // b7ze - 20 days ago - Gardening tips and tricks - // last 6 months: - // 3jn2 - 30 days ago - Web development best practices - // 43jk - 2 months ago - Longboard maintenance - // g8d9 - 3 months ago - History book club - // 4lk3 - 4 months ago - Local events and meetups - // 43jn - 6 months ago - Mobile photography techniques - }, -} - -var msgCmd = &cobra.Command{ - Use: "msg", - Short: "Send a message to active conversation", - Long: `Send a message to the active conversation and receive a message from the LLM in return.`, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Sending message to active conversation...") - // If no messsage provided via args, we should open an editor ala `git commit` - // After submitting the message, the - }, -} - -var viewCmd = &cobra.Command{ - Use: "view", - Short: "View messages in a conversation", - Long: `Displays all the messages in a coversation.`, - Run: func(cmd *cobra.Command, args []string) { - fmt.Println("Displaying conversation messages...") - }, -} - -var newCmd = &cobra.Command{ - Use: "new", - Short: "Start a new conversation", - Long: `Start a new conversation with the Large Language Model.`, - Run: func(cmd *cobra.Command, args []string) { - messageContents, err := InputFromEditor("# What would you like to say?", "message.*.md") - if err != nil { - fmt.Fprintf(os.Stderr, "Error receiving message input: %v\n", err) - os.Exit(1) - } - - if messageContents == "" { - fmt.Fprintf(os.Stderr, "No message was provided.\n") - os.Exit(1) - } - - fmt.Printf("> %s\n", messageContents) - - messages := []Message{ - { - OriginalContent: messageContents, - Role: "user", - }, - } - - err = CreateChatCompletionStream("You are a helpful assistant.", messages, os.Stdout) - if err != nil { - fmt.Fprintf(os.Stderr, "An error occured: %v\n", err) - os.Exit(1) - } - - fmt.Println() - }, -} - -var promptCmd = &cobra.Command{ - Use: "prompt", - Short: "Do a one-shot prompt", - Long: `Prompt the Large Language Model and get a response.`, - Run: func(cmd *cobra.Command, args []string) { - messages := []Message{ - { - OriginalContent: strings.Join(args, " "), - Role: "user", - }, - } - - err := CreateChatCompletionStream("You are a helpful assistant.", messages, os.Stdout) - if err != nil { - fmt.Fprintf(os.Stderr, "An error occured: %v\n", err) - os.Exit(1) - } - - fmt.Println() - }, -} - func main() { - rootCmd.AddCommand(newCmd, promptCmd) - if err := rootCmd.Execute(); err != nil { + cmd := cli.NewRootCmd() + if err := cmd.Execute(); err != nil { fmt.Println(err) os.Exit(1) } diff --git a/pkg/cli/cmd.go b/pkg/cli/cmd.go new file mode 100644 index 0000000..1d9e874 --- /dev/null +++ b/pkg/cli/cmd.go @@ -0,0 +1,139 @@ +package cli + +import ( + "fmt" + "os" + "strings" + "github.com/spf13/cobra" +) + +var config = LoadConfig() +var store, storeError = InitializeStore() + +func checkStore() { + if storeError != nil { + fmt.Fprintf(os.Stderr, "Error establishing connection to store: %v\n", storeError) + os.Exit(1) + } +} + +var rootCmd = &cobra.Command{ + Use: "lm", + Short: "Interact with Large Language Models", + Long: `lm is a CLI tool to interact with OpenAI's GPT 3.5 and GPT 4.`, + Run: func(cmd *cobra.Command, args []string) { + checkStore() + // execute `lm ls` by default + }, +} + +var lsCmd = &cobra.Command{ + Use: "ls", + Short: "List existing conversations", + Long: `List all existing conversations in descending order of recent activity.`, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Listing conversations...") + // Example output, asterisk to indicate current converation + + // $ lm ls + // last hour: + // 98sg - 12 minutes ago - Project discussion + // last day: + // tj3l - 10 hours ago - Deep learning concepts + // last week: + // bwfm - 2 days ago - Machine learning study + // * 8n3h - 3 days ago - Weekend plans + // f3n7 - 6 days ago - CLI development + // last month: + // 5hn2 - 8 days ago - Book club discussion + // b7ze - 20 days ago - Gardening tips and tricks + // last 6 months: + // 3jn2 - 30 days ago - Web development best practices + // 43jk - 2 months ago - Longboard maintenance + // g8d9 - 3 months ago - History book club + // 4lk3 - 4 months ago - Local events and meetups + // 43jn - 6 months ago - Mobile photography techniques + }, +} + +var msgCmd = &cobra.Command{ + Use: "msg", + Short: "Send a message to active conversation", + Long: `Send a message to the active conversation and receive a message from the LLM in return.`, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Sending message to active conversation...") + // If no messsage provided via args, we should open an editor ala `git commit` + // After submitting the message, the + }, +} + +var viewCmd = &cobra.Command{ + Use: "view", + Short: "View messages in a conversation", + Long: `Displays all the messages in a coversation.`, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Displaying conversation messages...") + }, +} + +var newCmd = &cobra.Command{ + Use: "new", + Short: "Start a new conversation", + Long: `Start a new conversation with the Large Language Model.`, + Run: func(cmd *cobra.Command, args []string) { + messageContents, err := InputFromEditor("# What would you like to say?", "message.*.md") + if err != nil { + fmt.Fprintf(os.Stderr, "Error receiving message input: %v\n", err) + os.Exit(1) + } + + if messageContents == "" { + fmt.Fprintf(os.Stderr, "No message was provided.\n") + os.Exit(1) + } + + fmt.Printf("> %s\n", messageContents) + + messages := []Message{ + { + OriginalContent: messageContents, + Role: "user", + }, + } + + err = CreateChatCompletionStream("You are a helpful assistant.", messages, os.Stdout) + if err != nil { + fmt.Fprintf(os.Stderr, "An error occured: %v\n", err) + os.Exit(1) + } + + fmt.Println() + }, +} + +var promptCmd = &cobra.Command{ + Use: "prompt", + Short: "Do a one-shot prompt", + Long: `Prompt the Large Language Model and get a response.`, + Run: func(cmd *cobra.Command, args []string) { + messages := []Message{ + { + OriginalContent: strings.Join(args, " "), + Role: "user", + }, + } + + err := CreateChatCompletionStream("You are a helpful assistant.", messages, os.Stdout) + if err != nil { + fmt.Fprintf(os.Stderr, "An error occured: %v\n", err) + os.Exit(1) + } + + fmt.Println() + }, +} + +func NewRootCmd() *cobra.Command { + rootCmd.AddCommand(newCmd, promptCmd) + return rootCmd; +} diff --git a/config.go b/pkg/cli/config.go similarity index 99% rename from config.go rename to pkg/cli/config.go index 71e94a8..21c3ca7 100644 --- a/config.go +++ b/pkg/cli/config.go @@ -1,4 +1,4 @@ -package main +package cli import ( "fmt" diff --git a/openai.go b/pkg/cli/openai.go similarity index 99% rename from openai.go rename to pkg/cli/openai.go index b142de9..4d90bf6 100644 --- a/openai.go +++ b/pkg/cli/openai.go @@ -1,4 +1,4 @@ -package main +package cli import ( "context" diff --git a/store.go b/pkg/cli/store.go similarity index 99% rename from store.go rename to pkg/cli/store.go index 182ae3b..500da1e 100644 --- a/store.go +++ b/pkg/cli/store.go @@ -1,4 +1,4 @@ -package main +package cli import ( "database/sql" diff --git a/util.go b/pkg/cli/util.go similarity index 98% rename from util.go rename to pkg/cli/util.go index 27ce1a1..641449b 100644 --- a/util.go +++ b/pkg/cli/util.go @@ -1,4 +1,4 @@ -package main +package cli import ( "os"