use http.DefaultClient #2530
Merged
use http.DefaultClient #2530
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
default client already handles proxy
mxyng
force-pushed
the
mxyng/http-default-client
branch
from
b5feedd
to
dfe5079
Compare
BruceMacD
approved these changes
Feb 16, 2024
The easiest way is to run the mitmproxy docker image, expose 8080 which you set to HTTPS_PROXY. The challenge is it uses a self signed cert so extracting and installing that cert so ollama uses it (without adding it to the system) is kind of annoying. I haven't gotten around to testing this and am blindly trusting the docs |
|
I can confirm this works with a socks5 proxy now. Thank you! |
jimscard
added a commit
to jimscard/ollama
that referenced
this pull request
Feb 21, 2024
* 'main' of https://github.com/jimscard/ollama: (147 commits) update llama.cpp submodule to `c14f72d` Update big-AGI config file link (ollama#2626) add `dist` directory in `build_windows.ps` update llama.cpp submodule to `f0d1fafc029a056cd765bdae58dcaa12312e9879` better error message when calling `/api/generate` or `/api/chat` with embedding models Support for `bert` and `nomic-bert` embedding models Update faq.md replace strings buffer with hasher (ollama#2437) add gguf file types (ollama#2532) use http.DefaultClient (ollama#2530) update llama.cpp submodule to `66c1968f7` (ollama#2618) Add Page Assist to the community integrations (ollama#2447) docs: add Msty app in readme (ollama#1775) Update README.md to include Elixir LangChain Library (ollama#2180) [nit] Remove unused msg local var. (ollama#2511) docs: add tenere to terminal clients (ollama#2329) Update import.md Add ShellOracle to community terminal integrations (ollama#1767) Update faq.md feat: add Helm Chart link to Package managers list (ollama#1673) ...
zhewang1-intc
pushed a commit
to zhewang1-intc/ollama
that referenced
this pull request
May 13, 2024
default client already handles proxy
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
default client already handles proxy: https://pkg.go.dev/net/http#RoundTripper