♻️ Up dependency (#16)

.flake8

@@ -3,17 +3,35 @@ max-line-length = 125
 max-module-members = 9
 
 ignore =
-    DAR101,  # Missing parameter(s) in Docstring
-    DAR201,  # Missing "Returns" in Docstring
-    DAR401,  # Missing exception(s) in Raises section
+    # Missing parameter(s) in Docstring
+    DAR101,
 
-    WPS204,  # Found overused expression
-    WPS305,  # F-strings is OK
-    WPS306,  # Found class without a base class - dataclass used
-    WPS323,  # Found `%` string formatting - simple logging format
-    WPS332,  # Walrus operator is OK
+    # Missing "Returns" in Docstring
+    DAR201,
 
-    S311,    # Standard pseudo-random generators are not suitable for security/cryptographic purposes is OK for the project
+    # Missing exception(s) in Raises section
+    DAR401,
+
+    # Found overused expression
+    WPS204,
+
+    #  Found too long ``try`` body length
+    WPS229,
+
+    # F-strings is OK
+    WPS305,
+
+    # Found class without a base class - dataclass used
+    WPS306,
+
+    # Found `%` string formatting - simple logging format
+    WPS323,
+
+    # Found walrus operator
+    WPS332,
+
+    # Standard pseudo-random generators are not suitable for security/cryptographic purposes is OK for the project
+    S311,
 
 
 per-file-ignores =
@@ -26,7 +44,6 @@ per-file-ignores =
     #  WPS432   Found magic number - ok for settings
     #  WPS604   Found incorrect node inside `class` body - custom exceptions
     #  F401:    imported but unused
-
     epsilion_wars_mmorpg_automation/exceptions.py: WPS420, WPS604,
     epsilion_wars_mmorpg_automation/settings.py: WPS432,
     epsilion_wars_mmorpg_automation/shared_state.py: WPS407,

.github/workflows/linters.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.11']
+        python-version: ['3.12']
     steps:
     - uses: actions/checkout@v2
 
@@ -24,8 +24,8 @@ jobs:
 
     - name: Run MyPy
       run: |
-        poetry run mypy epsilion_wars_mmorpg_automation/ etc/
+        poetry run mypy epsilion_wars_mmorpg_automation/
 
     - name: Run flake8
       run: |
-        poetry run flake8 epsilion_wars_mmorpg_automation/ etc/
+        poetry run flake8 epsilion_wars_mmorpg_automation/

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.11']
+        python-version: ['3.12']
     steps:
     - uses: actions/checkout@v2
 

README.md

@@ -16,7 +16,8 @@ Table of Contents
 
 * [What about the rules?](#what-about-the-rules)
 * [Requirements](#requirements)
-* [Installation](#installation)
+* [Installation Windows](#installation-windows)
+* [Installation Linux](#installation-linux)
 * [Usage](#usage)
   * [Grinding](#grinding)
   * [Farming](#farming-experimental)
@@ -26,7 +27,6 @@ Table of Contents
   * [What about the captcha?](#what-about-the-captcha)
 * [Developers](#developers)
   * [Run on server](#run-on-server)
-  * [TData converter](#tdata-converter)
   * [Need more characters](#need-more-characters)
 
 
@@ -36,7 +36,7 @@ TL;DR Screw [the rules](https://teletype.in/@epsilionwar/HkPsNEfZL)
 ![img.png](assets/block.png)
 
 ## Requirements
-1. [Python 3.11 or later](https://www.python.org/downloads/) and [pip](https://pip.pypa.io/en/stable/installation/) 
+1. [Python 3.12 or later](https://www.python.org/downloads/) and [pip](https://pip.pypa.io/en/stable/installation/) 
 2. Telegram [API ID and token](https://docs.telethon.dev/en/stable/basic/signing-in.html#signing-in)
 3. [Registration](https://t.me/epsilionwarbot?start=ref-537453818) on the game.
 
@@ -215,12 +215,6 @@ vi /etc/supervisor/conf.d/epsa.conf
 service supervisor restart
 ```
 
-### TData converter
-If you plan to buy Telegram accounts, you will need a utility to convert credentials from tdata to .session (for Telethon library).
-```shell
-python etc/tdata_converter.py -f ~/.local/share/TelegramDesktop/tdata
-```
-
 ### Need more characters?
 The game allows you to have three characters per telegram account. 
 If you need more, you will need new telegram accounts. 

epsilion_wars_mmorpg_automation/captcha/anti_captcha_provider.py

@@ -59,7 +59,7 @@ async def create_task(self, image_base64: str) -> dict:
                 raise AntiCaptchaError('network error') from fetch_exc
 
         task_data = response.json()
-        logging.info(f'response createTask {task_data=}')
+        logging.info('response createTask {0}'.format(task_data))
         error = task_data.get('errorCode')
         if error:
             raise AntiCaptchaError(error)
@@ -88,7 +88,7 @@ async def get_task(self, task_id: int) -> dict:
                 raise AntiCaptchaError('network error') from fetch_exc
 
         task_data = response.json()
-        logging.info(f'response getTaskResult {task_data=}')
+        logging.info('response getTaskResult {0}'.format(task_data))
         error = task_data.get('errorCode')
         if error:
             raise AntiCaptchaError(error)

epsilion_wars_mmorpg_automation/captcha/simple_grammar.py

@@ -60,7 +60,7 @@ async def simple_grammar(message: str, *_: Any) -> str | None:
 
     found_word_pattern = found.group('question').replace('*', '.').strip().lower()
     found_word_pattern = replace_eng_chars(found_word_pattern)
-    logging.debug(f'grammar captcha resolver: {found_word_pattern=}')
+    logging.debug('grammar captcha resolver: {0}'.format(found_word_pattern))
 
     for answer in _words:
         if re.match(found_word_pattern, answer):

epsilion_wars_mmorpg_automation/game/action/common.py

@@ -23,7 +23,7 @@ async def ping(entity: int | events.NewMessage.Event) -> None:
     message = random.choice(
         seq=app_settings.ping_commands,
     )
-    logging.info(f'call ping command debug {game_bot_id=} {message=}')
+    logging.info(f'call ping command debug {game_bot_id} {message}')
     await wait_for()
     await client.send_message(
         entity=game_bot_id,

epsilion_wars_mmorpg_automation/settings.py

@@ -2,7 +2,15 @@
 import os
 from typing import Literal
 
-from pydantic import BaseSettings, Field
+from pydantic import Field
+from pydantic_settings import BaseSettings
+
+APP_PATH = os.path.abspath(
+    os.path.join(
+        os.path.dirname(__file__),
+        '..',
+    ),
+)
 
 
 class AppSettings(BaseSettings):
@@ -22,7 +30,10 @@ class AppSettings(BaseSettings):
     captcha_solver_enabled: bool = True
 
     select_combo_strategy: Literal['simple', 'random', 'random-or-skip', 'disabled', 'tuned', 'priority'] = 'simple'
-    skip_combo_chance: int = Field(default=30, description='Chance to skip combo bite if `random-or-skip` strategy selected')
+    skip_combo_chance: int = Field(
+        default=30,
+        description='Chance to skip combo bite if `random-or-skip` strategy selected',
+    )
 
     skip_random_vendor: bool = True
     skip_random_vendor_stop_words: str = 'Свиток Кселеса,Безопасный свиток заточки [IV]'
@@ -178,7 +189,7 @@ class AppSettings(BaseSettings):
 
 
 app_settings = AppSettings(
-    _env_file=os.path.join(os.path.dirname(__file__), '..', '.env'),
+    _env_file=os.path.join(APP_PATH, '.env'),  # type: ignore
 )
 
 game_bot_name = app_settings.game_username_backup if app_settings.use_backup_game_bot else app_settings.game_username

epsilion_wars_mmorpg_automation/trainer/captcha_solver.py

@@ -18,7 +18,7 @@ async def main() -> None:
         'captcha_solver_enabled': app_settings.captcha_solver_enabled,
         'anti_captcha_enabled': bool(app_settings.anti_captcha_com_apikey),
     }
-    logging.info(f'start captcha-solver ({local_settings=})')
+    logging.info('start captcha-solver ({0})'.format(local_settings))
 
     if not app_settings.captcha_solver_enabled:
         logging.warning('Enable captcha_solver_enabled setting first')

epsilion_wars_mmorpg_automation/trainer/farming.py

@@ -24,7 +24,7 @@ async def main(repair_locations_path: str = '') -> None:
         'repair_locations_path': app_settings.repair_locations_path,
     }
     repair_locations_path = repair_locations_path or app_settings.repair_locations_path
-    logging.info(f'start farming ({local_settings=}), {repair_locations_path}')
+    logging.info(f'start farming ({local_settings}), {repair_locations_path}')
 
     shared_state.REPAIR_LOCATIONS_PATH = repair_locations_path.split(',')
 

epsilion_wars_mmorpg_automation/trainer/grinding.py

@@ -27,7 +27,7 @@ async def main(execution_limit_minutes: int | None = None) -> None:
         'notifications_enabled': app_settings.notifications_enabled,
         'slow_mode': app_settings.slow_mode,
     }
-    logging.info(f'start grinding ({local_settings=})')
+    logging.info('start grinding ({0})'.format(local_settings))
     logging.info('move u character to hunting location first')
 
     me = await client.get_me()

epsilion_wars_mmorpg_automation/trainer/handlers/common.py

@@ -10,7 +10,7 @@
 from epsilion_wars_mmorpg_automation.trainer import loop
 
 
-async def skip_turn_handler(event: events.NewMessage.Event) -> None:
+async def skip_turn_handler(_: events.NewMessage.Event) -> None:
     """Just skip event."""
     logging.info('skip event')
 

epsilion_wars_mmorpg_automation/trainer/handlers/fishing.py

@@ -11,7 +11,7 @@ async def fishing_start(event: events.NewMessage.Event) -> None:
     logging.info('start fishing event')
     response = await action.fishing_actions.select_fishing_type(event)
     if response:
-        logging.info(f'{response.message=}')
+        logging.info(f'{response.message}')
         if state.fishing_states.is_rod_equip_needed(response.message):
             await action.common_actions.show_equip(event)
 

epsilion_wars_mmorpg_automation/trainer/handlers/hunting.py

@@ -11,7 +11,7 @@ async def hunting_start(event: events.NewMessage.Event) -> None:
     logging.info('start hunting event')
     response = await action.hunting_actions.select_hunt_type(event)
     if response:
-        logging.info(f'{response.message=}')
+        logging.info(f'{response.message}')
         if state.hunting_states.is_bow_equip_needed(response.message):
             await action.common_actions.show_equip(event)
 

epsilion_wars_mmorpg_automation/wait_utils.py

@@ -22,7 +22,7 @@ class WaitActions(enum.Enum):
 
 
 async def wait_for(timing: WaitActions = WaitActions.COMMON) -> None:
-    """Lets wait like human =)."""
+    """Let wait like human."""
     min_seconds, max_seconds, min_slow_mode, max_slow_mode = timing.value
     if app_settings.slow_mode:
         sleep_time = random.randint(min_slow_mode, max_slow_mode)