summaryrefslogtreecommitdiffstats
path: root/g4f
diff options
context:
space:
mode:
authornullstreak <139914347+nullstreak@users.noreply.github.com>2023-12-21 01:03:15 +0100
committerGitHub <noreply@github.com>2023-12-21 01:03:15 +0100
commit5d47ba4205bc4c61ea8d0a8d3957ccbf4722e8cc (patch)
treef3abc999d5c594ef7c9436c544b42d8d2011d4ab /g4f
parentMerge pull request #1359 from yifeikong/patch-1 (diff)
downloadgpt4free-5d47ba4205bc4c61ea8d0a8d3957ccbf4722e8cc.tar
gpt4free-5d47ba4205bc4c61ea8d0a8d3957ccbf4722e8cc.tar.gz
gpt4free-5d47ba4205bc4c61ea8d0a8d3957ccbf4722e8cc.tar.bz2
gpt4free-5d47ba4205bc4c61ea8d0a8d3957ccbf4722e8cc.tar.lz
gpt4free-5d47ba4205bc4c61ea8d0a8d3957ccbf4722e8cc.tar.xz
gpt4free-5d47ba4205bc4c61ea8d0a8d3957ccbf4722e8cc.tar.zst
gpt4free-5d47ba4205bc4c61ea8d0a8d3957ccbf4722e8cc.zip
Diffstat (limited to 'g4f')
-rw-r--r--g4f/Provider/Bing.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/g4f/Provider/Bing.py b/g4f/Provider/Bing.py
index f1255553..dccfc5b1 100644
--- a/g4f/Provider/Bing.py
+++ b/g4f/Provider/Bing.py
@@ -60,7 +60,10 @@ class Bing(AsyncGeneratorProvider):
for key, value in default_cookies.items():
if key not in cookies:
cookies[key] = value
- return stream_generate(prompt, tone, image, context, proxy, cookies, web_search)
+
+ gpt4_turbo = True if model.startswith("gpt-4-turbo") else False
+
+ return stream_generate(prompt, tone, image, context, proxy, cookies, web_search, gpt4_turbo)
def create_context(messages: Messages):
return "".join(
@@ -377,7 +380,7 @@ def compress_image_to_base64(img, compression_rate) -> str:
except Exception as e:
raise e
-def create_message(conversation: Conversation, prompt: str, tone: str, context: str = None, web_search: bool = False) -> str:
+def create_message(conversation: Conversation, prompt: str, tone: str, context: str = None, web_search: bool = False, gpt4_turbo: bool = False) -> str:
options_sets = Defaults.optionsSets
if tone == Tones.creative:
options_sets.append("h3imaginative")
@@ -387,8 +390,12 @@ def create_message(conversation: Conversation, prompt: str, tone: str, context:
options_sets.append("galileo")
else:
options_sets.append("harmonyv3")
+
if not web_search:
options_sets.append("nosearchall")
+
+ if gpt4_turbo:
+ options_sets.append("dlgpt4t")
request_id = str(uuid.uuid4())
struct = {
@@ -444,7 +451,8 @@ async def stream_generate(
context: str = None,
proxy: str = None,
cookies: dict = None,
- web_search: bool = False
+ web_search: bool = False,
+ gpt4_turbo: bool = False
):
async with ClientSession(
timeout=ClientTimeout(total=900),
@@ -456,7 +464,7 @@ async def stream_generate(
await wss.send_str(format_message({'protocol': 'json', 'version': 1}))
await wss.receive(timeout=900)
- await wss.send_str(create_message(conversation, prompt, tone, context, web_search))
+ await wss.send_str(create_message(conversation, prompt, tone, context, web_search, gpt4_turbo))
response_txt = ''
returned_text = ''