Update Bing.py

Removed unnecessary check that could prematurely stop the AI's response while answering
pull/851/head
Luneye 1 year ago committed by GitHub
parent 5d08c7201f
commit e2e2f281e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -8,33 +8,65 @@ import asyncio
from aiohttp import ClientSession from aiohttp import ClientSession
from ..typing import Any, AsyncGenerator, CreateResult, Union from ..typing import Any, AsyncGenerator, CreateResult, Union
from .base_provider import AsyncGeneratorProvider, get_cookies from .base_provider import BaseProvider
class Bing(AsyncGeneratorProvider): class Bing(BaseProvider):
url = "https://bing.com/chat" url = "https://bing.com/chat"
needs_auth = True
working = True
supports_gpt_4 = True supports_gpt_4 = True
working=True
supports_stream=True supports_stream=True
@staticmethod @staticmethod
def create_async_generator( def create_completion(
model: str, model: str,
messages: list[dict[str, str]], messages: list[dict[str, str]],
cookies: dict = get_cookies(".bing.com"), stream: bool,
**kwargs **kwargs: Any
) -> AsyncGenerator: ) -> CreateResult:
yield from run(create(messages, **kwargs))
def create(
messages: list[dict[str, str]],
cookies: dict = {}
):
if len(messages) < 2: if len(messages) < 2:
prompt = messages[0]["content"] prompt = messages[0]["content"]
context = None context = None
else: else:
prompt = messages[-1]["content"] prompt = messages[-1]["content"]
context = create_context(messages[:-1]) context = convert(messages[:-1])
if not cookies:
cookies = {
'MUID': '',
'BCP': '',
'MUIDB': '',
'USRLOC': '',
'SRCHD': 'AF=hpcodx',
'MMCASM': '',
'_UR': '',
'ANON': '',
'NAP': '',
'ABDEF': '',
'PPLState': '1',
'KievRPSSecAuth': '',
'_U': '',
'SUID': '',
'_EDGE_S': '',
'WLS': '',
'_HPVN': '',
'_SS': '',
'_clck': '',
'SRCHUSR': '',
'_RwBf': '',
'SRCHHPGUSR': '',
'ipv6': '',
}
return stream_generate(prompt, context, cookies) return stream_generate(prompt, context, cookies)
def create_context(messages: list[dict[str, str]]): def convert(messages: list[dict[str, str]]):
context = "" context = ""
for message in messages: for message in messages:
@ -159,7 +191,8 @@ class Defaults:
'x-forwarded-for': ip_address, 'x-forwarded-for': ip_address,
} }
optionsSets = [ optionsSets = {
"optionsSets": [
'saharasugg', 'saharasugg',
'enablenewsfc', 'enablenewsfc',
'clgalileo', 'clgalileo',
@ -176,15 +209,16 @@ class Defaults:
"dv3sugg", "dv3sugg",
"nojbfedge" "nojbfedge"
] ]
}
def format_message(message: dict) -> str: def format_message(msg: dict) -> str:
return json.dumps(message, ensure_ascii=False) + Defaults.delimiter return json.dumps(msg, ensure_ascii=False) + Defaults.delimiter
def create_message(conversation: Conversation, prompt: str, context: str=None) -> str: def create_message(conversation: Conversation, prompt: str, context: str=None) -> str:
struct = { struct = {
'arguments': [ 'arguments': [
{ {
'optionsSets': Defaults.optionsSets, **Defaults.optionsSets,
'source': 'cib', 'source': 'cib',
'allowedMessageTypes': Defaults.allowedMessageTypes, 'allowedMessageTypes': Defaults.allowedMessageTypes,
'sliceIds': Defaults.sliceIds, 'sliceIds': Defaults.sliceIds,
@ -264,10 +298,6 @@ async def stream_generate(
response_txt += inline_txt + '\n' response_txt += inline_txt + '\n'
result_text += inline_txt + '\n' result_text += inline_txt + '\n'
if returned_text.endswith(' '):
final = True
break
if response_txt.startswith(returned_text): if response_txt.startswith(returned_text):
new = response_txt[len(returned_text):] new = response_txt[len(returned_text):]
if new != "\n": if new != "\n":

Loading…
Cancel
Save