final mypy

rename List, Dict

Author: MaxNumerique

src/opengeodeweb_back/data.py

@@ -1,4 +1,3 @@
-from typing import List, Optional
 from sqlalchemy import String, JSON
 from sqlalchemy.orm import Mapped, mapped_column
 from .database import database, Base
@@ -13,17 +12,18 @@ class Data(Base):
     name: Mapped[str] = mapped_column(String, nullable=False)
     native_file_name: Mapped[str] = mapped_column(String, nullable=False)
     viewable_file_name: Mapped[str] = mapped_column(String, nullable=False)
-    light_viewable: Mapped[Optional[str]] = mapped_column(String, nullable=True)
     geode_object: Mapped[str] = mapped_column(String, nullable=False)
-    input_file: Mapped[Optional[dict]] = mapped_column(JSON, nullable=True)
-    additional_files: Mapped[Optional[List[str]]] = mapped_column(JSON, nullable=True)
+
+    light_viewable: Mapped[str | None] = mapped_column(String, nullable=True)
+    input_file: Mapped[str | None] = mapped_column(String, nullable=True)
+    additional_files: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
 
     @staticmethod
     def create(
         name: str,
         geode_object: str,
-        input_file: Optional[dict] = None,
-        additional_files: Optional[List[str]] = None
+        input_file: str,
+        additional_files: list[str] | None = None
     ) -> "Data":
         input_file = input_file if input_file is not None else {}
         additional_files = additional_files if additional_files is not None else []

src/opengeodeweb_back/utils_functions.py

@@ -3,7 +3,7 @@
 import threading
 import time
 import zipfile
-from typing import List, Dict, Any
+from typing import Any
 
 # Third party imports
 import flask
@@ -157,9 +157,9 @@ def create_data_folder_from_id(data_id: str) -> str:
 def save_all_viewables_and_return_info(
     geode_object: str,
     data: Any,
-    input_file: List[str],
-    additional_files: List[str] = [],
-) -> Dict[str, Any]:
+    input_file: list[str],
+    additional_files: list[str] = [],
+) -> dict[str, Any]:
     data_entry = Data.create(
         name=data.name(),
         geode_object=geode_object,
@@ -202,13 +202,13 @@ def save_all_viewables_and_return_info(
 
 def generate_native_viewable_and_light_viewable_from_object(
     geode_object: str, data: Any
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     return save_all_viewables_and_return_info(geode_object, data, input_file=[])
 
 
 def generate_native_viewable_and_light_viewable_from_file(
     geode_object: str, input_filename: str
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     temp_data_entry = Data.create(
         name="temp",
         geode_object=geode_object,
@@ -224,7 +224,7 @@ def generate_native_viewable_and_light_viewable_from_file(
     )
     shutil.copy2(full_input_filename, copied_full_path)
 
-    additional_files_copied: List[str] = []
+    additional_files_copied: list[str] = []
     additional = geode_functions.additional_files(geode_object, full_input_filename)
     for additional_file in additional.mandatory_files + additional.optional_files:
         if additional_file.is_missing: