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

Fix: enable ollama api-key. (#6205)

Browse Source 
### What problem does this PR solve?

#6189

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Kevin Hu
2025-03-18 13:37:34 +08:00
committed by GitHub
parent 1333d3c02a
commit e9a6675c40
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rag/llm/chat_model.py
View File

@ -306,7 +306,7 @@ class QWenChat(Base):
result_list = list(g)
error_msg_list = [item for item in result_list if str(item).find("**ERROR**") >= 0]
if len(error_msg_list) > 0:
return "**ERROR**: " + "".join(error_msg_list) , 0
return "**ERROR**: " + "".join(error_msg_list), 0
else:
return "".join(result_list[:-1]), result_list[-1]
@ -338,7 +338,8 @@ class QWenChat(Base):
ans += LENGTH_NOTIFICATION_EN
yield ans
else:
yield ans + "\n**ERROR**: " + resp.message if not re.search(r" (key|quota)", str(resp.message).lower()) else "Out of credit. Please set the API key in **settings > Model providers.**"
yield ans + "\n**ERROR**: " + resp.message if not re.search(r" (key|quota)",
str(resp.message).lower()) else "Out of credit. Please set the API key in **settings > Model providers.**"
except Exception as e:
yield ans + "\n**ERROR**: " + str(e)
@ -360,7 +361,6 @@ class QWenChat(Base):
])
class ZhipuChat(Base):
def __init__(self, key, model_name="glm-3-turbo", **kwargs):
self.client = ZhipuAI(api_key=key)
@ -431,7 +431,8 @@ class ZhipuChat(Base):
class OllamaChat(Base):
def __init__(self, key, model_name, **kwargs):
self.client = Client(host=kwargs["base_url"])
self.client = Client(host=kwargs["base_url"]) if not key or key == "x" else \
Client(host=kwargs["base_url"], headers={"Authorization": f"Bear {key}"})
self.model_name = model_name
def chat(self, system, history, gen_conf):
@ -753,7 +754,7 @@ class BedrockChat(Base):
self.client = boto3.client('bedrock-runtime')
else:
self.client = boto3.client(service_name='bedrock-runtime', region_name=self.bedrock_region,
aws_access_key_id=self.bedrock_ak, aws_secret_access_key=self.bedrock_sk)
aws_access_key_id=self.bedrock_ak, aws_secret_access_key=self.bedrock_sk)
def chat(self, system, history, gen_conf):
from botocore.exceptions import ClientError