Skip to content

Commit 505a765

Browse files
authored
fix: sync provider naming (#3380)
# Description
1 parent b241103 commit 505a765

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

backend/api/quivr_api/modules/sync/controller/azure_sync_routes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from quivr_api.middlewares.auth import AuthBearer, get_current_user
1010
from quivr_api.modules.dependencies import get_service
1111
from quivr_api.modules.sync.dto.inputs import SyncStatus, SyncUpdateInput
12+
from quivr_api.modules.sync.dto.outputs import SyncProvider
1213
from quivr_api.modules.sync.service.sync_service import SyncsService
1314
from quivr_api.modules.sync.utils.oauth2 import parse_oauth2_state
1415
from quivr_api.modules.user.entity.user_identity import UserIdentity
@@ -63,7 +64,7 @@ async def authorize_azure(
6364
)
6465
logger.debug(f"Authorizing Azure sync for user: {current_user.id}")
6566
state = await syncs_service.create_oauth2_state(
66-
provider="Azure", name=name, user_id=current_user.id
67+
provider=SyncProvider.AZURE, name=name, user_id=current_user.id
6768
)
6869
flow = client.initiate_auth_code_flow(
6970
scopes=SCOPE,

backend/api/quivr_api/modules/sync/controller/dropbox_sync_routes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from quivr_api.middlewares.auth import AuthBearer, get_current_user
1010
from quivr_api.modules.dependencies import get_service
1111
from quivr_api.modules.sync.dto.inputs import SyncStatus, SyncUpdateInput
12+
from quivr_api.modules.sync.dto.outputs import SyncProvider
1213
from quivr_api.modules.sync.service.sync_service import SyncsService
1314
from quivr_api.modules.sync.utils.oauth2 import parse_oauth2_state
1415
from quivr_api.modules.user.entity.user_identity import UserIdentity
@@ -64,7 +65,7 @@ async def authorize_dropbox(
6465
scope=SCOPE,
6566
)
6667
state = await syncs_service.create_oauth2_state(
67-
provider="DropBox", name=name, user_id=current_user.id
68+
provider=SyncProvider.DROPBOX, name=name, user_id=current_user.id
6869
)
6970
authorize_url = auth_flow.start(state.model_dump_json())
7071
logger.info(

backend/api/quivr_api/modules/sync/controller/github_sync_routes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from quivr_api.middlewares.auth import AuthBearer, get_current_user
99
from quivr_api.modules.dependencies import get_service
1010
from quivr_api.modules.sync.dto.inputs import SyncStatus, SyncUpdateInput
11+
from quivr_api.modules.sync.dto.outputs import SyncProvider
1112
from quivr_api.modules.sync.service.sync_service import SyncsService
1213
from quivr_api.modules.sync.utils.oauth2 import parse_oauth2_state
1314
from quivr_api.modules.user.entity.user_identity import UserIdentity
@@ -54,7 +55,7 @@ async def authorize_github(
5455
"""
5556
logger.debug(f"Authorizing GitHub sync for user: {current_user.id}")
5657
state = await syncs_service.create_oauth2_state(
57-
provider="Github", name=name, user_id=current_user.id
58+
provider=SyncProvider.GITHUB, name=name, user_id=current_user.id
5859
)
5960
authorization_url = (
6061
f"https://github.com/login/oauth/authorize?client_id={CLIENT_ID}"

backend/api/quivr_api/modules/sync/controller/google_sync_routes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from quivr_api.middlewares.auth import AuthBearer, get_current_user
1111
from quivr_api.modules.dependencies import get_service
1212
from quivr_api.modules.sync.dto.inputs import SyncStatus, SyncUpdateInput
13+
from quivr_api.modules.sync.dto.outputs import SyncProvider
1314
from quivr_api.modules.sync.service.sync_service import SyncsService
1415
from quivr_api.modules.sync.utils.oauth2 import parse_oauth2_state
1516
from quivr_api.modules.user.entity.user_identity import UserIdentity
@@ -89,7 +90,7 @@ async def authorize_google(
8990
)
9091

9192
state = await syncs_service.create_oauth2_state(
92-
provider="Google", name=name, user_id=current_user.id
93+
provider=SyncProvider.GOOGLE, name=name, user_id=current_user.id
9394
)
9495
authorization_url, state = flow.authorization_url(
9596
access_type="offline",

backend/api/quivr_api/modules/sync/controller/notion_sync_routes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from quivr_api.middlewares.auth import AuthBearer, get_current_user
1212
from quivr_api.modules.dependencies import get_service
1313
from quivr_api.modules.sync.dto.inputs import SyncStatus, SyncUpdateInput
14+
from quivr_api.modules.sync.dto.outputs import SyncProvider
1415
from quivr_api.modules.sync.service.sync_service import SyncsService
1516
from quivr_api.modules.sync.utils.oauth2 import parse_oauth2_state
1617
from quivr_api.modules.user.entity.user_identity import UserIdentity
@@ -57,7 +58,7 @@ async def authorize_notion(
5758
"""
5859
logger.debug(f"Authorizing Notion sync for user: {current_user.id}, name : {name}")
5960
state = await syncs_service.create_oauth2_state(
60-
provider="Notion", name=name, user_id=current_user.id
61+
provider=SyncProvider.NOTION, name=name, user_id=current_user.id
6162
)
6263
# Finalize the state
6364
authorize_url = str(NOTION_AUTH_URL) + f"&state={state.model_dump_json()}"

backend/api/quivr_api/modules/sync/controller/sync_routes.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from quivr_api.modules.sync.controller.google_sync_routes import google_sync_router
2121
from quivr_api.modules.sync.controller.notion_sync_routes import notion_sync_router
2222
from quivr_api.modules.sync.dto import SyncsDescription
23-
from quivr_api.modules.sync.dto.outputs import AuthMethodEnum
23+
from quivr_api.modules.sync.dto.outputs import AuthMethodEnum, SyncProvider
2424
from quivr_api.modules.sync.entity.sync_models import SyncFile
2525
from quivr_api.modules.sync.service.sync_service import SyncsService
2626
from quivr_api.modules.user.entity.user_identity import UserIdentity
@@ -51,31 +51,31 @@
5151

5252
# Google sync description
5353
google_sync = SyncsDescription(
54-
name="Google",
54+
name=SyncProvider.GOOGLE,
5555
description="Sync your Google Drive with Quivr",
5656
auth_method=AuthMethodEnum.URI_WITH_CALLBACK,
5757
)
5858

5959
azure_sync = SyncsDescription(
60-
name="Azure",
60+
name=SyncProvider.AZURE,
6161
description="Sync your Azure Drive with Quivr",
6262
auth_method=AuthMethodEnum.URI_WITH_CALLBACK,
6363
)
6464

6565
dropbox_sync = SyncsDescription(
66-
name="DropBox",
66+
name=SyncProvider.DROPBOX,
6767
description="Sync your DropBox Drive with Quivr",
6868
auth_method=AuthMethodEnum.URI_WITH_CALLBACK,
6969
)
7070

7171
notion_sync = SyncsDescription(
72-
name="Notion",
72+
name=SyncProvider.NOTION,
7373
description="Sync your Notion with Quivr",
7474
auth_method=AuthMethodEnum.URI_WITH_CALLBACK,
7575
)
7676

7777
github_sync = SyncsDescription(
78-
name="GitHub",
78+
name=SyncProvider.GITHUB,
7979
description="Sync your GitHub Drive with Quivr",
8080
auth_method=AuthMethodEnum.URI_WITH_CALLBACK,
8181
)

backend/api/quivr_api/modules/sync/service/sync_service.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
SyncStatus,
1111
SyncUpdateInput,
1212
)
13-
from quivr_api.modules.sync.dto.outputs import SyncsOutput
13+
from quivr_api.modules.sync.dto.outputs import SyncProvider, SyncsOutput
1414
from quivr_api.modules.sync.repository.sync_repository import SyncsRepository
1515
from quivr_api.modules.sync.utils.oauth2 import Oauth2BaseState, Oauth2State
1616

@@ -54,7 +54,7 @@ async def get_from_oauth2_state(self, state: Oauth2State) -> SyncsOutput:
5454

5555
async def create_oauth2_state(
5656
self,
57-
provider: str,
57+
provider: SyncProvider,
5858
name: str,
5959
user_id: UUID,
6060
additional_data: dict[str, Any] = {},

0 commit comments

Comments
 (0)