Skip to content

Commit

Permalink
fix: analyze command default backend bug (#966)
Browse files Browse the repository at this point in the history
Now, the default value of the `backend` flag for the analyze command
will be an empty string. And the `NewAnalysis` function has been
modified to use the default backend set by the user if the backend flag
is not provided and the `defaultprovider` is set in the config file.
Otherwise, backend will be set to "openai".

Fixes: #902

Signed-off-by: VaibhavMalik4187 <vaibhavmalik2018@gmail.com>
Co-authored-by: JuHyung Son <sonju0427@gmail.com>
  • Loading branch information
VaibhavMalik4187 and JuHyung-Son committed Feb 28, 2024
1 parent 334a86a commit aab8d77
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion cmd/analyze/analyze.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ var AnalyzeCmd = &cobra.Command{
withDoc,
interactiveMode,
)

if err != nil {
color.Red("Error: %v", err)
os.Exit(1)
Expand Down Expand Up @@ -124,7 +125,7 @@ func init() {
// explain flag
AnalyzeCmd.Flags().BoolVarP(&explain, "explain", "e", false, "Explain the problem to me")
// add flag for backend
AnalyzeCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
AnalyzeCmd.Flags().StringVarP(&backend, "backend", "b", "", "Backend AI provider")
// output as json
AnalyzeCmd.Flags().StringVarP(&output, "output", "o", "text", "Output format (text, json)")
// add language options for output
Expand Down
8 changes: 6 additions & 2 deletions pkg/analysis/analysis.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,15 @@ func NewAnalysis(
}

// Backend string will have high priority than a default provider
// Backend as "openai" represents the default CLI argument passed through
if configAI.DefaultProvider != "" && backend == "openai" {
// Hence, use the default provider only if the backend is not specified by the user.
if configAI.DefaultProvider != "" && backend == "" {
backend = configAI.DefaultProvider
}

if backend == "" {
backend = "openai"
}

var aiProvider ai.AIProvider
for _, provider := range configAI.Providers {
if backend == provider.Name {
Expand Down
4 changes: 0 additions & 4 deletions pkg/server/analyze.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ func (h *handler) Analyze(ctx context.Context, i *schemav1.AnalyzeRequest) (
i.Output = "json"
}

if i.Backend == "" {
i.Backend = "openai"
}

if int(i.MaxConcurrency) == 0 {
i.MaxConcurrency = 10
}
Expand Down

0 comments on commit aab8d77

Please sign in to comment.