Run gofmt/goimports on go sources

This commit is contained in:
Matt Low 2023-11-04 22:56:22 +00:00
parent 4590f1db38
commit 200ec57f29
4 changed files with 27 additions and 26 deletions

View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"strings" "strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -66,7 +67,7 @@ var replyCmd = &cobra.Command{
var newCmd = &cobra.Command{ var newCmd = &cobra.Command{
Use: "new", Use: "new",
Short: "Start a new conversation", Short: "Start a new conversation",
Long: `Start a new conversation with the Large Language Model.`, Long: `Start a new conversation with the Large Language Model.`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
messageContents, err := InputFromEditor("# What would you like to say?\n", "message.*.md") messageContents, err := InputFromEditor("# What would you like to say?\n", "message.*.md")
if err != nil { if err != nil {
@ -83,8 +84,8 @@ var newCmd = &cobra.Command{
messages := []Message{ messages := []Message{
{ {
Role: "user",
OriginalContent: messageContents, OriginalContent: messageContents,
Role: "user",
}, },
} }
@ -99,9 +100,9 @@ var newCmd = &cobra.Command{
} }
var promptCmd = &cobra.Command{ var promptCmd = &cobra.Command{
Use: "prompt", Use: "prompt",
Short: "Do a one-shot prompt", Short: "Do a one-shot prompt",
Long: `Prompt the Large Language Model and get a response.`, Long: `Prompt the Large Language Model and get a response.`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
message := strings.Join(args, " ") message := strings.Join(args, " ")
if len(strings.Trim(message, " \t\n")) == 0 { if len(strings.Trim(message, " \t\n")) == 0 {
@ -111,8 +112,8 @@ var promptCmd = &cobra.Command{
messages := []Message{ messages := []Message{
{ {
Role: "user",
OriginalContent: message, OriginalContent: message,
Role: "user",
}, },
} }
@ -128,5 +129,5 @@ var promptCmd = &cobra.Command{
func NewRootCmd() *cobra.Command { func NewRootCmd() *cobra.Command {
rootCmd.AddCommand(newCmd, promptCmd) rootCmd.AddCommand(newCmd, promptCmd)
return rootCmd; return rootCmd
} }

View File

@ -37,7 +37,6 @@ func InitializeConfig() *Config {
defaultConfig := &Config{} defaultConfig := &Config{}
defaultConfig.OpenAI.APIKey = "your_key_here" defaultConfig.OpenAI.APIKey = "your_key_here"
file, err := os.Create(configFile) file, err := os.Create(configFile)
if err != nil { if err != nil {
Fatal("Could not open config file for writing: %v", err) Fatal("Could not open config file for writing: %v", err)

View File

@ -5,20 +5,21 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
openai "github.com/sashabaranov/go-openai" openai "github.com/sashabaranov/go-openai"
) )
func CreateChatCompletionRequest(system string, messages []Message) (*openai.ChatCompletionRequest) { func CreateChatCompletionRequest(system string, messages []Message) *openai.ChatCompletionRequest {
chatCompletionMessages := []openai.ChatCompletionMessage{ chatCompletionMessages := []openai.ChatCompletionMessage{
{ {
Role: "system", Role: "system",
Content: system, Content: system,
}, },
} }
for _, m := range(messages) { for _, m := range messages {
chatCompletionMessages = append(chatCompletionMessages, openai.ChatCompletionMessage{ chatCompletionMessages = append(chatCompletionMessages, openai.ChatCompletionMessage{
Role: m.Role, Role: m.Role,
Content: m.OriginalContent, Content: m.OriginalContent,
}) })
} }
@ -26,8 +27,8 @@ func CreateChatCompletionRequest(system string, messages []Message) (*openai.Cha
return &openai.ChatCompletionRequest{ return &openai.ChatCompletionRequest{
Model: openai.GPT4, Model: openai.GPT4,
MaxTokens: 256, MaxTokens: 256,
Messages: chatCompletionMessages, Messages: chatCompletionMessages,
Stream: true, Stream: true,
} }
} }

View File

@ -4,33 +4,33 @@ import (
"database/sql" "database/sql"
"os" "os"
"path/filepath" "path/filepath"
"gorm.io/gorm"
"gorm.io/driver/sqlite"
sqids "github.com/sqids/sqids-go" sqids "github.com/sqids/sqids-go"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
) )
type Store struct { type Store struct {
db *gorm.DB db *gorm.DB
sqids *sqids.Sqids sqids *sqids.Sqids
} }
type Message struct { type Message struct {
ID uint `gorm:"primaryKey"` ID uint `gorm:"primaryKey"`
ConversationID uint `gorm:"foreignKey:ConversationID"` ConversationID uint `gorm:"foreignKey:ConversationID"`
Conversation Conversation Conversation Conversation
OriginalContent string OriginalContent string
Role string // 'user' or 'assistant' Role string // 'user' or 'assistant'
} }
type Conversation struct { type Conversation struct {
ID uint `gorm:"primaryKey"` ID uint `gorm:"primaryKey"`
ShortName sql.NullString ShortName sql.NullString
Title string Title string
} }
func getDataDir() string { func getDataDir() string {
var dataDir string; var dataDir string
xdgDataHome := os.Getenv("XDG_DATA_HOME") xdgDataHome := os.Getenv("XDG_DATA_HOME")
if xdgDataHome != "" { if xdgDataHome != "" {
@ -57,7 +57,7 @@ func InitializeStore() *Store {
&Message{}, &Message{},
} }
for _, x := range(models) { for _, x := range models {
err := db.AutoMigrate(x) err := db.AutoMigrate(x)
if err != nil { if err != nil {
Fatal("Could not perform database migrations: %v\n", err) Fatal("Could not perform database migrations: %v\n", err)
@ -76,7 +76,7 @@ func (s *Store) SaveConversation(conversation *Conversation) error {
} }
if !conversation.ShortName.Valid { if !conversation.ShortName.Valid {
shortName, _ := s.sqids.Encode([]uint64{ uint64(conversation.ID) }) shortName, _ := s.sqids.Encode([]uint64{uint64(conversation.ID)})
conversation.ShortName = sql.NullString{String: shortName, Valid: true} conversation.ShortName = sql.NullString{String: shortName, Valid: true}
err = s.db.Save(&conversation).Error err = s.db.Save(&conversation).Error
} }