opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-27 19:27:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: convert provider_id to plugin_provider_id in get_configurations (#13596)

Browse Source
This commit is contained in:
Yeuoly 2025-02-12 16:42:03 +08:00 committed by GitHub
parent 83d0142641
commit 7f4a8b955d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/controllers/console/datasets/datasets.py
View File

@ -14,6 +14,7 @@ from controllers.console.wraps import account_initialization_required, enterpris
from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError
from core.indexing_runner import IndexingRunner from core.indexing_runner import IndexingRunner
from core.model_runtime.entities.model_entities import ModelType from core.model_runtime.entities.model_entities import ModelType
from core.plugin.entities.plugin import ModelProviderID
from core.provider_manager import ProviderManager from core.provider_manager import ProviderManager
from core.rag.datasource.vdb.vector_type import VectorType from core.rag.datasource.vdb.vector_type import VectorType
from core.rag.extractor.entity.extract_setting import ExtractSetting from core.rag.extractor.entity.extract_setting import ExtractSetting
@ -72,6 +73,8 @@ class DatasetListApi(Resource):
data = marshal(datasets, dataset_detail_fields) data = marshal(datasets, dataset_detail_fields)
for item in data: for item in data:
# convert embedding_model_provider to plugin standard format
item["embedding_model_provider"] = str(ModelProviderID(item["embedding_model_provider"]))
if item["indexing_technique"] == "high_quality": if item["indexing_technique"] == "high_quality":
item_model = f"{item['embedding_model']}:{item['embedding_model_provider']}" item_model = f"{item['embedding_model']}:{item['embedding_model_provider']}"
if item_model in model_names: if item_model in model_names:

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: def __init__(self, value: str, is_hardcoded: bool = False) -> None:
super().__init__(value, is_hardcoded) super().__init__(value, is_hardcoded)
if self.organization == "langgenius" and self.provider_name == "google": if self.organization == "langgenius" and self.provider_name == "google":
self.provider_name = "gemini" self.plugin_name = "gemini"
class ToolProviderID(GenericProviderID): class ToolProviderID(GenericProviderID):
@ -181,7 +181,7 @@ class ToolProviderID(GenericProviderID):
super().__init__(value, is_hardcoded) super().__init__(value, is_hardcoded)
if self.organization == "langgenius": if self.organization == "langgenius":
if self.provider_name in ["jina", "siliconflow"]: 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): class PluginDependency(BaseModel):

3
api/core/provider_manager.py
View File

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