hz/ebiz-dify-ai
1
0
Fork 0
mirror of http://112.124.100.131/huang.ze/ebiz-dify-ai.git synced 2025-12-10 19:36:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify plugin and provider ID generation logic and deduplicate plugin_ids (#14041)

Browse Source
This commit is contained in:
Yeuoly
2025-02-19 20:05:01 +08:00
committed by GitHub
parent bfbc5eb91e
commit 23888398d1
2 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/services/plugin/dependencies_analysis.py
View File

@@ -1,5 +1,5 @@
from core.helper import marketplace
from core.plugin.entities.plugin import GenericProviderID, PluginDependency, PluginInstallationSource
from core.plugin.entities.plugin import ModelProviderID, PluginDependency, PluginInstallationSource, ToolProviderID
from core.plugin.manager.plugin import PluginInstallationManager
@@ -12,10 +12,7 @@ class DependenciesAnalysisService:
Convert the tool id to the plugin_id
"""
try:
tool_provider_id = GenericProviderID(tool_id)
if tool_id in ["jina", "siliconflow"]:
tool_provider_id.plugin_name = tool_provider_id.plugin_name + "_tool"
return tool_provider_id.plugin_id
return ToolProviderID(tool_id).plugin_id
except Exception as e:
raise e
@@ -27,11 +24,7 @@ class DependenciesAnalysisService:
Convert the model provider id to the plugin_id
"""
try:
generic_provider_id = GenericProviderID(model_provider_id)
if model_provider_id == "google":
generic_provider_id.plugin_name = "gemini"
return generic_provider_id.plugin_id
return ModelProviderID(model_provider_id).plugin_id
except Exception as e:
raise e