[PR #10069] [MERGED] cmd: add retry/backoff #13138

Closed
opened 2026-04-13 00:18:55 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/10069
Author: @bmizerany
Created: 4/1/2025
Status: Merged
Merged: 4/16/2025
Merged by: @bmizerany

Base: mainHead: bmizerany/client2progressbar


📝 Commits (1)

📊 Changes

6 files changed (+233 additions, -158 deletions)

View changed files

📝 cmd/cmd.go (+27 -6)
📝 server/internal/client/ollama/registry.go (+105 -91)
📝 server/internal/client/ollama/registry_test.go (+5 -5)
📝 server/internal/client/ollama/trace.go (+20 -3)
📝 server/internal/registry/server.go (+60 -40)
📝 server/internal/registry/server_test.go (+16 -13)

📄 Description

This commit adds retry/backoff to the registry client for pull requests.

Also, revert progress indication to match original client's until we can
"get it right."

Also, make WithTrace wrap existing traces instead of clobbering them.
This allows clients to compose traces.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/10069 **Author:** [@bmizerany](https://github.com/bmizerany) **Created:** 4/1/2025 **Status:** ✅ Merged **Merged:** 4/16/2025 **Merged by:** [@bmizerany](https://github.com/bmizerany) **Base:** `main` ← **Head:** `bmizerany/client2progressbar` --- ### 📝 Commits (1) - [`8a7ff6a`](https://github.com/ollama/ollama/commit/8a7ff6a0eda76b9338e3fd4a20f20d676de6926b) cmd: add retry/backoff ### 📊 Changes **6 files changed** (+233 additions, -158 deletions) <details> <summary>View changed files</summary> 📝 `cmd/cmd.go` (+27 -6) 📝 `server/internal/client/ollama/registry.go` (+105 -91) 📝 `server/internal/client/ollama/registry_test.go` (+5 -5) 📝 `server/internal/client/ollama/trace.go` (+20 -3) 📝 `server/internal/registry/server.go` (+60 -40) 📝 `server/internal/registry/server_test.go` (+16 -13) </details> ### 📄 Description This commit adds retry/backoff to the registry client for pull requests. Also, revert progress indication to match original client's until we can "get it right." Also, make WithTrace wrap existing traces instead of clobbering them. This allows clients to compose traces. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-13 00:18:55 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama#13138