Merge pull request #1512 from dgageot/remove-annoying-warning

Remove annoying warning

Author: dgageot

cmd/root/api.go

@@ -75,6 +75,8 @@ func monitorStdin(ctx context.Context, cancel context.CancelFunc, stdin *os.File
 }
 
 func (f *apiFlags) runAPICommand(cmd *cobra.Command, args []string) error {
+	f.runConfig.ModelsGateway = "http://localhost:7777"
+
 	telemetry.TrackCommand("api", args)
 
 	ctx := cmd.Context()

cmd/root/flags.go

@@ -54,12 +54,6 @@ func canonize(endpoint string) string {
 	return strings.TrimSuffix(strings.TrimSpace(endpoint), "/")
 }
 
-func logFlagShadowing(envValue, varName, flagName string) {
-	if envValue != "" {
-		_, _ = fmt.Fprintf(os.Stderr, "CLI flag --%s set, overriding environment variable %s\n", flagName, varName)
-	}
-}
-
 // loadUserConfig is the function used to load user configuration.
 // It can be overridden in tests.
 var loadUserConfig = userconfig.Load
@@ -70,12 +64,12 @@ func addGatewayFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) {
 	persistentPreRunE := cmd.PersistentPreRunE
 	cmd.PersistentPreRunE = func(_ *cobra.Command, args []string) error {
 		// Precedence: CLI flag > environment variable > user config
-		if runConfig.ModelsGateway != "" {
-			logFlagShadowing(os.Getenv(envModelsGateway), envModelsGateway, flagModelsGateway)
-		} else if gateway := os.Getenv(envModelsGateway); gateway != "" {
-			runConfig.ModelsGateway = gateway
-		} else if userCfg, err := loadUserConfig(); err == nil && userCfg.ModelsGateway != "" {
-			runConfig.ModelsGateway = userCfg.ModelsGateway
+		if runConfig.ModelsGateway == "" {
+			if gateway := os.Getenv(envModelsGateway); gateway != "" {
+				runConfig.ModelsGateway = gateway
+			} else if userCfg, err := loadUserConfig(); err == nil && userCfg.ModelsGateway != "" {
+				runConfig.ModelsGateway = userCfg.ModelsGateway
+			}
 		}
 
 		runConfig.ModelsGateway = canonize(runConfig.ModelsGateway)