0.1.9.8

Author: VadimBoev

g4f/Provider/needs_auth/Bard.py

@@ -8,11 +8,11 @@
 from selenium.webdriver.common.keys import Keys
 
 from ...typing import CreateResult, Messages
-from ..base_provider import BaseProvider
+from ..base_provider import AbstractProvider
 from ..helper import format_prompt
 from ...webdriver import WebDriver, WebDriverSession
 
-class Bard(BaseProvider):
+class Bard(AbstractProvider):
     url = "https://bard.google.com"
     working = True
     needs_auth = True

g4f/Provider/needs_auth/HuggingChat.py

@@ -8,6 +8,9 @@
 from ..base_provider import AsyncGeneratorProvider
 from ..helper import format_prompt, get_cookies
 
+map = {
+    "openchat/openchat_3.5": "openchat/openchat-3.5-1210",
+}
 
 class HuggingChat(AsyncGeneratorProvider):
     url = "https://huggingface.co/chat"
@@ -25,7 +28,10 @@ async def create_async_generator(
         cookies: dict = None,
         **kwargs
     ) -> AsyncResult:
-        model = model if model else cls.model
+        if not model:
+            model = cls.model
+        elif model in map:
+            model = map[model]
         if not cookies:
             cookies = get_cookies(".huggingface.co")
 
@@ -47,14 +53,19 @@ async def create_async_generator(
                 "web_search": web_search
             }
             async with session.post(f"{cls.url}/conversation/{conversation_id}", json=send, proxy=proxy) as response:
+                first_token = True
                 async for line in response.content:
                     line = json.loads(line[:-1])
                     if "type" not in line:
                         raise RuntimeError(f"Response: {line}")
                     elif line["type"] == "stream":
-                        yield line["token"]
+                        token = line["token"]
+                        if first_token:
+                            token = token.lstrip()
+                            first_token = False
+                        yield token
                     elif line["type"] == "finalAnswer":
                         break
 
             async with session.delete(f"{cls.url}/conversation/{conversation_id}", proxy=proxy) as response:
-                response.raise_for_status()
+                response.raise_for_status()

g4f/Provider/needs_auth/OpenaiChat.py

@@ -7,9 +7,9 @@
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
-                
+
 from ..base_provider import AsyncGeneratorProvider
-from ..helper import get_event_loop, format_prompt
+from ..helper import get_event_loop, format_prompt, get_cookies
 from ...webdriver import get_browser
 from ...typing import AsyncResult, Messages
 from ...requests import StreamSession
@@ -27,7 +27,7 @@ class OpenaiChat(AsyncGeneratorProvider):
     needs_auth            = True
     supports_gpt_35_turbo = True
     supports_gpt_4        = True
-    _access_token: str    = None
+    _cookies: dict        = {}
 
     @classmethod
     async def create(
@@ -72,6 +72,7 @@ async def create_async_generator(
         proxy: str = None,
         timeout: int = 120,
         access_token: str = None,
+        cookies: dict = None,
         auto_continue: bool = False,
         history_disabled: bool = True,
         action: str = "next",
@@ -86,13 +87,18 @@ async def create_async_generator(
             raise ValueError(f"Model are not supported: {model}")
         if not parent_id:
             parent_id = str(uuid.uuid4())
+        if not cookies:
+            cookies = cls._cookies
         if not access_token:
-            access_token = cls._access_token
+            if not cookies:
+                cls._cookies = cookies = get_cookies("chat.openai.com")
+            if "access_token" in cookies:
+                access_token = cookies["access_token"]
         if not access_token:
             login_url = os.environ.get("G4F_LOGIN_URL")
             if login_url:
                 yield f"Please login: [ChatGPT]({login_url})\n\n"
-            access_token = cls._access_token = await cls.browse_access_token(proxy)
+            cls._cookies["access_token"] = access_token = await cls.browse_access_token(proxy)
         headers = {
             "Accept": "text/event-stream",
             "Authorization": f"Bearer {access_token}",
@@ -101,7 +107,8 @@ async def create_async_generator(
             proxies={"https": proxy},
             impersonate="chrome110",
             headers=headers,
-            timeout=timeout
+            timeout=timeout,
+            cookies=dict([(name, value) for name, value in cookies.items() if name == "_puid"])
         ) as session:
             end_turn = EndTurn()
             while not end_turn.is_end:
@@ -170,7 +177,12 @@ def browse() -> str:
                 WebDriverWait(driver, 1200).until(
                     EC.presence_of_element_located((By.ID, "prompt-textarea"))
                 )
-                javascript = "return (await (await fetch('/api/auth/session')).json())['accessToken']"
+                javascript = """
+access_token = (await (await fetch('/api/auth/session')).json())['accessToken'];
+expires = new Date(); expires.setTime(expires.getTime() + 60 * 60 * 24 * 7); // One week
+document.cookie = 'access_token=' + access_token + ';expires=' + expires.toUTCString() + ';path=/';
+return access_token;
+"""
                 return driver.execute_script(javascript)
             finally:
                 driver.quit()

g4f/Provider/needs_auth/Poe.py

@@ -3,7 +3,7 @@
 import time
 
 from ...typing import CreateResult, Messages
-from ..base_provider import BaseProvider
+from ..base_provider import AbstractProvider
 from ..helper import format_prompt
 from ...webdriver import WebDriver, WebDriverSession
 
@@ -20,7 +20,7 @@
     "palm": {"name": "Google-PaLM"},
 }
 
-class Poe(BaseProvider):
+class Poe(AbstractProvider):
     url = "https://poe.com"
     working = True
     needs_auth = True

g4f/Provider/needs_auth/Raycast.py

@@ -5,10 +5,10 @@
 import requests
 
 from ...typing import CreateResult, Messages
-from ..base_provider import BaseProvider
+from ..base_provider import AbstractProvider
 
 
-class Raycast(BaseProvider):
+class Raycast(AbstractProvider):
     url                     = "https://raycast.com"
     supports_gpt_35_turbo   = True
     supports_gpt_4          = True

g4f/Provider/needs_auth/Theb.py

@@ -3,7 +3,7 @@
 import time
 
 from ...typing import CreateResult, Messages
-from ..base_provider import BaseProvider
+from ..base_provider import AbstractProvider
 from ..helper import format_prompt
 from ...webdriver import WebDriver, WebDriverSession
 
@@ -31,7 +31,7 @@
     "qwen-7b-chat": "Qwen 7B"
 }
 
-class Theb(BaseProvider):
+class Theb(AbstractProvider):
     url = "https://beta.theb.ai"
     working = True
     supports_gpt_35_turbo = True

g4f/Provider/needs_auth/ThebApi.py

@@ -3,7 +3,7 @@
 import requests
 
 from ...typing import Any, CreateResult, Messages
-from ..base_provider import BaseProvider
+from ..base_provider import AbstractProvider
 
 models = {
     "theb-ai": "TheB.AI",
@@ -29,7 +29,7 @@
     "qwen-7b-chat": "Qwen 7B"
 }
 
-class ThebApi(BaseProvider):
+class ThebApi(AbstractProvider):
     url = "https://theb.ai"
     working = True
     needs_auth = True