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

c2cgeoportal_admin/views/layers_wms.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
@@ -27,11 +27,19 @@
 
 
 from functools import partial
-from typing import Any, Dict, List, Optional
 
 import sqlalchemy
+from c2cgeoform import JSONDict
 from c2cgeoform.schema import GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import ItemAction, ListField
+from c2cgeoform.views.abstract_views import (
+    DeleteResponse,
+    GridResponse,
+    IndexResponse,
+    ItemAction,
+    ListField,
+    ObjectResponse,
+    SaveResponse,
+)
 from deform.widget import FormWidget
 from pyramid.view import view_config, view_defaults
 from sqlalchemy import delete, insert, inspect, update
@@ -54,15 +62,15 @@ base_schema.add(metadata_schema_node(LayerWMS.metadatas, LayerWMS))
 base_schema.add(interfaces_schema_node(LayerWMS.interfaces))
 base_schema.add(restrictionareas_schema_node(LayerWMS.restrictionareas))
 base_schema.add_unique_validator(LayerWMS.name, LayerWMS.id)
-base_schema.add(parent_id_node(LayerGroup))  # type: ignore
+base_schema.add(parent_id_node(LayerGroup))
 
 
 @view_defaults(match_param="table=layers_wms")
-class LayerWmsViews(DimensionLayerViews):
+class LayerWmsViews(DimensionLayerViews[LayerWMS]):
     """The WMS layer administration view."""
 
     _list_fields = (
-        DimensionLayerViews._list_fields
+        DimensionLayerViews._list_fields  # pylint: disable=protected-access
         + [
             _list_field(
                 "ogc_server",
@@ -77,27 +85,34 @@ class LayerWmsViews(DimensionLayerViews):
             _list_field("time_mode"),
             _list_field("time_widget"),
         ]
-        + DimensionLayerViews._extra_list_fields
+        + DimensionLayerViews._extra_list_fields  # pylint: disable=protected-access
     )
     _id_field = "id"
     _model = LayerWMS
     _base_schema = base_schema
 
-    def _base_query(self, query: Optional[sqlalchemy.orm.query.Query] = None) -> sqlalchemy.orm.query.Query:
+    def _base_query(self) -> sqlalchemy.orm.query.Query[LayerWMS]:
+        return super()._sub_query(
+            self._request.dbsession.query(LayerWMS, OGCServer.name).distinct().outerjoin(LayerWMS.ogc_server)
+        )
+
+    def _sub_query(
+        self, query: sqlalchemy.orm.query.Query[LayerWMS] | None
+    ) -> sqlalchemy.orm.query.Query[LayerWMS]:
         del query
-        return super()._base_query(self._request.dbsession.query(LayerWMS).distinct().outerjoin("ogc_server"))
+        return self._base_query()
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore
-    def index(self) -> Dict[str, Any]:
-        return super().index()  # type: ignore
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore[misc]
+    def index(self) -> IndexResponse:
+        return super().index()
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore
-    def grid(self) -> Dict[str, Any]:
-        return super().grid()  # type: ignore
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore[misc]
+    def grid(self) -> GridResponse:
+        return super().grid()
 
-    def _item_actions(self, item: LayerWMS, readonly: bool = False) -> List[ItemAction]:
-        actions: List[ItemAction] = super()._item_actions(item, readonly)
-        if inspect(item).persistent:
+    def _item_actions(self, item: LayerWMS, readonly: bool = False) -> list[ItemAction]:
+        actions: list[ItemAction] = super()._item_actions(item, readonly)
+        if inspect(item).persistent:  # type: ignore[attr-defined]
             actions.insert(
                 next((i for i, v in enumerate(actions) if v.name() == "delete")),
                 ItemAction(
@@ -111,35 +126,35 @@ class LayerWmsViews(DimensionLayerViews):
             )
         return actions
 
-    @view_config(  # type: ignore
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def view(self) -> Dict[str, Any]:
+    def view(self) -> ObjectResponse:
         if self._is_new():
             dbsession = self._request.dbsession
             default_wms = LayerWMS.get_default(dbsession)
             if default_wms:
-                return self.copy(default_wms, excludes=["name", "layer"])  # type: ignore
-        return super().edit()  # type: ignore
+                return self.copy(default_wms, excludes=["name", "layer"])
+        return super().edit()
 
-    @view_config(  # type: ignore
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2"
     )
-    def save(self) -> Dict[str, Any]:
-        return super().save()  # type: ignore
+    def save(self) -> SaveResponse:
+        return super().save()
 
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore
-    def delete(self) -> Dict[str, Any]:
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore[misc]
+    def delete(self) -> DeleteResponse:
         return super().delete()
 
-    @view_config(  # type: ignore
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self) -> Dict[str, Any]:
-        return super().duplicate()  # type: ignore
+    def duplicate(self) -> ObjectResponse:
+        return super().duplicate()
 
-    @view_config(route_name="convert_to_wmts", request_method="POST", renderer="fast_json")  # type: ignore
-    def convert_to_wmts(self) -> Dict[str, Any]:
+    @view_config(route_name="convert_to_wmts", request_method="POST", renderer="fast_json")  # type: ignore[misc]
+    def convert_to_wmts(self) -> JSONDict:
         src = self._get_object()
         dbsession = self._request.dbsession
         default_wmts = LayerWMTS.get_default(dbsession)

c2cgeoportal_admin/views/layers_wmts.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
@@ -27,11 +27,19 @@
 
 
 from functools import partial
-from typing import Any, Dict, List, Optional
 
 import sqlalchemy
+from c2cgeoform import JSONDict
 from c2cgeoform.schema import GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import ItemAction, ListField
+from c2cgeoform.views.abstract_views import (
+    DeleteResponse,
+    GridResponse,
+    IndexResponse,
+    ItemAction,
+    ListField,
+    ObjectResponse,
+    SaveResponse,
+)
 from deform.widget import FormWidget
 from pyramid.view import view_config, view_defaults
 from sqlalchemy import delete, insert, inspect, update
@@ -54,15 +62,15 @@ base_schema.add(metadata_schema_node(LayerWMTS.metadatas, LayerWMTS))
 base_schema.add(interfaces_schema_node(LayerWMTS.interfaces))
 base_schema.add(restrictionareas_schema_node(LayerWMTS.restrictionareas))
 base_schema.add_unique_validator(LayerWMTS.name, LayerWMTS.id)
-base_schema.add(parent_id_node(LayerGroup))  # type: ignore
+base_schema.add(parent_id_node(LayerGroup))
 
 
 @view_defaults(match_param="table=layers_wmts")
-class LayerWmtsViews(DimensionLayerViews):
+class LayerWmtsViews(DimensionLayerViews[LayerWMTS]):
     """The WMTS layer administration view."""
 
     _list_fields = (
-        DimensionLayerViews._list_fields
+        DimensionLayerViews._list_fields  # pylint: disable=protected-access
         + [
             _list_field("url"),
             _list_field("layer"),
@@ -70,26 +78,32 @@ class LayerWmtsViews(DimensionLayerViews):
             _list_field("matrix_set"),
             _list_field("image_type"),
         ]
-        + DimensionLayerViews._extra_list_fields
+        + DimensionLayerViews._extra_list_fields  # pylint: disable=protected-access
     )
     _id_field = "id"
     _model = LayerWMTS
     _base_schema = base_schema
 
-    def _base_query(self, query: Optional[sqlalchemy.orm.query.Query] = None) -> sqlalchemy.orm.query.Query:
-        return super()._base_query(self._request.dbsession.query(LayerWMTS).distinct())
+    def _base_query(self) -> sqlalchemy.orm.query.Query[LayerWMTS]:
+        return super()._sub_query(self._request.dbsession.query(LayerWMTS).distinct())
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore
-    def index(self) -> Dict[str, Any]:
-        return super().index()  # type: ignore
+    def _sub_query(
+        self, query: sqlalchemy.orm.query.Query[LayerWMTS]
+    ) -> sqlalchemy.orm.query.Query[LayerWMTS]:
+        del query
+        return self._base_query()
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore
-    def grid(self) -> Dict[str, Any]:
-        return super().grid()  # type: ignore
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore[misc]
+    def index(self) -> IndexResponse:
+        return super().index()
 
-    def _item_actions(self, item: LayerWMTS, readonly: bool = False) -> List[ItemAction]:
-        actions: List[ItemAction] = super()._item_actions(item, readonly)
-        if inspect(item).persistent:
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore[misc]
+    def grid(self) -> GridResponse:
+        return super().grid()
+
+    def _item_actions(self, item: LayerWMTS, readonly: bool = False) -> list[ItemAction]:
+        actions: list[ItemAction] = super()._item_actions(item, readonly)
+        if inspect(item).persistent:  # type: ignore[attr-defined]
             actions.insert(
                 next((i for i, v in enumerate(actions) if v.name() == "delete")),
                 ItemAction(
@@ -103,35 +117,35 @@ class LayerWmtsViews(DimensionLayerViews):
             )
         return actions
 
-    @view_config(  # type: ignore
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def view(self) -> Dict[str, Any]:
+    def view(self) -> ObjectResponse:
         if self._is_new():
             dbsession = self._request.dbsession
             default_wmts = LayerWMTS.get_default(dbsession)
             if default_wmts:
-                return self.copy(default_wmts, excludes=["name", "layer"])  # type: ignore
-        return super().edit()  # type: ignore
+                return self.copy(default_wmts, excludes=["name", "layer"])
+        return super().edit()
 
-    @view_config(  # type: ignore
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2"
     )
-    def save(self) -> Dict[str, Any]:
-        return super().save()  # type: ignore
+    def save(self) -> SaveResponse:
+        return super().save()
 
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore
-    def delete(self) -> Dict[str, Any]:
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore[misc]
+    def delete(self) -> DeleteResponse:
         return super().delete()
 
-    @view_config(  # type: ignore
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self) -> Dict[str, Any]:
-        return super().duplicate()  # type: ignore
+    def duplicate(self) -> ObjectResponse:
+        return super().duplicate()
 
-    @view_config(route_name="convert_to_wms", request_method="POST", renderer="fast_json")  # type: ignore
-    def convert_to_wms(self) -> Dict[str, Any]:
+    @view_config(route_name="convert_to_wms", request_method="POST", renderer="fast_json")  # type: ignore[misc]
+    def convert_to_wms(self) -> JSONDict:
         src = self._get_object()
         dbsession = self._request.dbsession
         default_wms = LayerWMS.get_default(dbsession)

c2cgeoportal_admin/views/layertree.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
@@ -26,10 +26,10 @@
 # either expressed or implied, of the FreeBSD Project.
 
 
-from typing import Any, Dict, List, Optional
+from typing import Any
 
 import pyramid.request
-from c2cgeoform.views.abstract_views import ItemAction
+from c2cgeoform.views.abstract_views import DeleteResponse, ItemAction
 from pyramid.httpexceptions import HTTPNotFound
 from pyramid.view import view_config, view_defaults
 from translationstring import TranslationStringFactory
@@ -42,6 +42,7 @@ itemtypes_tables = {
     "group": "layer_groups",
     "l_wms": "layers_wms",
     "l_wmts": "layers_wmts",
+    "l_cog": "layers_cog",
 }
 
 
@@ -54,13 +55,13 @@ class LayerTreeViews:
         self._dbsession = request.dbsession
 
     @view_config(route_name="layertree", renderer="../templates/layertree.jinja2")  # type: ignore
-    def index(self) -> Dict[str, int]:
+    def index(self) -> dict[str, int]:
         node_limit = self._request.registry.settings["admin_interface"].get("layer_tree_max_nodes")
         limit_exceeded = self._dbsession.query(LayergroupTreeitem).count() < node_limit
         return {"limit_exceeded": limit_exceeded, "interfaces": self._dbsession.query(Interface).all()}
 
     @view_config(route_name="layertree_children", renderer="fast_json")  # type: ignore
-    def children(self) -> List[Dict[str, Any]]:
+    def children(self) -> list[dict[str, Any]]:
         interface = self._request.params.get("interface", None)
         group_id = self._request.params.get("group_id", None)
         path = self._request.params.get("path", "")
@@ -97,7 +98,7 @@ class LayerTreeViews:
             or interface in [interface.name for interface in item.interfaces]
         ]
 
-    def _item_actions(self, item: TreeItem, parent_id: Optional[int] = None) -> List[ItemAction]:
+    def _item_actions(self, item: TreeItem, parent_id: int | None = None) -> list[ItemAction]:
         actions = []
         actions.append(
             ItemAction(
@@ -179,7 +180,7 @@ class LayerTreeViews:
         return actions
 
     @view_config(route_name="layertree_unlink", request_method="DELETE", renderer="fast_json")  # type: ignore
-    def unlink(self) -> Dict[str, Any]:
+    def unlink(self) -> dict[str, Any]:
         group_id = self._request.matchdict.get("group_id")
         item_id = self._request.matchdict.get("item_id")
         link = (
@@ -195,7 +196,7 @@ class LayerTreeViews:
         return {"success": True, "redirect": self._request.route_url("layertree")}
 
     @view_config(route_name="layertree_delete", request_method="DELETE", renderer="fast_json")  # type: ignore
-    def delete(self) -> Dict[str, Any]:
+    def delete(self) -> DeleteResponse:
         item_id = self._request.matchdict.get("item_id")
         item = self._request.dbsession.query(TreeItem).get(item_id)
         if item is None:

c2cgeoportal_admin/views/logged_views.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023-2023, Camptocamp SA
+# Copyright (c) 2023-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -26,25 +26,25 @@
 # either expressed or implied, of the FreeBSD Project.
 
 import datetime
-from typing import Any, Dict, Optional, Union
+from typing import Generic, TypeVar
 
-import pytz
-from c2cgeoform.views.abstract_views import AbstractViews
+from c2cgeoform.views.abstract_views import AbstractViews, DeleteResponse, SaveResponse
 from pyramid.httpexceptions import HTTPFound
 
 from c2cgeoportal_commons.models import Base
 from c2cgeoportal_commons.models.main import Log, LogAction
 
+_T = TypeVar("_T", bound=Log)
 
-class LoggedViews(AbstractViews):  # type: ignore
+
+class LoggedViews(AbstractViews[_T], Generic[_T]):
     """Extension of AbstractViews which log actions in a table."""
 
     _log_model = Log  # main.Log or static.Log
     _name_field = "name"
 
-    def save(self) -> Union[HTTPFound, Dict[str, Any]]:
+    def save(self) -> SaveResponse:
         response = super().save()
-
         if isinstance(response, HTTPFound):
             self._create_log(
                 action=LogAction.INSERT if self._is_new() else LogAction.UPDATE,
@@ -53,23 +53,26 @@ class LoggedViews(AbstractViews):  # type: ignore
 
         return response
 
-    def delete(self) -> Dict[str, Any]:
+    def delete(self) -> DeleteResponse:
         obj = self._get_object()
 
         response = super().delete()
 
         self._create_log(LogAction.DELETE, obj)
 
-        return response  # type: ignore
+        return response
 
     def _create_log(
         self,
         action: LogAction,
-        obj: Base,
-        element_url_table: Optional[str] = None,
+        obj: Base,  # type: ignore[valid-type]
+        element_url_table: str | None = None,
     ) -> None:
+        assert self._model is not None
+        assert self._name_field is not None
+        assert self._id_field is not None
         log = self._log_model(
-            date=datetime.datetime.now(pytz.utc),
+            date=datetime.datetime.now(datetime.timezone.utc),
             action=action,
             element_type=self._model.__tablename__,
             element_id=getattr(obj, self._id_field),

c2cgeoportal_admin/views/logs.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023-2023, Camptocamp SA
+# Copyright (c) 2023-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,8 @@
 
 from functools import partial
 
-from c2cgeoform.views.abstract_views import AbstractViews, ItemAction, ListField
+from c2cgeoform import JSONDict
+from c2cgeoform.views.abstract_views import AbstractViews, GridResponse, IndexResponse, ItemAction, ListField
 from pyramid.view import view_config, view_defaults
 
 from c2cgeoportal_commons.models import _
@@ -37,7 +38,7 @@ _list_field = partial(ListField, AbstractLog)
 
 
 @view_defaults(match_param="table=logs")
-class LogViews(AbstractViews):  # type: ignore
+class LogViews(AbstractViews[AbstractLog]):
     """The theme administration view."""
 
     # We pass labels explicitly because actually we are not able to get info
@@ -56,18 +57,18 @@ class LogViews(AbstractViews):  # type: ignore
     _id_field = "id"
     _model = AbstractLog
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")
-    def index(self):
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore[misc]
+    def index(self) -> IndexResponse:
         return super().index()
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")
-    def grid(self):
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore[misc]
+    def grid(self) -> GridResponse:
         return super().grid()
 
     def _grid_actions(self):
         return []
 
-    def _grid_item_actions(self, item):
+    def _grid_item_actions(self, item: AbstractLog) -> JSONDict:
         element_url = self._request.route_url(
             "c2cgeoform_item",
             table=item.element_url_table,

c2cgeoportal_admin/views/oauth2_clients.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2023, Camptocamp SA
+# Copyright (c) 2021-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -27,10 +27,16 @@
 
 
 from functools import partial
-from typing import Any, Dict
 
 from c2cgeoform.schema import GeoFormSchemaNode
-from c2cgeoform.views.abstract_views import ListField
+from c2cgeoform.views.abstract_views import (
+    DeleteResponse,
+    GridResponse,
+    IndexResponse,
+    ListField,
+    ObjectResponse,
+    SaveResponse,
+)
 from pyramid.view import view_config, view_defaults
 
 from c2cgeoportal_admin.views.logged_views import LoggedViews
@@ -43,7 +49,7 @@ base_schema.add_unique_validator(OAuth2Client.client_id, OAuth2Client.id)
 
 
 @view_defaults(match_param="table=oauth2_clients")
-class OAuth2ClientViews(LoggedViews):
+class OAuth2ClientViews(LoggedViews[OAuth2Client]):
     """The oAuth2 client administration view."""
 
     _list_fields = [
@@ -61,32 +67,30 @@ class OAuth2ClientViews(LoggedViews):
     def _base_query(self):
         return self._request.dbsession.query(OAuth2Client)
 
-    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore
-    def index(self) -> Dict[str, Any]:
-        return super().index()  # type: ignore
+    @view_config(route_name="c2cgeoform_index", renderer="../templates/index.jinja2")  # type: ignore[misc]
+    def index(self) -> IndexResponse:
+        return super().index()
 
-    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore
-    def grid(self) -> Dict[str, Any]:
-        return super().grid()  # type: ignore
+    @view_config(route_name="c2cgeoform_grid", renderer="fast_json")  # type: ignore[misc]
+    def grid(self) -> GridResponse:
+        return super().grid()
 
-    @view_config(  # type: ignore
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def view(self) -> Dict[str, Any]:
-        return super().edit()  # type: ignore
+    def view(self) -> ObjectResponse:
+        return super().edit()
 
-    @view_config(  # type: ignore
-        route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2"
-    )
-    def save(self) -> Dict[str, Any]:
+    @view_config(route_name="c2cgeoform_item", request_method="POST", renderer="../templates/edit.jinja2")  # type: ignore[misc]
+    def save(self) -> SaveResponse:
         return super().save()
 
-    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore
-    def delete(self) -> Dict[str, Any]:
+    @view_config(route_name="c2cgeoform_item", request_method="DELETE", renderer="fast_json")  # type: ignore[misc]
+    def delete(self) -> DeleteResponse:
         return super().delete()
 
-    @view_config(  # type: ignore
+    @view_config(  # type: ignore[misc]
         route_name="c2cgeoform_item_duplicate", request_method="GET", renderer="../templates/edit.jinja2"
     )
-    def duplicate(self) -> Dict[str, Any]:
-        return super().duplicate()  # type: ignore
+    def duplicate(self) -> ObjectResponse:
+        return super().duplicate()