Merge pull request #17 from cocoide/feature/config

設定ファイルを読み込む便利関数の作成、それをGPTとの通信に適応

Author: mochi-yu

cmd/settings.go

@@ -3,38 +3,42 @@ package cmd
 import (
 	"fmt"
 	"log"
+
+	"github.com/cocoide/commitify/util"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 var setAPIKeyCmd = &cobra.Command{
 	Use:   "set-apikey [api_key]",
 	Short: "API Key settings for ChatGPT",
-	Args: cobra.ExactArgs(1),
-	Run: func (cmd *cobra.Command, args [] string) {
-		apikey := args[0]
-		viper.Set("chatgpt.api_key", apikey)
-		if err := viper.WriteConfig(); err != nil {
-			log.Fatal("An error occurred while writing the configuration file:", err)
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		config, _ := util.ReadConfig()
+		config.ChatGptToken = args[0]
+		if err := util.WriteConfig(config); err != nil {
+			log.Fatal("Failed to write into config", err)
 		}
-		fmt.Println("ChatGPT API key has been set")
+		fmt.Println("ChatGPT Token has been set")
 	},
 }
 
 var showAPIKeyCmd = &cobra.Command{
-	Use: "show-apikey",
+	Use:   "show-apikey",
 	Short: "Display ChatGPT API key",
-	Run: func (cmd *cobra.Command, args [] string)  {
-		apikey := viper.GetString("chatgpt.api_key")
-		if apikey == "" {
+	Run: func(cmd *cobra.Command, args []string) {
+		config, err := util.ReadConfig()
+		if err != nil {
+			log.Fatal("Failed to read config:", err)
+		}
+		if config.ChatGptToken == "" {
 			fmt.Println("API key is not set")
 		} else {
-			fmt.Println("ChatGPT APIKey:", apikey)
+			fmt.Println("ChatGPT APIKey:", config.ChatGptToken)
 		}
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(setAPIKeyCmd)
 	rootCmd.AddCommand(showAPIKeyCmd)
-}
+}

config.yaml

@@ -0,0 +1 @@
+chatgpttoken: 

internal/entity/config.go

@@ -0,0 +1,5 @@
+package entity
+
+type Config struct {
+	ChatGptToken string `json:"chatGptToken"`
+}

internal/gateway/openai.go

@@ -2,8 +2,9 @@ package gateway
 
 import (
 	"context"
-	"os"
+	"log"
 
+	"github.com/cocoide/commitify/util"
 	"github.com/sashabaranov/go-openai"
 )
 
@@ -18,8 +19,11 @@ type openAIGateway struct {
 }
 
 func NewOpenAIGateway(ctx context.Context) OpenAIGateway {
-	OPENAI_SECRET := os.Getenv("OPENAI_SECRET")
-	client := openai.NewClient(OPENAI_SECRET)
+	config, err := util.ReadConfig()
+	if err != nil {
+		log.Fatalf("Failed to read config: %v", err)
+	}
+	client := openai.NewClient(config.ChatGptToken)
 	return &openAIGateway{client: client, ctx: ctx}
 }
 

util/config.go

@@ -0,0 +1,45 @@
+package util
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/cocoide/commitify/internal/entity"
+	"github.com/spf13/viper"
+)
+
+func ReadConfig() (*entity.Config, error) {
+	var result entity.Config
+	viper.AddConfigPath(".")
+	viper.SetConfigName("config")
+	viper.SetConfigType("yaml")
+	if err := viper.ReadInConfig(); err != nil {
+		return &result, fmt.Errorf("Error reading config file, %s", err.Error())
+	}
+	if err := viper.Unmarshal(&result); err != nil {
+		return &result, fmt.Errorf("Unable to decode into struct, %v", err.Error())
+	}
+	return &result, nil
+}
+
+func WriteConfig(config *entity.Config) error {
+	viper.AddConfigPath(".")
+	viper.SetConfigName("config")
+	viper.SetConfigType("yaml")
+	configMap := make(map[string]interface{})
+	configBytes, err := json.Marshal(config)
+	if err != nil {
+		return fmt.Errorf("Error marshalling config: %s", err.Error())
+	}
+	err = json.Unmarshal(configBytes, &configMap)
+	if err != nil {
+		return fmt.Errorf("Error unmarshalling config: %s", err.Error())
+	}
+	if err := viper.MergeConfigMap(configMap); err != nil {
+		return err
+	}
+	if err := viper.WriteConfig(); err != nil {
+		return fmt.Errorf("Error saving config file, %s", err.Error())
+	}
+	return nil
+}