-
Notifications
You must be signed in to change notification settings - Fork 2.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support ollama #1326
Open
Smpests
wants to merge
8
commits into
microsoft:main
Choose a base branch
from
Smpests:feature/ollama-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Support ollama #1326
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b2736a9
ollama support.
Smpests 5c9dcdb
remove useless print code
Smpests a98ae6a
resolve generate community report error
Smpests 82d3a07
ollama support.
Smpests f57f4a3
remove useless print code
Smpests 7452efc
resolve generate community report error
Smpests 970d324
resolve coflict
Smpests 84be1e5
support search by ollama
Smpests File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# Copyright (c) 2024 Microsoft Corporation. | ||
# Licensed under the MIT License | ||
|
||
"""Ollama LLM implementations.""" | ||
|
||
from .create_ollama_client import create_ollama_client | ||
from .factories import ( | ||
create_ollama_chat_llm, | ||
create_ollama_completion_llm, | ||
create_ollama_embedding_llm, | ||
) | ||
from .ollama_chat_llm import OllamaChatLLM | ||
from .ollama_completion_llm import OllamaCompletionLLM | ||
from .ollama_configuration import OllamaConfiguration | ||
from .ollama_embeddings_llm import OllamaEmbeddingsLLM | ||
from .types import OllamaClientType | ||
|
||
|
||
__all__ = [ | ||
"OllamaChatLLM", | ||
"OllamaClientType", | ||
"OllamaCompletionLLM", | ||
"OllamaConfiguration", | ||
"OllamaEmbeddingsLLM", | ||
"create_ollama_chat_llm", | ||
"create_ollama_client", | ||
"create_ollama_completion_llm", | ||
"create_ollama_embedding_llm", | ||
] |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# Copyright (c) 2024 Microsoft Corporation. | ||
# Licensed under the MIT License | ||
|
||
"""Create OpenAI client instance.""" | ||
|
||
import logging | ||
from functools import cache | ||
|
||
from ollama import AsyncClient, Client | ||
|
||
from .ollama_configuration import OllamaConfiguration | ||
from .types import OllamaClientType | ||
|
||
log = logging.getLogger(__name__) | ||
|
||
API_BASE_REQUIRED_FOR_AZURE = "api_base is required for Azure OpenAI client" | ||
|
||
|
||
@cache | ||
def create_ollama_client( | ||
configuration: OllamaConfiguration, | ||
sync: bool = False, | ||
) -> OllamaClientType: | ||
"""Create a new Ollama client instance.""" | ||
|
||
log.info("Creating OpenAI client base_url=%s", configuration.api_base) | ||
if sync: | ||
return Client( | ||
host=configuration.api_base, | ||
timeout=configuration.request_timeout or 180.0, | ||
) | ||
return AsyncClient( | ||
host=configuration.api_base, | ||
# Timeout/Retry Configuration - Use Tenacity for Retries, so disable them here | ||
timeout=configuration.request_timeout or 180.0, | ||
) |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fyi, "Creating OpenAI client base_url=%s" should be "Creating Ollama client base_url=%s"