Rename CommandMultiPartParser class to MultiPartJSONParser and update it

telegram_bots/parsers.py → constructor_telegram_bots/parsers.py

@@ -8,7 +8,9 @@
 import json
 
 
-class CommandMultiPartParser(MultiPartParser):
+class MultiPartJSONParser(MultiPartParser):
+	"""Parser for JSON data in multipart form data with support for files."""
+
 	def parse(self, *args: Any, **kwargs: Any) -> dict[str, Any]:  # type: ignore [override]
 		parsed: DataAndFiles = super().parse(*args, **kwargs)  # type: ignore [type-arg]
 
@@ -17,22 +19,18 @@ def parse(self, *args: Any, **kwargs: Any) -> dict[str, Any]:  # type: ignore [o
 		except (KeyError, JSONDecodeError):
 			raise ParseError()
 
-		sorted_files: dict[str, list[InMemoryUploadedFile | int]] = {
-			'images': [],
-			'images_id': [],
-			'files': [],
-			'files_id': [],
-		}
+		data.update({'images': [], 'images_id': [], 'files': [], 'files_id': []})
 
-		for key, value in parsed.files:
-			name: str = key.split(':')[0] + 's'
+		for key, value in parsed.files.items():
+			try:
+				name: str = key.split(':')[0]
+			except IndexError:
+				continue
 
-			if name in sorted_files:
+			if name in ['image', 'file']:
 				if isinstance(value, InMemoryUploadedFile):
-					sorted_files[name].append(value)
+					data[f'{name}s'].append(value)
 				elif isinstance(value, str) and value.isdigit():
-					sorted_files[f'{name}_id'].append(int(value))
-
-		data.update(sorted_files)
+					data[f'{name}s_id'].append(int(value))
 
 		return data

telegram_bots/views.py

@@ -20,6 +20,7 @@
 
 from constructor_telegram_bots.authentication import CookiesTokenAuthentication
 from constructor_telegram_bots.pagination import LimitOffsetPagination
+from constructor_telegram_bots.parsers import MultiPartJSONParser
 
 from .mixins import TelegramBotMixin
 from .models import (
@@ -32,7 +33,6 @@
 	User,
 	Variable,
 )
-from .parsers import CommandMultiPartParser
 from .serializers import (
 	BackgroundTaskSerializer,
 	CommandSerializer,
@@ -116,7 +116,7 @@ def get_queryset(self) -> QuerySet[Connection]:
 class CommandViewSet(TelegramBotMixin, ModelViewSet[Command]):
 	authentication_classes = [CookiesTokenAuthentication]
 	permission_classes = [IsAuthenticated]
-	parser_classes = [CommandMultiPartParser]
+	parser_classes = [MultiPartJSONParser]
 	lookup_value_converter = 'int'
 	lookup_field = 'id'