summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Lohaus <hlohaus@users.noreply.github.com>2024-01-27 16:09:21 +0100
committerGitHub <noreply@github.com>2024-01-27 16:09:21 +0100
commit0d83bdeef91001c7c00d69f79fccad5a78b4b94b (patch)
tree362ebeb245cc4e123914635b03f890a314a7a40d
parentMerge pull request #1512 from KennyPhan123/patch-1 (diff)
parentFix PerplexityLabs Provider, Improve bypass_cloudflare helper (diff)
downloadgpt4free-0.2.0.7.tar
gpt4free-0.2.0.7.tar.gz
gpt4free-0.2.0.7.tar.bz2
gpt4free-0.2.0.7.tar.lz
gpt4free-0.2.0.7.tar.xz
gpt4free-0.2.0.7.tar.zst
gpt4free-0.2.0.7.zip
-rw-r--r--etc/unittest/backend.py5
-rw-r--r--g4f/Provider/Aura.py5
-rw-r--r--g4f/Provider/Bestim.py15
-rw-r--r--g4f/Provider/Chatgpt4Online.py30
-rw-r--r--g4f/Provider/PerplexityLabs.py2
-rw-r--r--g4f/Provider/base_provider.py6
-rw-r--r--g4f/Provider/bing/create_images.py16
-rw-r--r--g4f/Provider/helper.py16
-rw-r--r--g4f/Provider/needs_auth/Bard.py12
-rw-r--r--g4f/Provider/needs_auth/OpenaiChat.py10
-rw-r--r--g4f/Provider/needs_auth/Poe.py4
-rw-r--r--g4f/Provider/needs_auth/Theb.py5
-rw-r--r--g4f/Provider/selenium/AItianhuSpace.py9
-rw-r--r--g4f/Provider/selenium/PerplexityAi.py6
-rw-r--r--g4f/Provider/selenium/TalkAi.py9
-rw-r--r--g4f/__init__.py12
-rw-r--r--g4f/debug.py3
-rw-r--r--g4f/errors.py2
-rw-r--r--g4f/gui/__init__.py6
-rw-r--r--g4f/gui/client/js/chat.v1.js14
-rw-r--r--g4f/gui/server/backend.py4
-rw-r--r--g4f/requests.py143
-rw-r--r--g4f/requests_aiohttp.py39
-rw-r--r--g4f/requests_curl_cffi.py77
-rw-r--r--g4f/webdriver.py34
25 files changed, 259 insertions, 225 deletions
diff --git a/etc/unittest/backend.py b/etc/unittest/backend.py
index 3be83f84..e4a7b3ab 100644
--- a/etc/unittest/backend.py
+++ b/etc/unittest/backend.py
@@ -1,4 +1,3 @@
-from . import include
import unittest
from unittest.mock import MagicMock
from .mocks import ProviderMock
@@ -13,7 +12,7 @@ class TestBackendApi(unittest.TestCase):
def setUp(self):
if not has_requirements:
- self.skipTest('"flask" not installed')
+ self.skipTest("gui is not installed")
self.app = MagicMock()
self.api = Backend_Api(self.app)
@@ -36,7 +35,7 @@ class TestUtilityFunctions(unittest.TestCase):
def setUp(self):
if not has_requirements:
- self.skipTest('"flask" not installed')
+ self.skipTest("gui is not installed")
def test_get_error_message(self):
g4f.debug.last_provider = ProviderMock
diff --git a/g4f/Provider/Aura.py b/g4f/Provider/Aura.py
index 06887425..126c8d0f 100644
--- a/g4f/Provider/Aura.py
+++ b/g4f/Provider/Aura.py
@@ -1,5 +1,7 @@
from __future__ import annotations
+
from aiohttp import ClientSession
+
from ..typing import AsyncResult, Messages
from .base_provider import AsyncGeneratorProvider
@@ -23,7 +25,7 @@ class Aura(AsyncGeneratorProvider):
"Content-Type": "application/json",
"Origin": f"{cls.url}",
"Referer": f"{cls.url}/",
- "Sec-Ch-Ua": '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
+ "Sec-Ch-Ua": '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
"Sec-Ch-Ua-Mobile": "?0",
"Sec-Ch-Ua-Platform": '"Linux"',
"Sec-Fetch-Dest": "empty",
@@ -52,5 +54,6 @@ class Aura(AsyncGeneratorProvider):
"temperature": 0.5
}
async with session.post(f"{cls.url}/api/chat", json=data, proxy=proxy) as response:
+ response.raise_for_status()
async for chunk in response.content.iter_any():
yield chunk.decode() \ No newline at end of file
diff --git a/g4f/Provider/Bestim.py b/g4f/Provider/Bestim.py
index be95b48a..323bd713 100644
--- a/g4f/Provider/Bestim.py
+++ b/g4f/Provider/Bestim.py
@@ -4,7 +4,6 @@ from ..typing import Messages
from .base_provider import BaseProvider, CreateResult
from ..requests import get_session_from_browser
from uuid import uuid4
-import requests
class Bestim(BaseProvider):
url = "https://chatgpt.bestim.org"
@@ -24,18 +23,7 @@ class Bestim(BaseProvider):
) -> CreateResult:
session = get_session_from_browser(cls.url, proxy=proxy)
headers = {
- 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:121.0) Gecko/20100101 Firefox/121.0',
'Accept': 'application/json, text/event-stream',
- 'Accept-Language': 'en-US,en;q=0.5',
- 'Accept-Encoding': 'gzip, deflate, br',
- 'Referer': 'https://chatgpt.bestim.org/chat/',
- 'Origin': 'https://chatgpt.bestim.org',
- 'Alt-Used': 'chatgpt.bestim.org',
- 'Connection': 'keep-alive',
- 'Sec-Fetch-Dest': 'empty',
- 'Sec-Fetch-Mode': 'cors',
- 'Sec-Fetch-Site': 'same-origin',
- 'TE': 'trailers'
}
data = {
"messagesHistory": [{
@@ -47,9 +35,8 @@ class Bestim(BaseProvider):
}
response = session.post(
url="https://chatgpt.bestim.org/chat/send2/",
- headers=headers,
json=data,
- proxies={"https": proxy},
+ headers=headers,
stream=True
)
response.raise_for_status()
diff --git a/g4f/Provider/Chatgpt4Online.py b/g4f/Provider/Chatgpt4Online.py
index 4135ec9d..e923a8b1 100644
--- a/g4f/Provider/Chatgpt4Online.py
+++ b/g4f/Provider/Chatgpt4Online.py
@@ -5,6 +5,7 @@ import json
from aiohttp import ClientSession
from ..typing import Messages, AsyncResult
+from ..requests import get_args_from_browser
from .base_provider import AsyncGeneratorProvider
from .helper import get_random_string
@@ -12,8 +13,9 @@ class Chatgpt4Online(AsyncGeneratorProvider):
url = "https://chatgpt4online.org"
supports_message_history = True
supports_gpt_35_turbo = True
- working = False # cloudfare block !
+ working = False
_wpnonce = None
+ _context_id = None
@classmethod
async def create_async_generator(
@@ -23,23 +25,10 @@ class Chatgpt4Online(AsyncGeneratorProvider):
proxy: str = None,
**kwargs
) -> AsyncResult:
- headers = {
- "accept": "*/*",
- "accept-language": "en-US",
- "content-type": "application/json",
- "sec-ch-ua": "\"Not_A Brand\";v=\"8\", \"Chromium\";v=\"120\", \"Google Chrome\";v=\"120\"",
- "sec-ch-ua-mobile": "?0",
- "sec-ch-ua-platform": "\"Windows\"",
- "sec-fetch-dest": "empty",
- "sec-fetch-mode": "cors",
- "sec-fetch-site": "same-origin",
- "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
- "referer": "https://chatgpt4online.org/",
- "referrer-policy": "strict-origin-when-cross-origin"
- }
- async with ClientSession(headers=headers) as session:
+ args = get_args_from_browser(f"{cls.url}/chat/", proxy=proxy)
+ async with ClientSession(**args) as session:
if not cls._wpnonce:
- async with session.get(f"{cls.url}/", proxy=proxy) as response:
+ async with session.get(f"{cls.url}/chat/", proxy=proxy) as response:
response.raise_for_status()
response = await response.text()
result = re.search(r'restNonce&quot;:&quot;(.*?)&quot;', response)
@@ -47,12 +36,17 @@ class Chatgpt4Online(AsyncGeneratorProvider):
cls._wpnonce = result.group(1)
else:
raise RuntimeError("No nonce found")
+ result = re.search(r'contextId&quot;:(.*?),', response)
+ if result:
+ cls._context_id = result.group(1)
+ else:
+ raise RuntimeError("No contextId found")
data = {
"botId":"default",
"customId":None,
"session":"N/A",
"chatId":get_random_string(11),
- "contextId":58,
+ "contextId":cls._context_id,
"messages":messages[:-1],
"newMessage":messages[-1]["content"],
"newImageId":None,
diff --git a/g4f/Provider/PerplexityLabs.py b/g4f/Provider/PerplexityLabs.py
index a7b98f7c..a82227cd 100644
--- a/g4f/Provider/PerplexityLabs.py
+++ b/g4f/Provider/PerplexityLabs.py
@@ -76,7 +76,7 @@ class PerplexityLabs(AsyncGeneratorProvider, ProviderModelMixin):
'model': cls.get_model(model),
'messages': messages
}
- await ws.send_str('42' + json.dumps(['perplexity_playground', message_data]))
+ await ws.send_str('42' + json.dumps(['perplexity_labs', message_data]))
last_message = 0
while True:
message = await ws.receive_str()
diff --git a/g4f/Provider/base_provider.py b/g4f/Provider/base_provider.py
index b173db4e..4b312ffc 100644
--- a/g4f/Provider/base_provider.py
+++ b/g4f/Provider/base_provider.py
@@ -10,6 +10,7 @@ from .helper import get_cookies, format_prompt
from ..typing import CreateResult, AsyncResult, Messages, Union
from ..base_provider import BaseProvider
from ..errors import NestAsyncioError, ModelNotSupportedError
+from .. import debug
if sys.version_info < (3, 10):
NoneType = type(None)
@@ -266,9 +267,10 @@ class ProviderModelMixin:
@classmethod
def get_model(cls, model: str) -> str:
if not model:
- return cls.default_model
+ model = cls.default_model
elif model in cls.model_aliases:
- return cls.model_aliases[model]
+ model = cls.model_aliases[model]
elif model not in cls.get_models():
raise ModelNotSupportedError(f"Model is not supported: {model} in: {cls.__name__}")
+ debug.last_model = model
return model \ No newline at end of file
diff --git a/g4f/Provider/bing/create_images.py b/g4f/Provider/bing/create_images.py
index 4fa85929..a3fcd91b 100644
--- a/g4f/Provider/bing/create_images.py
+++ b/g4f/Provider/bing/create_images.py
@@ -202,16 +202,15 @@ class CreateImagesBing:
Yields:
Generator[str, None, None]: The final output as markdown formatted string with images.
"""
- try:
- cookies = self.cookies or get_cookies(".bing.com")
- except MissingRequirementsError as e:
- raise MissingAccessToken(f'Missing "_U" cookie. {e}')
-
+ cookies = self.cookies or get_cookies(".bing.com", False)
if "_U" not in cookies:
login_url = os.environ.get("G4F_LOGIN_URL")
if login_url:
yield f"Please login: [Bing]({login_url})\n\n"
- self.cookies = get_cookies_from_browser(self.proxy)
+ try:
+ self.cookies = get_cookies_from_browser(self.proxy)
+ except MissingRequirementsError as e:
+ raise MissingAccessToken(f'Missing "_U" cookie. {e}')
yield asyncio.run(self.create_async(prompt))
async def create_async(self, prompt: str) -> ImageResponse:
@@ -224,10 +223,7 @@ class CreateImagesBing:
Returns:
str: Markdown formatted string with images.
"""
- try:
- cookies = self.cookies or get_cookies(".bing.com")
- except MissingRequirementsError as e:
- raise MissingAccessToken(f'Missing "_U" cookie. {e}')
+ cookies = self.cookies or get_cookies(".bing.com", False)
if "_U" not in cookies:
raise MissingAccessToken('Missing "_U" cookie')
proxy = os.environ.get("G4F_PROXY")
diff --git a/g4f/Provider/helper.py b/g4f/Provider/helper.py
index 0af61d8d..9788bffd 100644
--- a/g4f/Provider/helper.py
+++ b/g4f/Provider/helper.py
@@ -21,12 +21,12 @@ try:
except ImportError:
has_browser_cookie3 = False
-from ..typing import Dict, Messages, Optional
-from ..errors import AiohttpSocksError, MissingRequirementsError
+from ..typing import Dict, Messages, Cookies, Optional
+from ..errors import MissingAiohttpSocksError, MissingRequirementsError
from .. import debug
# Global variable to store cookies
-_cookies: Dict[str, Dict[str, str]] = {}
+_cookies: Dict[str, Cookies] = {}
if has_browser_cookie3 and os.environ.get('DBUS_SESSION_BUS_ADDRESS') == "/dev/null":
_LinuxPasswordManager.get_password = lambda a, b: b"secret"
@@ -48,7 +48,13 @@ def get_cookies(domain_name: str = '', raise_requirements_error: bool = True) ->
_cookies[domain_name] = cookies
return cookies
-def load_cookies_from_browsers(domain_name: str, raise_requirements_error: bool = True) -> Dict[str, str]:
+def set_cookies(domain_name: str, cookies: Cookies = None) -> None:
+ if cookies:
+ _cookies[domain_name] = cookies
+ else:
+ _cookies.pop(domain_name)
+
+def load_cookies_from_browsers(domain_name: str, raise_requirements_error: bool = True) -> Cookies:
"""
Helper function to load cookies from various browsers.
@@ -143,5 +149,5 @@ def get_connector(connector: BaseConnector = None, proxy: str = None) -> Optiona
from aiohttp_socks import ProxyConnector
connector = ProxyConnector.from_url(proxy)
except ImportError:
- raise AiohttpSocksError('Install "aiohttp_socks" package for proxy support')
+ raise MissingAiohttpSocksError('Install "aiohttp_socks" package for proxy support')
return connector \ No newline at end of file
diff --git a/g4f/Provider/needs_auth/Bard.py b/g4f/Provider/needs_auth/Bard.py
index 09ed1c3c..73c62edc 100644
--- a/g4f/Provider/needs_auth/Bard.py
+++ b/g4f/Provider/needs_auth/Bard.py
@@ -7,14 +7,14 @@ try:
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
- from selenium.webdriver.common.keys import Keys
except ImportError:
pass
from ...typing import CreateResult, Messages
from ..base_provider import AbstractProvider
from ..helper import format_prompt
-from ...webdriver import WebDriver, WebDriverSession
+from ...webdriver import WebDriver, WebDriverSession, element_send_text
+
class Bard(AbstractProvider):
url = "https://bard.google.com"
@@ -68,13 +68,7 @@ XMLHttpRequest.prototype.open = function(method, url) {
"""
driver.execute_script(script)
- textarea = driver.find_element(By.CSS_SELECTOR, "div.ql-editor.textarea")
- lines = prompt.splitlines()
- for idx, line in enumerate(lines):
- textarea.send_keys(line)
- if (len(lines) - 1 != idx):
- textarea.send_keys(Keys.SHIFT + "\n")
- textarea.send_keys(Keys.ENTER)
+ element_send_text(driver.find_element(By.CSS_SELECTOR, "div.ql-editor.textarea"), prompt)
while True:
chunk = driver.execute_script("return window._message;")
diff --git a/g4f/Provider/needs_auth/OpenaiChat.py b/g4f/Provider/needs_auth/OpenaiChat.py
index b07bd49b..60a101d7 100644
--- a/g4f/Provider/needs_auth/OpenaiChat.py
+++ b/g4f/Provider/needs_auth/OpenaiChat.py
@@ -16,9 +16,8 @@ try:
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
- has_webdriver = True
except ImportError:
- has_webdriver = False
+ pass
from ..base_provider import AsyncGeneratorProvider, ProviderModelMixin
from ..helper import format_prompt, get_cookies
@@ -332,13 +331,14 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
cookies = cls._cookies or get_cookies("chat.openai.com", False)
if not access_token and "access_token" in cookies:
access_token = cookies["access_token"]
- if not access_token and not has_webdriver:
- raise MissingAccessToken(f'Missing "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, cookies = cls.browse_access_token(proxy)
+ try:
+ access_token, cookies = cls.browse_access_token(proxy)
+ except MissingRequirementsError:
+ raise MissingAccessToken(f'Missing "access_token"')
cls._cookies = cookies
headers = {"Authorization": f"Bearer {access_token}"}
diff --git a/g4f/Provider/needs_auth/Poe.py b/g4f/Provider/needs_auth/Poe.py
index 41c5315a..0c969d27 100644
--- a/g4f/Provider/needs_auth/Poe.py
+++ b/g4f/Provider/needs_auth/Poe.py
@@ -5,7 +5,7 @@ import time
from ...typing import CreateResult, Messages
from ..base_provider import AbstractProvider
from ..helper import format_prompt
-from ...webdriver import WebDriver, WebDriverSession
+from ...webdriver import WebDriver, WebDriverSession, element_send_text
models = {
"meta-llama/Llama-2-7b-chat-hf": {"name": "Llama-2-7b"},
@@ -89,7 +89,7 @@ class Poe(AbstractProvider):
else:
raise RuntimeError("Prompt textarea not found. You may not be logged in.")
- driver.find_element(By.CSS_SELECTOR, "footer textarea[class^='GrowingTextArea']").send_keys(prompt)
+ element_send_text(driver.find_element(By.CSS_SELECTOR, "footer textarea[class^='GrowingTextArea']"), prompt)
driver.find_element(By.CSS_SELECTOR, "footer button[class*='ChatMessageSendButton']").click()
script = """
diff --git a/g4f/Provider/needs_auth/Theb.py b/g4f/Provider/needs_auth/Theb.py
index efb38a40..2930e35d 100644
--- a/g4f/Provider/needs_auth/Theb.py
+++ b/g4f/Provider/needs_auth/Theb.py
@@ -5,7 +5,7 @@ import time
from ...typing import CreateResult, Messages
from ..base_provider import AbstractProvider
from ..helper import format_prompt
-from ...webdriver import WebDriver, WebDriverSession
+from ...webdriver import WebDriver, WebDriverSession, element_send_text
models = {
"theb-ai": "TheB.AI",
@@ -118,8 +118,7 @@ window._last_message = "";
# Submit prompt
wait.until(EC.visibility_of_element_located((By.ID, "textareaAutosize")))
- driver.find_element(By.ID, "textareaAutosize").send_keys(prompt)
- driver.find_element(By.ID, "textareaAutosize").send_keys(Keys.ENTER)
+ element_send_text(driver.find_element(By.ID, "textareaAutosize"), prompt)
# Read response with reader
script = """
diff --git a/g4f/Provider/selenium/AItianhuSpace.py b/g4f/Provider/selenium/AItianhuSpace.py
index 9878bd5a..4c438e3b 100644
--- a/g4f/Provider/selenium/AItianhuSpace.py
+++ b/g4f/Provider/selenium/AItianhuSpace.py
@@ -6,7 +6,7 @@ import random
from ...typing import CreateResult, Messages
from ..base_provider import AbstractProvider
from ..helper import format_prompt, get_random_string
-from ...webdriver import WebDriver, WebDriverSession
+from ...webdriver import WebDriver, WebDriverSession, element_send_text
from ... import debug
class AItianhuSpace(AbstractProvider):
@@ -52,9 +52,9 @@ class AItianhuSpace(AbstractProvider):
wait.until(EC.visibility_of_element_located((By.ID, "sheet")))
driver.execute_script(f"""
document.getElementById('sheet').addEventListener('click', () => {{
- window.open('{url}', '_blank');
+ window.open(arguments[0]);
}});
- """)
+ """, url)
driver.find_element(By.ID, "sheet").click()
time.sleep(10)
@@ -91,8 +91,7 @@ XMLHttpRequest.prototype.open = function(method, url) {
driver.execute_script(script)
# Submit prompt
- driver.find_element(By.CSS_SELECTOR, "textarea.n-input__textarea-el").send_keys(prompt)
- driver.find_element(By.CSS_SELECTOR, "button.n-button.n-button--primary-type.n-button--medium-type").click()
+ element_send_text(driver.find_element(By.CSS_SELECTOR, "textarea.n-input__textarea-el"), prompt)
# Read response
while True:
diff --git a/g4f/Provider/selenium/PerplexityAi.py b/g4f/Provider/selenium/PerplexityAi.py
index 8ae6ad2b..6b529d5b 100644
--- a/g4f/Provider/selenium/PerplexityAi.py
+++ b/g4f/Provider/selenium/PerplexityAi.py
@@ -6,14 +6,13 @@ try:
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
- from selenium.webdriver.common.keys import Keys
except ImportError:
pass
from ...typing import CreateResult, Messages
from ..base_provider import AbstractProvider
from ..helper import format_prompt
-from ...webdriver import WebDriver, WebDriverSession
+from ...webdriver import WebDriver, WebDriverSession, element_send_text
class PerplexityAi(AbstractProvider):
url = "https://www.perplexity.ai"
@@ -83,8 +82,7 @@ WebSocket.prototype.send = function(...args) {
raise RuntimeError("You need a account for copilot")
# Submit prompt
- driver.find_element(By.CSS_SELECTOR, "textarea[placeholder='Ask anything...']").send_keys(prompt)
- driver.find_element(By.CSS_SELECTOR, "textarea[placeholder='Ask anything...']").send_keys(Keys.ENTER)
+ element_send_text(driver.find_element(By.CSS_SELECTOR, "textarea[placeholder='Ask anything...']"), prompt)
# Stream response
script = """
diff --git a/g4f/Provider/selenium/TalkAi.py b/g4f/Provider/selenium/TalkAi.py
index 5aeb48ac..89280598 100644
--- a/g4f/Provider/selenium/TalkAi.py
+++ b/g4f/Provider/selenium/TalkAi.py
@@ -42,7 +42,7 @@ class TalkAi(AbstractProvider):
"content": message["content"]
} for message in messages],
"model": model if model else "gpt-3.5-turbo",
- "max_tokens": 256,
+ "max_tokens": 2048,
"temperature": 1,
"top_p": 1,
"presence_penalty": 0,
@@ -67,16 +67,15 @@ window._reader = response.body.pipeThrough(new TextDecoderStream()).getReader();
while True:
chunk = driver.execute_script("""
chunk = await window._reader.read();
-if (chunk["done"]) {
+if (chunk.done) {
return null;
}
content = "";
-lines = chunk["value"].split("\\n")
-lines.forEach((line, index) => {
+for (line of chunk.value.split("\\n")) {
if (line.startsWith('data: ')) {
content += line.substring('data: '.length);
}
-});
+}
return content;
""")
if chunk:
diff --git a/g4f/__init__.py b/g4f/__init__.py
index 996acf6c..173a1688 100644
--- a/g4f/__init__.py
+++ b/g4f/__init__.py
@@ -3,11 +3,13 @@ from __future__ import annotations
import os
from .errors import *
-from .models import Model, ModelUtils, _all_models
+from .models import Model, ModelUtils
from .Provider import AsyncGeneratorProvider, ProviderUtils
from .typing import Messages, CreateResult, AsyncResult, Union
from . import debug, version
from .base_provider import BaseRetryProvider, ProviderType
+from .Provider.helper import get_cookies, set_cookies
+from .Provider.base_provider import ProviderModelMixin
def get_model_and_provider(model : Union[Model, str],
provider : Union[ProviderType, str, None],
@@ -76,6 +78,7 @@ def get_model_and_provider(model : Union[Model, str],
print(f'Using {provider.__name__} provider')
debug.last_provider = provider
+ debug.last_model = model
return model, provider
@@ -227,5 +230,10 @@ def get_last_provider(as_dict: bool = False) -> Union[ProviderType, dict[str, st
if isinstance(last, BaseRetryProvider):
last = last.last_provider
if last and as_dict:
- return {"name": last.__name__, "url": last.url}
+ return {
+ "name": last.__name__,
+ "url": last.url,
+ "model": debug.last_model,
+ "models": last.models if isinstance(last, ProviderModelMixin) else []
+ }
return last \ No newline at end of file
diff --git a/g4f/debug.py b/g4f/debug.py
index 68a4f1ec..050bb0b2 100644
--- a/g4f/debug.py
+++ b/g4f/debug.py
@@ -2,4 +2,5 @@ from .base_provider import ProviderType
logging: bool = False
version_check: bool = True
-last_provider: ProviderType = None \ No newline at end of file
+last_provider: ProviderType = None
+last_model: str = None \ No newline at end of file
diff --git a/g4f/errors.py b/g4f/errors.py
index 66d41d4c..15bfafbd 100644
--- a/g4f/errors.py
+++ b/g4f/errors.py
@@ -34,7 +34,7 @@ class ModelNotSupportedError(Exception):
class MissingRequirementsError(Exception):
pass
-class AiohttpSocksError(MissingRequirementsError):
+class MissingAiohttpSocksError(MissingRequirementsError):
pass
class MissingAccessToken(Exception):
diff --git a/g4f/gui/__init__.py b/g4f/gui/__init__.py
index d2dfbbc5..46b4f56a 100644
--- a/g4f/gui/__init__.py
+++ b/g4f/gui/__init__.py
@@ -1,12 +1,12 @@
+from ..errors import MissingRequirementsError
try:
from .server.app import app
from .server.website import Website
from .server.backend import Backend_Api
except ImportError:
- from g4f.errors import MissingRequirementsError
- raise MissingRequirementsError('Install "flask" and "werkzeug" package for gui')
+ raise MissingRequirementsError('Install "flask" package for the gui')
-def run_gui(host: str = '0.0.0.0', port: int = 80, debug: bool = False) -> None:
+def run_gui(host: str = '0.0.0.0', port: int = 8080, debug: bool = False) -> None:
config = {
'host' : host,
'port' : port,
diff --git a/g4f/gui/client/js/chat.v1.js b/g4f/gui/client/js/chat.v1.js
index d62c040b..99a75569 100644
--- a/g4f/gui/client/js/chat.v1.js
+++ b/g4f/gui/client/js/chat.v1.js
@@ -164,12 +164,16 @@ const ask_gpt = async () => {
for (const line of value.split("\n")) {
if (!line) continue;
const message = JSON.parse(line);
- if (message["type"] == "content") {
- text += message["content"];
+ if (message.type == "content") {
+ text += message.content;
} else if (message["type"] == "provider") {
- provider = message["provider"];
- content.querySelector('.provider').innerHTML =
- '<a href="' + provider.url + '" target="_blank">' + provider.name + "</a>"
+ provider = message.provider
+ content.querySelector('.provider').innerHTML = `
+ <a href="${provider.url}" target="_blank">
+ ${provider.name}
+ </a>
+ ${provider.model ? ' with ' + provider.model : ''}
+ `
} else if (message["type"] == "error") {
error = message["error"];
} else if (message["type"] == "message") {
diff --git a/g4f/gui/server/backend.py b/g4f/gui/server/backend.py
index 9346f489..8bf58e52 100644
--- a/g4f/gui/server/backend.py
+++ b/g4f/gui/server/backend.py
@@ -3,7 +3,7 @@ import json
from flask import request, Flask
from typing import Generator
from g4f import version, models
-from g4f import _all_models, get_last_provider, ChatCompletion
+from g4f import get_last_provider, ChatCompletion
from g4f.image import is_allowed_extension, to_image
from g4f.errors import VersionNotFoundError
from g4f.Provider import __providers__
@@ -76,7 +76,7 @@ class Backend_Api:
Returns:
List[str]: A list of model names.
"""
- return _all_models
+ return models._all_models
def get_providers(self):
"""
diff --git a/g4f/requests.py b/g4f/requests.py
index 46f3b457..275e108b 100644
--- a/g4f/requests.py
+++ b/g4f/requests.py
@@ -1,130 +1,21 @@
from __future__ import annotations
-import json
-from functools import partialmethod
-from typing import AsyncGenerator
from urllib.parse import urlparse
try:
- from curl_cffi.requests import AsyncSession, Session, Response
+ from curl_cffi.requests import Session
+ from .requests_curl_cffi import StreamResponse, StreamSession
has_curl_cffi = True
except ImportError:
Session = type
+ from .requests_aiohttp import StreamResponse, StreamSession
has_curl_cffi = False
from .webdriver import WebDriver, WebDriverSession, bypass_cloudflare, get_driver_cookies
from .errors import MissingRequirementsError
-if not has_curl_cffi:
- from aiohttp import ClientSession, ClientResponse, ClientTimeout
- from .Provider.helper import get_connector
-
- class StreamResponse(ClientResponse):
- async def iter_lines(self) -> iter[bytes, None]:
- async for line in self.content:
- yield line.rstrip(b"\r\n")
-
- async def json(self):
- return await super().json(content_type=None)
-
- class StreamSession(ClientSession):
- def __init__(self, headers: dict = {}, timeout: int = None, proxies: dict = {}, impersonate = None, **kwargs):
- if impersonate:
- headers = {
- 'Accept-Encoding': 'gzip, deflate, br',
- 'Accept-Language': 'en-US',
- 'Connection': 'keep-alive',
- 'Sec-Fetch-Dest': 'empty',
- 'Sec-Fetch-Mode': 'cors',
- 'Sec-Fetch-Site': 'same-site',
- "User-Agent": 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36',
- 'Accept': '*/*',
- 'sec-ch-ua': '"Google Chrome";v="107", "Chromium";v="107", "Not?A_Brand";v="24"',
- 'sec-ch-ua-mobile': '?0',
- 'sec-ch-ua-platform': '"Windows"',
- **headers
- }
- super().__init__(
- **kwargs,
- timeout=ClientTimeout(timeout) if timeout else None,
- response_class=StreamResponse,
- connector=get_connector(kwargs.get("connector"), proxies.get("https")),
- headers=headers
- )
-else:
- class StreamResponse:
- """
- A wrapper class for handling asynchronous streaming responses.
-
- Attributes:
- inner (Response): The original Response object.
- """
-
- def __init__(self, inner: Response) -> None:
- """Initialize the StreamResponse with the provided Response object."""
- self.inner: Response = inner
-
- async def text(self) -> str:
- """Asynchronously get the response text."""
- return await self.inner.atext()
-
- def raise_for_status(self) -> None:
- """Raise an HTTPError if one occurred."""
- self.inner.raise_for_status()
-
- async def json(self, **kwargs) -> dict:
- """Asynchronously parse the JSON response content."""
- return json.loads(await self.inner.acontent(), **kwargs)
-
- async def iter_lines(self) -> AsyncGenerator[bytes, None]:
- """Asynchronously iterate over the lines of the response."""
- async for line in self.inner.aiter_lines():
- yield line
-
- async def iter_content(self) -> AsyncGenerator[bytes, None]:
- """Asynchronously iterate over the response content."""
- async for chunk in self.inner.aiter_content():
- yield chunk
-
- async def __aenter__(self):
- """Asynchronously enter the runtime context for the response object."""
- inner: Response = await self.inner
- self.inner = inner
- self.request = inner.request
- self.status_code: int = inner.status_code
- self.reason: str = inner.reason
- self.ok: bool = inner.ok
- self.headers = inner.headers
- self.cookies = inner.cookies
- return self
-
- async def __aexit__(self, *args):
- """Asynchronously exit the runtime context for the response object."""
- await self.inner.aclose()
-
- class StreamSession(AsyncSession):
- """
- An asynchronous session class for handling HTTP requests with streaming.
-
- Inherits from AsyncSession.
- """
- def request(
- self, method: str, url: str, **kwargs
- ) -> StreamResponse:
- """Create and return a StreamResponse object for the given HTTP request."""
- return StreamResponse(super().request(method, url, stream=True, **kwargs))
-
- # Defining HTTP methods as partial methods of the request method.
- head = partialmethod(request, "HEAD")
- get = partialmethod(request, "GET")
- post = partialmethod(request, "POST")
- put = partialmethod(request, "PUT")
- patch = partialmethod(request, "PATCH")
- delete = partialmethod(request, "DELETE")
-
-
-def get_session_from_browser(url: str, webdriver: WebDriver = None, proxy: str = None, timeout: int = 120) -> Session:
+def get_args_from_browser(url: str, webdriver: WebDriver = None, proxy: str = None, timeout: int = 120) -> dict:
"""
Create a Session object using a WebDriver to handle cookies and headers.
@@ -137,26 +28,36 @@ def get_session_from_browser(url: str, webdriver: WebDriver = None, proxy: str =
Returns:
Session: A Session object configured with cookies and headers from the WebDriver.
"""
- if not has_curl_cffi:
- raise MissingRequirementsError('Install "curl_cffi" package')
- with WebDriverSession(webdriver, "", proxy=proxy, virtual_display=True) as driver:
+ with WebDriverSession(webdriver, "", proxy=proxy, virtual_display=False) as driver:
bypass_cloudflare(driver, url, timeout)
cookies = get_driver_cookies(driver)
user_agent = driver.execute_script("return navigator.userAgent")
-
parse = urlparse(url)
- return Session(
- cookies=cookies,
- headers={
+ return {
+ 'cookies': cookies,
+ 'headers': {
'accept': '*/*',
+ "accept-language": "en-US",
+ "accept-encoding": "gzip, deflate, br",
'authority': parse.netloc,
'origin': f'{parse.scheme}://{parse.netloc}',
'referer': url,
+ "sec-ch-ua": "\"Google Chrome\";v=\"121\", \"Not;A=Brand\";v=\"8\", \"Chromium\";v=\"121\"",
+ "sec-ch-ua-mobile": "?0",
+ "sec-ch-ua-platform": "Windows",
'sec-fetch-dest': 'empty',
'sec-fetch-mode': 'cors',
'sec-fetch-site': 'same-origin',
- 'user-agent': user_agent
+ 'user-agent': user_agent,
},
+ }
+
+def get_session_from_browser(url: str, webdriver: WebDriver = None, proxy: str = None, timeout: int = 120) -> Session:
+ if not has_curl_cffi:
+ raise MissingRequirementsError('Install "curl_cffi" package')
+ args = get_args_from_browser(url, webdriver, proxy, timeout)
+ return Session(
+ **args,
proxies={"https": proxy, "http": proxy},
timeout=timeout,
impersonate="chrome110"
diff --git a/g4f/requests_aiohttp.py b/g4f/requests_aiohttp.py
new file mode 100644
index 00000000..aa097312
--- /dev/null
+++ b/g4f/requests_aiohttp.py
@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+from aiohttp import ClientSession, ClientResponse, ClientTimeout
+from typing import AsyncGenerator, Any
+
+from .Provider.helper import get_connector
+
+class StreamResponse(ClientResponse):
+ async def iter_lines(self) -> AsyncGenerator[bytes, None]:
+ async for line in self.content:
+ yield line.rstrip(b"\r\n")
+
+ async def json(self) -> Any:
+ return await super().json(content_type=None)
+
+class StreamSession(ClientSession):
+ def __init__(self, headers: dict = {}, timeout: int = None, proxies: dict = {}, impersonate = None, **kwargs):
+ if impersonate:
+ headers = {
+ 'Accept-Encoding': 'gzip, deflate, br',
+ 'Accept-Language': 'en-US',
+ 'Connection': 'keep-alive',
+ 'Sec-Fetch-Dest': 'empty',
+ 'Sec-Fetch-Mode': 'cors',
+ 'Sec-Fetch-Site': 'same-site',
+ "User-Agent": 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36',
+ 'Accept': '*/*',
+ 'sec-ch-ua': '"Google Chrome";v="107", "Chromium";v="107", "Not?A_Brand";v="24"',
+ 'sec-ch-ua-mobile': '?0',
+ 'sec-ch-ua-platform': '"Windows"',
+ **headers
+ }
+ super().__init__(
+ **kwargs,
+ timeout=ClientTimeout(timeout) if timeout else None,
+ response_class=StreamResponse,
+ connector=get_connector(kwargs.get("connector"), proxies.get("https")),
+ headers=headers
+ ) \ No newline at end of file
diff --git a/g4f/requests_curl_cffi.py b/g4f/requests_curl_cffi.py
new file mode 100644
index 00000000..64e41d65
--- /dev/null
+++ b/g4f/requests_curl_cffi.py
@@ -0,0 +1,77 @@
+from __future__ import annotations
+
+from curl_cffi.requests import AsyncSession, Response
+from typing import AsyncGenerator, Any
+from functools import partialmethod
+import json
+
+class StreamResponse:
+ """
+ A wrapper class for handling asynchronous streaming responses.
+
+ Attributes:
+ inner (Response): The original Response object.
+ """
+
+ def __init__(self, inner: Response) -> None:
+ """Initialize the StreamResponse with the provided Response object."""
+ self.inner: Response = inner
+
+ async def text(self) -> str:
+ """Asynchronously get the response text."""
+ return await self.inner.atext()
+
+ def raise_for_status(self) -> None:
+ """Raise an HTTPError if one occurred."""
+ self.inner.raise_for_status()
+
+ async def json(self, **kwargs) -> Any:
+ """Asynchronously parse the JSON response content."""
+ return json.loads(await self.inner.acontent(), **kwargs)
+
+ async def iter_lines(self) -> AsyncGenerator[bytes, None]:
+ """Asynchronously iterate over the lines of the response."""
+ async for line in self.inner.aiter_lines():
+ yield line
+
+ async def iter_content(self) -> AsyncGenerator[bytes, None]:
+ """Asynchronously iterate over the response content."""
+ async for chunk in self.inner.aiter_content():
+ yield chunk
+
+ async def __aenter__(self):
+ """Asynchronously enter the runtime context for the response object."""
+ inner: Response = await self.inner
+ self.inner = inner
+ self.request = inner.request
+ self.status_code: int = inner.status_code
+ self.reason: str = inner.reason
+ self.ok: bool = inner.ok
+ self.headers = inner.headers
+ self.cookies = inner.cookies
+ return self
+
+ async def __aexit__(self, *args):
+ """Asynchronously exit the runtime context for the response object."""
+ await self.inner.aclose()
+
+class StreamSession(AsyncSession):
+ """
+ An asynchronous session class for handling HTTP requests with streaming.
+
+ Inherits from AsyncSession.
+ """
+
+ def request(
+ self, method: str, url: str, **kwargs
+ ) -> StreamResponse:
+ """Create and return a StreamResponse object for the given HTTP request."""
+ return StreamResponse(super().request(method, url, stream=True, **kwargs))
+
+ # Defining HTTP methods as partial methods of the request method.
+ head = partialmethod(request, "HEAD")
+ get = partialmethod(request, "GET")
+ post = partialmethod(request, "POST")
+ put = partialmethod(request, "PUT")
+ patch = partialmethod(request, "PATCH")
+ delete = partialmethod(request, "DELETE")
diff --git a/g4f/webdriver.py b/g4f/webdriver.py
index d2009ddc..ee03ff66 100644
--- a/g4f/webdriver.py
+++ b/g4f/webdriver.py
@@ -3,15 +3,18 @@ from __future__ import annotations
try:
from platformdirs import user_config_dir
from selenium.webdriver.remote.webdriver import WebDriver
+ from selenium.webdriver.remote.webelement import WebElement
from undetected_chromedriver import Chrome, ChromeOptions
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
+ from selenium.webdriver.common.keys import Keys
has_requirements = True
except ImportError:
- WebDriver = type
+ from typing import Type as WebDriver
has_requirements = False
-
+
+import time
from os import path
from os import access, R_OK
from .errors import MissingRequirementsError
@@ -90,7 +93,27 @@ def bypass_cloudflare(driver: WebDriver, url: str, timeout: int) -> None:
if driver.find_element(By.TAG_NAME, "body").get_attribute("class") == "no-js":
if debug.logging:
print("Cloudflare protection detected:", url)
+
+ # Open website in a new tab
+ element = driver.find_element(By.ID, "challenge-body-text")
+ driver.execute_script(f"""
+ arguments[0].addEventListener('click', () => {{
+ window.open(arguments[1]);
+ }});
+ """, element, url)
+ element.click()
+ time.sleep(3)
+
+ # Switch to the new tab and close the old tab
+ original_window = driver.current_window_handle
+ for window_handle in driver.window_handles:
+ if window_handle != original_window:
+ driver.close()
+ driver.switch_to.window(window_handle)
+ break
+
try:
+ # Click on the challenge button in the iframe
driver.switch_to.frame(driver.find_element(By.CSS_SELECTOR, "#turnstile-wrapper iframe"))
WebDriverWait(driver, 5).until(
EC.presence_of_element_located((By.CSS_SELECTOR, "#challenge-stage input"))
@@ -197,4 +220,9 @@ class WebDriverSession:
print(f"Error closing WebDriver: {e}")
self.default_driver.quit()
if self.virtual_display:
- self.virtual_display.stop() \ No newline at end of file
+ self.virtual_display.stop()
+
+def element_send_text(element: WebElement, text: str) -> None:
+ script = "arguments[0].innerText = arguments[1]"
+ element.parent.execute_script(script, element, text)
+ element.send_keys(Keys.ENTER) \ No newline at end of file