Updated driver so it accepts the new modal. Bumped the library version.

Erol444 · Erol444 · commit d8a80e077524 · 2023-05-11T22:51:33.000+02:00
diff --git a/gpt4_openai/__init__.py b/gpt4_openai/__init__.py
@@ -42,7 +42,7 @@ def _call(self, prompt: str, stop: Optional[List[str]] = None) -> str:
             raise ValueError("You have reached the maximum number of requests per hour ! Help me to Improve. Abusing this tool is at your own risk")
         else:
             sleep(2)
-            data = self.chatbot.send_message(prompt)
+            data = self.chatbot.send_message(prompt, model='gpt4')
             #print(data)
             response = data["message"]
             self.conversation = data["conversation_id"]
diff --git a/gpt4_openai/driver.py b/gpt4_openai/driver.py
@@ -26,6 +26,7 @@
     '//div[starts-with(@class, "markdown prose w-full break-words")]',
 )
 chatgpt_alert = (By.XPATH, '//div[@role="alert"]')
+chatgpt_dialog = (By.XPATH, '//div[@role="dialog"]')
 chatgpt_intro = (By.ID, 'headlessui-portal-root')
 chatgpt_login_btn = (By.XPATH, '//button[text()="Log in"]')
 chatgpt_login_h1 = (By.XPATH, '//h1[text()="Welcome back"]')
@@ -80,6 +81,7 @@ def __init__(
         :param chrome_args: The arguments to pass to the browser
         :param moderation: Whether to enable message moderation
         :param verbose: Whether to enable verbose logging
+        :param headless: Whether to run the browser in headless mode
         '''
         self.__init_logger(verbose)
 
@@ -149,7 +151,7 @@ def __init_logger(self, verbose: bool) -> None:
         :param verbose: Whether to enable verbose logging
         '''
         self.logger = logging.getLogger('pyChatGPT')
-        self.logger.setLevel(logging.INFO)
+        self.logger.setLevel(logging.DEBUG)
         if verbose:
             formatter = logging.Formatter('[%(funcName)s] %(message)s')
             stream_handler = logging.StreamHandler()
@@ -377,19 +379,39 @@ def __check_blocking_elements(self) -> None:
         Check for blocking elements and dismiss them
         '''
         self.logger.debug('Looking for blocking elements...')
+        
         try:
-            intro = WebDriverWait(self.driver, 3).until(
-                EC.presence_of_element_located(chatgpt_intro)
+            # FInd a button to dismiss the dialog with class="btn relative btn-primary" inside the div[@role="dialog"]
+            btn_to_dismiss = WebDriverWait(self.driver, 5).until(
+                EC.presence_of_element_located((By.XPATH, '//div[@role="dialog"]//button[@class="btn relative btn-primary"]'))
             )
-            self.logger.debug('Dismissing intro...')
-            self.driver.execute_script('arguments[0].remove()', intro)
-        except SeleniumExceptions.TimeoutException:
+            if btn_to_dismiss:
+                self.logger.debug('Dismissing dialog...')
+                self.driver.execute_script('arguments[0].click()', btn_to_dismiss)
+        except:
+            pass
+        
+        try:
+            # for 3 times
+            i = 0
+            while i<=2:
+                self.__sleep(0.4)
+                if i !=2:
+                    #get the button with class="btn relative btn-neutral ml-auto"
+                    btn = WebDriverWait(self.driver, 5).until(
+                        EC.presence_of_element_located((By.XPATH, '//button[@class="btn relative btn-neutral ml-auto"]'))
+                    )
+                else:
+                    #get the button with class="btn relative btn-primary ml-auto"
+                    btn = WebDriverWait(self.driver, 5).until(
+                        EC.presence_of_element_located((By.XPATH, '//button[@class="btn relative btn-primary ml-auto"]'))
+                    )
+                if btn:
+                    self.logger.debug('Dismissing dialog...')
+                    self.driver.execute_script('arguments[0].click()', btn)
+                i+=1     
+        except:  
             pass
-
-        alerts = self.driver.find_elements(*chatgpt_alert)
-        if alerts:
-            self.logger.debug('Dismissing alert...')
-            self.driver.execute_script('arguments[0].remove()', alerts[0])
 
     def __stream_message(self):
         prev_content = ''
@@ -409,15 +431,15 @@ def __stream_message(self):
             if not result_streaming:
                 break
 
-    def send_message(self, message: str, stream: bool = False) -> dict:
+    def send_message(self, message: str, stream: bool = False, model: str = "default") -> dict:
         '''
         Send a message to ChatGPT\n
         :param message: Message to send
         :return: Dictionary with keys `message` and `conversation_id`
         '''
         self.logger.debug('Ensuring Cloudflare cookies...')
         self.__ensure_cf()
-        self.__check_blocking_elements()
+        #self.__check_blocking_elements()
 
         # Wait for page to load
         try:
@@ -429,17 +451,19 @@ def send_message(self, message: str, stream: bool = False) -> dict:
 
         # If we have paid access, we should select GPT4 model
         try:
-            self.logger.debug('Trying to select model...')
-            WebDriverWait(self.driver, 3).until(
-                EC.presence_of_element_located(model_selector)
-            ).click()
-            self.logger.debug('Paid access detected, selecting GPT4 model...')
-            self.__sleep(1.0)
-            WebDriverWait(self.driver, 3).until(
-                EC.presence_of_element_located(gpt4_selector)
-            ).click()
-            self.logger.debug('GPT4 model selected')
+            if model == "gpt4":
+                self.logger.debug('Trying to select model...')
+                WebDriverWait(self.driver, 3).until(
+                    EC.presence_of_element_located(model_selector)
+                ).click()
+                self.logger.debug('Paid access detected, selecting GPT4 model...')
+                self.__sleep(1.0)
+                WebDriverWait(self.driver, 3).until(
+                    EC.presence_of_element_located(gpt4_selector)
+                ).click()
+                self.logger.debug('GPT4 model selected')
         except SeleniumExceptions.TimeoutException:
+            print(">>> WARNING <<<\n>> You don't have paid access to GPT4, using default model...")
             self.logger.debug('Paid access not detected, using default model...')
 
         self.logger.debug('Sending message...')
@@ -489,19 +513,19 @@ def send_message(self, message: str, stream: bool = False) -> dict:
         content = markdownify(response.get_attribute('innerHTML')).replace(
             'Copy code`', '`'
         )
+                
         pattern = re.compile(
             r'[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
         )
         matches = pattern.search(self.driver.current_url)
         if not matches:
             self.driver.refresh()
-            self.__sleep(1)
-            self.__check_blocking_elements()
-            self.__sleep(1)
+            self.__sleep(2)
+            #self.__check_blocking_elements()
             self.driver.execute_script("arguments[0].click();", WebDriverWait(self.driver, 10).until(
                 EC.element_to_be_clickable(chatgpt_chats_list_first_node)
             ))
-            self.__sleep(1)
+            self.__sleep(2)
             #print(self.driver.current_url)
             matches = pattern.search(self.driver.current_url)
 
@@ -568,4 +592,4 @@ def refresh_chat_page(self) -> None:
 
         self.driver.get(chatgpt_chat_url)
         self.__check_capacity(chatgpt_chat_url)
-        self.__check_blocking_elements()
+        self.__check_blocking_elements()
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="gpt4-openai-api",
-    version="0.1.0",
+    version="0.2.0",
     description="Python package for unofficial GPT-4 API access via chat.openai.com using Selenium browser",
     author="Erol444",
     author_email="erol123444@gmail.com",
