chore(openai): Refactor openai.New() function to use options for arguments.

- Add a new file `openai/options.go`
- Replace `openai.New()` arguments with `openai.WithToken()`, `openai.WithModel()`, `openai.WithOrgID()`, and `openai.WithProxyURL()` options in `commit.go`

Author: appleboy

cmd/commit.go

@@ -55,10 +55,10 @@ var commitCmd = &cobra.Command{
 
 		color.Green("Summarize the commit message use " + viper.GetString("openai.model") + " model")
 		client, err := openai.New(
-			viper.GetString("openai.api_key"),
-			viper.GetString("openai.model"),
-			viper.GetString("openai.org_id"),
-			viper.GetString("openai.proxy"),
+			openai.WithToken(viper.GetString("openai.api_key")),
+			openai.WithModel(viper.GetString("openai.model")),
+			openai.WithOrgID(viper.GetString("openai.org_id")),
+			openai.WithProxyURL(viper.GetString("openai.proxy")),
 		)
 		if err != nil {
 			return err

git/git.go

@@ -45,6 +45,7 @@ func diffFiles() *exec.Cmd {
 		"--ignore-all-space",
 		"--diff-algorithm=minimal",
 		"--function-context",
+		"--unified=1",
 	}
 
 	args = append(args, excludeFiles()...)

openai/openai.go

@@ -107,35 +107,43 @@ func (c *Client) Completion(
 }
 
 // New for initialize OpenAI client interface.
-func New(token, model, orgID, proxyURL string) (*Client, error) {
+func New(opts ...Option) (*Client, error) {
+	cfg := &config{}
+
+	// Loop through each option
+	for _, o := range opts {
+		// Call the option giving the instantiated
+		o.apply(cfg)
+	}
+
 	instance := &Client{}
-	if token == "" {
+	if cfg.token == "" {
 		return nil, errors.New("missing api key")
 	}
 
-	v, ok := modelMaps[model]
+	v, ok := modelMaps[cfg.model]
 	if !ok {
 		return nil, errors.New("missing model")
 	}
 	instance.model = v
 
-	cfg := openai.DefaultConfig(token)
-	if orgID != "" {
-		cfg.OrgID = orgID
+	c := openai.DefaultConfig(cfg.token)
+	if cfg.orgID != "" {
+		c.OrgID = cfg.orgID
 	}
 
-	if proxyURL != "" {
+	if cfg.proxyURL != "" {
 		httpClient := &http.Client{
 			Timeout: time.Second * 10,
 		}
-		proxy, _ := url.Parse(proxyURL)
+		proxy, _ := url.Parse(cfg.proxyURL)
 		httpClient.Transport = &http.Transport{
 			Proxy: http.ProxyURL(proxy),
 		}
-		cfg.HTTPClient = httpClient
+		c.HTTPClient = httpClient
 	}
 
-	instance.client = openai.NewClientWithConfig(cfg)
+	instance.client = openai.NewClientWithConfig(c)
 
 	return instance, nil
 }

openai/options.go

@@ -0,0 +1,45 @@
+package openai
+
+// Option specifies instrumentation configuration options.
+type Option interface {
+	apply(*config)
+}
+
+var _ Option = (*optionFunc)(nil)
+
+type optionFunc func(*config)
+
+func (o optionFunc) apply(c *config) {
+	o(c)
+}
+
+func WithToken(val string) Option {
+	return optionFunc(func(c *config) {
+		c.token = val
+	})
+}
+
+func WithOrgID(val string) Option {
+	return optionFunc(func(c *config) {
+		c.orgID = val
+	})
+}
+
+func WithModel(val string) Option {
+	return optionFunc(func(c *config) {
+		c.model = val
+	})
+}
+
+func WithProxyURL(val string) Option {
+	return optionFunc(func(c *config) {
+		c.proxyURL = val
+	})
+}
+
+type config struct {
+	token    string
+	orgID    string
+	model    string
+	proxyURL string
+}