chunzhi/chatgpt_academic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

把newbing的cookie加回来

Browse Source
This commit is contained in:
binary-husky 2023-07-05 13:48:50 +08:00
parent 9f8e7a6efa
commit cda281f08b
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.py
View File

@ -75,8 +75,6 @@ API_URL_REDIRECT = {}
# 如果需要在二级路径下运行（常规情况下，不要修改!!）（需要配合修改main.py才能生效!） # 如果需要在二级路径下运行（常规情况下，不要修改!!）（需要配合修改main.py才能生效!）
CUSTOM_PATH = "/" CUSTOM_PATH = "/"
# 使用Newbing
NEWBING_STYLE = "creative" # ["creative", "balanced", "precise"]
# 如果需要使用Slack Claude，使用教程详情见 request_llm/README.md # 如果需要使用Slack Claude，使用教程详情见 request_llm/README.md
SLACK_CLAUDE_BOT_ID = '' SLACK_CLAUDE_BOT_ID = ''
@ -88,3 +86,10 @@ AZURE_ENDPOINT = "https://你的api名称.openai.azure.com/"
AZURE_API_KEY = "填入azure openai api的密钥" AZURE_API_KEY = "填入azure openai api的密钥"
AZURE_API_VERSION = "填入api版本" AZURE_API_VERSION = "填入api版本"
AZURE_ENGINE = "填入ENGINE" AZURE_ENGINE = "填入ENGINE"
# 使用Newbing
NEWBING_STYLE = "creative" # ["creative", "balanced", "precise"]
NEWBING_COOKIES = """
put your new bing cookies here
"""

39
request_llm/bridge_newbingfree.py
View File

@ -89,9 +89,6 @@ class NewBingHandle(Process):
if a not in self.local_history: if a not in self.local_history:
self.local_history.append(a) self.local_history.append(a)
prompt += a + '\n' prompt += a + '\n'
# if b not in self.local_history:
# self.local_history.append(b)
# prompt += b + '\n'
# 问题 # 问题
prompt += question prompt += question
@ -101,7 +98,7 @@ class NewBingHandle(Process):
async for final, response in self.newbing_model.ask_stream( async for final, response in self.newbing_model.ask_stream(
prompt=question, prompt=question,
conversation_style=NEWBING_STYLE, # ["creative", "balanced", "precise"] conversation_style=NEWBING_STYLE, # ["creative", "balanced", "precise"]
wss_link=endpoint, # "wss://sydney.bing.com/sydney/ChatHub" wss_link=endpoint, # "wss://sydney.bing.com/sydney/ChatHub"
): ):
if not final: if not final:
print(response) print(response)
@ -121,14 +118,26 @@ class NewBingHandle(Process):
self.local_history = [] self.local_history = []
if (self.newbing_model is None) or (not self.success): if (self.newbing_model is None) or (not self.success):
# 代理设置 # 代理设置
proxies, = get_conf('proxies') proxies, NEWBING_COOKIES = get_conf('proxies', 'NEWBING_COOKIES')
if proxies is None: if proxies is None:
self.proxies_https = None self.proxies_https = None
else: else:
self.proxies_https = proxies['https'] self.proxies_https = proxies['https']
if (NEWBING_COOKIES is not None) and len(NEWBING_COOKIES) > 100:
try:
cookies = json.loads(NEWBING_COOKIES)
except:
self.success = False
tb_str = '\n```\n' + trimmed_format_exc() + '\n```\n'
self.child.send(f'[Local Message] NEWBING_COOKIES未填写或有格式错误。')
self.child.send('[Fail]'); self.child.send('[Finish]')
raise RuntimeError(f"NEWBING_COOKIES未填写或有格式错误。")
else:
cookies = None
try: try:
self.newbing_model = NewbingChatbot(proxy=self.proxies_https) self.newbing_model = NewbingChatbot(proxy=self.proxies_https, cookies=cookies)
except: except:
self.success = False self.success = False
tb_str = '\n```\n' + trimmed_format_exc() + '\n```\n' tb_str = '\n```\n' + trimmed_format_exc() + '\n```\n'
@ -151,18 +160,14 @@ class NewBingHandle(Process):
""" """
这个函数运行在主进程 这个函数运行在主进程
""" """
self.threadLock.acquire() self.threadLock.acquire() # 获取线程锁
self.parent.send(kwargs) # 发送请求到子进程 self.parent.send(kwargs) # 请求子进程
while True: while True:
res = self.parent.recv() # 等待newbing回复的片段 res = self.parent.recv() # 等待newbing回复的片段
if res == '[Finish]': if res == '[Finish]': break # 结束
break # 结束 elif res == '[Fail]': self.success = False; break # 失败
elif res == '[Fail]': else: yield res # newbing回复的片段
self.success = False self.threadLock.release() # 释放线程锁
break
else:
yield res # newbing回复的片段
self.threadLock.release()
""" """