c2cgeoportal-admin 2.8.1.181__py3-none-any.whl → 2.9rc1__py3-none-any.whl

c2cgeoportal_admin/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2023, Camptocamp SA
+# Copyright (c) 2017-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@ from typing import Any
 
 import c2cgeoform
 import c2cwsgiutils.pretty_json
-import sqlalchemy
+import sqlalchemy.orm.session
 import zope.sqlalchemy
 from c2c.template.config import config as configuration
 from pkg_resources import resource_filename
@@ -52,8 +52,12 @@ _ = TranslationStringFactory("c2cgeoportal_admin")
 
 def main(_, **settings):
     """Return a Pyramid WSGI application."""
-    configuration.init(settings.get("app.cfg"))
-    settings.update(configuration.get_config())
+    app_cfg = settings.get("app.cfg")
+    assert app_cfg is not None
+    configuration.init(app_cfg)
+    conf = configuration.get_config()
+    assert conf is not None
+    settings.update(conf)
 
     config = Configurator(settings=settings)
 
@@ -70,9 +74,13 @@ def main(_, **settings):
     session_factory.configure(bind=engine)
 
     def get_tm_session(
-        session_factory: sessionmaker, transaction_manager: TransactionManager
+        session_factory: sessionmaker[  # pylint: disable=unsubscriptable-object
+            sqlalchemy.orm.session.Session
+        ],
+        transaction_manager: TransactionManager,
     ) -> sqlalchemy.orm.session.Session:
         dbsession = session_factory()
+        assert isinstance(dbsession, sqlalchemy.orm.session.Session)
         zope.sqlalchemy.register(dbsession, transaction_manager=transaction_manager)
         return dbsession
 
@@ -95,7 +103,7 @@ def main(_, **settings):
         property=True,
     )
 
-    config.add_route("ogc_server_clear_cache", "/ogc_server_clear_cache/{id}")
+    config.add_route("ogc_server_clear_cache", "/admin/ogc_server_clear_cache/{id}")
 
     config.add_subscriber(add_renderer_globals, BeforeRender)
     config.add_subscriber(add_localizer, NewRequest)

c2cgeoportal_admin/lib/{lingua_extractor.py → lingva_extractor.py}

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2022, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -27,10 +27,10 @@
 
 
 import os
-from typing import Any, Dict, List, Optional
+from typing import Any
 
 import yaml
-from lingua.extractors import Extractor, Message
+from lingva.extractors import Extractor, Message
 
 
 class GeomapfishConfigExtractor(Extractor):  # type: ignore
@@ -41,10 +41,10 @@ class GeomapfishConfigExtractor(Extractor):  # type: ignore
     def __call__(
         self,
         filename: str,
-        options: Dict[str, Any],
-        fileobj: Optional[Dict[str, Any]] = None,
+        options: dict[str, Any],
+        fileobj: dict[str, Any] | None = None,
         lineno: int = 0,
-    ) -> List[Message]:
+    ) -> list[Message]:
         del options, fileobj, lineno
 
         print(f"Running {self.__class__.__name__} on {filename}")

c2cgeoportal_admin/lib/ogcserver_synchronizer.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023, Camptocamp SA
+# Copyright (c) 2020-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
 import functools
 import logging
 from io import StringIO
-from typing import Any, Optional, Set, cast
+from typing import Any, Optional, cast
 from xml.etree.ElementTree import Element  # nosec
 
 import pyramid.request
@@ -202,7 +202,7 @@ class OGCServerSynchronizer:
         self._logger.info("%s layers added", self._layers_added)
         self._logger.info("%s layers removed", self._layers_removed)
 
-    def synchronize_layer(self, el: Element, parent: Optional[main.TreeGroup] = None) -> main.TreeItem:
+    def synchronize_layer(self, el: Element, parent: main.TreeGroup | None = None) -> main.TreeItem:
         if el.find("Layer") is None:
             tree_item = self.get_layer_wms(el, parent)
         elif parent is None:
