Update ruff settings

constructor_telegram_bots/settings.py

@@ -92,7 +92,7 @@
 	INSTALLED_APPS.append('silk')
 
 REST_FRAMEWORK = {
-	'EXCEPTION_HANDLER': 'drf_standardized_errors.handler.exception_handler',
+	'EXCEPTION_HANDLER': 'drf_standardized_errors.handler.exception_handler'
 }
 
 TINYMCE_DEFAULT_CONFIG = {

constructor_telegram_bots/urls.py

@@ -42,4 +42,6 @@
 
 	urlpatterns.append(path('silk/', include('silk.urls', namespace='silk')))
 
-urlpatterns += [re_path(r'^.*', TemplateView.as_view(template_name='frontend/index.html'))]
+urlpatterns += [
+	re_path(r'^.*', TemplateView.as_view(template_name='frontend/index.html'))
+]

donation/models.py

@@ -27,7 +27,9 @@ def section_position_default() -> int:
 class Section(models.Model):  # type: ignore [django-manager-missing]
 	title = models.CharField(_('Заголовок'), max_length=255)
 	text = models.TextField(_('Текст'))
-	position = models.PositiveSmallIntegerField(_('Позиция'), blank=True, default=section_position_default)
+	position = models.PositiveSmallIntegerField(
+		_('Позиция'), blank=True, default=section_position_default
+	)
 
 	class Meta(TypedModelMeta):
 		ordering = ['position']
@@ -46,7 +48,9 @@ def button_position_default() -> int:
 class Button(models.Model):  # type: ignore [django-manager-missing]
 	text = models.CharField(_('Текст'), max_length=255)
 	url = models.URLField(_('Ссылка'))
-	position = models.PositiveSmallIntegerField(_('Позиция'), blank=True, default=button_position_default)
+	position = models.PositiveSmallIntegerField(
+		_('Позиция'), blank=True, default=button_position_default
+	)
 
 	class Meta(TypedModelMeta):
 		ordering = ['position']

instruction/models.py

@@ -12,7 +12,9 @@ def section_position_default() -> int:
 class Section(models.Model):  # type: ignore [django-manager-missing]
 	title = models.CharField(_('Заголовок'), max_length=255)
 	text = models.TextField(_('Текст'))
-	position = models.PositiveSmallIntegerField(_('Позиция'), blank=True, default=section_position_default)
+	position = models.PositiveSmallIntegerField(
+		_('Позиция'), blank=True, default=section_position_default
+	)
 
 	class Meta(TypedModelMeta):
 		ordering = ['position']

languages/urls.py

@@ -3,6 +3,4 @@
 from .views import LanguagesAPIView
 
 app_name = 'languages'
-urlpatterns = [
-	path('', LanguagesAPIView.as_view(), name='index'),
-]
+urlpatterns = [path('', LanguagesAPIView.as_view(), name='index')]

manage.py

@@ -3,7 +3,9 @@
 
 
 def main() -> None:
-	os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'constructor_telegram_bots.settings')
+	os.environ.setdefault(
+		'DJANGO_SETTINGS_MODULE', 'constructor_telegram_bots.settings'
+	)
 
 	try:
 		from django.core.management import execute_from_command_line

privacy_policy/models.py

@@ -12,7 +12,9 @@ def section_default_position() -> int:
 class Section(models.Model):  # type: ignore [django-manager-missing]
 	title = models.CharField(_('Заголовок'), max_length=255)
 	text = models.TextField(_('Текст'))
-	position = models.PositiveSmallIntegerField(_('Позиция'), blank=True, default=section_default_position)
+	position = models.PositiveSmallIntegerField(
+		_('Позиция'), blank=True, default=section_default_position
+	)
 
 	class Meta(TypedModelMeta):
 		ordering = ['position']

pyproject.toml

@@ -39,9 +39,8 @@ plugins = ["mypy_django_plugin.main", "mypy_drf_plugin.main"]
 django_settings_module = "constructor_telegram_bots.settings"
 
 [tool.ruff]
-line-length = 120
 target-version = "py311"
