opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-02 15:17:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/r2' into deploy/rag-dev

Browse Source
This commit is contained in:
jyong 2025-06-06 17:47:47 +08:00
commit 83ba61203b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/services/rag_pipeline/rag_pipeline.py
View File

@ -422,7 +422,7 @@ class RagPipelineService:
Run published workflow datasource Run published workflow datasource
""" """
if is_published: if is_published:
# fetch published workflow by app_model # fetch published workflow by app_model
workflow = self.get_published_workflow(pipeline=pipeline) workflow = self.get_published_workflow(pipeline=pipeline)
else: else:
workflow = self.get_draft_workflow(pipeline=pipeline) workflow = self.get_draft_workflow(pipeline=pipeline)
@ -440,7 +440,6 @@ class RagPipelineService:
if not datasource_node_data: if not datasource_node_data:
raise ValueError("Datasource node data not found") raise ValueError("Datasource node data not found")
from core.datasource.datasource_manager import DatasourceManager from core.datasource.datasource_manager import DatasourceManager
datasource_runtime = DatasourceManager.get_datasource_runtime( datasource_runtime = DatasourceManager.get_datasource_runtime(
@ -474,16 +473,16 @@ class RagPipelineService:
} }
case _: case _:
raise ValueError(f"Unsupported datasource provider: {datasource_runtime.datasource_provider_type}") raise ValueError(f"Unsupported datasource provider: {datasource_runtime.datasource_provider_type}")
def run_datasource_workflow_node( def run_datasource_workflow_node(
self, pipeline: Pipeline, node_id: str, user_inputs: dict, account: Account, datasource_type: str, is_published: bool self, pipeline: Pipeline, node_id: str, user_inputs: dict, account: Account, datasource_type: str,
is_published: bool
) -> dict: ) -> dict:
""" """
Run published workflow datasource Run published workflow datasource
""" """
if is_published: if is_published:
# fetch published workflow by app_model # fetch published workflow by app_model
workflow = self.get_published_workflow(pipeline=pipeline) workflow = self.get_published_workflow(pipeline=pipeline)
else: else:
workflow = self.get_draft_workflow(pipeline=pipeline) workflow = self.get_draft_workflow(pipeline=pipeline)
@ -544,6 +543,8 @@ class RagPipelineService:
) )
return { return {
"result": [result.model_dump() for result in website_crawl_result.result], "result": [result.model_dump() for result in website_crawl_result.result],
"job_id": website_crawl_result.job_id,
"status": website_crawl_result.status,
"provider_type": datasource_node_data.get("provider_type"), "provider_type": datasource_node_data.get("provider_type"),
} }
case _: case _: