diff options
author | H Lohaus <hlohaus@users.noreply.github.com> | 2024-01-27 16:09:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-27 16:09:21 +0100 |
commit | 0d83bdeef91001c7c00d69f79fccad5a78b4b94b (patch) | |
tree | 362ebeb245cc4e123914635b03f890a314a7a40d /g4f/Provider/selenium | |
parent | Merge pull request #1512 from KennyPhan123/patch-1 (diff) | |
parent | Fix PerplexityLabs Provider, Improve bypass_cloudflare helper (diff) | |
download | gpt4free-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 |
Diffstat (limited to '')
-rw-r--r-- | g4f/Provider/selenium/AItianhuSpace.py | 9 | ||||
-rw-r--r-- | g4f/Provider/selenium/PerplexityAi.py | 6 | ||||
-rw-r--r-- | g4f/Provider/selenium/TalkAi.py | 9 |
3 files changed, 10 insertions, 14 deletions
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: |