From 1eb7dc05e59433de149ec16d9b2fe19b3fa4b24b Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Fri, 26 Jan 2024 12:49:52 +0100 Subject: Fix: ChromeDriver only supports characters in the BMP Add set_cookies helper, Show last used model --- g4f/Provider/base_provider.py | 6 ++++-- g4f/Provider/bing/create_images.py | 16 ++++++---------- g4f/Provider/helper.py | 8 +++++++- g4f/Provider/needs_auth/Bard.py | 12 +++--------- g4f/Provider/needs_auth/OpenaiChat.py | 10 +++++----- g4f/Provider/needs_auth/Poe.py | 4 ++-- g4f/Provider/needs_auth/Theb.py | 5 ++--- g4f/Provider/selenium/AItianhuSpace.py | 5 ++--- g4f/Provider/selenium/PerplexityAi.py | 6 ++---- g4f/Provider/selenium/TalkAi.py | 9 ++++----- g4f/__init__.py | 12 ++++++++++-- g4f/debug.py | 3 ++- g4f/errors.py | 2 +- g4f/gui/__init__.py | 6 +++--- g4f/gui/client/js/chat.v1.js | 14 +++++++++----- g4f/gui/server/backend.py | 4 ++-- g4f/webdriver.py | 11 +++++++++-- 17 files changed, 73 insertions(+), 60 deletions(-) (limited to 'g4f') 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..87fdb158 100644 --- a/g4f/Provider/helper.py +++ b/g4f/Provider/helper.py @@ -21,7 +21,7 @@ try: except ImportError: has_browser_cookie3 = False -from ..typing import Dict, Messages, Optional +from ..typing import Dict, Messages, Cookies, Optional from ..errors import AiohttpSocksError, MissingRequirementsError from .. import debug @@ -48,6 +48,12 @@ def get_cookies(domain_name: str = '', raise_requirements_error: bool = True) -> _cookies[domain_name] = cookies return cookies +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) -> Dict[str, str]: """ Helper function to load cookies from various browsers. 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..6af8ceaf 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): @@ -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..6032001b 100644 --- a/g4f/errors.py +++ b/g4f/errors.py @@ -31,7 +31,7 @@ class NestAsyncioError(Exception): class ModelNotSupportedError(Exception): pass -class MissingRequirementsError(Exception): +class MissingRequirementsError(ImportError): pass class AiohttpSocksError(MissingRequirementsError): 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 = - '' + provider.name + "" + provider = message.provider + content.querySelector('.provider').innerHTML = ` + + ${provider.name} + + ${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/webdriver.py b/g4f/webdriver.py index d2009ddc..66b3956e 100644 --- a/g4f/webdriver.py +++ b/g4f/webdriver.py @@ -3,13 +3,15 @@ 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 from os import path @@ -197,4 +199,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 -- cgit v1.2.3