Austin/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2024-11-16 11:42:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/fix/chore-fix' into dev/plugin-deploy
Some checks failed
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Has been cancelled
Details
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Has been cancelled
Details
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Has been cancelled
Details
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Has been cancelled
Details
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Has been cancelled
Details
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
takatost 2024-11-08 23:11:02 +08:00
commit 0b2b6a3ef3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/model_manager.py
View File

@ -409,7 +409,7 @@ class ModelManager:
return ModelInstance(provider_model_bundle, model) return ModelInstance(provider_model_bundle, model)
def get_default_provider_model_name(self, tenant_id: str, model_type: ModelType) -> tuple[str, str]: def get_default_provider_model_name(self, tenant_id: str, model_type: ModelType) -> tuple[str | None, str | None]:
""" """
Return first provider and the first model in the provider Return first provider and the first model in the provider
:param tenant_id: tenant id :param tenant_id: tenant id

5
api/core/provider_manager.py
View File

@ -270,7 +270,7 @@ class ProviderManager:
), ),
) )
def get_first_provider_first_model(self, tenant_id: str, model_type: ModelType) -> tuple[str, str]: def get_first_provider_first_model(self, tenant_id: str, model_type: ModelType) -> tuple[str | None, str | None]:
""" """
Get names of first model and its provider Get names of first model and its provider
@ -283,6 +283,9 @@ class ProviderManager:
# get available models from provider_configurations # get available models from provider_configurations
all_models = provider_configurations.get_models(model_type=model_type, only_active=False) all_models = provider_configurations.get_models(model_type=model_type, only_active=False)
if not all_models:
return None, None
return all_models[0].provider.provider, all_models[0].model return all_models[0].provider.provider, all_models[0].model
def update_default_model_record( def update_default_model_record(