-extend-exclude = ["frontend", "migrations"]
+extend-exclude = ["migrations"]
 
 [tool.ruff.lint]
 select = [
@@ -53,7 +52,8 @@ select = [
 	"UP",  # pyupgrade
 	"B",  # flake8-bugbear
 	"C4",  # flake8-comprehensions
-	"T20"  # flake8-print
+	"T20",  # flake8-print
+	"INT",  # flake8-gettext
 ]
 ignore = [
 	"E501",  # line too long, handled by black

telegram_bots/admin.py

@@ -19,10 +19,10 @@ class TelegramBotAdmin(admin.ModelAdmin[TelegramBot]):
 	list_display = [
 		'id',
 		'owner',
-		'_username',
-		'_storage_size',
-		'_used_storage_size',
-		'_remaining_storage_size',
+		'username_display',
+		'storage_size_display',
+		'used_storage_size_display',
+		'remaining_storage_size_display',
 		'commands_count',
 		'users_count',
 		'is_private',
@@ -32,11 +32,11 @@ class TelegramBotAdmin(admin.ModelAdmin[TelegramBot]):
 	fields = [
 		'id',
 		'owner',
-		'_username',
+		'username_display',
 		'api_token',
-		'_storage_size',
-		'_used_storage_size',
-		'_remaining_storage_size',
+		'storage_size_display',
+		'used_storage_size_display',
+		'remaining_storage_size_display',
 		'commands_count',
 		'users_count',
 		'is_private',
@@ -48,26 +48,25 @@ def get_queryset(self, request: HttpRequest) -> QuerySet[TelegramBot]:
 		return (
 			super()
 			.get_queryset(request)
-			.annotate(
-				commands_count=Count('commands'),
-				users_count=Count('users'),
-			)
+			.annotate(commands_count=Count('commands'), users_count=Count('users'))
 		)
 
 	@admin.display(description='@username', ordering='username')
-	def _username(self, telegram_bot: TelegramBot) -> str:
-		return format_html_link(f'tg://resolve?domain={telegram_bot.username}', f'@{telegram_bot.username}')
+	def username_display(self, telegram_bot: TelegramBot) -> str:
+		return format_html_link(
+			f'tg://resolve?domain={telegram_bot.username}', f'@{telegram_bot.username}'
+		)
 
 	@admin.display(description=_('Размер хранилища'))
-	def _storage_size(self, telegram_bot: TelegramBot) -> str:
+	def storage_size_display(self, telegram_bot: TelegramBot) -> str:
 		return f'{(telegram_bot.storage_size / 1024 ** 2):.2f}MB'
 
 	@admin.display(description=_('Используемый размер хранилища'))
-	def _used_storage_size(self, telegram_bot: TelegramBot) -> str:
+	def used_storage_size_display(self, telegram_bot: TelegramBot) -> str:
 		return f'{(telegram_bot.used_storage_size / 1024 ** 2):.2f}MB'
 
 	@admin.display(description=_('Оставшийся размер хранилища'))
-	def _remaining_storage_size(self, telegram_bot: TelegramBot) -> str:
+	def remaining_storage_size_display(self, telegram_bot: TelegramBot) -> str:
 		return f'{(telegram_bot.remaining_storage_size / 1024 ** 2):.2f}MB'
 
 	@admin.display(description=_('Команд'), ordering='commands_count')
@@ -89,12 +88,7 @@ def has_change_permission(self, *args: Any, **kwargs: Any) -> Literal[False]:
 class UserAdmin(admin.ModelAdmin[User]):
 	search_fields = ['telegram_id', 'full_name']
 	date_hierarchy = 'activated_date'
-	list_filter = [
-		'is_allowed',
-		'is_blocked',
-		'last_activity_date',
-		'activated_date',
-	]
+	list_filter = ['is_allowed', 'is_blocked', 'last_activity_date', 'activated_date']
 	list_display = [
 		'id',
 		'telegram_bot',

telegram_bots/base_models.py

@@ -9,8 +9,12 @@ class AbstractBlock(models.Model):
 	name = models.CharField(_('Название'), max_length=128)
 	x = models.FloatField(_('Координата X'), default=0)
 	y = models.FloatField(_('Координата Y'), default=0)
-	source_connections = GenericRelation('Connection', 'source_object_id', 'source_content_type')
-	target_connections = GenericRelation('Connection', 'target_object_id', 'target_content_type')
+	source_connections = GenericRelation(
+		'Connection', 'source_object_id', 'source_content_type'
+	)
+	target_connections = GenericRelation(
+		'Connection', 'target_object_id', 'target_content_type'
+	)
 
 	class Meta(TypedModelMeta):
 		abstract = True
@@ -29,7 +33,9 @@ class AbstractAPIRequest(models.Model):
 	]
 
 	url = models.URLField(_('URL-адрес'))
-	method = models.CharField(_('Метод'), max_length=6, choices=METHOD_CHOICES, default='get')
+	method = models.CharField(
+		_('Метод'), max_length=6, choices=METHOD_CHOICES, default='get'
+	)
 	headers = models.JSONField(_('Заголовки'), blank=True, null=True)
 	body = models.JSONField(_('Данные'), blank=True, null=True)
 

telegram_bots/hub/authentication.py

@@ -9,7 +9,9 @@
 class TokenAuthentication(BaseTokenAuthentication):
 	def authenticate_credentials(self, token: str) -> tuple[TelegramBotsHub, str]:
 		try:
-			telegram_bots_hub: TelegramBotsHub = TelegramBotsHub.objects.get(token=token)
+			telegram_bots_hub: TelegramBotsHub = TelegramBotsHub.objects.get(
+				token=token
+			)
 		except TelegramBotsHub.DoesNotExist:
 			raise AuthenticationFailed(_('Неверный токен!'))
 

telegram_bots/hub/models.py

@@ -90,7 +90,9 @@ def is_port_available(self, port: int) -> bool:
 
 	@property
 	def is_available(self) -> bool:
-		response: Response | None = self.make_api_request('get', '/', delete_on_exception=False)
+		response: Response | None = self.make_api_request(
+			'get', '/', delete_on_exception=False
+		)
 
 		if response:
 			data: dict[str, Any] = response.json()
@@ -181,10 +183,7 @@ def save(
 				for _retry in range(10):
 					if self.is_available:
 						return super().save(
-							force_insert,
-							force_update,
-							using,
-							update_fields,
+							force_insert, force_update, using, update_fields
 						)
 
 					time.sleep(6)
@@ -193,7 +192,9 @@ def save(
 				except ProcessLookupError:
 					pass
 
-	def delete(self, using: str | None = None, keep_parents: bool = False) -> tuple[int, dict[str, int]]:
+	def delete(
+		self, using: str | None = None, keep_parents: bool = False
+	) -> tuple[int, dict[str, int]]:
 		if self.is_available:
 			os.kill(self.pid, signal.SIGTERM)
 

telegram_bots/hub/serializers.py

@@ -25,7 +25,9 @@ class Meta:
 		fields = ('id', 'is_private', 'is_enabled', 'is_loading')
 		read_only_fields = ('id', 'is_private')
 
-	def update(self, instance: TelegramBot, validated_data: dict[str, Any]) -> TelegramBot:
+	def update(
+		self, instance: TelegramBot, validated_data: dict[str, Any]
+	) -> TelegramBot:
 		instance.is_enabled = validated_data.get('is_enabled', instance.is_enabled)
 		instance.is_loading = validated_data.get('is_loading', instance.is_loading)
 		instance.save()
@@ -36,7 +38,11 @@ def update(self, instance: TelegramBot, validated_data: dict[str, Any]) -> Teleg
 class CommandSettingsSerializer(serializers.ModelSerializer[CommandSettings]):
 	class Meta:
 		model = CommandSettings
-		fields = ('is_reply_to_user_message', 'is_delete_user_message', 'is_send_as_new_message')
+		fields = (
+			'is_reply_to_user_message',
+			'is_delete_user_message',
+			'is_send_as_new_message',
+		)
 
 
 class CommandTriggerSerializer(serializers.ModelSerializer[CommandTrigger]):
@@ -81,7 +87,9 @@ class Meta:
 		fields = ('text',)
 
 
-class CommandKeyboardButtonSerializer(serializers.ModelSerializer[CommandKeyboardButton]):
+class CommandKeyboardButtonSerializer(
+	serializers.ModelSerializer[CommandKeyboardButton]
+):
 	telegram_bot_command_id = serializers.IntegerField(source='telegram_bot_command.id')
 
 	class Meta:
@@ -103,7 +111,9 @@ class Meta:
 		fields = ('url', 'method', 'headers', 'body')
 
 
-class CommandDatabaseRecordSerializer(serializers.ModelSerializer[CommandDatabaseRecord]):
+class CommandDatabaseRecordSerializer(
+	serializers.ModelSerializer[CommandDatabaseRecord]
+):
 	class Meta:
 		model = CommandDatabaseRecord
 		fields = ('data',)
@@ -152,7 +162,9 @@ def telegram_bot(self) -> TelegramBot:
 		telegram_bot: TelegramBot | None = self.context.get('telegram_bot')
 
 		if not isinstance(telegram_bot, TelegramBot):
-			raise TypeError('You not passed a TelegramBot instance to the serializer context!')
+			raise TypeError(
+				'You not passed a TelegramBot instance to the serializer context!'
+			)
 
 		return telegram_bot
 

telegram_bots/mixins.py

@@ -11,7 +11,10 @@ class TelegramBotMixin:
 	@property
 	def telegram_bot(self) -> TelegramBot:
 		if self._telegram_bot is None:
-			self._telegram_bot = get_object_or_404(self.request.user.telegram_bots, id=self.kwargs['telegram_bot_id'])  # type: ignore [attr-defined]
+			self._telegram_bot = get_object_or_404(
+				self.request.user.telegram_bots,  # type: ignore [attr-defined]
+				id=self.kwargs['telegram_bot_id'],  # type: ignore [attr-defined]
+			)
 
 		return self._telegram_bot