-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
refactor: chat_routes #1512
Merged
Merged
refactor: chat_routes #1512
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3119499
🔥 remove duplicate code
gozineb c3b5612
🏗️ add a chat strategy for brainless and brainful questions
gozineb 40f70bb
🚚 extract authorization validation
gozineb 3b8f95b
🚚 extract chat utils
gozineb 5ae4033
🚚 extract get_answer_generator to Brainful/less strategy
gozineb 4af2c0d
🔥 remove conditional to get gpt_answer_generator
gozineb 27dd657
🔥 remove logs
gozineb 794cbfc
♻️ replace get_openai_api_key conditional with strategy
gozineb ce95e6f
Merge branch 'main' into refacto/design-patterns
gozineb 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
Empty file.
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,43 @@ | ||
from llm.qa_base import QABaseBrainPicking | ||
from routes.authorizations.brain_authorization import validate_brain_authorization | ||
from routes.authorizations.types import RoleEnum | ||
from routes.chat.interface import ChatInterface | ||
|
||
from repository.brain import get_brain_details | ||
|
||
|
||
class BrainfulChat(ChatInterface): | ||
def validate_authorization(self, user_id, brain_id): | ||
if brain_id: | ||
validate_brain_authorization( | ||
brain_id=brain_id, | ||
user_id=user_id, | ||
required_roles=[RoleEnum.Viewer, RoleEnum.Editor, RoleEnum.Owner], | ||
) | ||
|
||
def get_openai_api_key(self, brain_id, user_id): | ||
brain_details = get_brain_details(brain_id) | ||
if brain_details: | ||
return brain_details.openai_api_key | ||
|
||
def get_answer_generator( | ||
self, | ||
brain_id, | ||
chat_id, | ||
model, | ||
max_tokens, | ||
temperature, | ||
user_openai_api_key, | ||
streaming, | ||
prompt_id, | ||
): | ||
return QABaseBrainPicking( | ||
chat_id=chat_id, | ||
model=model, | ||
max_tokens=max_tokens, | ||
temperature=temperature, | ||
brain_id=brain_id, | ||
user_openai_api_key=user_openai_api_key, | ||
streaming=streaming, | ||
prompt_id=prompt_id, | ||
) |
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 @@ | ||
from llm.qa_headless import HeadlessQA | ||
from routes.chat.interface import ChatInterface | ||
|
||
from repository.user_identity import get_user_identity | ||
|
||
|
||
class BrainlessChat(ChatInterface): | ||
def validate_authorization(self, user_id, brain_id): | ||
pass | ||
|
||
def get_openai_api_key(self, brain_id, user_id): | ||
user_identity = get_user_identity(user_id) | ||
|
||
if user_identity is not None: | ||
return user_identity.openai_api_key | ||
|
||
def get_answer_generator( | ||
self, | ||
brain_id, | ||
chat_id, | ||
model, | ||
max_tokens, | ||
temperature, | ||
user_openai_api_key, | ||
streaming, | ||
prompt_id, | ||
): | ||
return HeadlessQA( | ||
chat_id=chat_id, | ||
model=model, | ||
max_tokens=max_tokens, | ||
temperature=temperature, | ||
user_openai_api_key=user_openai_api_key, | ||
streaming=streaming, | ||
prompt_id=prompt_id, | ||
) |
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,11 @@ | ||
from uuid import UUID | ||
|
||
from .brainful_chat import BrainfulChat | ||
from .brainless_chat import BrainlessChat | ||
|
||
|
||
def get_chat_strategy(brain_id: UUID | None = None): | ||
if brain_id: | ||
return BrainfulChat() | ||
else: | ||
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. Le else n'est pas nécessaire ici |
||
return BrainlessChat() |
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,25 @@ | ||
from abc import ABC, abstractmethod | ||
|
||
|
||
class ChatInterface(ABC): | ||
@abstractmethod | ||
def validate_authorization(self, user_id, required_roles): | ||
pass | ||
|
||
@abstractmethod | ||
def get_openai_api_key(self, brain_id, user_id): | ||
pass | ||
|
||
@abstractmethod | ||
def get_answer_generator( | ||
self, | ||
brain_id, | ||
chat_id, | ||
model, | ||
max_tokens, | ||
temperature, | ||
user_openai_api_key, | ||
streaming, | ||
prompt_id, | ||
): | ||
pass |
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,57 @@ | ||
import time | ||
from uuid import UUID | ||
|
||
from fastapi import HTTPException | ||
from models import UserIdentity, UserUsage | ||
from models.databases.supabase.supabase import SupabaseDB | ||
|
||
|
||
class NullableUUID(UUID): | ||
@classmethod | ||
def __get_validators__(cls): | ||
yield cls.validate | ||
|
||
@classmethod | ||
def validate(cls, v) -> UUID | None: | ||
if v == "": | ||
return None | ||
try: | ||
return UUID(v) | ||
except ValueError: | ||
return None | ||
|
||
|
||
def delete_chat_from_db(supabase_db: SupabaseDB, chat_id): | ||
try: | ||
supabase_db.delete_chat_history(chat_id) | ||
except Exception as e: | ||
print(e) | ||
pass | ||
try: | ||
supabase_db.delete_chat(chat_id) | ||
except Exception as e: | ||
print(e) | ||
pass | ||
|
||
|
||
def check_user_requests_limit( | ||
user: UserIdentity, | ||
): | ||
userDailyUsage = UserUsage( | ||
id=user.id, email=user.email, openai_api_key=user.openai_api_key | ||
) | ||
|
||
userSettings = userDailyUsage.get_user_settings() | ||
|
||
date = time.strftime("%Y%m%d") | ||
userDailyUsage.handle_increment_user_request_count(date) | ||
|
||
if user.openai_api_key is None: | ||
daily_chat_credit = userSettings.get("daily_chat_credit", 0) | ||
if int(userDailyUsage.daily_requests_count) >= int(daily_chat_credit): | ||
raise HTTPException( | ||
status_code=429, # pyright: ignore reportPrivateUsage=none | ||
detail="You have reached the maximum number of requests for today.", # pyright: ignore reportPrivateUsage=none | ||
) | ||
else: | ||
pass |
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.
le if ici n'est plus nécessaire car tu fais déjà le if dans la factory