Update dependencies, fix mypy (#377)

* Update dependencies, fix mypy

* Remove unnecessary code

noxfile.py

@@ -148,6 +148,7 @@ def mypy(session: Session) -> None:
         "pytest",
         "types-setuptools",
         "pandas-stubs",
+        "pyarrow-stubs",
         "types-Pygments",
         "types-colorama",
         "types-beautifulsoup4",

pyproject.toml

@@ -64,6 +64,7 @@ typeguard = ">=2.13.3"
 xdoctest = { extras = ["colors"], version = ">=0.15.10" }
 myst-parser = { version = ">=0.16.1" }
 pandas-stubs = "*"
+pyarrow-stubs = ">=10.0.1.9"
 types-Pygments = "*"
 types-colorama = "*"
 types-setuptools = "*"

src/datadoc/backend/dataset_parser.py

@@ -171,8 +171,7 @@ def __init__(self, dataset: pathlib.Path | CloudPath) -> None:
     def get_fields(self) -> list[Variable]:
         """Extract the fields from this dataset."""
         with self.dataset.open(mode="rb") as f:
-            # Type stubs for pyarrow are incorrect see https://github.com/zen-xu/pyarrow-stubs/issues/4
-            schema: pa.Schema = pq.read_schema(f)  # type: ignore  # noqa: PGH003
+            schema: pa.Schema = pq.read_schema(f)  # type: ignore [arg-type]
         return [
             Variable(
                 short_name=data_field.name.strip(),

src/datadoc/frontend/callbacks/utils.py

@@ -6,20 +6,17 @@
 import logging
 from typing import TYPE_CHECKING
 from typing import TypeAlias
-from typing import cast
 
 import arrow
 from datadoc_model import model
 
 from datadoc import config
-from datadoc import enums
 from datadoc import state
 from datadoc.frontend.components.dataset_tab import build_dataset_tab
 from datadoc.frontend.components.variables_tab import build_variables_tab
 
 if TYPE_CHECKING:
     import pathlib
-    from enum import Enum
 
     import pydantic
     from cloudpathlib import CloudPath
@@ -34,20 +31,6 @@
 )
 
 
-def get_language_strings_enum(
-    enum: Enum | type[enums.LanguageStringsEnum],
-) -> enums.LanguageStringsEnum:
-    """Get the correct language strings enum for the given enum.
-
-    We need multiple languages to display in the front end, but the model only defines a single language in the enums.
-    """
-    language_strings_enum: enums.LanguageStringsEnum = getattr(
-        enums,
-        cast(type[enums.LanguageStringsEnum], enum).__name__,
-    )
-    return language_strings_enum
-
-
 def _check_if_language_string_item_exists(
     language_strings: model.LanguageStringType,
     language_code: str,

src/datadoc/frontend/fields/display_base.py

@@ -13,12 +13,11 @@
 from dash import html
 
 from datadoc import state
+from datadoc.enums import LanguageStringsEnum
 from datadoc.enums import SupportedLanguages
-from datadoc.frontend.callbacks.utils import get_language_strings_enum
 
 if TYPE_CHECKING:
     from collections.abc import Callable
-    from enum import Enum
 
     from dash.development.base_component import Component
     from datadoc_model.model import LanguageStringType
@@ -58,15 +57,15 @@
 
 
 def get_enum_options(
-    enum: Enum,
+    enum: type[LanguageStringsEnum],
 ) -> list[dict[str, str]]:
     """Generate the list of options based on the currently chosen language."""
     dropdown_options = [
         {
-            "title": i.get_value_for_language(SupportedLanguages.NORSK_BOKMÅL),
+            "title": i.get_value_for_language(SupportedLanguages.NORSK_BOKMÅL) or "",
             "id": i.name,
         }
-        for i in get_language_strings_enum(enum)  # type: ignore [attr-defined]
+        for i in enum  # type: ignore [attr-defined]
     ]
     dropdown_options.insert(0, {"title": DROPDOWN_DESELECT_OPTION, "id": ""})
     return dropdown_options

tests/frontend/callbacks/test_callbacks_utils.py

@@ -1,12 +1,8 @@
-from enum import Enum
-
 import pytest
 from dash import html
 from datadoc_model import model
 
-from datadoc.enums import LanguageStringsEnum
 from datadoc.frontend.callbacks.utils import find_existing_language_string
-from datadoc.frontend.callbacks.utils import get_language_strings_enum
 from datadoc.frontend.callbacks.utils import render_tabs
 
 
@@ -58,31 +54,6 @@ def test_find_existing_language_string_pre_existing_strings(
     )
 
 
-@pytest.mark.parametrize(
-    "model_enum",
-    [
-        model.Assessment,
-        model.DataSetStatus,
-        model.DataSetState,
-        model.DataType,
-        model.VariableRole,
-        model.TemporalityTypeType,
-    ],
-)
-def test_get_language_strings_enum(model_enum: Enum):
-    assert issubclass(get_language_strings_enum(model_enum), LanguageStringsEnum)  # type: ignore [arg-type]
-
-
-def test_get_language_strings_enum_unknown():
-    class TestEnum(Enum):
-        """Test enum."""
-
-        TEST = "test"
-
-    with pytest.raises(AttributeError):
-        get_language_strings_enum(TestEnum)
-
-
 @pytest.mark.parametrize(
     ("tab", "content"),
     [