pkg/cli/cmd.go

@@ -10,10 +10,8 @@ import (
 )
 
 var (
-	maxTokens        int
+	maxTokens int
-	model            string
+	model     string
-	systemPrompt     string
-	systemPromptFile string
 )
 
 func init() {
@@ -21,9 +19,6 @@ func init() {
 	for _, cmd := range inputCmds {
 		cmd.Flags().IntVar(&maxTokens, "length", *config.OpenAI.DefaultMaxLength, "Max response length in tokens")
 		cmd.Flags().StringVar(&model, "model", *config.OpenAI.DefaultModel, "The language model to use")
-		cmd.Flags().StringVar(&systemPrompt, "system-prompt", *config.ModelDefaults.SystemPrompt, "The system prompt to use.")
-		cmd.Flags().StringVar(&systemPromptFile, "system-prompt-file", "", "A path to a file whose contents are used as the system prompt.")
-		cmd.MarkFlagsMutuallyExclusive("system-prompt", "system-prompt-file")
 	}
 
 	rootCmd.AddCommand(
@@ -40,17 +35,6 @@ func Execute() error {
 	return rootCmd.Execute()
 }
 
-func SystemPrompt() string {
-	if systemPromptFile != "" {
-		content, err := FileContents(systemPromptFile)
-		if err != nil {
-			Fatal("Could not read file contents at %s: %v", systemPromptFile, err)
-		}
-		return content
-	}
-	return systemPrompt
-}
-
 // InputFromArgsOrEditor returns either the provided input from the args slice
 // (joined with spaces), or if len(args) is 0, opens an editor and returns
 // whatever input was provided there. placeholder is a string which populates
@@ -343,11 +327,12 @@ var newCmd = &cobra.Command{
 			Fatal("Could not save new conversation: %v\n", err)
 		}
 
+		const system = "You are a helpful assistant."
 		messages := []Message{
 			{
 				ConversationID:  conversation.ID,
 				Role:            "system",
-				OriginalContent: SystemPrompt(),
+				OriginalContent: system,
 			},
 			{
 				ConversationID:  conversation.ID,
@@ -411,10 +396,11 @@ var promptCmd = &cobra.Command{
 			Fatal("No message was provided.\n")
 		}
 
+		const system = "You are a helpful assistant."
 		messages := []Message{
 			{
 				Role:            "system",
-				OriginalContent: SystemPrompt(),
+				OriginalContent: system,
 			},
 			{
 				Role:            "user",

pkg/cli/config.go

@@ -9,9 +9,6 @@ import (
 )
 
 type Config struct {
-	ModelDefaults *struct {
-		SystemPrompt *string `yaml:"systemPrompt" default:"You are a helpful assistant."`
-	} `yaml:"modelDefaults"`
 	OpenAI *struct {
 		APIKey           *string `yaml:"apiKey" default:"your_key_here"`
 		DefaultModel     *string `yaml:"defaultModel" default:"gpt-4"`
@@ -23,7 +20,7 @@ type Config struct {
 	} `yaml:"chroma"`
 }
 
-func ConfigDir() string {
+func getConfigDir() string {
 	var configDir string
 
 	xdgConfigHome := os.Getenv("XDG_CONFIG_HOME")
@@ -39,7 +36,7 @@ func ConfigDir() string {
 }
 
 func NewConfig() (*Config, error) {
-	configFile := filepath.Join(ConfigDir(), "config.yaml")
+	configFile := filepath.Join(getConfigDir(), "config.yaml")
 	shouldWriteDefaults := false
 	c := &Config{}
 

pkg/cli/store.go

@@ -33,7 +33,7 @@ type Conversation struct {
 	Title     string
 }
 
-func DataDir() string {
+func getDataDir() string {
 	var dataDir string
 
 	xdgDataHome := os.Getenv("XDG_DATA_HOME")
@@ -49,7 +49,7 @@ func DataDir() string {
 }
 
 func NewStore() (*Store, error) {
-	databaseFile := filepath.Join(DataDir(), "conversations.db")
+	databaseFile := filepath.Join(getDataDir(), "conversations.db")
 	db, err := gorm.Open(sqlite.Open(databaseFile), &gorm.Config{})
 	if err != nil {
 		return nil, fmt.Errorf("Error establishing connection to store: %v", err)

pkg/cli/util.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
@@ -159,15 +158,3 @@ func SetStructDefaults(data interface{}) bool {
 	}
 	return changed
 }
-
-// FileContents returns the string contents of the given file.
-// TODO: we should support retrieving the content (or an approximation of)
-// non-text documents, e.g. PDFs.
-func FileContents(file string) (string, error) {
-	path := filepath.Clean(file)
-	content, err := os.ReadFile(path)
-	if err != nil {
-		return "", err
-	}
-	return strings.Trim(string(content), "\n\t "), nil
-}