smart-bot-factory 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

smart_bot_factory/aiogram_calendar/__init__.py

@@ -1,6 +1,14 @@
 from .common import get_user_locale
-from .simple_calendar import SimpleCalendar
 from .dialog_calendar import DialogCalendar
-from .schemas import SimpleCalendarCallback, DialogCalendarCallback, CalendarLabels
+from .schemas import (CalendarLabels, DialogCalendarCallback,
+                      SimpleCalendarCallback)
+from .simple_calendar import SimpleCalendar
 
-__all__ = ['SimpleCalendar', 'DialogCalendar', 'SimpleCalendarCallback', 'DialogCalendarCallback', 'CalendarLabels', 'get_user_locale']
+__all__ = [
+    "SimpleCalendar",
+    "DialogCalendar",
+    "SimpleCalendarCallback",
+    "DialogCalendarCallback",
+    "CalendarLabels",
+    "get_user_locale",
+]

smart_bot_factory/aiogram_calendar/common.py

@@ -1,41 +1,35 @@
 import calendar
 import locale
+from datetime import datetime
 
 from aiogram.types import User
-from datetime import datetime
 
 from .schemas import CalendarLabels
 
 
 async def get_user_locale(from_user: User) -> str:
-    "Returns user locale in format en_US, accepts User instance from Message, CallbackData etc"
-    loc = from_user.language_code
-    return locale.locale_alias[loc].split(".")[0]
+    "Always returns ru_RU locale for consistent Russian language support"
+    return "ru_RU"
 
 
 class GenericCalendar:
 
     def __init__(
         self,
-        locale: str = None,
+        locale: str = None,  # оставляем для обратной совместимости
         cancel_btn: str = None,
         today_btn: str = None,
-        show_alerts: bool = False
+        show_alerts: bool = False,
     ) -> None:
-        """Pass labels if you need to have alternative language of buttons
+        """Initialize calendar with Russian language by default
 
         Parameters:
