Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加openai base_url参数,修复proxy为空错误 #24

Open
wants to merge 1 commit into
base: 2.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

api_key_list = [value for key, value in _config.items('openai') if key.startswith('api') and value]
temperature = _config.get('openai', 'temperature')
base_url = _config.get('openai', 'base_url')
room_id = _config.getint('room', 'id')
mysql = dict(_config.items('mysql'))
sqlite = dict(_config.items('sqlite'))
Expand Down
1 change: 1 addition & 0 deletions src/core/vup.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ async def generate_chat(self, embedding):
messages = self.event.get_prompt_messages(**extra_kwargs)
logger.info(f"prompt:{messages[1]} 开始请求gpt")
chat = ChatOpenAI(temperature=config.temperature, max_retries=2, max_tokens=150,
openai_api_base=config.base_url,
openai_api_key=get_openai_key())
llm_res = chat.generate([messages])
assistant_content = llm_res.generations[0][0].text
Expand Down
13 changes: 8 additions & 5 deletions src/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,16 @@ def test_net(self):
from langchain import OpenAI
import requests
# 测试外网环境(可能异常)
r = requests.get(url='https://www.youtube.com/', verify=False, proxies={
'http': f'http://{config.proxy}/',
'https': f'http://{config.proxy}/'
})
proxies = None
if config.proxy:
proxies = {
'http': f'http://{config.proxy}/',
'https': f'http://{config.proxy}/'
}
r = requests.get(url='https://www.youtube.com/', verify=False, proxies=proxies)
assert r.status_code == 200
# 测试openai库
llm = OpenAI(temperature=config.temperature, openai_api_key=get_openai_key(), verbose=config.debug)
llm = OpenAI(temperature=config.temperature, openai_api_base=config.base_url, openai_api_key=get_openai_key(), verbose=config.debug)
text = "python是世界上最好的语言 "
print(llm(text))
print('测试成功!')
Expand Down
1 change: 1 addition & 0 deletions src/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ def top_n_indices_from_embeddings(


def sync_get_embedding(texts: List[str], model="text-embedding-ada-002"):
openai.api_base=config.base_url
res = openai.Embedding.create(input=texts, model=model, api_key=get_openai_key())
if isinstance(texts, list) and len(texts) == 1:
return res['data'][0]['embedding']
Expand Down