Pass down base URL and API key to completion handler #1002
Merged
Conversation
This file contains hidden or 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
jhrozek
reviewed
Feb 10, 2025
| api_key: Optional[str], | ||
| stream: bool = False, | ||
| is_fim_request: bool = False, | ||
| ) -> Union[ChatResponse, GenerateResponse]: | ||
| """Stream response directly from Ollama API.""" | ||
|
|
||
| if not base_url: | ||
| raise ValueError("base_url is required for Ollama") |
There was a problem hiding this comment.
could we default to localhost:11434 ?
There was a problem hiding this comment.
We should already get this default frm the caller.
jhrozek
reviewed
Feb 10, 2025
| # TODO: Add CodeGate user agent. | ||
| headers = dict() | ||
| if api_key: | ||
| headers["Authorization"] = f"Bearer {api_key}" |
There was a problem hiding this comment.
Does the bearer token get forwarded or does it have some other meaning later on?
There was a problem hiding this comment.
It gets set so we can forward it
jhrozek
reviewed
Feb 10, 2025
JAORMX
force-pushed
the
ollama-api-key
branch
2 times, most recently
from
222d2f3 to
dd3db9f
Compare
In order to make Ollama work with API Keys, I needed to change the completion handler to take a base URL and also leverage a given API key (if available). Signed-off-by: Juan Antonio Osorio <[email protected]> Co-Authored-by: Alejandro Ponce de Leon <[email protected]>
Signed-off-by: Juan Antonio Osorio <[email protected]>
JAORMX
force-pushed
the
ollama-api-key
branch
2 times, most recently
from
5b8a04e to
d5281d2
Compare
Signed-off-by: Juan Antonio Osorio <[email protected]>
jhrozek
approved these changes
Feb 11, 2025
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.
In order to make Ollama work with API Keys, I needed to change the
completion handler to take a base URL and also leverage a given API key
(if available).
Signed-off-by: Juan Antonio Osorio [email protected]
Co-Authored-by: Alejandro Ponce de Leon [email protected]