QuivrHQ/quivr
1
1
Fork 0
mirror of https://github.com/QuivrHQ/quivr.git synced 2024-08-16 18:00:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix/disabledKnowledgeTab

Browse Source
This commit is contained in:
Antoine Dewez 2024-03-25 17:09:24 -07:00 committed by GitHub
commit a1b52a6074
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/modules/brain/integrations/Notion/Notion_connector.py
View File

@ -59,7 +59,7 @@ class NotionConnector(IntegrationBrain, Integration):
def _load_credentials(self) -> dict[str, str]:
"""Load the Notion credentials"""
self.integration_details = self.get_integration_brain(
self.brain_id, self.user_id
self.brain_id
)
if self.credentials is None:
logger.info("Loading Notion credentials")
@ -343,7 +343,7 @@ class NotionConnector(IntegrationBrain, Integration):
"""
Update all the brains with the latest data from Notion
"""
integration = self.get_integration_brain(self.brain_id, self.user_id)
integration = self.get_integration_brain(self.brain_id)
last_synced = integration.last_synced
query_dict = {

2
backend/modules/brain/integrations/SQL/SQL_connector.py
View File

@ -26,7 +26,7 @@ class SQLConnector(IntegrationBrain):
def _load_credentials(self) -> dict[str, str]:
"""Load the Notion credentials"""
self.integration_details = self.get_integration_brain(
self.brain_id, self.user_id
self.brain_id
)
if self.credentials is None:
logger.info("Loading Notion credentials")

12
backend/modules/brain/repository/integration_brains.py
View File

@ -33,14 +33,18 @@ class IntegrationBrain(IntegrationBrainInterface):
def __init__(self):
self.db = get_supabase_client()
def get_integration_brain(self, brain_id, user_id):
response = (
def get_integration_brain(self, brain_id, user_id = None):
query = (
self.db.table("integrations_user")
.select("*")
.filter("brain_id", "eq", brain_id)
.filter("user_id", "eq", user_id)
.execute()
)
if user_id:
query.filter("user_id", "eq", user_id)
response = query.execute()
if len(response.data) == 0:
return None

2
backend/modules/brain/repository/interfaces/brains_interface.py
View File

@ -21,7 +21,7 @@ class BrainsInterface(ABC):
pass
@abstractmethod
def get_brain_details(self, brain_id: UUID) -> BrainEntity | None:
def get_brain_details(self, brain_id: UUID, user_id: UUID) -> BrainEntity | None:
"""
Get all public brains
"""

2
backend/modules/brain/repository/interfaces/integration_brains_interface.py
View File

@ -9,7 +9,7 @@ from modules.brain.entity.integration_brain import (
class IntegrationBrainInterface(ABC):
@abstractmethod
def get_integration_brain(self, brain_id: UUID, user_id: UUID) -> IntegrationEntity:
def get_integration_brain(self, brain_id: UUID) -> IntegrationEntity:
"""Get the integration brain entity
Args:

14
backend/modules/brain/service/brain_service.py
View File

@ -58,9 +58,9 @@ class BrainService:
def get_brain_by_id(self, brain_id: UUID):
return self.brain_repository.get_brain_by_id(brain_id)
def get_integration_brain(self, brain_id, user_id) -> IntegrationEntity | None:
def get_integration_brain(self, brain_id) -> IntegrationEntity | None:
return self.integration_brains_repository.get_integration_brain(
brain_id, user_id
brain_id
)
def find_brain_from_question(
@ -323,7 +323,7 @@ class BrainService:
def update_brain_last_update_time(self, brain_id: UUID):
self.brain_repository.update_brain_last_update_time(brain_id)
def get_brain_details(self, brain_id: UUID, user_id: UUID) -> BrainEntity | None:
def get_brain_details(self, brain_id: UUID, user_id: UUID = None) -> BrainEntity | None:
brain = self.brain_repository.get_brain_details(brain_id)
if brain == None:
return None
@ -334,6 +334,14 @@ class BrainService:
brain_id, user_id
)
)
if (brain.integration):
brain.integration_description = (
self.integration_description_repository.get_integration_description(
brain.integration.integration_id
)
)
return brain
def get_connected_brains(self, brain_id: UUID) -> list[BrainEntity]: