.github/workflows/check-lint.yml

@@ -23,13 +23,13 @@ jobs:
         id: setup-python
         uses: actions/setup-python@v3
         with:
-          python-version: '3.10.6'
+          python-version: '3.10'
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------
       - name: Install poetry
         env:  # Keep in sync with `POETRY_VERSION` in `Dockerfile`
-          POETRY_VERSION: "1.2.0"
+          POETRY_VERSION: "1.1.14"
         run: |
           curl -sSL "https://install.python-poetry.org" | python -
           # Adding `poetry` to `$PATH`:

.github/workflows/poetry-test.yml

@@ -23,13 +23,13 @@ jobs:
         id: setup-python
         uses: actions/setup-python@v3
         with:
-          python-version: '3.10.6'
+          python-version: '3.10'
       #----------------------------------------------
       #  -----  install & configure poetry  -----
       #----------------------------------------------
       - name: Install poetry
         env:  # Keep in sync with `POETRY_VERSION` in `Dockerfile`
-          POETRY_VERSION: "1.2.0"
+          POETRY_VERSION: "1.1.14"
         run: |
           curl -sSL "https://install.python-poetry.org" | python -
           # Adding `poetry` to `$PATH`:

app/core/bot.py

@@ -90,9 +90,7 @@ class TransportBot:
         )
 
     @staticmethod
-    async def morning_bus_mailing(
+    async def morning_bus_mailing(chat_ids: list[int] | None) -> None:
-        chat_ids: list[int] | None, show_keyboard: bool = False
-    ) -> None:
         if not chat_ids:
             return None
 
@@ -106,15 +104,10 @@ class TransportBot:
                 'т19',
             ],
         )
-        kwargs = {'reply_markup': TransportBot.get_keyboard()} if show_keyboard else {}
-
         await asyncio.gather(
             *[
                 TransportBot.bot.send_message(
-                    chat_id=chat_id,
+                    chat_id=chat_id, text=text, parse_mode=types.ParseMode.HTML
-                    text=text,
-                    parse_mode=types.ParseMode.HTML,
-                    **kwargs
                 )
                 for chat_id in chat_ids
             ]

app/core/scheduler.py

@@ -9,32 +9,25 @@ bot_cron_jobs = {
         'job': TransportBot.morning_bus_mailing,
         'cron': [
             {
-                'time': {
+                'trigger': 'cron',
-                    'trigger': 'cron',
+                'day_of_week': 'mon-fri',
-                    'day_of_week': 'mon-fri',
+                'hour': 8,
-                    'hour': 8,
+                'minute': 59,
-                    'minute': 59,
+                'second': 0,
-                    'second': 0,
-                },
             },
             {
-                'time': {
+                'trigger': 'cron',
-                    'trigger': 'cron',
+                'day_of_week': 'mon-fri',
-                    'day_of_week': 'mon-fri',
+                'hour': 9,
-                    'hour': 9,
+                'minute': 4,
-                    'minute': 4,
+                'second': 0,
-                    'second': 0,
-                },
             },
             {
-                'time': {
+                'trigger': 'cron',
-                    'trigger': 'cron',
+                'day_of_week': 'mon-fri',
-                    'day_of_week': 'mon-fri',
+                'hour': 9,
-                    'hour': 9,
+                'minute': 9,
-                    'minute': 9,
+                'second': 0,
-                    'second': 0,
-                },
-                'kwargs_per_job': {'show_keyboard': True},
             },
         ],
         'func_kwargs': {
@@ -61,11 +54,7 @@ class BotScheduler:
             return None
         for cron in cron_jobs['cron']:
             self.scheduler.add_job(
-                cron_jobs['job'],
+                cron_jobs['job'], kwargs=cron_jobs.get('func_kwargs'), **cron
-                kwargs=dict(
-                    **cron_jobs.get('func_kwargs'), **cron.get('kwargs_per_job', {})
-                ),
-                **cron['time'],
             )
             logger.info(f'Added scheduled job: {cron_jobs["job"].__name__} {cron}')
 

deploy/Dockerfile.bot

@@ -30,7 +30,7 @@ RUN printf "================\n\nStart build app. USER is: "${USER}"\n\n=========
     sshpass \
   && pip install --upgrade pip \
   # Installing `poetry` package manager:
-  && pip install poetry wheel\
+  && pip install poetry \
   # Cleaning cache:
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && apt-get clean -y && rm -rf /var/lib/apt/lists/*
@@ -47,7 +47,7 @@ RUN if [ "$USER" != "root" ]; then \
 COPY --chown="$USER":"$USER" ./poetry.lock ./pyproject.toml /app/
 
 # Installing requirements
-RUN poetry --version \
+RUN poetry version \
   && poetry run pip install -U pip \
   && poetry install \
     $(if [ "$USER" != 'root' ]; then echo '--no-dev'; fi) \