diff --git a/api/apps/llm_app.py b/api/apps/llm_app.py index 381c6fb140..2e878af9e8 100644 --- a/api/apps/llm_app.py +++ b/api/apps/llm_app.py @@ -194,7 +194,7 @@ def list_app(): res = {} for m in llms: - if model_type and m["model_type"] != model_type: + if model_type and m["model_type"].find(model_type)<0: continue if m["fid"] not in res: res[m["fid"]] = [] diff --git a/api/db/init_data.py b/api/db/init_data.py index 42ddb15f48..7a449619ee 100644 --- a/api/db/init_data.py +++ b/api/db/init_data.py @@ -143,6 +143,12 @@ def init_llm_factory(): llm_infos = [ # ---------------------- OpenAI ------------------------ { + "fid": factory_infos[0]["name"], + "llm_name": "gpt-4o", + "tags": "LLM,CHAT,128K", + "max_tokens": 128000, + "model_type": LLMType.CHAT.value + "," + LLMType.IMAGE2TEXT.value + }, { "fid": factory_infos[0]["name"], "llm_name": "gpt-3.5-turbo", "tags": "LLM,CHAT,4K", diff --git a/api/db/services/llm_service.py b/api/db/services/llm_service.py index 5258518356..a287cd6745 100644 --- a/api/db/services/llm_service.py +++ b/api/db/services/llm_service.py @@ -81,7 +81,7 @@ def model_instance(cls, tenant_id, llm_type, if not model_config: if llm_type == LLMType.EMBEDDING.value: llm = LLMService.query(llm_name=llm_name) - if llm and llm[0].fid in ["Youdao", "FastEmbed"]: + if llm and llm[0].fid in ["Youdao", "FastEmbed", "DeepSeek"]: model_config = {"llm_factory": llm[0].fid, "api_key":"", "llm_name": llm_name, "api_base": ""} if not model_config: if llm_name == "flag-embedding": diff --git a/api/settings.py b/api/settings.py index 4d284325bd..7605337346 100644 --- a/api/settings.py +++ b/api/settings.py @@ -86,6 +86,12 @@ "embedding_model": "", "image2text_model": "", "asr_model": "", + }, + "DeepSeek": { + "chat_model": "deepseek-chat", + "embedding_model": "BAAI/bge-large-zh-v1.5", + "image2text_model": "", + "asr_model": "", } } LLM = get_base_config("user_default_llm", {}) diff --git a/rag/llm/__init__.py b/rag/llm/__init__.py index 0a3386a709..546a099461 100644 --- a/rag/llm/__init__.py +++ b/rag/llm/__init__.py @@ -25,7 +25,8 @@ "Tongyi-Qianwen": DefaultEmbedding, #QWenEmbed, "ZHIPU-AI": ZhipuEmbed, "FastEmbed": FastEmbed, - "Youdao": YoudaoEmbed + "Youdao": YoudaoEmbed, + "DeepSeek": DefaultEmbedding } diff --git a/rag/svr/task_executor.py b/rag/svr/task_executor.py index 331636be4e..62e8f905e2 100644 --- a/rag/svr/task_executor.py +++ b/rag/svr/task_executor.py @@ -261,7 +261,7 @@ def main(): st = timer() cks = build(r) - cron_logger.info("Build chunks({}): {}".format(r["name"], timer()-st)) + cron_logger.info("Build chunks({}): {:.2f}".format(r["name"], timer()-st)) if cks is None: continue if not cks: @@ -279,7 +279,7 @@ def main(): callback(-1, "Embedding error:{}".format(str(e))) cron_logger.error(str(e)) tk_count = 0 - cron_logger.info("Embedding elapsed({}): {}".format(r["name"], timer()-st)) + cron_logger.info("Embedding elapsed({:.2f}): {}".format(r["name"], timer()-st)) callback(msg="Finished embedding({:.2f})! Start to build index!".format(timer()-st)) init_kb(r) @@ -291,7 +291,7 @@ def main(): if b % 128 == 0: callback(prog=0.8 + 0.1 * (b + 1) / len(cks), msg="") - cron_logger.info("Indexing elapsed({}): {}".format(r["name"], timer()-st)) + cron_logger.info("Indexing elapsed({}): {:.2f}".format(r["name"], timer()-st)) if es_r: callback(-1, "Index failure!") ELASTICSEARCH.deleteByQuery( @@ -306,7 +306,7 @@ def main(): DocumentService.increment_chunk_num( r["doc_id"], r["kb_id"], tk_count, chunk_count, 0) cron_logger.info( - "Chunk doc({}), token({}), chunks({}), elapsed:{}".format( + "Chunk doc({}), token({}), chunks({}), elapsed:{:.2f}".format( r["id"], tk_count, len(cks), timer()-st))