AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-12 22:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix get embedding model provider in empty dataset (#1986)

Browse Source 
Co-authored-by: jyong <jyong@dify.ai>
This commit is contained in:
Jyong 2024-01-10 20:48:16 +08:00 committed by GitHub
parent 0025ba4921
commit 24bdedf802
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/core/indexing_runner.py
View File

@ -221,12 +221,18 @@ class IndexingRunner:
if not dataset: if not dataset:
raise ValueError('Dataset not found.') raise ValueError('Dataset not found.')
if dataset.indexing_technique == 'high_quality' or indexing_technique == 'high_quality': if dataset.indexing_technique == 'high_quality' or indexing_technique == 'high_quality':
if dataset.embedding_model_provider:
embedding_model_instance = self.model_manager.get_model_instance( embedding_model_instance = self.model_manager.get_model_instance(
tenant_id=tenant_id, tenant_id=tenant_id,
provider=dataset.embedding_model_provider, provider=dataset.embedding_model_provider,
model_type=ModelType.TEXT_EMBEDDING, model_type=ModelType.TEXT_EMBEDDING,
model=dataset.embedding_model model=dataset.embedding_model
) )
else:
embedding_model_instance = self.model_manager.get_default_model_instance(
tenant_id=tenant_id,
model_type=ModelType.TEXT_EMBEDDING,
)
else: else:
if indexing_technique == 'high_quality': if indexing_technique == 'high_quality':
embedding_model_instance = self.model_manager.get_default_model_instance( embedding_model_instance = self.model_manager.get_default_model_instance(
@ -328,12 +334,18 @@ class IndexingRunner:
if not dataset: if not dataset:
raise ValueError('Dataset not found.') raise ValueError('Dataset not found.')
if dataset.indexing_technique == 'high_quality' or indexing_technique == 'high_quality': if dataset.indexing_technique == 'high_quality' or indexing_technique == 'high_quality':
if dataset.embedding_model_provider:
embedding_model_instance = self.model_manager.get_model_instance( embedding_model_instance = self.model_manager.get_model_instance(
tenant_id=tenant_id, tenant_id=tenant_id,
provider=dataset.embedding_model_provider, provider=dataset.embedding_model_provider,
model_type=ModelType.TEXT_EMBEDDING, model_type=ModelType.TEXT_EMBEDDING,
model=dataset.embedding_model model=dataset.embedding_model
) )
else:
embedding_model_instance = self.model_manager.get_default_model_instance(
tenant_id=tenant_id,
model_type=ModelType.TEXT_EMBEDDING,
)
else: else:
if indexing_technique == 'high_quality': if indexing_technique == 'high_quality':
embedding_model_instance = self.model_manager.get_default_model_instance( embedding_model_instance = self.model_manager.get_default_model_instance(

2
api/core/model_manager.py
View File

@ -179,6 +179,8 @@ class ModelManager:
:param model: model name :param model: model name
:return: :return:
""" """
if not provider:
return self.get_default_model_instance(tenant_id, model_type)
provider_model_bundle = self._provider_manager.get_provider_model_bundle( provider_model_bundle = self._provider_manager.get_provider_model_bundle(
tenant_id=tenant_id, tenant_id=tenant_id,
provider=provider, provider=provider,

4
api/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py
View File

@ -69,9 +69,9 @@ class BaichuanTextEmbeddingModel(TextEmbeddingModel):
raise InsufficientAccountBalance(msg) raise InsufficientAccountBalance(msg)
elif err == 'invalid_authentication': elif err == 'invalid_authentication':
raise InvalidAuthenticationError(msg) raise InvalidAuthenticationError(msg)
elif 'rate' in err: elif err and 'rate' in err:
raise RateLimitReachedError(msg) raise RateLimitReachedError(msg)
elif 'internal' in err: elif err and 'internal' in err:
raise InternalServerError(msg) raise InternalServerError(msg)
elif err == 'api_key_empty': elif err == 'api_key_empty':
raise InvalidAPIKeyError(msg) raise InvalidAPIKeyError(msg)