-
Notifications
You must be signed in to change notification settings - Fork 4
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
[PARKED] Create /chat endpoint #412
Draft
suzinyou
wants to merge
10
commits into
main
Choose a base branch
from
multiturn2
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.
Draft
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
fef1ca4
implement multiturn
suzinyou b7dae79
refactor search_base func
suzinyou 0f1f546
remove unused logging
suzinyou 7e8f6a1
cleanup json schema displays
suzinyou 9e0b258
fix mypy issue
suzinyou 07dbdf7
fix mypy issue
suzinyou 7e4f41e
Merge branch 'refactor-search-base' into multiturn2
suzinyou 49b6e12
refactor voice search endpoint
suzinyou 294b796
add comment back in
suzinyou b2bf168
Merge branch 'refactor-search-base' into multiturn2
suzinyou 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 |
---|---|---|
|
@@ -2,8 +2,6 @@ | |
Augmented Generation (RAG). | ||
""" | ||
|
||
from typing import Optional | ||
|
||
from pydantic import ValidationError | ||
|
||
from ..config import LITELLM_MODEL_GENERATION | ||
|
@@ -15,23 +13,27 @@ | |
|
||
|
||
async def get_llm_rag_answer( | ||
question: str, | ||
question: str | list[dict[str, str]], | ||
context: str, | ||
original_language: IdentifiedLanguage, | ||
metadata: Optional[dict] = None, | ||
metadata: dict | None = None, | ||
chat_history: list[dict[str, str]] | None = None, | ||
) -> RAG: | ||
"""Get an answer from the LLM model using RAG. | ||
|
||
Parameters | ||
---------- | ||
question | ||
The question to ask the LLM model. | ||
The question to ask the LLM model, or list of chat history messages in the form | ||
of {"content": str, "role": str}. | ||
Comment on lines
+27
to
+28
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To undo |
||
context | ||
The context to provide to the LLM model. | ||
response_language | ||
The language of the response. | ||
metadata | ||
Additional metadata to provide to the LLM model. | ||
chat_history | ||
The previous chat history to provide to the LLM model if it exists. | ||
|
||
Returns | ||
------- | ||
|
@@ -45,6 +47,7 @@ async def get_llm_rag_answer( | |
result = await _ask_llm_async( | ||
user_message=question, | ||
system_message=prompt, | ||
chat_history=chat_history, | ||
litellm_model=LITELLM_MODEL_GENERATION, | ||
metadata=metadata, | ||
json=True, | ||
|
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 |
---|---|---|
@@ -1,5 +1,3 @@ | ||
from typing import Optional | ||
|
||
from litellm import acompletion | ||
|
||
from ..config import LITELLM_API_KEY, LITELLM_ENDPOINT, LITELLM_MODEL_DEFAULT | ||
|
@@ -9,11 +7,12 @@ | |
|
||
|
||
async def _ask_llm_async( | ||
user_message: str, | ||
user_message: str | list[dict[str, str]], | ||
system_message: str, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. to undo |
||
litellm_model: Optional[str] = LITELLM_MODEL_DEFAULT, | ||
litellm_endpoint: Optional[str] = LITELLM_ENDPOINT, | ||
metadata: Optional[dict] = None, | ||
chat_history: list[dict[str, str]] | None = None, | ||
litellm_model: str | None = LITELLM_MODEL_DEFAULT, | ||
litellm_endpoint: str | None = LITELLM_ENDPOINT, | ||
metadata: dict | None = None, | ||
json: bool = False, | ||
) -> str: | ||
""" | ||
|
@@ -36,6 +35,10 @@ async def _ask_llm_async( | |
"role": "user", | ||
}, | ||
] | ||
|
||
if chat_history is not None: | ||
messages = messages[:1] + chat_history + messages[1:] | ||
|
||
logger.info(f"LLM input: 'model': {litellm_model}, 'endpoint': {litellm_endpoint}") | ||
|
||
llm_response_raw = await acompletion( | ||
|
Oops, something went wrong.
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.
To undo