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

Merge branch 'chore/optimize-model-selection-agent-node' into dev/plugin-deploy

Browse Source
This commit is contained in:
Yi
2025-02-13 01:20:34 +08:00
parent 3ff07b8e4d 0c62e000cd
commit b8b7805d81
19 changed files with 90 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/core/plugin/entities/plugin.py
View File

@ -173,7 +173,7 @@ class ModelProviderID(GenericProviderID):
def __init__(self, value: str, is_hardcoded: bool = False) -> None:
super().__init__(value, is_hardcoded)
if self.organization == "langgenius" and self.provider_name == "google":
self.provider_name = "gemini"
self.plugin_name = "gemini"
class ToolProviderID(GenericProviderID):
@ -181,7 +181,7 @@ class ToolProviderID(GenericProviderID):
super().__init__(value, is_hardcoded)
if self.organization == "langgenius":
if self.provider_name in ["jina", "siliconflow"]:
self.provider_name = f"{self.provider_name}_tool"
self.plugin_name = f"{self.provider_name}_tool"
class PluginDependency(BaseModel):

3
api/core/provider_manager.py
View File

@ -30,6 +30,7 @@ from core.model_runtime.entities.provider_entities import (
ProviderEntity,
)
from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
from core.plugin.entities.plugin import ModelProviderID
from extensions import ext_hosting_provider
from extensions.ext_database import db
from extensions.ext_redis import redis_client
@ -191,7 +192,7 @@ class ProviderManager:
model_settings=model_settings,
)
provider_configurations[provider_name] = provider_configuration
provider_configurations[str(ModelProviderID(provider_name))] = provider_configuration
# Return the encapsulated object
return provider_configurations