refactor(model): remove model_name parameter (#165)

- Remove custom model checking logic from `commit.go` and `review.go`
- Simplify model validation logic in `hepler.go`
- Delete the `groq/model.go` file and its references
- Remove the model mapping logic from `openai.go`
- Simplify model assignment in `openai.go`
- Remove the `OPENROUTER` provider and related custom model logic from `options.go`
- Remove the `modelName` field and related validation logic from `options.go`
- Adjust tests in `options_test.go` to reflect removal of custom model logic and update expected error to `errorsMissingModel`

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

Author: appleboy

cmd/commit.go

@@ -85,10 +85,6 @@ var commitCmd = &cobra.Command{
 		}
 
 		currentModel := viper.GetString("openai.model")
-		if openai.Provider(viper.GetString("openai.provider")).IsCustomModel() {
-			currentModel = viper.GetString("openai.model_name")
-		}
-
 		color.Green("Summarize the commit message use " + currentModel + " model")
 		client, err := openai.New(
 			openai.WithToken(viper.GetString("openai.api_key")),
@@ -101,7 +97,6 @@ var commitCmd = &cobra.Command{
 			openai.WithMaxTokens(viper.GetInt("openai.max_tokens")),
 			openai.WithTemperature(float32(viper.GetFloat64("openai.temperature"))),
 			openai.WithProvider(viper.GetString("openai.provider")),
-			openai.WithModelName(viper.GetString("openai.model_name")),
 			openai.WithSkipVerify(viper.GetBool("openai.skip_verify")),
 			openai.WithHeaders(viper.GetStringSlice("openai.headers")),
 			openai.WithApiVersion(viper.GetString("openai.api_version")),

cmd/hepler.go

@@ -31,7 +31,7 @@ func check() error {
 		viper.Set("output.lang", commitLang)
 	}
 
-	if openai.GetModel(commitModel) != openai.DefaultModel {
+	if commitModel != openai.DefaultModel {
 		viper.Set("openai.model", commitModel)
 	}
 

cmd/review.go

@@ -52,10 +52,6 @@ var reviewCmd = &cobra.Command{
 		}
 
 		currentModel := viper.GetString("openai.model")
-		if openai.Provider(viper.GetString("openai.provider")).IsCustomModel() {
-			currentModel = viper.GetString("openai.model_name")
-		}
-
 		color.Green("Code review your changes using " + currentModel + " model")
 		client, err := openai.New(
 			openai.WithToken(viper.GetString("openai.api_key")),
@@ -68,7 +64,6 @@ var reviewCmd = &cobra.Command{
 			openai.WithMaxTokens(viper.GetInt("openai.max_tokens")),
 			openai.WithTemperature(float32(viper.GetFloat64("openai.temperature"))),
 			openai.WithProvider(viper.GetString("openai.provider")),
-			openai.WithModelName(viper.GetString("openai.model_name")),
 			openai.WithSkipVerify(viper.GetBool("openai.skip_verify")),
 			openai.WithHeaders(viper.GetStringSlice("openai.headers")),
 			openai.WithApiVersion(viper.GetString("openai.api_version")),

groq/model.go

@@ -7,61 +7,13 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/appleboy/CodeGPT/groq"
-
 	openai "github.com/sashabaranov/go-openai"
 	"golang.org/x/net/proxy"
 )
 
 // DefaultModel is the default OpenAI model to use if one is not provided.
 var DefaultModel = openai.GPT3Dot5Turbo
 
-// modelMaps maps model names to their corresponding model ID strings.
-var modelMaps = map[string]string{
-	"gpt-4-32k-0613":          openai.GPT432K0613,
-	"gpt-4-32k-0314":          openai.GPT432K0314,
-	"gpt-4-32k":               openai.GPT432K,
-	"gpt-4-0613":              openai.GPT40613,
-	"gpt-4-0314":              openai.GPT40314,
-	"gpt-4-turbo":             openai.GPT4Turbo,
-	"gpt-4-turbo-2024-04-09":  openai.GPT4Turbo20240409,
-	"gpt-4-0125-preview":      openai.GPT4Turbo0125,
-	"gpt-4-1106-preview":      openai.GPT4Turbo1106,
-	"gpt-4-turbo-preview":     openai.GPT4TurboPreview,
-	"gpt-4-vision-preview":    openai.GPT4VisionPreview,
-	"gpt-4":                   openai.GPT4,
-	"gpt-3.5-turbo-0125":      openai.GPT3Dot5Turbo0125,
-	"gpt-3.5-turbo-1106":      openai.GPT3Dot5Turbo1106,
-	"gpt-3.5-turbo-0613":      openai.GPT3Dot5Turbo0613,
-	"gpt-3.5-turbo-0301":      openai.GPT3Dot5Turbo0301,
-	"gpt-3.5-turbo-16k":       openai.GPT3Dot5Turbo16K,
-	"gpt-3.5-turbo-16k-0613":  openai.GPT3Dot5Turbo16K0613,
-	"gpt-3.5-turbo":           openai.GPT3Dot5Turbo,
-	"gpt-3.5-turbo-instruct":  openai.GPT3Dot5TurboInstruct,
-	"davinci":                 openai.GPT3Davinci,
-	"davinci-002":             openai.GPT3Davinci002,
-	"curie":                   openai.GPT3Curie,
-	"curie-002":               openai.GPT3Curie002,
-	"ada":                     openai.GPT3Ada,
-	"ada-002":                 openai.GPT3Ada002,
-	"babbage":                 openai.GPT3Babbage,
-	"babbage-002":             openai.GPT3Babbage002,
-	groq.LLaMA38b.String():    groq.LLaMA38b.String(),
-	groq.LLaMA370b.String():   groq.LLaMA370b.String(),
-	groq.Mixtral8x7b.String(): groq.Mixtral8x7b.String(),
-	groq.Gemma7b.String():     groq.Gemma7b.String(),
-}
-
-// GetModel returns the model ID corresponding to the given model name.
-// If the model name is not recognized, it returns the default model ID.
-func GetModel(model string) string {
-	v, ok := modelMaps[model]
-	if !ok {
-		return DefaultModel
-	}
-	return v
-}
-
 // Client is a struct that represents an OpenAI client.
 type Client struct {
 	client      *openai.Client
@@ -183,7 +135,7 @@ func New(opts ...Option) (*Client, error) {
 
 	// Create a new client instance with the necessary fields.
 	engine := &Client{
-		model:       modelMaps[cfg.model],
+		model:       cfg.model,
 		maxTokens:   cfg.maxTokens,
 		temperature: cfg.temperature,
 	}
@@ -229,7 +181,7 @@ func New(opts ...Option) (*Client, error) {
 	if cfg.provider == AZURE {
 		defaultAzureConfig := openai.DefaultAzureConfig(cfg.token, cfg.baseURL)
 		defaultAzureConfig.AzureModelMapperFunc = func(model string) string {
-			return cfg.modelName
+			return cfg.model
 		}
 		// Set the API version to the one with the specified options.
 		if cfg.apiVersion != "" {
@@ -247,9 +199,6 @@ func New(opts ...Option) (*Client, error) {
 			c.APIVersion = cfg.apiVersion
 		}
 
-		if cfg.provider.IsCustomModel() {
-			engine.model = cfg.modelName
-		}
 		engine.client = openai.NewClientWithConfig(c)
 	}
 

openai/openai.go

@@ -8,9 +8,8 @@ import (
 )
 
 var (
-	errorsMissingToken       = errors.New("please set OPENAI_API_KEY environment variable")
-	errorsMissingModel       = errors.New("missing model")
-	errorsMissingCustomModel = errors.New("missing custom model name")
+	errorsMissingToken = errors.New("please set OPENAI_API_KEY environment variable")
+	errorsMissingModel = errors.New("missing model")
 )
 
 type Provider string
@@ -21,21 +20,16 @@ func (p Provider) String() string {
 
 func (p Provider) IsValid() bool {
 	switch p {
-	case OPENAI, AZURE, OPENROUTER:
+	case OPENAI, AZURE:
 		return true
 	default:
 		return false
 	}
 }
 
-func (p Provider) IsCustomModel() bool {
-	return p != OPENAI
-}
-
 var (
-	OPENAI     Provider = "openai"
-	AZURE      Provider = "azure"
-	OPENROUTER Provider = "openrouter"
+	OPENAI Provider = "openai"
+	AZURE  Provider = "azure"
 )
 
 const (
@@ -152,15 +146,6 @@ func WithProvider(val string) Option {
 	})
 }
 
-// WithModelName sets the `modelName` variable to the provided `val` parameter.
-// This function returns an `Option` object.
-func WithModelName(val string) Option {
-	// Return an `optionFunc` object with `c.modelName` set to `val`.
-	return optionFunc(func(c *config) {
-		c.modelName = val
-	})
-}
-
 // WithSkipVerify returns a new Option that sets the skipVerify for the client configuration.
 func WithSkipVerify(val bool) Option {
 	return optionFunc(func(c *config) {
@@ -220,7 +205,6 @@ type config struct {
 	frequencyPenalty float32
 
 	provider   Provider
-	modelName  string
 	skipVerify bool
 	headers    []string
 	apiVersion string
@@ -233,17 +217,10 @@ func (cfg *config) valid() error {
 		return errorsMissingToken
 	}
 
-	// Check that the model exists in the model maps.
-	modelExists := modelMaps[cfg.model] != ""
-	if !modelExists {
+	if cfg.model == "" {
 		return errorsMissingModel
 	}
 
-	// If the provider is Azure, check that the model name is not empty.
-	if cfg.provider.IsCustomModel() && cfg.modelName == "" {
-		return errorsMissingCustomModel
-	}
-
 	// If all checks pass, return nil (no error).
 	return nil
 }

openai/options.go

@@ -30,7 +30,7 @@ func Test_config_valid(t *testing.T) {
 			name: "missing model",
 			cfg: newConfig(
 				WithToken("test"),
-				WithModel("test"),
+				WithModel(""),
 				WithProvider(OPENAI.String()),
 			),
 			wantErr: errorsMissingModel,
@@ -39,19 +39,10 @@ func Test_config_valid(t *testing.T) {
 			name: "missing Azure deployment model",
 			cfg: newConfig(
 				WithToken("test"),
-				WithModel(openai.GPT3Dot5Turbo),
+				WithModel(""),
 				WithProvider(AZURE.String()),
 			),
-			wantErr: errorsMissingCustomModel,
-		},
-		{
-			name: "missing OpenRouter Custom model",
-			cfg: newConfig(
-				WithToken("test"),
-				WithModel(openai.GPT3Dot5Turbo),
-				WithProvider(OPENROUTER.String()),
-			),
-			wantErr: errorsMissingCustomModel,
+			wantErr: errorsMissingModel,
 		},
 	}
 	for _, tt := range tests {