From ad7650e724a5286d1bff7ff9b827c2cccd625dcf Mon Sep 17 00:00:00 2001 From: jyong <718720800@qq.com> Date: Thu, 17 Jul 2025 16:36:40 +0800 Subject: [PATCH] r2 transform --- .../rag_pipeline/rag_pipeline_dsl_service.py | 6 +- .../rag_pipeline_transform_service.py | 60 +++++++++---------- 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/api/services/rag_pipeline/rag_pipeline_dsl_service.py b/api/services/rag_pipeline/rag_pipeline_dsl_service.py index d1b76f14fe..59b7be7f65 100644 --- a/api/services/rag_pipeline/rag_pipeline_dsl_service.py +++ b/api/services/rag_pipeline/rag_pipeline_dsl_service.py @@ -24,7 +24,6 @@ from core.model_runtime.utils.encoders import jsonable_encoder from core.plugin.entities.plugin import PluginDependency from core.workflow.nodes.datasource.entities import DatasourceNodeData from core.workflow.nodes.enums import NodeType -from core.workflow.nodes.knowledge_index.entities import KnowledgeIndexNodeData from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData from core.workflow.nodes.llm.entities import LLMNodeData from core.workflow.nodes.parameter_extractor.entities import ParameterExtractorNodeData @@ -761,7 +760,10 @@ class RagPipelineDslService: ) if knowledge_index_entity.retrieval_model.reranking_mode == "reranking_model": if knowledge_index_entity.retrieval_model.reranking_enable: - if knowledge_index_entity.retrieval_model.reranking_model and knowledge_index_entity.retrieval_model.reranking_mode == "reranking_model": + if ( + knowledge_index_entity.retrieval_model.reranking_model + and knowledge_index_entity.retrieval_model.reranking_mode == "reranking_model" + ): if knowledge_index_entity.retrieval_model.reranking_model.reranking_provider_name: dependencies.append( DependenciesAnalysisService.analyze_model_provider_dependency( diff --git a/api/services/rag_pipeline/rag_pipeline_transform_service.py b/api/services/rag_pipeline/rag_pipeline_transform_service.py index 613d351bc7..6549fd3dec 100644 --- a/api/services/rag_pipeline/rag_pipeline_transform_service.py +++ b/api/services/rag_pipeline/rag_pipeline_transform_service.py @@ -232,7 +232,7 @@ class RagPipelineTransformService: def _deal_dependencies(self, pipeline_yaml: dict, tenant_id: str): installer_manager = PluginInstaller() installed_plugins = installer_manager.list_plugins(tenant_id) - + datasource_manager = PluginDatasourceManager() plugin_migration = PluginMigration() @@ -247,37 +247,37 @@ class RagPipelineTransformService: plugin_unique_identifier = dependency.get("value", {}).get("plugin_unique_identifier") plugin_id = plugin_unique_identifier.split(":")[0] if plugin_id not in installed_plugins_ids: - # if plugin_id == "langgenius/notion_datasource": - # datasource = plugin_migration._fetch_plugin_unique_identifier(f"{plugin_id}/notion") - # need_install_plugin_unique_identifiers.append(datasource.plugin_unique_identifier) - # elif plugin_id == "langgenius/firecrawl_datasource": - # datasource = datasource_manager.fetch_datasource_provider(tenant_id, f"{plugin_id}/firecrawl") - # need_install_plugin_unique_identifiers.append(datasource.plugin_unique_identifier) - # elif plugin_id == "langgenius/jina_datasource": - # datasource = datasource_manager.fetch_datasource_provider(tenant_id, f"{plugin_id}/jina") - # need_install_plugin_unique_identifiers.append(datasource.plugin_unique_identifier) - # elif plugin_id == "langgenius/dify_extractor": - # tool = tool_manager.get_plugin_provider(f"{plugin_id}/dify_extractor", tenant_id) - # need_install_plugin_unique_identifiers.append(tool.plugin_unique_identifier) - # elif plugin_id == "langgenius/general_chunker": - # tool = tool_manager.get_plugin_provider(f"{plugin_id}/general_chunker", tenant_id) - # need_install_plugin_unique_identifiers.append(tool.plugin_unique_identifier) - # elif plugin_id == "langgenius/parentchild_chunker": - # tool = tool_manager.get_plugin_provider(f"{plugin_id}/parentchild_chunker", tenant_id) - # need_install_plugin_unique_identifiers.append(tool.plugin_unique_identifier) - # dependency["value"]["current_identifier"] = plugin_unique_identifier + # if plugin_id == "langgenius/notion_datasource": + # datasource = plugin_migration._fetch_plugin_unique_identifier(f"{plugin_id}/notion") + # need_install_plugin_unique_identifiers.append(datasource.plugin_unique_identifier) + # elif plugin_id == "langgenius/firecrawl_datasource": + # datasource = datasource_manager.fetch_datasource_provider(tenant_id, f"{plugin_id}/firecrawl") + # need_install_plugin_unique_identifiers.append(datasource.plugin_unique_identifier) + # elif plugin_id == "langgenius/jina_datasource": + # datasource = datasource_manager.fetch_datasource_provider(tenant_id, f"{plugin_id}/jina") + # need_install_plugin_unique_identifiers.append(datasource.plugin_unique_identifier) + # elif plugin_id == "langgenius/dify_extractor": + # tool = tool_manager.get_plugin_provider(f"{plugin_id}/dify_extractor", tenant_id) + # need_install_plugin_unique_identifiers.append(tool.plugin_unique_identifier) + # elif plugin_id == "langgenius/general_chunker": + # tool = tool_manager.get_plugin_provider(f"{plugin_id}/general_chunker", tenant_id) + # need_install_plugin_unique_identifiers.append(tool.plugin_unique_identifier) + # elif plugin_id == "langgenius/parentchild_chunker": + # tool = tool_manager.get_plugin_provider(f"{plugin_id}/parentchild_chunker", tenant_id) + # need_install_plugin_unique_identifiers.append(tool.plugin_unique_identifier) + # dependency["value"]["current_identifier"] = plugin_unique_identifier plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(plugin_id) if plugin_unique_identifier: need_install_plugin_unique_identifiers.append(plugin_unique_identifier) if need_install_plugin_unique_identifiers: installer_manager.install_from_identifiers( - tenant_id, - need_install_plugin_unique_identifiers, - PluginInstallationSource.Marketplace, - metas=[ - { - "plugin_unique_identifier": identifier, - } - for identifier in need_install_plugin_unique_identifiers - ], - ) \ No newline at end of file + tenant_id, + need_install_plugin_unique_identifiers, + PluginInstallationSource.Marketplace, + metas=[ + { + "plugin_unique_identifier": identifier, + } + for identifier in need_install_plugin_unique_identifiers + ], + )