apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-06-22 21:28:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: Google Drive folder handling and connector page updates

Browse source
This commit is contained in:
CREDO23 2025-12-28 19:57:10 +02:00
parent 10c98745cd
commit 27beac4f62
4 changed files with 40 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

21
surfsense_backend/app/routes/search_source_connectors_routes.py
View file

@ -543,13 +543,13 @@ async def index_connector_content(
None,
description="End date for indexing (YYYY-MM-DD format). If not provided, uses today's date",
),
folder_id: str = Query(
folder_ids: str = Query(
None,
description="[Google Drive only] Folder ID to index. If not provided, uses the connector's saved selected_folder_id",
description="[Google Drive only] Comma-separated folder IDs to index",
),
folder_name: str = Query(
folder_names: str = Query(
None,
description="[Google Drive only] Folder name for display purposes",
description="[Google Drive only] Comma-separated folder names for display purposes",
),
session: AsyncSession = Depends(get_async_session),
user: User = Depends(current_active_user),
@ -763,15 +763,22 @@ async def index_connector_content(
index_google_drive_files_task,
)
if not folder_ids or not folder_names:
raise HTTPException(
status_code=400,
detail="Google Drive indexing requires folder_ids and folder_names parameters",
)
logger.info(
f"Triggering Google Drive indexing for connector {connector_id} into search space {search_space_id}, folder: {folder_name or 'default'}"
f"Triggering Google Drive indexing for connector {connector_id} into search space {search_space_id}, folders: {folder_names}"
)
# Pass comma-separated strings directly to Celery task
index_google_drive_files_task.delay(
connector_id,
search_space_id,
str(user.id),
folder_id,
folder_name,
folder_ids, # Pass as comma-separated string
folder_names, # Pass as comma-separated string
)
response_message = "Google Drive indexing started in the background."

20
surfsense_backend/app/tasks/document_processors/file_processors.py
View file

@ -511,8 +511,8 @@ async def process_file_in_background(
session, filename, markdown_content, search_space_id, user_id
)
# Update from connector if provided
await _update_document_from_connector(result, connector, session)
if connector:
await _update_document_from_connector(result, connector, session)
if result:
await task_logger.log_task_success(
@ -630,8 +630,8 @@ async def process_file_in_background(
session, filename, transcribed_text, search_space_id, user_id
)
# Update from connector if provided
await _update_document_from_connector(result, connector, session)
if connector:
await _update_document_from_connector(result, connector, session)
if result:
await task_logger.log_task_success(
@ -778,8 +778,8 @@ async def process_file_in_background(
session, filename, docs, search_space_id, user_id
)
# Update from connector if provided
await _update_document_from_connector(result, connector, session)
if connector:
await _update_document_from_connector(result, connector, session)
if result:
# Update page usage after successful processing
@ -925,8 +925,8 @@ async def process_file_in_background(
user_id, final_page_count, allow_exceed=True
)
# Update from connector if provided
await _update_document_from_connector(last_created_doc, connector, session)
if connector:
await _update_document_from_connector(last_created_doc, connector, session)
await task_logger.log_task_success(
log_entry,
@ -1052,8 +1052,8 @@ async def process_file_in_background(
user_id, final_page_count, allow_exceed=True
)
# Update from connector if provided
await _update_document_from_connector(doc_result, connector, session)
if connector:
await _update_document_from_connector(doc_result, connector, session)
await task_logger.log_task_success(
log_entry,