From 5ca47b44b2b42abb4f48163c17500b5ee67ab28f Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <heiner.lohaus@netformic.com>
Date: Tue, 5 Sep 2023 17:27:24 +0200
Subject: Add to many provider async and stream support, Fix Ails, AItianhu,
 ChatgptAi, ChatgptLogin Provider, Add fallback cookies to Bing, Improve
 OpenaiChat Provider

---
 g4f/Provider/Bing.py | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'g4f/Provider/Bing.py')

diff --git a/g4f/Provider/Bing.py b/g4f/Provider/Bing.py
index cec82108..179ca29b 100644
--- a/g4f/Provider/Bing.py
+++ b/g4f/Provider/Bing.py
@@ -1,23 +1,14 @@
 from __future__ import annotations
 
-import asyncio
-import json
-import os
-import random
-
-import aiohttp
-from aiohttp import ClientSession
-
-from ..typing import Any, AsyncGenerator, CreateResult, Union
+from aiohttp        import ClientSession
+from ..typing       import Any, AsyncGenerator, Union
 from .base_provider import AsyncGeneratorProvider, get_cookies
 
 
 class Bing(AsyncGeneratorProvider):
     url             = "https://bing.com/chat"
-    needs_auth      = True
     working         = True
     supports_gpt_4  = True
-    supports_stream = True
         
     @staticmethod
     def create_async_generator(
@@ -34,18 +25,16 @@ class Bing(AsyncGeneratorProvider):
             prompt = messages[-1]["content"]
             context = create_context(messages[:-1])
         
-        if cookies and "SRCHD" in cookies:
-            #TODO: Will implement proper cookie retrieval later and use a try-except mechanism in 'stream_generate' instead of defaulting the cookie value like this
-            cookies_dict = {
-                'SRCHD'         : cookies["SRCHD"],
+        if not cookies or "SRCHD" not in cookies:
+            cookies = {
+                'SRCHD'         : 'AF=NOFORM',
                 'PPLState'      : '1',
                 'KievRPSSecAuth': '',
                 'SUID'          : '',
                 'SRCHUSR'       : '',
                 'SRCHHPGUSR'    : '',
             }
-        
-        return stream_generate(prompt, context, cookies_dict)
+        return stream_generate(prompt, context, cookies)
 
 def create_context(messages: list[dict[str, str]]):
     context = "".join(f"[{message['role']}](#message)\n{message['content']}\n\n" for message in messages)
-- 
cgit v1.2.3


From 7a9b7195736153481fd8b50393004e231a3ee7a0 Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <heiner.lohaus@netformic.com>
Date: Tue, 5 Sep 2023 17:35:51 +0200
Subject: Fix imports in Bing

---
 g4f/Provider/Bing.py | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

(limited to 'g4f/Provider/Bing.py')

diff --git a/g4f/Provider/Bing.py b/g4f/Provider/Bing.py
index 179ca29b..05be27e7 100644
--- a/g4f/Provider/Bing.py
+++ b/g4f/Provider/Bing.py
@@ -1,7 +1,10 @@
 from __future__ import annotations
 
-from aiohttp        import ClientSession
-from ..typing       import Any, AsyncGenerator, Union
+import random
+import json
+import os
+from aiohttp        import ClientSession, ClientTimeout
+from ..typing       import AsyncGenerator
 from .base_provider import AsyncGeneratorProvider, get_cookies
 
 
@@ -225,7 +228,7 @@ async def stream_generate(
         cookies: dict=None
     ):
     async with ClientSession(
-        timeout=aiohttp.ClientTimeout(total=900),
+        timeout=ClientTimeout(total=900),
         cookies=cookies,
         headers=Defaults.headers,
     ) as session:
@@ -277,16 +280,4 @@ async def stream_generate(
                             final = True
                             break
         finally:
-            await delete_conversation(session, conversation)
-
-def run(generator: AsyncGenerator[Union[Any, str], Any]):
-    loop = asyncio.get_event_loop()
-    gen = generator.__aiter__()
-
-    while True:
-        try:
-            yield loop.run_until_complete(gen.__anext__())
-
-        except StopAsyncIteration:
-            break
-
+            await delete_conversation(session, conversation)
\ No newline at end of file
-- 
cgit v1.2.3