selenoid firefox to chrome

app/core/application.py

@@ -4,6 +4,7 @@ from dataclasses import dataclass
 from aiogram import Dispatcher
 from aiogram.utils.executor import start_polling
 from aiohttp import web
+
 from app.core.bot import TransportBot
 from app.core.routes import Handler
 from app.core.scheduler import BotScheduler, bot_scheduler
@@ -37,7 +38,7 @@ class Application:
         session = await TransportBot.bot.get_session()
         if session and not session.closed:
             await session.close()
-            await asyncio.sleep(0.2)
+            await asyncio.sleep(0)
 
         logger.warning('Bye!')
 

app/core/bot.py

@@ -5,6 +5,7 @@ from aiogram import Bot, types
 from aiogram.contrib.middlewares.logging import LoggingMiddleware
 from aiogram.dispatcher import Dispatcher
 from aiogram.utils.callback_data import CallbackData
+
 from app.core.parse_web import WebParser
 from app.settings import TELEGRAM_API_TOKEN
 

app/core/parse_web.py

@@ -1,67 +1,25 @@
-import os
-import tarfile
 import time
 from collections import defaultdict
-from pathlib import Path
 
-import wget
-from app.core.utils import logger, timed_cache
-from app.settings import BASE_DIR, DRIVER_SESSION_TTL, GECKO_DRIVER_VERSION
 from selenium import webdriver
 from selenium.common.exceptions import (
     NoSuchElementException,
     StaleElementReferenceException,
-    WebDriverException,
 )
-from selenium.webdriver.firefox import options
-from selenium.webdriver.firefox.service import Service
-from selenium.webdriver.firefox.webdriver import RemoteWebDriver, WebDriver
+from selenium.webdriver.remote.webdriver import WebDriver
+
+from app.core.utils import logger, timed_cache
+from app.settings import DRIVER_SESSION_TTL
 
 
 class WebParser:
-    @staticmethod
-    def download_gecko_driver() -> None:
-        gecko_driver_url = (
-            f'https://github.com/mozilla/geckodriver/releases/download/v{GECKO_DRIVER_VERSION}/'
-            f'geckodriver-v{GECKO_DRIVER_VERSION}-linux64.tar.gz'
-        )
-
-        if not Path(BASE_DIR / 'geckodriver').exists():
-            logger.info(f'Downloading gecodriver v {GECKO_DRIVER_VERSION}...')
-            geckodriver_file = wget.download(
-                url=gecko_driver_url, out=BASE_DIR.resolve().as_posix()
-            )
-
-            with tarfile.open(geckodriver_file) as tar:
-                tar.extractall(BASE_DIR)
-            os.remove(
-                f'{BASE_DIR / "geckodriver"}-v{GECKO_DRIVER_VERSION}-linux64.tar.gz'
-            )
-            logger.info(f'\ngeckodriver has been downloaded to folder {BASE_DIR}')
-
-    @staticmethod
-    def configure_firefox_driver(private_window: bool = False) -> WebDriver | None:
-        opt = options.Options()
-        opt.headless = True
-        opt.add_argument('-profile')
-        opt.add_argument(f'{Path.home()}/snap/firefox/common/.mozilla/firefox')
-        if private_window:
-            opt.set_preference("browser.privatebrowsing.autostart", True)
-        service = Service(executable_path=(BASE_DIR / 'geckodriver').as_posix())
-        try:
-            firefox_driver = webdriver.Firefox(service=service, options=opt)
-            return firefox_driver
-        except WebDriverException:
-            logger.error('Error configuring webdriver. Possible it already configured')
-            return None
-
     @staticmethod
     def parse_yandex_maps(
         *,
         url: str,
         message: str,
         buses: list[str],
-        driver: RemoteWebDriver | None = None,
+        driver: WebDriver | None = None,
     ) -> str:
         if not driver:
             logger.error('Driver is not configured')
@@ -105,10 +63,10 @@ class WebParser:
 
     @staticmethod
     @timed_cache(seconds=DRIVER_SESSION_TTL)
-    def get_driver() -> RemoteWebDriver:
-        opt = options.Options()
-        opt.headless = True
-        driver = RemoteWebDriver(
+    def get_driver() -> WebDriver:
+        opt = webdriver.ChromeOptions()
+        opt.add_argument('--headless')
+        driver = webdriver.Remote(
             command_executor='http://selenoid_host:4444/wd/hub', options=opt
         )
         return driver

app/core/routes.py

@@ -3,6 +3,7 @@ from http import HTTPStatus
 
 from aiogram.types import Update
 from aiohttp import web
+
 from app.core.bot import TransportBot
 
 
@@ -28,4 +29,4 @@ class Handler:
         while True:
             update = await self.queue.get()
             await TransportBot.dispatcher.process_update(update)
-            await asyncio.sleep(0.1)
+            await asyncio.sleep(0)

app/core/scheduler.py

@@ -1,8 +1,9 @@
 from typing import Any
 
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+
 from app.core.bot import TransportBot
 from app.core.utils import logger
-from apscheduler.schedulers.asyncio import AsyncIOScheduler
 
 bot_cron_jobs = {
     'morning_home->work_bus': {