youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-03 08:58:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace BuiltinToolManageService with RagPipelineManageService for datasource management and remove unused datasource engine and related code

Browse Source
This commit is contained in:
Yeuoly
2025-05-16 18:42:07 +08:00
parent 8bea88c8cc
commit c5a2f43ceb
22 changed files with 390 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
api/core/datasource/__base/datasource_plugin.py
View File

@ -1,12 +1,9 @@
from collections.abc import Generator
from typing import Any, Optional
from collections.abc import Mapping
from typing import Any
from core.datasource.__base.datasource_runtime import DatasourceRuntime
from core.datasource.entities.datasource_entities import (
DatasourceEntity,
DatasourceInvokeMessage,
DatasourceParameter,
DatasourceProviderType,
)
from core.plugin.impl.datasource import PluginDatasourceManager
from core.plugin.utils.converter import convert_parameters_to_plugin_format
@ -16,7 +13,6 @@ class DatasourcePlugin:
tenant_id: str
icon: str
plugin_unique_identifier: str
runtime_parameters: Optional[list[DatasourceParameter]]
entity: DatasourceEntity
runtime: DatasourceRuntime
@ -33,49 +29,41 @@ class DatasourcePlugin:
self.tenant_id = tenant_id
self.icon = icon
self.plugin_unique_identifier = plugin_unique_identifier
self.runtime_parameters = None
def datasource_provider_type(self) -> DatasourceProviderType:
return DatasourceProviderType.RAG_PIPELINE
def _invoke_first_step(
self,
user_id: str,
datasource_parameters: dict[str, Any],
rag_pipeline_id: Optional[str] = None,
) -> Generator[DatasourceInvokeMessage, None, None]:
) -> Mapping[str, Any]:
manager = PluginDatasourceManager()
datasource_parameters = convert_parameters_to_plugin_format(datasource_parameters)
yield from manager.invoke_first_step(
return manager.invoke_first_step(
tenant_id=self.tenant_id,
user_id=user_id,
datasource_provider=self.entity.identity.provider,
datasource_name=self.entity.identity.name,
credentials=self.runtime.credentials,
datasource_parameters=datasource_parameters,
rag_pipeline_id=rag_pipeline_id,
)
def _invoke_second_step(
self,
user_id: str,
datasource_parameters: dict[str, Any],
rag_pipeline_id: Optional[str] = None,
) -> Generator[DatasourceInvokeMessage, None, None]:
) -> Mapping[str, Any]:
manager = PluginDatasourceManager()
datasource_parameters = convert_parameters_to_plugin_format(datasource_parameters)
yield from manager.invoke(
return manager.invoke_second_step(
tenant_id=self.tenant_id,
user_id=user_id,
datasource_provider=self.entity.identity.provider,
datasource_name=self.entity.identity.name,
credentials=self.runtime.credentials,
datasource_parameters=datasource_parameters,
rag_pipeline_id=rag_pipeline_id,
)
def fork_datasource_runtime(self, runtime: DatasourceRuntime) -> "DatasourcePlugin":
@ -86,28 +74,3 @@ class DatasourcePlugin:
icon=self.icon,
plugin_unique_identifier=self.plugin_unique_identifier,
)
def get_runtime_parameters(
self,
rag_pipeline_id: Optional[str] = None,
) -> list[DatasourceParameter]:
"""
get the runtime parameters
"""
if not self.entity.has_runtime_parameters:
return self.entity.parameters
if self.runtime_parameters is not None:
return self.runtime_parameters
manager = PluginDatasourceManager()
self.runtime_parameters = manager.get_runtime_parameters(
tenant_id=self.tenant_id,
user_id="",
provider=self.entity.identity.provider,
datasource=self.entity.identity.name,
credentials=self.runtime.credentials,
rag_pipeline_id=rag_pipeline_id,
)
return self.runtime_parameters

11
api/core/datasource/__base/datasource_provider.py
View File

@ -2,7 +2,7 @@ from typing import Any
from core.datasource.__base.datasource_plugin import DatasourcePlugin
from core.datasource.__base.datasource_runtime import DatasourceRuntime
from core.datasource.entities.datasource_entities import DatasourceProviderEntityWithPlugin, DatasourceProviderType
from core.datasource.entities.datasource_entities import DatasourceProviderEntityWithPlugin
from core.entities.provider_entities import ProviderConfig
from core.plugin.impl.tool import PluginToolManager
from core.tools.errors import ToolProviderCredentialValidationError
@ -22,15 +22,6 @@ class DatasourcePluginProviderController:
self.plugin_id = plugin_id
self.plugin_unique_identifier = plugin_unique_identifier
@property
def provider_type(self) -> DatasourceProviderType:
"""
returns the type of the provider
:return: type of the provider
"""
return DatasourceProviderType.RAG_PIPELINE
@property
def need_credentials(self) -> bool:
"""