selenium: explicit import ChromeWrapper

TheShellLand · Nov 27, 2023 · fb12c64 · fb12c64
1 parent a358fa1
commit fb12c64
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 61 deletions.
diff --git a/automon/integrations/facebook/groups.py b/automon/integrations/facebook/groups.py
@@ -5,6 +5,7 @@
 from automon.log import logger
 from automon.helpers.sleeper import Sleeper
 from automon.integrations.seleniumWrapper import SeleniumBrowser
+from automon.integrations.seleniumWrapper.config_webdriver_chrome import ChromeWrapper
 
 log = logger.logging.getLogger(__name__)
 log.setLevel(logger.DEBUG)
@@ -567,27 +568,27 @@ def set_url(self, url: str) -> str:
     def start(self, headless: bool = True, random_user_agent: bool = False, set_user_agent: str = None):
         """start new instance of selenium"""
         self._browser = SeleniumBrowser()
+        self._browser.config.webdriver_wrapper = ChromeWrapper()
 
         if headless:
-            self._browser.set_webdriver().Chrome().in_headless().set_locale_experimental()
-            # self._browser.set_webdriver().Chrome().enable_headless().set_locale_experimental()
+            self._browser.config.webdriver_wrapper.enable_headless().set_locale_experimental()
         else:
-            self._browser.set_webdriver().Chrome().set_locale_experimental()
+            self._browser.config.webdriver_wrapper.set_locale_experimental()
 
         if random_user_agent:
