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

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

This commit is contained in:
jyong 2025-06-11 14:03:50 +08:00
parent 14d5af468c a6f7560d2f
commit 3e5781c6f1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/services/rag_pipeline/pipeline_template/customized/customized_retrieval.py
View File

@ -73,6 +73,6 @@ class CustomizedPipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
"icon_info": pipeline_template.icon,
"description": pipeline_template.description,
"chunk_structure": pipeline_template.chunk_structure,
"export_data": yaml.safe_load(pipeline_template.yaml_content),
"export_data": pipeline_template.yaml_content,
"created_by": pipeline_template.created_user_name,
}

2
api/services/rag_pipeline/pipeline_template/database/database_retrieval.py
View File

@ -72,7 +72,7 @@ class DatabasePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
"name": pipeline_template.name,
"icon_info": pipeline_template.icon,
"chunk_structure": pipeline_template.chunk_structure,
"export_data": yaml.safe_load(pipeline_template.yaml_content),
"export_data": pipeline_template.yaml_content,
"created_by": pipeline_template.created_user_name,
"description": pipeline_template.description,
}

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

@ -474,9 +474,9 @@ class RagPipelineService:
provider_type=datasource_runtime.datasource_provider_type(),
)
return {
"result": [result.model_dump() for result in website_crawl_result.result],
"job_id": website_crawl_result.job_id,
"status": website_crawl_result.status,
"result": [result for result in website_crawl_result.result],
"job_id": website_crawl_result.result.job_id,
"status": website_crawl_result.result.status,
"provider_type": datasource_node_data.get("provider_type"),
}
case _: