jandres/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-01-08 07:14:14 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/deploy/rag-dev' into deploy/rag-dev

Browse Source
This commit is contained in:
Dongyu Li
2025-06-19 11:10:43 +08:00
parent 82d0a70cb4 cc2cd85ff5
commit 0c5706b3f6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/controllers/console/datasets/datasets_document.py
View File

@@ -1,3 +1,4 @@
import json
import logging import logging
from argparse import ArgumentTypeError from argparse import ArgumentTypeError
from datetime import UTC, datetime from datetime import UTC, datetime
@@ -1116,7 +1117,7 @@ class DocumentPipelineExecutionLogApi(DocumentResource):
if not log: if not log:
return {"datasource_info": None, "datasource_type": None, "input_data": None}, 200 return {"datasource_info": None, "datasource_type": None, "input_data": None}, 200
return { return {
"datasource_info": log.datasource_info, "datasource_info": json.loads(log.datasource_info),
"datasource_type": log.datasource_type, "datasource_type": log.datasource_type,
"input_data": log.input_data, "input_data": log.input_data,
}, 200 }, 200
@@ -1144,3 +1145,5 @@ api.add_resource(DocumentRetryApi, "/datasets/<uuid:dataset_id>/retry")
api.add_resource(DocumentRenameApi, "/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/rename") api.add_resource(DocumentRenameApi, "/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/rename")
api.add_resource(WebsiteDocumentSyncApi, "/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/website-sync") api.add_resource(WebsiteDocumentSyncApi, "/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/website-sync")
api.add_resource(DocumentPipelineExecutionLogApi,
"/datasets/<uuid:dataset_id>/documents/<uuid:document_id>/pipeline-execution-log")

2
api/core/app/apps/pipeline/pipeline_generator.py
View File

@@ -140,7 +140,7 @@ class PipelineGenerator(BaseAppGenerator):
document_pipeline_execution_log = DocumentPipelineExecutionLog( document_pipeline_execution_log = DocumentPipelineExecutionLog(
document_id=document_id, document_id=document_id,
datasource_type=datasource_type, datasource_type=datasource_type,
datasource_info=datasource_info, datasource_info=json.dumps(datasource_info),
input_data=inputs, input_data=inputs,
pipeline_id=pipeline.id, pipeline_id=pipeline.id,
created_by=user.id, created_by=user.id,