third-party-mirrors/ollama
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 161aa75f1bf813e9944067b871e852f60869ae43 into d7eb05b9361febead29a74e71ddffc2ebeff5302

Browse Source
This commit is contained in:
Matthew Garelli 2024-11-14 13:57:16 +08:00 committed by GitHub
commit e8f46f7a73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmd/cmd.go
View File

@ -1279,6 +1279,32 @@ func checkServerHeartbeat(cmd *cobra.Command, _ []string) error {
return nil
}
func completionFlagHandler(cmd *cobra.Command, _ []string, shells []string, completionFlag string) {
shl, err := cmd.Flags().GetString(completionFlag)
if err != nil {
fmt.Println("required one argument <shell>")
return
}
if !slices.Contains(shells, shl) {
fmt.Println("argument <shell> was not one of " + strings.Join(shells, ", "))
return
}
switch shl {
case shells[0]:
cmd.Root().GenBashCompletion(os.Stdout)
case shells[1]:
cmd.Root().GenZshCompletion(os.Stdout)
case shells[2]:
cmd.Root().GenFishCompletion(os.Stdout, true)
case shells[3]:
cmd.Root().GenPowerShellCompletionWithDesc(os.Stdout)
default:
fmt.Println("not a recognized shell")
os.Exit(1)
}
os.Exit(0)
}
func versionHandler(cmd *cobra.Command, _ []string) {
client, err := api.ClientFromEnvironment()
if err != nil {
@ -1322,6 +1348,9 @@ func NewCLI() *cobra.Command {
console.ConsoleFromFile(os.Stdin) //nolint:errcheck
}
var shells = []string{"bash", "zsh", "fish", "powershell"}
completionFlag := "shell-completion"
rootCmd := &cobra.Command{
Use: "ollama",
Short: "Large language model runner",
@ -1336,11 +1365,20 @@ func NewCLI() *cobra.Command {
return
}
if compShell, _ := cmd.Flags().GetString(completionFlag); compShell != "" {
completionFlagHandler(cmd, args, shells, completionFlag)
return
}
cmd.Print(cmd.UsageString())
},
}
rootCmd.Flags().BoolP("version", "v", false, "Show version information")
rootCmd.Flags().StringP(completionFlag, "", "", "<shell> Generate shell completions for "+strings.Join(shells, ", "))
rootCmd.RegisterFlagCompletionFunc(completionFlag, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
return shells, cobra.ShellCompDirectiveDefault
})
createCmd := &cobra.Command{
Use: "create MODEL",