Merge pull request #2046 from DSD-DBS/fix-mypy-issues

fix: Convert invariant List to Sequence

backend/capellacollab/settings/configuration/models.py

@@ -5,6 +5,7 @@
 import enum
 import typing as t
 import zoneinfo
+from collections import abc as collections_abc
 
 import pydantic
 from croniter import croniter
@@ -69,40 +70,40 @@ class CustomNavbarLink(NavbarLink):
 
 
 class NavbarConfiguration(core_pydantic.BaseModelStrict):
-    external_links: list[BuiltInNavbarLink | CustomNavbarLink] = (
-        pydantic.Field(
-            default=(
+    external_links: collections_abc.Sequence[
+        BuiltInNavbarLink | CustomNavbarLink
+    ] = pydantic.Field(
+        default=(
+            [
+                BuiltInNavbarLink(
+                    name="Grafana",
+                    service=BuiltInLinkItem.GRAFANA,
+                    role=users_models.Role.ADMIN,
+                ),
+                BuiltInNavbarLink(
+                    name="Prometheus",
+                    service=BuiltInLinkItem.PROMETHEUS,
+                    role=users_models.Role.ADMIN,
+                ),
+                BuiltInNavbarLink(
+                    name="Documentation",
+                    service=BuiltInLinkItem.DOCUMENTATION,
+                    role=users_models.Role.USER,
+                ),
+            ]
+            + (
                 [
                     BuiltInNavbarLink(
-                        name="Grafana",
-                        service=BuiltInLinkItem.GRAFANA,
-                        role=users_models.Role.ADMIN,
-                    ),
-                    BuiltInNavbarLink(
-                        name="Prometheus",
-                        service=BuiltInLinkItem.PROMETHEUS,
-                        role=users_models.Role.ADMIN,
-                    ),
-                    BuiltInNavbarLink(
-                        name="Documentation",
-                        service=BuiltInLinkItem.DOCUMENTATION,
+                        name="SMTP Mock",
+                        service=BuiltInLinkItem.SMTP_MOCK,
                         role=users_models.Role.USER,
-                    ),
+                    )
                 ]
-                + (
-                    [
-                        BuiltInNavbarLink(
-                            name="SMTP Mock",
-                            service=BuiltInLinkItem.SMTP_MOCK,
-                            role=users_models.Role.USER,
-                        )
-                    ]
-                    if core.DEVELOPMENT_MODE
-                    else []
-                )
-            ),
-            description="Links to display in the navigation bar.",
-        )
+                if core.DEVELOPMENT_MODE
+                else []
+            )
+        ),
+        description="Links to display in the navigation bar.",
     )
 
 

backend/capellacollab/tools/models.py

@@ -64,15 +64,13 @@ class ToolSessionEnvironment(core_pydantic.BaseModel):
         ),
     )
     value: str = pydantic.Field(
-        default={"RMT_PASSWORD": "{CAPELLACOLLAB_SESSION_TOKEN}"},
+        default="{CAPELLACOLLAB_SESSION_TOKEN}",
         description=(
             "Environment variables, which are mounted into session containers. "
             "You can use f-strings to reference other environment variables in the value. "
         ),
         examples=[
-            {
-                "MY_TOOL_USERNAME_WITH_PREFIX": "test_{CAPELLACOLLAB_SESSION_REQUESTER_USERNAME}",
-            }
+            "test_{CAPELLACOLLAB_SESSION_REQUESTER_USERNAME}",
         ],
     )