From 9239cadd8b3e539a7d5da0eb22b2b047417fb426 Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <hlohaus@users.noreply.github.com>
Date: Sun, 19 Nov 2023 05:36:04 +0100
Subject: Add Response Handler to OpenaiChat Update Providers with WebDriver
 Add WebDriverSession helper Use native streaming in curl_cffi

---
 g4f/Provider/needs_auth/Bard.py | 45 +++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

(limited to 'g4f/Provider/needs_auth/Bard.py')

diff --git a/g4f/Provider/needs_auth/Bard.py b/g4f/Provider/needs_auth/Bard.py
index b1df6909..77c029b8 100644
--- a/g4f/Provider/needs_auth/Bard.py
+++ b/g4f/Provider/needs_auth/Bard.py
@@ -4,7 +4,7 @@ import time
 
 from ...typing import CreateResult, Messages
 from ..base_provider import BaseProvider
-from ..helper import WebDriver, format_prompt, get_browser
+from ..helper import WebDriver, WebDriverSession, format_prompt
 
 class Bard(BaseProvider):
     url = "https://bard.google.com"
@@ -18,34 +18,32 @@ class Bard(BaseProvider):
         messages: Messages,
         stream: bool,
         proxy: str = None,
-        browser: WebDriver = None,
+        web_driver: WebDriver = None,
         user_data_dir: str = None,
         headless: bool = True,
         **kwargs
     ) -> CreateResult:
         prompt = format_prompt(messages)
-        driver = browser if browser else get_browser(user_data_dir, headless, proxy)
+        session = WebDriverSession(web_driver, user_data_dir, headless, proxy=proxy)
+        with session as driver:
+            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.by import By
-        from selenium.webdriver.support.ui import WebDriverWait
-        from selenium.webdriver.support import expected_conditions as EC
-
-        try:
-            driver.get(f"{cls.url}/chat")
-            wait = WebDriverWait(driver, 10 if headless else 240)
-            wait.until(EC.visibility_of_element_located((By.CSS_SELECTOR, "div.ql-editor.textarea")))
-        except:
-            # Reopen browser for login
-            if not browser:
-                driver.quit()
-                driver = get_browser(None, False, proxy)
+            try:
                 driver.get(f"{cls.url}/chat")
-                wait = WebDriverWait(driver, 240)
+                wait = WebDriverWait(driver, 10 if headless else 240)
                 wait.until(EC.visibility_of_element_located((By.CSS_SELECTOR, "div.ql-editor.textarea")))
-            else:
-                raise RuntimeError("Prompt textarea not found. You may not be logged in.")
+            except:
+                # Reopen browser for login
+                if not web_driver:
+                    driver = session.reopen(headless=False)
+                    driver.get(f"{cls.url}/chat")
+                    wait = WebDriverWait(driver, 240)
+                    wait.until(EC.visibility_of_element_located((By.CSS_SELECTOR, "div.ql-editor.textarea")))
+                else:
+                    raise RuntimeError("Prompt textarea not found. You may not be logged in.")
 
-        try:
             # Add hook in XMLHttpRequest
             script = """
 const _http_request_open = XMLHttpRequest.prototype.open;
@@ -72,9 +70,4 @@ XMLHttpRequest.prototype.open = function(method, url) {
                     yield chunk
                     return
                 else:
-                    time.sleep(0.1)
-        finally:
-            if not browser:
-                driver.close()
-                time.sleep(0.1)
-                driver.quit()
\ No newline at end of file
+                    time.sleep(0.1)
\ No newline at end of file
-- 
cgit v1.2.3