Исправление ошибок «чистого» запуска (#47)

* fix(OrioksHelper): semaphore length getting bug

* chore(requirements): get rid of `install` requirement

This line crashed requirements installing process (see below). No code is using the package, so removing the dependency looks acceptable.

FYI: `install` is `pip-install` now, see: pypi/support#451

* chore(.gitignore): add `.vscode/` for better VS Code experience

* refactor(OrioksHelper): get rid of not working users queue

* refactor(UserHelper): silence `increment_failed_request_count` bug

* fix(get_orioks_news): add users data clearing on error in `user_news_check_from_news_id`

* build(requirements): support pip-compile, remove unnecessary requirements

* refactor: apply `pylint` + `black`

Author: Psychosoc1al

.gitignore

@@ -1,6 +1,7 @@
 __pycache__/
 venv/
 .idea/
+.vscode/
 setenv.sh
 users_data/**/*.json
 users_data/**/*.pkl

app/helpers/OrioksHelper.py

@@ -10,11 +10,9 @@
 
 from app.exceptions import OrioksInvalidLoginCredentialsException
 from app.helpers import (
-    TelegramMessageHelper,
     CommonHelper,
     UserHelper,
 )
-import aiogram.utils.markdown as md
 
 from config import config
 
@@ -27,29 +25,6 @@ async def orioks_login_save_cookies(
         user_login: int, user_password: str, user_telegram_id: int
     ) -> None:
         # pylint: disable=protected-access
-        user_queue = len(_sem._waiters) + 2
-        if user_queue - 2 > 0:
-            logging.info('login: %s', user_queue)
-            _cats_queue_emoji = f'{"🐈" * (user_queue - 1)}🐈‍⬛'
-            await TelegramMessageHelper.text_message_to_user(
-                user_telegram_id=user_telegram_id,
-                message=md.text(
-                    md.text(_cats_queue_emoji),
-                    md.text(
-                        md.text(
-                            f'Твой номер в очереди на авторизацию: {user_queue}.'
-                        ),
-                        md.text(
-                            'Ты получишь уведомление, когда она будет выполнена.'
-                        ),
-                        sep=' ',
-                    ),
-                    md.text(
-                        'Это предотвращает слишком большую нагрузку на ОРИОКС'
-                    ),
-                    sep='\n',
-                ),
-            )
         async with _sem:
             async with ClientSession(
                 timeout=config.REQUESTS_TIMEOUT,

app/helpers/UserHelper.py

@@ -1,8 +1,5 @@
-from aiogram.utils import markdown
-
 from app.exceptions import DatabaseException
 from app.models.users import UserStatus, UserNotifySettings
-from config import config
 
 
 class UserHelper:
@@ -126,32 +123,8 @@ def get_users_with_enabled_news_subscription():
         return users
 
     @staticmethod
-    async def increment_failed_request_count(user_telegram_id: int) -> None:
-        user = UserHelper.__get_user_by_telegram_id(
-            user_telegram_id=user_telegram_id
-        )
-        user.failed_request_count += 1
-        if user.failed_request_count > config.ORIOKS_MAX_FAILED_REQUESTS:
-            from app.helpers import OrioksHelper
-            from app.helpers import TelegramMessageHelper
-
-            OrioksHelper.make_orioks_logout(user_telegram_id=user_telegram_id)
-            await TelegramMessageHelper.text_message_to_user(
-                user_telegram_id=user_telegram_id,
-                message=markdown.text(
-                    markdown.hbold('Ваш аккаунт был деавторизирован.'),
-                    markdown.text(
-                        '🔧 Ошибки при получении данных с сервера ОРИОКС.'
-                    ),
-                    markdown.text('Пожалуйста, авторизуйтесь заново: /login'),
-                    markdown.text(),
-                    markdown.text(
-                        'Связаться с поддержкой Бота: @orioks_monitoring_support_bot'
-                    ),
-                    sep='\n',
-                ),
-            )
-        user.save()
+    async def increment_failed_request_count(_: int) -> None:
+        return  # FIXME
 
     @staticmethod
     def reset_failed_request_count(user_telegram_id: int) -> None:

checking/news/get_orioks_news.py

@@ -172,6 +172,7 @@ async def user_news_check_from_news_id(
             message=f'[{user_telegram_id}] - old_json["last_id"] > last_news_id["last_id"]'
         )
         await session.close()
+        CommonHelper.safe_delete(path=path_users_to_file)
         raise Exception(
             f'[{user_telegram_id}] - old_json["last_id"] > last_news_id["last_id"]'
         )

requirements.in

@@ -0,0 +1,15 @@
+aiofiles==0.8.0
+aiogram==2.19
+aioschedule==0.5.2
+alembic==1.8.0
+beautifulsoup4==4.10.0
+Mako==1.2.0
+mypy==0.960
+Pillow==9.1.0
+pylint-runner==0.6.0
+pylint==2.14.1
+python-dotenv==0.20.0
+qrcode==7.3.1
+requests==2.27.1
+SQLAlchemy==1.4.37
+types-aiofiles==0.8.8

requirements.txt

@@ -1,67 +1,120 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile
+#
 aiofiles==0.8.0
+    # via -r requirements.in
 aiogram==2.19
-aiohttp==3.8.1
+    # via -r requirements.in
+aiohttp==3.8.6
+    # via aiogram
 aioschedule==0.5.2
-aiosignal==1.2.0
+    # via -r requirements.in
+aiosignal==1.3.2
+    # via aiohttp
 alembic==1.8.0
-anyio==3.5.0
-astroid==2.11.5
-async-generator==1.10
-async-timeout==4.0.2
-attrs==21.4.0
-Babel==2.9.1
+    # via -r requirements.in
+astroid==2.11.7
+    # via pylint
+async-timeout==4.0.3
+    # via aiohttp
+attrs==24.3.0
+    # via aiohttp
+babel==2.9.1
+    # via aiogram
 beautifulsoup4==4.10.0
-certifi==2021.10.8
-cffi==1.15.0
+    # via -r requirements.in
+certifi==2024.12.14
+    # via
+    #   aiogram
+    #   requests
 charset-normalizer==2.0.12
-colorama==0.4.4
-cryptography==36.0.1
-dill==0.3.5.1
-frozenlist==1.3.0
-greenlet==1.1.2
-h11==0.12.0
-html2image==2.0.1
-httpcore==0.14.7
-httpx==0.22.0
-idna==3.3
-imgkit==1.2.2
-importlib-metadata==4.11.4
-importlib-resources==5.7.1
-install==1.3.5
-isort==5.10.1
-lazy-object-proxy==1.7.1
-Mako==1.2.0
-MarkupSafe==2.1.1
+    # via
+    #   aiohttp
+    #   requests
+colorama==0.4.6
+    # via
+    #   pylint
+    #   pylint-runner
+    #   qrcode
+dill==0.3.9
+    # via pylint
+frozenlist==1.5.0
+    # via
+    #   aiohttp
+    #   aiosignal
+greenlet==3.1.1
+    # via sqlalchemy
+idna==3.10
+    # via
+    #   requests
+    #   yarl
+isort==5.13.2
+    # via pylint
+lazy-object-proxy==1.10.0
+    # via astroid
+mako==1.2.0
+    # via
+    #   -r requirements.in
+    #   alembic
+markupsafe==3.0.2
+    # via mako
 mccabe==0.7.0
-multidict==6.0.2
+    # via pylint
+multidict==6.1.0
+    # via
+    #   aiohttp
+    #   yarl
 mypy==0.960
-mypy-extensions==0.4.3
-outcome==1.1.0
-Pillow==9.1.0
-platformdirs==2.5.2
-pycparser==2.21
+    # via -r requirements.in
+mypy-extensions==1.0.0
+    # via mypy
+pillow==9.1.0
+    # via -r requirements.in
+platformdirs==4.3.6
+    # via pylint
+propcache==0.2.1
+    # via yarl
 pylint==2.14.1
+    # via
+    #   -r requirements.in
+    #   pylint-runner
 pylint-runner==0.6.0
-pyOpenSSL==22.0.0
-PySocks==1.7.1
+    # via -r requirements.in
 python-dotenv==0.20.0
-pytz==2021.3
+    # via -r requirements.in
+pytz==2024.2
+    # via babel
 qrcode==7.3.1
+    # via -r requirements.in
 requests==2.27.1
-rfc3986==1.5.0
-six==1.16.0
-sniffio==1.2.0
-sortedcontainers==2.4.0
-soupsieve==2.3.1
-SQLAlchemy==1.4.37
-tomli==2.0.1
-tomlkit==0.11.0
-trio==0.20.0
-trio-websocket==0.9.2
+    # via -r requirements.in
+soupsieve==2.6
+    # via beautifulsoup4
+sqlalchemy==1.4.37
+    # via
+    #   -r requirements.in
+    #   alembic
+tomli==2.2.1
+    # via
+    #   mypy
+    #   pylint
+tomlkit==0.13.2
+    # via pylint
 types-aiofiles==0.8.8
-typing_extensions==4.2.0
-urllib3==1.26.8
-wrapt==1.14.1
-wsproto==1.1.0
-yarl==1.7.2
-zipp==3.8.0
+    # via -r requirements.in
+typing-extensions==4.12.2
+    # via
+    #   multidict
+    #   mypy
+urllib3==1.26.20
+    # via requests
+wrapt==1.17.2
+    # via astroid
+yarl==1.18.3
+    # via aiohttp
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools