opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/rag-2' of https://github.com/langgenius/dify into feat/rag-2

This commit is contained in:
twwu 2025-07-31 16:29:00 +08:00
parent 0b871abe59 82819af55c
commit 18af3dfe5d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/core/rag/extractor/extract_processor.py
View File

@ -183,7 +183,6 @@ class ExtractProcessor:
tenant_id=extract_setting.website_info.tenant_id,
mode=extract_setting.website_info.mode,
only_main_content=extract_setting.website_info.only_main_content,
credential_id=extract_setting.website_info.credential_id,
)
return extractor.extract()
elif extract_setting.website_info.provider == "watercrawl":
@ -193,7 +192,6 @@ class ExtractProcessor:
tenant_id=extract_setting.website_info.tenant_id,
mode=extract_setting.website_info.mode,
only_main_content=extract_setting.website_info.only_main_content,
credential_id=extract_setting.website_info.credential_id,
)
return extractor.extract()
elif extract_setting.website_info.provider == "jinareader":
@ -203,7 +201,6 @@ class ExtractProcessor:
tenant_id=extract_setting.website_info.tenant_id,
mode=extract_setting.website_info.mode,
only_main_content=extract_setting.website_info.only_main_content,
credential_id=extract_setting.website_info.credential_id,
)
return extractor.extract()
else:

5
api/services/datasource_provider_service.py
View File

@ -103,8 +103,9 @@ class DatasourceProviderService:
"""
with Session(db.engine) as session:
datasource_provider = (
session.query(DatasourceProvider)
.filter_by(tenant_id=tenant_id, is_default=True, provider=provider, plugin_id=plugin_id)
session.query(DatasourceProvider.id)
.filter_by(tenant_id=tenant_id, provider=provider, plugin_id=plugin_id)
.order_by(DatasourceProvider.is_default.desc(), DatasourceProvider.created_at.asc())
.first()
)
if not datasource_provider: