Skip to content

Commit 887de56

Browse files
committed
feat: enhance model handling with default parameters and cache model check
1 parent 92d5e17 commit 887de56

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

apps/knowledge/task/embedding.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ def get_embedding_model(model_id, exception_handler=lambda e: maxkb_logger.error
2727
))):
2828
try:
2929
model = QuerySet(Model).filter(id=model_id).first()
30-
embedding_model = ModelManage.get_model(model_id, lambda _id: get_model(model))
30+
31+
s = {p.get('field'): p.get('default_value') for p in model.model_params_form if p.get('default_value') is not None}
32+
embedding_model = ModelManage.get_model(model_id, lambda _id: get_model(model, **{**s}))
3133
except Exception as e:
3234
exception_handler(e)
3335
raise e
@@ -77,6 +79,7 @@ def exception_handler(e):
7779
))
7880

7981
embedding_model = get_embedding_model(model_id, exception_handler)
82+
#
8083
ListenerManagement.embedding_by_document(document_id, embedding_model, state_list)
8184

8285

apps/models_provider/impl/aliyun_bai_lian_model_provider/model/embedding.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ def __init__(self, api_key, model_name: str, optional_params: dict):
2222
self.model_name = model_name
2323
self.optional_params = optional_params
2424

25+
def is_cache_model(self):
26+
return False
27+
2528
@staticmethod
2629
def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
2730
optional_params = MaxKBBaseModel.filter_optional_params(model_kwargs)

apps/models_provider/impl/openai_model_provider/model/embedding.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ def __init__(self, api_key, base_url, model_name: str, optional_params: dict):
2222
self.model_name = model_name
2323
self.optional_params = optional_params
2424

25+
def is_cache_model(self):
26+
return False
27+
2528
@staticmethod
2629
def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
2730
optional_params = MaxKBBaseModel.filter_optional_params(model_kwargs)

0 commit comments

Comments
 (0)