ソースを参照

Revert "cmd: provide feedback if OLLAMA_MODELS is set on non-serve command (#3470)" (#3662)

This reverts commit 7d05a6ee8f44b314fa697a427439e5fa4d78c3d7.

This proved to be more painful than useful.

See: https://github.com/ollama/ollama/issues/3624
Blake Mizerany 1 年間 前
コミット
949d7832cf
1 ファイル変更5 行追加12 行削除
  1. 5 12
      cmd/cmd.go

+ 5 - 12
cmd/cmd.go

@@ -252,14 +252,6 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string) (string, er
 }
 
 func RunHandler(cmd *cobra.Command, args []string) error {
-	if os.Getenv("OLLAMA_MODELS") != "" {
-		return errors.New("OLLAMA_MODELS must only be set for 'ollama serve'")
-	}
-
-	if err := checkServerHeartbeat(cmd, args); err != nil {
-		return err
-	}
-
 	client, err := api.ClientFromEnvironment()
 	if err != nil {
 		return err
@@ -986,10 +978,11 @@ func NewCLI() *cobra.Command {
 	showCmd.Flags().Bool("system", false, "Show system message of a model")
 
 	runCmd := &cobra.Command{
-		Use:   "run MODEL [PROMPT]",
-		Short: "Run a model",
-		Args:  cobra.MinimumNArgs(1),
-		RunE:  RunHandler,
+		Use:     "run MODEL [PROMPT]",
+		Short:   "Run a model",
+		Args:    cobra.MinimumNArgs(1),
+		PreRunE: checkServerHeartbeat,
+		RunE:    RunHandler,
 	}
 
 	runCmd.Flags().Bool("verbose", false, "Show timings for response")