-        locale (str): Locale calendar must have captions in (in format uk_UA), if None - default English will be used
+        locale (str): Ignored, always uses Russian
         cancel_btn (str): label for button Cancel to cancel date input
         today_btn (str): label for button Today to set calendar back to todays date
         show_alerts (bool): defines how the date range error would shown (defaults to False)
         """
         self._labels = CalendarLabels()
-        if locale:
-            # getting month names and days of week in specified locale
-            with calendar.different_locale(locale):
-                self._labels.days_of_week = list(calendar.day_abbr)
-                self._labels.months = calendar.month_abbr[1:]
 
         if cancel_btn:
             self._labels.cancel_caption = cancel_btn
@@ -56,15 +50,15 @@ class GenericCalendar:
         date = datetime(int(data.year), int(data.month), int(data.day))
         if self.min_date and self.min_date > date:
             await query.answer(
-                f'The date have to be later {self.min_date.strftime("%d/%m/%Y")}',
-                show_alert=self.show_alerts
+                f'Дата должна быть позже {self.min_date.strftime("%d/%m/%Y")}',
+                show_alert=self.show_alerts,
             )
             return False, None
         elif self.max_date and self.max_date < date:
             await query.answer(
-                f'The date have to be before {self.max_date.strftime("%d/%m/%Y")}',
-                show_alert=self.show_alerts
+                f'Дата должна быть раньше {self.max_date.strftime("%d/%m/%Y")}',
+                show_alert=self.show_alerts,
             )
             return False, None
         await query.message.delete_reply_markup()  # removing inline keyboard
-        return True, date
+        return True, date

smart_bot_factory/aiogram_calendar/dialog_calendar.py

@@ -1,16 +1,19 @@
 import calendar
 from datetime import datetime
 
-from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
-from aiogram.types import CallbackQuery
+from aiogram.types import (CallbackQuery, InlineKeyboardButton,
+                           InlineKeyboardMarkup)
 
-from .schemas import DialogCalendarCallback, DialogCalAct, highlight, superscript
 from .common import GenericCalendar
+from .schemas import (DialogCalAct, DialogCalendarCallback, highlight,
+                      superscript)
 
 
 class DialogCalendar(GenericCalendar):
 
-    ignore_callback = DialogCalendarCallback(act=DialogCalAct.ignore).pack()    # placeholder for no answer buttons
+    ignore_callback = DialogCalendarCallback(
+        act=DialogCalAct.ignore
+    ).pack()  # placeholder for no answer buttons
 
     async def _get_month_kb(self, year: int):
         """Creates an inline keyboard with months for specified year"""
@@ -25,14 +28,22 @@ class DialogCalendar(GenericCalendar):
         years_row.append(
             InlineKeyboardButton(
                 text=self._labels.cancel_caption,
-                callback_data=DialogCalendarCallback(act=DialogCalAct.cancel, year=year, month=1, day=1).pack()
+                callback_data=DialogCalendarCallback(
+                    act=DialogCalAct.cancel, year=year, month=1, day=1
+                ).pack(),
             )
         )
-        years_row.append(InlineKeyboardButton(
-            text=str(year) if year != today.year else highlight(year),
-            callback_data=DialogCalendarCallback(act=DialogCalAct.start, year=year, month=-1, day=-1).pack()
-        ))
-        years_row.append(InlineKeyboardButton(text=" ", callback_data=self.ignore_callback))
+        years_row.append(
+            InlineKeyboardButton(
+                text=str(year) if year != today.year else highlight(year),
+                callback_data=DialogCalendarCallback(
+                    act=DialogCalAct.start, year=year, month=-1, day=-1
+                ).pack(),
+            )
+        )
+        years_row.append(
+            InlineKeyboardButton(text=" ", callback_data=self.ignore_callback)
+        )
         kb.append(years_row)
         # two rows with 6 months buttons
         month6_row = []
@@ -44,21 +55,25 @@ class DialogCalendar(GenericCalendar):
             return month_str
 
         for month in range(1, 7):
-            month6_row.append(InlineKeyboardButton(
-                text=highlight_month(),
-                callback_data=DialogCalendarCallback(
-                    act=DialogCalAct.set_m, year=year, month=month, day=-1
-                ).pack()
-            ))
+            month6_row.append(
+                InlineKeyboardButton(
+                    text=highlight_month(),
+                    callback_data=DialogCalendarCallback(
+                        act=DialogCalAct.set_m, year=year, month=month, day=-1
+                    ).pack(),
+                )
+            )
         month12_row = []
 
         for month in range(7, 13):
-            month12_row.append(InlineKeyboardButton(
-                text=highlight_month(),
-                callback_data=DialogCalendarCallback(
-                    act=DialogCalAct.set_m, year=year, month=month, day=-1
-                ).pack()
-            ))
+            month12_row.append(
+                InlineKeyboardButton(
+                    text=highlight_month(),
+                    callback_data=DialogCalendarCallback(
+                        act=DialogCalAct.set_m, year=year, month=month, day=-1
+                    ).pack(),
+                )
+            )
 
         kb.append(month6_row)
         kb.append(month12_row)
@@ -101,23 +116,36 @@ class DialogCalendar(GenericCalendar):
         nav_row.append(
             InlineKeyboardButton(
                 text=self._labels.cancel_caption,
-                callback_data=DialogCalendarCallback(act=DialogCalAct.cancel, year=year, month=1, day=1).pack()
+                callback_data=DialogCalendarCallback(
+                    act=DialogCalAct.cancel, year=year, month=1, day=1
+                ).pack(),
+            )
+        )
+        nav_row.append(
+            InlineKeyboardButton(
+                text=str(year) if year != now_year else highlight(year),
+                callback_data=DialogCalendarCallback(
+                    act=DialogCalAct.start, year=year, month=-1, day=-1
+                ).pack(),
+            )
+        )
+        nav_row.append(
+            InlineKeyboardButton(
+                text=highlight_month(),
+                callback_data=DialogCalendarCallback(
+                    act=DialogCalAct.set_y, year=year, month=-1, day=-1
+                ).pack(),
             )
         )
-        nav_row.append(InlineKeyboardButton(
-            text=str(year) if year != now_year else highlight(year),
-            callback_data=DialogCalendarCallback(act=DialogCalAct.start, year=year, month=-1, day=-1).pack()
-        ))
-        nav_row.append(InlineKeyboardButton(
-            text=highlight_month(),
-            callback_data=DialogCalendarCallback(act=DialogCalAct.set_y, year=year, month=-1, day=-1).pack()
-        ))
         kb.append(nav_row)
 
         week_days_labels_row = []
         for weekday in self._labels.days_of_week:
-            week_days_labels_row.append(InlineKeyboardButton(
-                text=highlight_weekday(), callback_data=self.ignore_callback))
+            week_days_labels_row.append(
+                InlineKeyboardButton(
+                    text=highlight_weekday(), callback_data=self.ignore_callback
+                )
+            )
         kb.append(week_days_labels_row)
 
         month_calendar = calendar.monthcalendar(year, month)
@@ -126,19 +154,25 @@ class DialogCalendar(GenericCalendar):
             days_row = []
             for day in week:
                 if day == 0:
-                    days_row.append(InlineKeyboardButton(text=" ", callback_data=self.ignore_callback))
+                    days_row.append(
+                        InlineKeyboardButton(
+                            text=" ", callback_data=self.ignore_callback
+                        )
+                    )
                     continue
-                days_row.append(InlineKeyboardButton(
-                    text=highlight_day(),
-                    callback_data=DialogCalendarCallback(act=DialogCalAct.day, year=year, month=month, day=day).pack()
-                ))
+                days_row.append(
+                    InlineKeyboardButton(
+                        text=highlight_day(),
+                        callback_data=DialogCalendarCallback(
+                            act=DialogCalAct.day, year=year, month=month, day=day
+                        ).pack(),
+                    )
+                )
             kb.append(days_row)
         return InlineKeyboardMarkup(row_width=7, inline_keyboard=kb)
 
     async def start_calendar(
-        self,
-        year: int = datetime.now().year,
-        month: int = None
+        self, year: int = datetime.now().year, month: int = None
     ) -> InlineKeyboardMarkup:
         today = datetime.now()
         now_year = today.year
@@ -150,48 +184,76 @@ class DialogCalendar(GenericCalendar):
         # first row - years
         years_row = []
         for value in range(year - 2, year + 3):
-            years_row.append(InlineKeyboardButton(
-                text=str(value) if value != now_year else highlight(value),
-                callback_data=DialogCalendarCallback(act=DialogCalAct.set_y, year=value, month=-1, day=-1).pack()
-            ))
+            years_row.append(
+                InlineKeyboardButton(
+                    text=str(value) if value != now_year else highlight(value),
+                    callback_data=DialogCalendarCallback(
+                        act=DialogCalAct.set_y, year=value, month=-1, day=-1
+                    ).pack(),
+                )
+            )
         kb.append(years_row)
         # nav buttons
         nav_row = []
-        nav_row.append(InlineKeyboardButton(
-            text='<<',
-            callback_data=DialogCalendarCallback(act=DialogCalAct.prev_y, year=year, month=-1, day=-1).pack()
-        ))
-        nav_row.append(InlineKeyboardButton(
-            text=self._labels.cancel_caption,
-            callback_data=DialogCalendarCallback(act=DialogCalAct.cancel, year=year, month=1, day=1).pack()
-        ))
-        nav_row.append(InlineKeyboardButton(
-            text='>>',
-            callback_data=DialogCalendarCallback(act=DialogCalAct.next_y, year=year, month=1, day=1).pack()
-        ))
+        nav_row.append(
+            InlineKeyboardButton(
+                text="<<",
+                callback_data=DialogCalendarCallback(
+                    act=DialogCalAct.prev_y, year=year, month=-1, day=-1
+                ).pack(),
+            )
+        )
+        nav_row.append(
+            InlineKeyboardButton(
+                text=self._labels.cancel_caption,
+                callback_data=DialogCalendarCallback(
+                    act=DialogCalAct.cancel, year=year, month=1, day=1
+                ).pack(),
+            )
+        )
+        nav_row.append(
+            InlineKeyboardButton(
+                text=">>",
+                callback_data=DialogCalendarCallback(
+                    act=DialogCalAct.next_y, year=year, month=1, day=1
+                ).pack(),
+            )
+        )
         kb.append(nav_row)
         return InlineKeyboardMarkup(row_width=5, inline_keyboard=kb)
 
-    async def process_selection(self, query: CallbackQuery, data: DialogCalendarCallback) -> tuple:
+    async def process_selection(
+        self, query: CallbackQuery, data: DialogCalendarCallback
+    ) -> tuple:
         return_data = (False, None)
         if data.act == DialogCalAct.ignore:
             await query.answer(cache_time=60)
         if data.act == DialogCalAct.set_y:
-            await query.message.edit_reply_markup(reply_markup=await self._get_month_kb(int(data.year)))
+            await query.message.edit_reply_markup(
+                reply_markup=await self._get_month_kb(int(data.year))
+            )
         if data.act == DialogCalAct.prev_y:
             new_year = int(data.year) - 5
-            await query.message.edit_reply_markup(reply_markup=await self.start_calendar(year=new_year))
+            await query.message.edit_reply_markup(
+                reply_markup=await self.start_calendar(year=new_year)
+            )
         if data.act == DialogCalAct.next_y:
             new_year = int(data.year) + 5
-            await query.message.edit_reply_markup(reply_markup=await self.start_calendar(year=new_year))
+            await query.message.edit_reply_markup(
+                reply_markup=await self.start_calendar(year=new_year)
+            )
         if data.act == DialogCalAct.start:
-            await query.message.edit_reply_markup(reply_markup=await self.start_calendar(int(data.year)))
+            await query.message.edit_reply_markup(
+                reply_markup=await self.start_calendar(int(data.year))
+            )
         if data.act == DialogCalAct.set_m:
-            await query.message.edit_reply_markup(reply_markup=await self._get_days_kb(int(data.year), int(data.month)))
+            await query.message.edit_reply_markup(
+                reply_markup=await self._get_days_kb(int(data.year), int(data.month))
+            )
         if data.act == DialogCalAct.day:
 
             return await self.process_day_select(data, query)
 
         if data.act == DialogCalAct.cancel:
             await query.message.delete_reply_markup()
-        return return_data
+        return return_data

smart_bot_factory/aiogram_calendar/schemas.py

@@ -1,31 +1,30 @@
-from typing import Optional
 from enum import Enum
-
-from pydantic import BaseModel, conlist, Field
+from typing import Optional
 
 from aiogram.filters.callback_data import CallbackData
+from pydantic import BaseModel, Field, conlist
 
 
 class SimpleCalAct(str, Enum):
-    ignore = 'IGNORE'
-    prev_y = 'PREV-YEAR'
-    next_y = 'NEXT-YEAR'
-    prev_m = 'PREV-MONTH'
-    next_m = 'NEXT-MONTH'
-    cancel = 'CANCEL'
-    today = 'TODAY'
-    day = 'DAY'
+    ignore = "IGNORE"
+    prev_y = "PREV-YEAR"
+    next_y = "NEXT-YEAR"
+    prev_m = "PREV-MONTH"
+    next_m = "NEXT-MONTH"
+    cancel = "CANCEL"
+    today = "TODAY"
+    day = "DAY"
 
 
 class DialogCalAct(str, Enum):
-    ignore = 'IGNORE'
-    set_y = 'SET-YEAR'
-    set_m = 'SET-MONTH'
-    prev_y = 'PREV-YEAR'
-    next_y = 'NEXT-YEAR'
-    cancel = 'CANCEL'
-    start = 'START'
-    day = 'SET-DAY'
+    ignore = "IGNORE"
+    set_y = "SET-YEAR"
+    set_m = "SET-MONTH"
+    prev_y = "PREV-YEAR"
+    next_y = "NEXT-YEAR"
+    cancel = "CANCEL"
+    start = "START"
+    day = "SET-DAY"
 
 
 class CalendarCallback(CallbackData, prefix="calendar"):
@@ -45,12 +44,34 @@ class DialogCalendarCallback(CalendarCallback, prefix="dialog_calendar"):
 
 class CalendarLabels(BaseModel):
     "Schema to pass labels for calendar. Can be used to put in different languages"
-    days_of_week: conlist(str, max_length=7, min_length=7) = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"]
+
+    days_of_week: conlist(str, max_length=7, min_length=7) = [
+        "Пн",
+        "Вт",
+        "Ср",
+        "Чт",
+        "Пт",
+        "Сб",
+        "Вс",
+    ]
     months: conlist(str, max_length=12, min_length=12) = [
-        "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+        "Янв",
+        "Фев",
+        "Мар",
+        "Апр",
+        "Май",
+        "Июн",
+        "Июл",
+        "Авг",
+        "Сен",
+        "Окт",
+        "Ноя",
+        "Дек",
     ]
-    cancel_caption: str = Field(default='Cancel', description='Caprion for Cancel button')
-    today_caption: str = Field(default='Today', description='Caprion for Cancel button')
+    cancel_caption: str = Field(
+        default="Отмена", description="Caprion for Cancel button"
+    )
+    today_caption: str = Field(default="Сегодня", description="Caprion for Today button")
 
 
 HIGHLIGHT_FORMAT = "[{}]"
@@ -63,16 +84,16 @@ def highlight(text):
 def superscript(text):
     normal = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-=()"
     super_s = "ᴬᴮᶜᴰᴱᶠᴳᴴᴵᴶᴷᴸᴹᴺᴼᴾQᴿˢᵀᵁⱽᵂˣʸᶻᵃᵇᶜᵈᵉᶠᵍʰᶦʲᵏˡᵐⁿᵒᵖ۹ʳˢᵗᵘᵛʷˣʸᶻ⁰¹²³⁴⁵⁶⁷⁸⁹⁺⁻⁼⁽⁾"
-    output = ''
+    output = ""
     for i in text:
-        output += (super_s[normal.index(i)] if i in normal else i)
+        output += super_s[normal.index(i)] if i in normal else i
     return output
 
 
 def subscript(text):
     normal = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-=()"
     sub_s = "ₐ₈CDₑբGₕᵢⱼₖₗₘₙₒₚQᵣₛₜᵤᵥwₓᵧZₐ♭꜀ᑯₑբ₉ₕᵢⱼₖₗₘₙₒₚ૧ᵣₛₜᵤᵥwₓᵧ₂₀₁₂₃₄₅₆₇₈₉₊₋₌₍₎"
-    output = ''
+    output = ""
     for i in text:
-        output += (sub_s[normal.index(i)] if i in normal else i)
-    return output
+        output += sub_s[normal.index(i)] if i in normal else i
+    return output