-            self._browser.set_webdriver().Chrome().set_user_agent(
+            self._browser.config.webdriver_wrapper.set_user_agent(
                 self._browser.get_random_user_agent()
             )
         elif set_user_agent:
-            self._browser.set_webdriver().Chrome().set_user_agent(
+            self._browser.config.webdriver_wrapper.set_user_agent(
                 set_user_agent
             )
 
         log.info(str(dict(
             browser=self._browser
         )))
         browser = self._browser.run()
-        self._browser.set_webdriver().Chrome().set_window_size(width=1920 * 0.6, height=1080)
+        self._browser.config.webdriver_wrapper.set_window_size(width=1920 * 0.6, height=1080)
         return browser
 
     def stop(self):

diff --git a/automon/integrations/instagram/client_browser.py b/automon/integrations/instagram/client_browser.py
@@ -2,6 +2,7 @@
 
 from automon.log import logger
 from automon.integrations.seleniumWrapper.browser import SeleniumBrowser
+from automon.integrations.seleniumWrapper.config_webdriver_chrome import ChromeWrapper
 
 from automon.helpers.sleeper import Sleeper
 # from automon.integrations.minioWrapper import MinioClient
@@ -28,13 +29,14 @@ def __init__(self,
         """Instagram Browser Client"""
         self.config = config or InstagramConfig(login=login, password=password)
         self.browser = SeleniumBrowser()
+        self.browser.config.webdriver_wrapper = ChromeWrapper()
 
         self.useragent = self.browser.get_random_user_agent()
 
         if headless:
-            self.browser.set_webdriver().Chrome().in_headless().set_user_agent(self.useragent)
+            self.browser.config.webdriver_wrapper.in_headless().set_user_agent(self.useragent)
         else:
-            self.browser.set_webdriver().Chrome().set_user_agent(self.useragent)
+            self.browser.config.webdriver_wrapper.set_user_agent(self.useragent)
 
     def __repr__(self):
         return f'{self.__dict__}'

diff --git a/automon/integrations/seleniumWrapper/browser.py b/automon/integrations/seleniumWrapper/browser.py
@@ -121,7 +121,7 @@ def current_url(self):
 
     @property
     def window_size(self):
-        return self.config.set_webdriver().window_size
+        return self.config.webdriver_wrapper.window_size
 
     def _screenshot_name(self, prefix=None):
         """Generate a unique filename"""
@@ -365,7 +365,7 @@ def get_page_source_beautifulsoup(self, markdup: str = None, features: str = 'lx
             markdup = self.get_page_source()
         return BeautifulSoup(markup=markdup, features=features)
 
-    def get_random_user_agent(self, filter: list or str = None, case_sensitive: bool = False) -> list:
+    def get_random_user_agent(self, filter: list or str = None, case_sensitive: bool = False) -> str:
         return SeleniumUserAgentBuilder().get_random(filter=filter, case_sensitive=case_sensitive)
 
     def get_screenshot_as_base64(self, **kwargs):
@@ -464,15 +464,12 @@ def save_screenshot(
 
         return False
 
-    def set_webdriver(self):
-        return self.config
-
     def set_window_size(self, width=1920, height=1080, device_type=None) -> bool:
         """set browser resolution"""
 
         try:
-            self.config.set_webdriver().webdriver_wrapper.set_window_size(width=width, height=height,
-                                                                          device_type=device_type)
+            self.config.webdriver_wrapper.set_window_size(width=width, height=height,
+                                                          device_type=device_type)
         except Exception as error:
             message, session, stacktrace = self.error_parsing(error)
             log.error(str(dict(

diff --git a/automon/integrations/seleniumWrapper/browser_types.py b/automon/integrations/seleniumWrapper/browser_types.py
@@ -49,8 +49,8 @@ def chrome(self, options: list = None) -> Chrome:
 
         try:
             if self.chromedriver:
-                return self.webdriver.Chrome(executable_path=self.chromedriver, options=chrome_options)
-            return self.webdriver.Chrome(options=chrome_options)
+                return self.webdriver.ChromeWrapper(executable_path=self.chromedriver, options=chrome_options)
+            return self.webdriver.ChromeWrapper(options=chrome_options)
         except Exception as e:
             log.error(f'Browser not set. {e}')
 
@@ -77,8 +77,8 @@ def chrome_headless(self, options: list = None, **kwargs) -> Chrome:
 
         try:
             if self.chromedriver:
-                return self.webdriver.Chrome(self.chromedriver, options=chrome_options, **kwargs)
-            return self.webdriver.Chrome(options=chrome_options, **kwargs)
+                return self.webdriver.ChromeWrapper(self.chromedriver, options=chrome_options, **kwargs)
+            return self.webdriver.ChromeWrapper(options=chrome_options, **kwargs)
         except Exception as e:
             log.error(f'Browser not set. {e}')
 

diff --git a/automon/integrations/seleniumWrapper/config.py b/automon/integrations/seleniumWrapper/config.py
@@ -3,35 +3,25 @@
 from automon.log import logger
 from automon.helpers.osWrapper import environ
 
-from .config_webdriver_chrome import ConfigChrome
-
 log = logger.logging.getLogger(__name__)
 log.setLevel(logger.DEBUG)
 
 
 class SeleniumConfig(object):
     def __init__(self):
         self._webdriver = None
-        self._webdriver_wrapper = None
+        self.webdriver_wrapper = None
 
         self._cookies_base64 = environ('SELENIUM_COOKIES_BASE64')
         self._cookies_file = environ('SELENIUM_COOKIES_FILE')
 
-        self._chrome = ConfigChrome()
-        self._edge = NotImplemented
-        self._firefox = NotImplemented
-
     @property
     def webdriver(self):
         try:
             return self.webdriver_wrapper.webdriver
         except:
             return self._webdriver
 
-    @property
-    def webdriver_wrapper(self):
-        return self._webdriver_wrapper
-
     @property
     def window_size(self):
         """get window size
@@ -50,28 +40,6 @@ def cookies_file(self):
         log.info(f'{self._cookies_file}')
         return self._cookies_file
 
-    def Chrome(self):
-        """selenium Chrome webdriver
-
-        """
-        self._webdriver_wrapper = self._chrome
-        log.info(str(dict(
-            webdriver_wrapper=self._webdriver_wrapper
-        )))
-        return self.webdriver_wrapper
-
-    def Edge(self):
-        """selenium Edge webdriver
-
-        """
-        return self._edge
-
-    def Firefox(self):
-        """selenium Firefox webdriver
-
-        """
-        return self._firefox
-
     def run(self):
         """run webdriver"""
         run = self.webdriver_wrapper.run()
@@ -81,9 +49,6 @@ def run(self):
         )))
         return run
 
-    def set_webdriver(self):
-        return self
-
     def start(self):
         """alias to run"""
         return self.run()

diff --git a/automon/integrations/seleniumWrapper/config_webdriver_chrome.py b/automon/integrations/seleniumWrapper/config_webdriver_chrome.py
@@ -12,7 +12,7 @@
 log.setLevel(logger.DEBUG)
 
 
-class ConfigChrome(object):
+class ChromeWrapper(object):
 
     def __init__(self):
         self._webdriver = None

diff --git a/automon/integrations/seleniumWrapper/tests/test_browser.py b/automon/integrations/seleniumWrapper/tests/test_browser.py
@@ -1,9 +1,11 @@
 import unittest
 
 from automon.integrations.seleniumWrapper.browser import SeleniumBrowser
+from automon.integrations.seleniumWrapper.config_webdriver_chrome import ChromeWrapper
 
 browser = SeleniumBrowser()
-browser.config.set_webdriver().Chrome().enable_defaults().enable_headless()
+browser.config.webdriver_wrapper = ChromeWrapper()
+browser.config.webdriver_wrapper.enable_defaults().enable_headless()
 
 
 class SeleniumClientTest(unittest.TestCase):

diff --git a/automon/integrations/seleniumWrapper/tests/test_browser_headless.py b/automon/integrations/seleniumWrapper/tests/test_browser_headless.py
@@ -1,9 +1,11 @@
 import unittest
 
 from automon.integrations.seleniumWrapper.browser import SeleniumBrowser
+from automon.integrations.seleniumWrapper.config_webdriver_chrome import ChromeWrapper
 
 browser = SeleniumBrowser()
-browser.config.set_webdriver().Chrome().enable_defaults().enable_headless()
+browser.config.webdriver_wrapper = ChromeWrapper()
+browser.config.webdriver_wrapper.enable_defaults().enable_headless()
 
 
 class SeleniumClientTest(unittest.TestCase):

diff --git a/automon/integrations/seleniumWrapper/tests/test_browser_useragent.py b/automon/integrations/seleniumWrapper/tests/test_browser_useragent.py
@@ -1,13 +1,15 @@
 import unittest
 
 from automon.integrations.seleniumWrapper.browser import SeleniumBrowser
+from automon.integrations.seleniumWrapper.config_webdriver_chrome import ChromeWrapper
 
 browser = SeleniumBrowser()
-browser.config.set_webdriver().Chrome().enable_defaults().enable_headless()
+browser.config.webdriver_wrapper = ChromeWrapper()
+browser.config.webdriver_wrapper.enable_defaults().enable_headless()
 
 agent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:112.0) Gecko/20100101 Firefox/112.0'
 
-browser.config.set_webdriver().webdriver_wrapper.set_user_agent(agent)
+browser.config.webdriver_wrapper.set_user_agent(agent)
 
 
 class SeleniumClientTest(unittest.TestCase):

diff --git a/automon/integrations/seleniumWrapper/tests/test_new_browser.py b/automon/integrations/seleniumWrapper/tests/test_new_browser.py
@@ -1,9 +1,11 @@
 import unittest
 
 from automon.integrations.seleniumWrapper.browser import SeleniumBrowser
+from automon.integrations.seleniumWrapper.config_webdriver_chrome import ChromeWrapper
 
 browser = SeleniumBrowser()
-browser.config.set_webdriver().Chrome().enable_defaults().enable_headless()
+browser.config.webdriver_wrapper = ChromeWrapper()
+browser.config.webdriver_wrapper.enable_defaults().enable_headless()
 
 
 class SeleniumClientTest(unittest.TestCase):