jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

transfer data

Browse Source
This commit is contained in:
Josh Yan 2024-07-03 17:44:23 -07:00
parent ae65cc8dea
commit 784958a1cb
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/cmd.go
View File

@ -77,9 +77,7 @@ func CreateHandler(cmd *cobra.Command, args []string) error {
return err return err
} }
status := "" status := "starting model create..."
spinner := progress.NewSpinner(status)
p.Add(status, spinner)
for i := range modelfile.Commands { for i := range modelfile.Commands {
switch modelfile.Commands[i].Name { switch modelfile.Commands[i].Name {
@ -113,7 +111,7 @@ func CreateHandler(cmd *cobra.Command, args []string) error {
path = tempfile path = tempfile
} }
spinner.Stop()
digest, err := createBlob(cmd, client, path) digest, err := createBlob(cmd, client, path)
if err != nil { if err != nil {
return err return err
@ -126,8 +124,6 @@ func CreateHandler(cmd *cobra.Command, args []string) error {
bars := make(map[string]*progress.Bar) bars := make(map[string]*progress.Bar)
fn := func(resp api.ProgressResponse) error { fn := func(resp api.ProgressResponse) error {
if resp.Digest != "" { if resp.Digest != "" {
spinner.Stop()
bar, ok := bars[resp.Digest] bar, ok := bars[resp.Digest]
if !ok { if !ok {
bar = progress.NewBar(fmt.Sprintf("pulling %s...", resp.Digest[7:19]), resp.Total, resp.Completed) bar = progress.NewBar(fmt.Sprintf("pulling %s...", resp.Digest[7:19]), resp.Total, resp.Completed)
@ -137,10 +133,8 @@ func CreateHandler(cmd *cobra.Command, args []string) error {
bar.Set(resp.Completed) bar.Set(resp.Completed)
} else if status != resp.Status { } else if status != resp.Status {
spinner.Stop()
status = resp.Status status = resp.Status
spinner = progress.NewSpinner(status) spinner := progress.NewSpinner(status)
p.Add(status, spinner) p.Add(status, spinner)
} }
@ -294,7 +288,7 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string) (string, er
// Create a progress bar and start a goroutine to update it // Create a progress bar and start a goroutine to update it
p := progress.NewProgress(os.Stderr) p := progress.NewProgress(os.Stderr)
bar := progress.NewBar("transferring model data...", fileSize, 0) bar := progress.NewBar("transferring model data...", fileSize, 0)
p.Add("", bar) p.Add("transferring model data", bar)
ticker := time.NewTicker(60 * time.Millisecond) ticker := time.NewTicker(60 * time.Millisecond)
done := make(chan struct{}) done := make(chan struct{})
@ -345,6 +339,8 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string) (string, er
if err = client.CreateBlob(cmd.Context(), digest, io.TeeReader(bin, &pw)); err != nil { if err = client.CreateBlob(cmd.Context(), digest, io.TeeReader(bin, &pw)); err != nil {
return "", err return "", err
} }
bar.Set(fileSize)
close(done)
return digest, nil return digest, nil
} }