Package attributes refactor

src/sio3pack/django/common/handler.py

@@ -1,4 +1,4 @@
-from typing import Type
+from typing import Any, Type
 
 from django.core.files import File
 from django.db import transaction
@@ -82,8 +82,8 @@ def lang_titles(self) -> dict[str, str]:
         return {t.language: t.name for t in self.db_package.name_translations.all()}
 
     @property
-    def model_solutions(self) -> list[RemoteFile]:
-        return [RemoteFile(s.source_file.path) for s in self.db_package.model_solutions.all()]
+    def model_solutions(self) -> list[dict[str, Any]]:
+        return [{"file": RemoteFile(s.source_file.path)} for s in self.db_package.model_solutions.all()]
 
     @property
     def lang_statements(self) -> dict[str, RemoteFile]:

src/sio3pack/django/sinolpack/handler.py

@@ -72,9 +72,9 @@ def config(self) -> dict[str, Any]:
         return self.db_package.config.parsed_config
 
     @property
-    def model_solutions(self) -> list[tuple[ModelSolutionKind, RemoteFile]]:
+    def model_solutions(self) -> list[dict[str, Any]]:
         solutions = SinolpackModelSolution.objects.filter(package=self.db_package)
-        return [(s.kind, RemoteFile(s.source_file.path)) for s in solutions]
+        return [{"file": RemoteFile(s.source_file.path), "kind": s.kind} for s in solutions]
 
     @property
     def additional_files(self) -> list[RemoteFile]:

src/sio3pack/packages/package/model.py

@@ -2,16 +2,15 @@
 from typing import Any
 
 from sio3pack import LocalFile
+from sio3pack.exceptions import SIO3PackException
 from sio3pack.files import File
-from sio3pack.graph import Graph, GraphOperation
+from sio3pack.graph import GraphOperation
 from sio3pack.packages.exceptions import UnknownPackageType
 from sio3pack.packages.package.handler import NoDjangoHandler
 from sio3pack.test import Test
 from sio3pack.utils.archive import Archive
 from sio3pack.utils.classinit import RegisteredSubclassesBase
 
-from sio3pack.exceptions import SIO3PackException
-
 
 def wrap_exceptions(func):
     """Decorator to catch exceptions and re-raise them as SIO3PackException."""
@@ -20,7 +19,7 @@ def decorator(*args, **kwargs):
         try:
             return func(*args, **kwargs)
         except SIO3PackException:
-            raise # Do not wrap SIO3PackExceptions again
+            raise  # Do not wrap SIO3PackExceptions again
         except Exception as e:
             raise SIO3PackException(f"SIO3Pack raised an exception in {func.__name__} function.", e)
 
@@ -34,6 +33,24 @@ class Package(RegisteredSubclassesBase):
 
     abstract = True
 
+    """
+    Attributes:
+        short_name (str): Short name of the problem.
+        full_name (str): Full name of the problem.
+        lang_titles (dict[str, str]): A dictionary of problem titles,
+            where keys are language codes and values are titles.
+        lang_statements (dict[str, File]): A dictionary of problem
+            statements, where keys are language codes and values are
+            files.
+        config (dict[str, Any]): Configuration of the problem.
+        model_solutions (list[dict[str, Any]]): A list
+            of model solutions, where each element is a tuple of model
+            solution kind and filename.
+        additional_files (list[File]): A list of additional files of
+            the problem.
+        attachments (list[File]): A list of attachments of the problem.
+    """
+
     def __init__(self):
         super().__init__()