UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-12-28 23:02:25 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix Google Drive integration

Browse Source
This commit is contained in:
Taylor Wilsdon 2024-12-26 14:41:58 -05:00
parent 1c7ff7b1dc
commit 909c94e983
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -307,3 +307,4 @@ dist
cypress/videos cypress/videos
cypress/screenshots cypress/screenshots
.vscode/settings.json .vscode/settings.json
.aider*

22
backend/open_webui/config.py
View File

@ -307,17 +307,6 @@ GOOGLE_CLIENT_SECRET = PersistentConfig(
os.environ.get("GOOGLE_CLIENT_SECRET", ""), os.environ.get("GOOGLE_CLIENT_SECRET", ""),
) )
GOOGLE_DRIVE_CLIENT_ID = PersistentConfig(
"GOOGLE_DRIVE_CLIENT_ID",
"google_drive.client_id",
os.environ.get("GOOGLE_DRIVE_CLIENT_ID", ""),
)
GOOGLE_DRIVE_API_KEY = PersistentConfig(
"GOOGLE_DRIVE_API_KEY",
"google_drive.api_key",
os.environ.get("GOOGLE_DRIVE_API_KEY", ""),
)
GOOGLE_OAUTH_SCOPE = PersistentConfig( GOOGLE_OAUTH_SCOPE = PersistentConfig(
"GOOGLE_OAUTH_SCOPE", "GOOGLE_OAUTH_SCOPE",
@ -1223,6 +1212,17 @@ ENABLE_GOOGLE_DRIVE_INTEGRATION = PersistentConfig(
os.getenv("ENABLE_GOOGLE_DRIVE_INTEGRATION", "False").lower() == "true", os.getenv("ENABLE_GOOGLE_DRIVE_INTEGRATION", "False").lower() == "true",
) )
GOOGLE_DRIVE_CLIENT_ID = PersistentConfig(
"GOOGLE_DRIVE_CLIENT_ID",
"google_drive.client_id",
os.environ.get("GOOGLE_DRIVE_CLIENT_ID", ""),
)
GOOGLE_DRIVE_API_KEY = PersistentConfig(
"GOOGLE_DRIVE_API_KEY",
"google_drive.api_key",
os.environ.get("GOOGLE_DRIVE_API_KEY", ""),
)
# RAG Content Extraction # RAG Content Extraction
CONTENT_EXTRACTION_ENGINE = PersistentConfig( CONTENT_EXTRACTION_ENGINE = PersistentConfig(

2
backend/open_webui/routers/retrieval.py
View File

@ -347,7 +347,7 @@ async def get_rag_config(request: Request, user=Depends(get_admin_user)):
return { return {
"status": True, "status": True,
"pdf_extract_images": request.app.state.config.PDF_EXTRACT_IMAGES, "pdf_extract_images": request.app.state.config.PDF_EXTRACT_IMAGES,
"ENABLE_GOOGLE_DRIVE_INTEGRATION": request.app.state.config.ENABLE_GOOGLE_DRIVE_INTEGRATION, "enable_google_drive_integration": request.app.state.config.ENABLE_GOOGLE_DRIVE_INTEGRATION,
"content_extraction": { "content_extraction": {
"engine": request.app.state.config.CONTENT_EXTRACTION_ENGINE, "engine": request.app.state.config.CONTENT_EXTRACTION_ENGINE,
"tika_server_url": request.app.state.config.TIKA_SERVER_URL, "tika_server_url": request.app.state.config.TIKA_SERVER_URL,

12
src/lib/components/admin/Settings/Documents.svelte
View File

@ -192,6 +192,7 @@
tika_server_url: tikaServerUrl tika_server_url: tikaServerUrl
} }
}); });
console.log(res)
await updateQuerySettings(localStorage.token, querySettings); await updateQuerySettings(localStorage.token, querySettings);
@ -234,7 +235,7 @@
querySettings = await getQuerySettings(localStorage.token); querySettings = await getQuerySettings(localStorage.token);
const res = await getRAGConfig(localStorage.token); const res = await getRAGConfig(localStorage.token);
console.log(res)
if (res) { if (res) {
pdfExtractImages = res.pdf_extract_images; pdfExtractImages = res.pdf_extract_images;
@ -248,8 +249,7 @@
fileMaxSize = res?.file.max_size ?? ''; fileMaxSize = res?.file.max_size ?? '';
fileMaxCount = res?.file.max_count ?? ''; fileMaxCount = res?.file.max_count ?? '';
enableGoogleDriveIntegration = res.enable_google_drive_integration;
enableGoogleDriveIntegration = res.enable_google_drive_integration ?? false;
console.log('Google Drive Integration onMount:', enableGoogleDriveIntegration); console.log('Google Drive Integration onMount:', enableGoogleDriveIntegration);
if (enableGoogleDriveIntegration === undefined) { if (enableGoogleDriveIntegration === undefined) {
console.error('enableGoogleDriveIntegration is undefined onMount'); console.error('enableGoogleDriveIntegration is undefined onMount');
@ -603,11 +603,7 @@
<div class="flex justify-between items-center text-xs"> <div class="flex justify-between items-center text-xs">
<div class="text-xs font-medium">{$i18n.t('Enable Google Drive')}</div> <div class="text-xs font-medium">{$i18n.t('Enable Google Drive')}</div>
<div> <div>
<Switch bind:state={enableGoogleDriveIntegration} on:change={() => { <Switch bind:state={enableGoogleDriveIntegration} />
console.log('Google Drive Integration before change:', enableGoogleDriveIntegration);
enableGoogleDriveIntegration = !enableGoogleDriveIntegration;
console.log('Google Drive Integration after change:', enableGoogleDriveIntegration);
}} />
</div> </div>
</div> </div>
</div> </div>