@@ -287,10 +287,11 @@ class OGCServerSynchronizer:
 
         return group
 
-    def get_layer_wms(self, el: Element, parent: Optional[main.TreeGroup] = None) -> main.LayerWMS:
+    def get_layer_wms(self, el: Element, parent: main.TreeGroup | None = None) -> main.LayerWMS:
         name_el = el.find("Name")
         assert name_el is not None
         name = name_el.text
+        assert name is not None
 
         layer = cast(
             Optional[main.LayerWMS],
@@ -359,7 +360,7 @@ class OGCServerSynchronizer:
 
     @functools.lru_cache(maxsize=10)
     def wms_capabilities(self) -> bytes:
-        errors: Set[str] = set()
+        errors: set[str] = set()
         url = get_url2(
             f"The OGC server '{self._ogc_server.name}'",
             self._ogc_server.url,

c2cgeoportal_admin/routes.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2023, Camptocamp SA
+# Copyright (c) 2017-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,7 @@ def includeme(config):
     from c2cgeoportal_commons.models.main import (  # pylint: disable=import-outside-toplevel
         Functionality,
         Interface,
+        LayerCOG,
         LayerGroup,
         LayerVectorTiles,
         LayerWMS,
@@ -72,19 +73,27 @@ def includeme(config):
         User,
     )
 
+    authentication_configuration = config.registry.settings.get("authentication", {})
+    oidc_configuration = authentication_configuration.get("openid_connect", {})
+    oidc_enabled = oidc_configuration.get("enabled", False)
+    oidc_provide_roles = oidc_configuration.get("provide_roles", False)
+    oauth2_configuration = authentication_configuration.get("oauth2", {})
+    oauth2_enabled = oauth2_configuration.get("enabled", not oidc_enabled)
+
     visible_routes = [
         ("themes", Theme),
         ("layer_groups", LayerGroup),
         ("layers_wms", LayerWMS),
         ("layers_wmts", LayerWMTS),
         ("layers_vectortiles", LayerVectorTiles),
+        ("layers_cog", LayerCOG),
         ("ogc_servers", OGCServer),
         ("restriction_areas", RestrictionArea),
-        ("users", User),
+        *([("users", User)] if not oidc_enabled or not oidc_provide_roles else []),
         ("roles", Role),
         ("functionalities", Functionality),
         ("interfaces", Interface),
-        ("oauth2_clients", OAuth2Client),
+        *([("oauth2_clients", OAuth2Client)] if oauth2_enabled else []),
         ("logs", Log),
     ]
 

c2cgeoportal_admin/schemas/dimensions.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2021, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,8 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+from typing import Any
+
 import colander
 from c2cgeoform.schema import GeoFormSchemaNode
 from deform.widget import MappingWidget, SequenceWidget
@@ -34,7 +36,7 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
 from c2cgeoportal_commons.models.main import Dimension
 
 
-def dimensions_schema_node(prop: InstrumentedAttribute) -> colander.SequenceSchema:
+def dimensions_schema_node(prop: InstrumentedAttribute[Any]) -> colander.SequenceSchema:
     """Get the scheme of the dimensions."""
     return colander.SequenceSchema(
         GeoFormSchemaNode(Dimension, name="dimension", widget=MappingWidget(template="dimension")),

c2cgeoportal_admin/schemas/functionalities.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2021, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -26,20 +26,19 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
-from typing import Any, Dict, List
+from typing import Any
 
 import colander
 from c2cgeoform.ext.deform_ext import RelationCheckBoxListWidget
 from c2cgeoform.schema import GeoFormManyToManySchemaNode, manytomany_validator
 from sqlalchemy import inspect, select
 from sqlalchemy.orm.attributes import InstrumentedAttribute
-from sqlalchemy.orm.decl_api import DeclarativeMeta
 from sqlalchemy.sql.functions import concat
 
 from c2cgeoportal_commons.models.main import Functionality
 
 
-def available_functionalities_for(settings: Dict[str, Any], model: DeclarativeMeta) -> List[Dict[str, Any]]:
+def available_functionalities_for(settings: dict[str, Any], model: type[Any]) -> list[dict[str, Any]]:
     """Return filtered list of functionality definitions."""
     mapper = inspect(model)
     relevant_for = {mapper.local_table.name}
@@ -50,18 +49,16 @@ def available_functionalities_for(settings: Dict[str, Any], model: DeclarativeMe
     ]
 
 
-def functionalities_widget(model: DeclarativeMeta) -> colander.deferred:
+def functionalities_widget(model: type[Any]) -> colander.deferred:
     """Return a colander deferred which itself returns a widget for the functionalities field."""
 
     def create_widget(node, kw):
         del node
 
         return RelationCheckBoxListWidget(
-            select(
-                [
-                    Functionality.id,
-                    concat(Functionality.name, "=", Functionality.value).label("label"),
-                ]
+            select(  # type: ignore[arg-type]
+                Functionality.id,
+                concat(Functionality.name, "=", Functionality.value).label("label"),
             )
             .where(
                 Functionality.name.in_(
@@ -81,12 +78,12 @@ def functionalities_widget(model: DeclarativeMeta) -> colander.deferred:
 
 
 def functionalities_schema_node(
-    prop: InstrumentedAttribute, model: DeclarativeMeta
+    prop: InstrumentedAttribute[Any], model: type[Any]
 ) -> colander.SequenceSchema:
     """Get the schema of the functionalities."""
 
     return colander.SequenceSchema(
-        GeoFormManyToManySchemaNode(Functionality),
+        GeoFormManyToManySchemaNode(Functionality, None),
         name=prop.key,
         title=prop.info["colanderalchemy"]["title"],
         description=prop.info["colanderalchemy"].get("description"),

c2cgeoportal_admin/schemas/interfaces.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2021, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,8 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+from typing import Any
+
 import colander
 from c2cgeoform.ext.deform_ext import RelationCheckBoxListWidget
 from c2cgeoform.schema import GeoFormManyToManySchemaNode, manytomany_validator
@@ -34,10 +36,12 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
 from c2cgeoportal_commons.models.main import Interface
 
 
-def interfaces_schema_node(prop: InstrumentedAttribute) -> colander.SequenceSchema:
+def interfaces_schema_node(
+    prop: InstrumentedAttribute[Any],  # pylint: disable=unsubscriptable-object
+) -> colander.SequenceSchema:
     """Get the serializable representation of an interface."""
     return colander.SequenceSchema(
-        GeoFormManyToManySchemaNode(Interface),
+        GeoFormManyToManySchemaNode(Interface, None),
         name=prop.key,
         title=prop.info["colanderalchemy"]["title"],
         description=prop.info["colanderalchemy"]["description"],

c2cgeoportal_admin/schemas/metadata.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2023, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 # either expressed or implied, of the FreeBSD Project.
 
 import json
-from typing import Any, Dict, List, Optional, Set, Union, cast
+from typing import Any, cast
 
 import colander
 import pyramid.request
@@ -34,7 +34,6 @@ from c2cgeoform.schema import GeoFormSchemaNode
 from deform.widget import MappingWidget, SelectWidget, SequenceWidget, TextAreaWidget
 from sqlalchemy import inspect
 from sqlalchemy.orm.attributes import InstrumentedAttribute
-from sqlalchemy.orm.decl_api import DeclarativeMeta
 from sqlalchemy.orm.mapper import Mapper
 
 from c2cgeoportal_admin import _
@@ -42,16 +41,17 @@ from c2cgeoportal_commons.lib.validators import url
 from c2cgeoportal_commons.models.main import Metadata
 
 
-def get_relevant_for(model: Union[DeclarativeMeta, Mapper]) -> Set[str]:
+def get_relevant_for(model: type[Any] | Mapper[Any]) -> set[str]:
     """Return list of relevant_for values for passed class."""
     mapper = inspect(model)
+    assert mapper is not None
     relevant_for = {mapper.local_table.name}  # or mapper.polymorphic_identity
     if mapper.inherits:
         relevant_for |= get_relevant_for(mapper.inherits)
     return relevant_for
 
 
-def metadata_definitions(settings: Dict[str, Any], model: DeclarativeMeta) -> List[Dict[str, Any]]:
+def metadata_definitions(settings: dict[str, Any], model: type[Any]) -> list[dict[str, Any]]:
     """Return filtered list metadata definitions."""
     return [
         m
@@ -76,7 +76,7 @@ class MetadataSelectWidget(SelectWidget):  # type: ignore
         return super().serialize(field, cstruct, **kw)
 
 
-def metadata_name_widget(model: DeclarativeMeta) -> colander.deferred:
+def metadata_name_widget(model: type[Any]) -> colander.deferred:
     """Return a colander deferred which itself returns a widget for the metadata name field."""
 
     def create_widget(node, kw):
@@ -136,15 +136,15 @@ class BooleanMetadata(colander.Boolean):  # type: ignore
         return None
 
 
-class MetadataSchemaNode(GeoFormSchemaNode):  # type: ignore # pylint: disable=abstract-method
+class MetadataSchemaNode(GeoFormSchemaNode):  # pylint: disable=abstract-method
     """The metadata schema."""
 
-    metadata_definitions: Optional[Dict[str, Any]] = None
+    metadata_definitions: dict[str, Any] | None = None
 
     def __init__(self, *args: Any, **kw: Any):
         super().__init__(*args, **kw)
 
-        self.available_types: List[str] = []
+        self.available_types: list[str] = []
 
         self._add_value_node("string", colander.String())
         self._add_value_node("liste", colander.String())
@@ -184,7 +184,7 @@ class MetadataSchemaNode(GeoFormSchemaNode):  # type: ignore # pylint: disable=a
 
     def _ui_type(self, metadata_name: str) -> str:
         metadata_type = (
-            cast(Dict[str, Dict[str, str]], self.metadata_definitions)
+            cast(dict[str, dict[str, str]], self.metadata_definitions)
             .get(metadata_name, {})
             .get("type", "string")
         )
@@ -192,15 +192,15 @@ class MetadataSchemaNode(GeoFormSchemaNode):  # type: ignore # pylint: disable=a
 
 
 def _translate_available_metadata(
-    available_metadata: Dict[str, Any], request: pyramid.request.Request
-) -> Dict[str, Any]:
+    available_metadata: dict[str, Any], request: pyramid.request.Request
+) -> dict[str, Any]:
     result = {}
     result.update(available_metadata)
     result["description"] = request.localizer.translate(_(available_metadata.get("description", "").strip()))
     return result
 
 
-def metadata_schema_node(prop: InstrumentedAttribute, model: DeclarativeMeta) -> colander.SequenceSchema:
+def metadata_schema_node(prop: InstrumentedAttribute[Any], model: type[Any]) -> colander.SequenceSchema:
     """Get the schema of a collection of metadata."""
 
     # Deferred which returns a dictionary with metadata name as key and metadata definition as value.

c2cgeoportal_admin/schemas/restriction_areas.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Camptocamp SA
+# Copyright (c) 2017-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,8 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+from typing import Any
+
 import colander
 from c2cgeoform.ext.deform_ext import RelationCheckBoxListWidget
 from c2cgeoform.schema import GeoFormManyToManySchemaNode, manytomany_validator
@@ -34,10 +36,10 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
 from c2cgeoportal_commons.models.main import RestrictionArea
 
 
-def restrictionareas_schema_node(prop: InstrumentedAttribute) -> colander.SequenceSchema:
+def restrictionareas_schema_node(prop: InstrumentedAttribute[Any]) -> colander.SequenceSchema:
     """Get the schema of a restriction area."""
     return colander.SequenceSchema(
-        GeoFormManyToManySchemaNode(RestrictionArea),
+        GeoFormManyToManySchemaNode(RestrictionArea, None),
         name=prop.key,
         title=prop.info["colanderalchemy"]["title"],
         description=prop.info["colanderalchemy"].get("description"),

c2cgeoportal_admin/schemas/roles.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2021, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,8 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
+from typing import Any
+
 import colander
 from c2cgeoform.ext.deform_ext import RelationCheckBoxListWidget
 from c2cgeoform.schema import GeoFormManyToManySchemaNode, manytomany_validator
@@ -34,10 +36,12 @@ from sqlalchemy.orm.attributes import InstrumentedAttribute
 from c2cgeoportal_commons.models.main import Role
 
 
-def roles_schema_node(prop: InstrumentedAttribute) -> colander.SequenceSchema:
+def roles_schema_node(
+    prop: InstrumentedAttribute[Any],  # pylint: disable=unsubscriptable-object
+) -> colander.SequenceSchema:
     """Get the schema of all the items."""
     return colander.SequenceSchema(
-        GeoFormManyToManySchemaNode(Role),
+        GeoFormManyToManySchemaNode(Role, None),
         name=prop.key,
         title=prop.info["colanderalchemy"]["title"],
         description=prop.info["colanderalchemy"].get("description"),

c2cgeoportal_admin/schemas/treegroup.py

@@ -28,10 +28,11 @@
 
 import logging
 from functools import partial
-from typing import Any, Dict, List, Optional
+from typing import Any
 
 import colander
 import pyramid.request
+import sqlalchemy
 from c2cgeoform.schema import GeoFormSchemaNode
 from sqlalchemy.orm import aliased
 from sqlalchemy.sql.expression import case, func
@@ -41,7 +42,7 @@ from c2cgeoportal_admin.widgets import ChildrenWidget, ChildWidget
 from c2cgeoportal_commons.lib.literal import Literal
 from c2cgeoportal_commons.models.main import LayergroupTreeitem, TreeGroup, TreeItem
 
-LOG = logging.getLogger(__name__)
+_LOG = logging.getLogger(__name__)
 
 # Correspondence between TreeItem.item_type and route table segment
 ITEM_TYPE_ROUTE_MAP = {
@@ -53,7 +54,7 @@ ITEM_TYPE_ROUTE_MAP = {
 }
 
 
-class ChildSchemaNode(GeoFormSchemaNode):  # type: ignore # pylint: disable=abstract-method
+class ChildSchemaNode(GeoFormSchemaNode):  # pylint: disable=abstract-method
     """Schema of the child nodes."""
 
     def objectify(self, dict_, context=None):
@@ -65,18 +66,21 @@ class ChildSchemaNode(GeoFormSchemaNode):  # type: ignore # pylint: disable=abst
 
 
 def treeitems(
-    node: TreeGroup, kw: Dict[str, pyramid.request.Request], only_groups: bool = False
-) -> List[Dict[str, Any]]:
+    node: TreeGroup, kw: dict[str, pyramid.request.Request], only_groups: bool = False
+) -> list[dict[str, Any]]:
     """Get a serializable representation of the tree items."""
     del node
     dbsession = kw["request"].dbsession
+    assert isinstance(dbsession, sqlalchemy.orm.Session)
 
-    group = case([(func.count(LayergroupTreeitem.id) == 0, "Unlinked")], else_="Others")
+    group = case(
+        (func.count(LayergroupTreeitem.id) == 0, "Unlinked"), else_="Others"  # pylint: disable=not-callable
+    )
 
     query = (
         dbsession.query(TreeItem, group)
         .distinct()
-        .outerjoin("parents_relation")
+        .outerjoin(TreeItem.parents_relation)
         .filter(TreeItem.item_type != "theme")
         .group_by(TreeItem)
         .order_by(group.desc(), TreeItem.name)
@@ -93,7 +97,7 @@ def treeitems(
         search_alias = aliased(search_ancestors, name="search_ancestors")
         relation_alias = aliased(LayergroupTreeitem, name="relation")
         search_ancestors = search_ancestors.union_all(
-            dbsession.query(relation_alias.treegroup_id).filter(
+            dbsession.query(relation_alias.treegroup_id).filter(  # type: ignore[arg-type]
                 relation_alias.treeitem_id == search_alias.c.treegroup_id
             )
         )
@@ -139,13 +143,13 @@ def base_deferred_parent_id_validator(node, kw, model):
     return validator
 
 
-def treeitem_edit_url(request: pyramid.request.Request, treeitem: TreeGroup) -> Optional[str]:
+def treeitem_edit_url(request: pyramid.request.Request, treeitem: TreeGroup) -> str | None:
     """Get the tree item editing URL."""
     if treeitem.item_type is None:
         return None
     table = ITEM_TYPE_ROUTE_MAP.get(treeitem.item_type, None)
     if table is None:
-        LOG.warning("%s not found in ITEM_TYPE_ROUTE_MAP", treeitem.item_type)
+        _LOG.warning("%s not found in ITEM_TYPE_ROUTE_MAP", treeitem.item_type)
         return None
     return request.route_url(  # type: ignore
         "c2cgeoform_item",

c2cgeoportal_admin/schemas/treeitem.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2021, Camptocamp SA
+# Copyright (c) 2018-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@ from c2cgeoportal_admin.schemas.treegroup import base_deferred_parent_id_validat
 
 
 # Used for the creation of a new layer/layergroup from the layertree
-def parent_id_node(model):
+def parent_id_node(model: type) -> colander.SchemaNode:
     """Get the scheme to the parent node ID."""
     return colander.SchemaNode(
         colander.Integer(),

c2cgeoportal_admin/static/theme.css

@@ -45,6 +45,9 @@
 .icon-l_wmts:before {
   content: '\e011';
 }
+.icon-l_cog:before {
+  content: '\e011';
+}
 .icon-mvt:before {
   content: '\e011';
 }

c2cgeoportal_admin/views/dimension_layers.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Camptocamp SA
+# Copyright (c) 2017-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,9 @@
 
 from functools import partial
 from itertools import groupby
-from typing import cast
+from typing import Generic, TypeVar, cast
 
-import sqlalchemy
+import sqlalchemy.orm.query
 from c2cgeoform.views.abstract_views import ListField
 from sqlalchemy.orm import subqueryload
 
@@ -39,8 +39,10 @@ from c2cgeoportal_commons.models.main import DimensionLayer
 
 _list_field = partial(ListField, DimensionLayer)
 
+_T = TypeVar("_T", bound=DimensionLayer)
 
-class DimensionLayerViews(LayerViews):
+
+class DimensionLayerViews(LayerViews[_T], Generic[_T]):
     """The layer with dimensions administration view."""
 
     _extra_list_fields = [
@@ -53,7 +55,9 @@ class DimensionLayerViews(LayerViews):
                 ]
             ),
         )
-    ] + LayerViews._extra_list_fields
+    ] + LayerViews._extra_list_fields  # pylint: disable=protected-access
 
-    def _base_query(self, query: sqlalchemy.orm.query.Query) -> sqlalchemy.orm.query.Query:
-        return super()._base_query(query.options(subqueryload("dimensions")))
+    def _sub_query(
+        self, query: sqlalchemy.orm.query.Query[DimensionLayer]
+    ) -> sqlalchemy.orm.query.Query[DimensionLayer]:
+        return super()._sub_query(query.options(subqueryload(DimensionLayer.dimensions)))