update: add apikey to every subcmd

siliconflow · Oct 8, 2024 · 9c5efe5 · 9c5efe5
1 parent d6fbb93
commit 9c5efe5
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 15 deletions.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -35,6 +35,7 @@ func Init() *cli.App {
 	app.Flags = []cli.Flag{
 		&verboseFlag,
 		&baseDomainFlag,
+		&apiKeyFlag,
 	}
 
 	// Commands

diff --git a/cmd/ls_model.go b/cmd/ls_model.go
@@ -22,9 +22,14 @@ func ListModel(c *cli.Context) error {
 		return err
 	}
 
-	apiKey, err := lib.NewSfFolder().GetKey()
-	if err != nil {
-		return err
+	var apiKey string
+	if args.ApiKey != "" {
+		apiKey = args.ApiKey
+	} else {
+		apiKey, err = lib.NewSfFolder().GetKey()
+		if err != nil {
+			return err
+		}
 	}
 
 	client := lib.NewClient(args.BaseDomain, apiKey)

diff --git a/cmd/lsfiles_model.go b/cmd/lsfiles_model.go
@@ -26,9 +26,14 @@ func ListFilesModel(c *cli.Context) error {
 		return err
 	}
 
-	apiKey, err := lib.NewSfFolder().GetKey()
-	if err != nil {
-		return err
+	var apiKey string
+	if args.ApiKey != "" {
+		apiKey = args.ApiKey
+	} else {
+		apiKey, err = lib.NewSfFolder().GetKey()
+		if err != nil {
+			return err
+		}
 	}
 
 	client := lib.NewClient(args.BaseDomain, apiKey)

diff --git a/cmd/rm_model.go b/cmd/rm_model.go
@@ -21,9 +21,14 @@ func RemoveModel(c *cli.Context) error {
 		return err
 	}
 
-	apiKey, err := lib.NewSfFolder().GetKey()
-	if err != nil {
-		return err
+	var apiKey string
+	if args.ApiKey != "" {
+		apiKey = args.ApiKey
+	} else {
+		apiKey, err = lib.NewSfFolder().GetKey()
+		if err != nil {
+			return err
+		}
 	}
 
 	client := lib.NewClient(args.BaseDomain, apiKey)

diff --git a/cmd/upload.go b/cmd/upload.go
@@ -46,9 +46,14 @@ func Upload(c *cli.Context) error {
 		return cli.Exit(fmt.Errorf("check path failed: %s", err), meta.LoadError)
 	}
 
-	apiKey, err := lib.NewSfFolder().GetKey()
-	if err != nil {
-		return err
+	var apiKey string
+	if args.ApiKey != "" {
+		apiKey = args.ApiKey
+	} else {
+		apiKey, err = lib.NewSfFolder().GetKey()
+		if err != nil {
+			return err
+		}
 	}
 
 	client := lib.NewClient(args.BaseDomain, apiKey)

diff --git a/cmd/whoami.go b/cmd/whoami.go
@@ -17,9 +17,14 @@ func Whoami(c *cli.Context) error {
 	setLogVerbose(args.Verbose)
 	logs.Debugf("args: %#v\n", args)
 
-	apiKey, err := lib.NewSfFolder().GetKey()
-	if err != nil {
-		return err
+	var apiKey string
+	if args.ApiKey != "" {
+		apiKey = args.ApiKey
+	} else {
+		apiKey, err = lib.NewSfFolder().GetKey()
+		if err != nil {
+			return err
+		}
 	}
 
 	client := lib.NewClient(meta.AuthDomain, apiKey)

diff --git a/meta/const.go b/meta/const.go
@@ -39,6 +39,7 @@ const (
 	TypeClip         UploadFileType = "bizyair/clip"
 	TypeClipVision   UploadFileType = "bizyair/clip_vision"
 	TypeUpscale      UploadFileType = "bizyair/upscale"
+	TypeDataset      UploadFileType = "bizyair/dataset"
 	TypeOther        UploadFileType = "other"
 )
 
@@ -52,6 +53,7 @@ var ModelTypes = []UploadFileType{
 	TypeClip,
 	TypeClipVision,
 	TypeUpscale,
+	TypeDataset,
 	TypeOther,
 }