pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2025-12-08 20:42:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

add base url for OpenAI (#166)

Browse Source
This commit is contained in:
KevinHuSh
2024-03-28 19:15:16 +08:00
committed by GitHub
parent be2b904daf
commit 38e5737067
8 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/apps/llm_app.py
View File

@ -45,7 +45,7 @@ def set_api_key():
for llm in LLMService.query(fid=factory):
if llm.model_type == LLMType.EMBEDDING.value:
mdl = EmbeddingModel[factory](
req["api_key"], llm.llm_name)
req["api_key"], llm.llm_name, req.get("base_url"))
try:
arr, tc = mdl.encode(["Test if the api key is available"])
if len(arr[0]) == 0 or tc == 0:
@ -54,7 +54,7 @@ def set_api_key():
msg += f"\nFail to access embedding model({llm.llm_name}) using this api key." + str(e)
elif not chat_passed and llm.model_type == LLMType.CHAT.value:
mdl = ChatModel[factory](
req["api_key"], llm.llm_name)
req["api_key"], llm.llm_name, req.get("base_url"))
try:
m, tc = mdl.chat(None, [{"role": "user", "content": "Hello! How are you doing!"}], {
"temperature": 0.9})
@ -83,7 +83,9 @@ def set_api_key():
llm_factory=factory,
llm_name=llm.llm_name,
model_type=llm.model_type,
api_key=req["api_key"])
api_key=req["api_key"],
api_base=req.get("base_url", "")
)
return get_json_result(data=True)

8
api/db/services/llm_service.py
View File

@ -84,19 +84,21 @@ class TenantLLMService(CommonService):
if model_config["llm_factory"] not in EmbeddingModel:
return
return EmbeddingModel[model_config["llm_factory"]](
model_config["api_key"], model_config["llm_name"])
model_config["api_key"], model_config["llm_name"], model_config["api_base"])
if llm_type == LLMType.IMAGE2TEXT.value:
if model_config["llm_factory"] not in CvModel:
return
return CvModel[model_config["llm_factory"]](
model_config["api_key"], model_config["llm_name"], lang)
model_config["api_key"], model_config["llm_name"], lang,
base_url=model_config["api_base"]
)
if llm_type == LLMType.CHAT.value:
if model_config["llm_factory"] not in ChatModel:
return
return ChatModel[model_config["llm_factory"]](
model_config["api_key"], model_config["llm_name"])
model_config["api_key"], model_config["llm_name"], model_config["api_base"])
@classmethod
@DB.connection_context()