c2cgeoportal-admin 2.6.0__py3-none-any.whl → 2.9rc44__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (80) hide show
  1. c2cgeoportal_admin/__init__.py +42 -12
  2. c2cgeoportal_admin/lib/lingva_extractor.py +77 -0
  3. c2cgeoportal_admin/lib/ogcserver_synchronizer.py +170 -57
  4. c2cgeoportal_admin/py.typed +0 -0
  5. c2cgeoportal_admin/routes.py +18 -6
  6. c2cgeoportal_admin/schemas/dimensions.py +16 -10
  7. c2cgeoportal_admin/schemas/functionalities.py +59 -21
  8. c2cgeoportal_admin/schemas/interfaces.py +26 -18
  9. c2cgeoportal_admin/schemas/metadata.py +101 -48
  10. c2cgeoportal_admin/schemas/restriction_areas.py +25 -19
  11. c2cgeoportal_admin/schemas/roles.py +12 -6
  12. c2cgeoportal_admin/schemas/treegroup.py +46 -21
  13. c2cgeoportal_admin/schemas/treeitem.py +3 -4
  14. c2cgeoportal_admin/static/layertree.css +3 -4
  15. c2cgeoportal_admin/static/navbar.css +36 -35
  16. c2cgeoportal_admin/static/theme.css +19 -9
  17. c2cgeoportal_admin/subscribers.py +3 -3
  18. c2cgeoportal_admin/templates/404.jinja2 +18 -2
  19. c2cgeoportal_admin/templates/layertree.jinja2 +31 -9
  20. c2cgeoportal_admin/templates/navigation_navbar.jinja2 +33 -0
  21. c2cgeoportal_admin/templates/ogcserver_synchronize.jinja2 +12 -0
  22. c2cgeoportal_admin/templates/widgets/functionality_fields.pt +51 -0
  23. c2cgeoportal_admin/templates/widgets/metadata.pt +7 -1
  24. c2cgeoportal_admin/views/__init__.py +29 -0
  25. c2cgeoportal_admin/views/dimension_layers.py +14 -9
  26. c2cgeoportal_admin/views/functionalities.py +52 -18
  27. c2cgeoportal_admin/views/home.py +5 -5
  28. c2cgeoportal_admin/views/interfaces.py +26 -20
  29. c2cgeoportal_admin/views/layer_groups.py +36 -25
  30. c2cgeoportal_admin/views/layers.py +17 -13
  31. c2cgeoportal_admin/views/layers_cog.py +135 -0
  32. c2cgeoportal_admin/views/layers_vectortiles.py +62 -27
  33. c2cgeoportal_admin/views/layers_wms.py +55 -34
  34. c2cgeoportal_admin/views/layers_wmts.py +54 -34
  35. c2cgeoportal_admin/views/layertree.py +38 -29
  36. c2cgeoportal_admin/views/logged_views.py +83 -0
  37. c2cgeoportal_admin/views/logs.py +91 -0
  38. c2cgeoportal_admin/views/oauth2_clients.py +30 -18
  39. c2cgeoportal_admin/views/ogc_servers.py +132 -36
  40. c2cgeoportal_admin/views/restriction_areas.py +39 -27
  41. c2cgeoportal_admin/views/roles.py +42 -28
  42. c2cgeoportal_admin/views/themes.py +47 -35
  43. c2cgeoportal_admin/views/themes_ordering.py +19 -14
  44. c2cgeoportal_admin/views/treeitems.py +21 -17
  45. c2cgeoportal_admin/views/users.py +46 -26
  46. c2cgeoportal_admin/widgets.py +17 -14
  47. {c2cgeoportal_admin-2.6.0.dist-info → c2cgeoportal_admin-2.9rc44.dist-info}/METADATA +12 -12
  48. c2cgeoportal_admin-2.9rc44.dist-info/RECORD +97 -0
  49. {c2cgeoportal_admin-2.6.0.dist-info → c2cgeoportal_admin-2.9rc44.dist-info}/WHEEL +1 -1
  50. c2cgeoportal_admin-2.9rc44.dist-info/entry_points.txt +5 -0
  51. tests/__init__.py +24 -20
  52. tests/conftest.py +22 -11
  53. tests/test_edit_url.py +11 -14
  54. tests/test_functionalities.py +52 -14
  55. tests/test_home.py +0 -1
  56. tests/test_interface.py +34 -11
  57. tests/test_layer_groups.py +57 -27
  58. tests/test_layers_cog.py +243 -0
  59. tests/test_layers_vectortiles.py +43 -25
  60. tests/test_layers_wms.py +67 -45
  61. tests/test_layers_wmts.py +47 -26
  62. tests/test_layertree.py +99 -16
  63. tests/test_left_menu.py +0 -1
  64. tests/test_lingva_extractor_config.py +64 -0
  65. tests/test_logs.py +102 -0
  66. tests/test_main.py +3 -1
  67. tests/test_metadatas.py +34 -21
  68. tests/test_oauth2_clients.py +40 -11
  69. tests/test_ogc_servers.py +84 -35
  70. tests/test_restriction_areas.py +38 -15
  71. tests/test_role.py +71 -43
  72. tests/test_themes.py +71 -37
  73. tests/test_themes_ordering.py +1 -2
  74. tests/test_treegroup.py +2 -2
  75. tests/test_user.py +56 -19
  76. tests/themes_ordering.py +1 -2
  77. c2cgeoportal_admin/templates/navigation_vertical.jinja2 +0 -33
  78. c2cgeoportal_admin-2.6.0.dist-info/RECORD +0 -89
  79. c2cgeoportal_admin-2.6.0.dist-info/entry_points.txt +0 -3
  80. {c2cgeoportal_admin-2.6.0.dist-info → c2cgeoportal_admin-2.9rc44.dist-info}/top_level.txt +0 -0
@@ -1,6 +1,4 @@
1
- # -*- coding: utf-8 -*-
2
-
3
- # Copyright (c) 2017-2020, Camptocamp SA
1
+ # Copyright (c) 2017-2024, Camptocamp SA
4
2
  # All rights reserved.
5
3
 
6
4
  # Redistribution and use in source and binary forms, with or without
@@ -28,8 +26,11 @@
28
26
  # either expressed or implied, of the FreeBSD Project.
29
27
 
30
28
 
29
+ from typing import Any
30
+
31
31
  import c2cgeoform
32
32
  import c2cwsgiutils.pretty_json
33
+ import sqlalchemy.orm.session
33
34
  import zope.sqlalchemy
34
35
  from c2c.template.config import config as configuration
35
36
  from pkg_resources import resource_filename
@@ -37,9 +38,11 @@ from pyramid.config import Configurator
37
38
  from pyramid.events import BeforeRender, NewRequest
38
39
  from sqlalchemy import engine_from_config
39
40
  from sqlalchemy.orm import configure_mappers, sessionmaker
41
+ from transaction import TransactionManager
40
42
  from translationstring import TranslationStringFactory
41
43
 
42
44
  from c2cgeoportal_admin.subscribers import add_localizer, add_renderer_globals
45
+ from c2cgeoportal_admin.views import IsAdminPredicate
43
46
 
44
47
  search_paths = (resource_filename(__name__, "templates/widgets"),) + c2cgeoform.default_search_paths
45
48
  c2cgeoform.default_search_paths = search_paths
@@ -48,11 +51,13 @@ _ = TranslationStringFactory("c2cgeoportal_admin")
48
51
 
49
52
 
50
53
  def main(_, **settings):
51
- """
52
- This function returns a Pyramid WSGI application.
53
- """
54
- configuration.init(settings.get("app.cfg"))
55
- settings.update(configuration.get_config())
54
+ """Return a Pyramid WSGI application."""
55
+ app_cfg = settings.get("app.cfg")
56
+ assert app_cfg is not None
57
+ configuration.init(app_cfg)
58
+ conf = configuration.get_config()
59
+ assert conf is not None
60
+ settings.update(conf)
56
61
 
57
62
  config = Configurator(settings=settings)
58
63
 
@@ -68,8 +73,14 @@ def main(_, **settings):
68
73
  session_factory = sessionmaker()
69
74
  session_factory.configure(bind=engine)
70
75
 
71
- def get_tm_session(session_factory, transaction_manager):
76
+ def get_tm_session(
77
+ session_factory: sessionmaker[ # pylint: disable=unsubscriptable-object
78
+ sqlalchemy.orm.session.Session
79
+ ],
80
+ transaction_manager: TransactionManager,
81
+ ) -> sqlalchemy.orm.session.Session:
72
82
  dbsession = session_factory()
83
+ assert isinstance(dbsession, sqlalchemy.orm.session.Session)
73
84
  zope.sqlalchemy.register(dbsession, transaction_manager=transaction_manager)
74
85
  return dbsession
75
86
 
@@ -81,6 +92,19 @@ def main(_, **settings):
81
92
  reify=True,
82
93
  )
83
94
 
95
+ # Add fake user as we do not have authentication from geoportal
96
+ from c2cgeoportal_commons.models.static import User # pylint: disable=import-outside-toplevel
97
+
98
+ config.add_request_method(
99
+ lambda request: User(
100
+ username="test_user",
101
+ ),
102
+ name="user",
103
+ property=True,
104
+ )
105
+
106
+ config.add_route("ogc_server_clear_cache", "/admin/ogc_server_clear_cache/{id}")
107
+
84
108
  config.add_subscriber(add_renderer_globals, BeforeRender)
85
109
  config.add_subscriber(add_localizer, NewRequest)
86
110
 
@@ -88,7 +112,9 @@ def main(_, **settings):
88
112
 
89
113
 
90
114
  class PermissionSetter:
91
- def __init__(self, config):
115
+ """Set the permission to the admin user."""
116
+
117
+ def __init__(self, config: Configurator):
92
118
  self.default_permission_to_revert = None
93
119
  self.config = config
94
120
 
@@ -100,12 +126,13 @@ class PermissionSetter:
100
126
  ]["introspectable"]["value"]
101
127
  self.config.set_default_permission("admin")
102
128
 
103
- def __exit__(self, _type, value, traceback):
129
+ def __exit__(self, _type: Any, value: Any, traceback: Any) -> None:
104
130
  self.config.commit() # avoid .ConfigurationConflictError
105
131
  self.config.set_default_permission(self.default_permission_to_revert)
106
132
 
107
133
 
108
- def includeme(config: Configurator):
134
+ def includeme(config: Configurator) -> None:
135
+ """Initialize the Pyramid application."""
109
136
  config.include("pyramid_jinja2")
110
137
  config.include("c2cgeoform")
111
138
  config.include("c2cgeoportal_commons")
@@ -113,6 +140,9 @@ def includeme(config: Configurator):
113
140
  # Use pyramid_tm to hook the transaction lifecycle to the request
114
141
  config.include("pyramid_tm")
115
142
  config.add_translation_dirs("c2cgeoportal_admin:locale")
143
+ config.add_view_predicate("is_admin", IsAdminPredicate)
144
+
145
+ configure_mappers()
116
146
 
117
147
  with PermissionSetter(config):
118
148
  config.scan()
@@ -0,0 +1,77 @@
1
+ # Copyright (c) 2011-2024, Camptocamp SA
2
+ # All rights reserved.
3
+
4
+ # Redistribution and use in source and binary forms, with or without
5
+ # modification, are permitted provided that the following conditions are met:
6
+
7
+ # 1. Redistributions of source code must retain the above copyright notice, this
8
+ # list of conditions and the following disclaimer.
9
+ # 2. Redistributions in binary form must reproduce the above copyright notice,
10
+ # this list of conditions and the following disclaimer in the documentation
11
+ # and/or other materials provided with the distribution.
12
+
13
+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14
+ # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16
+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
17
+ # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18
+ # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19
+ # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
20
+ # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23
+
24
+ # The views and conclusions contained in the software and documentation are those
25
+ # of the authors and should not be interpreted as representing official policies,
26
+ # either expressed or implied, of the FreeBSD Project.
27
+
28
+
29
+ import os
30
+ from typing import Any
31
+
32
+ import yaml
33
+ from lingva.extractors import Extractor, Message
34
+
35
+
36
+ class GeomapfishConfigExtractor(Extractor): # type: ignore
37
+ """GeoMapFish config extractor (raster layers, and print templates)."""
38
+
39
+ extensions = [".yaml"]
40
+
41
+ def __call__(
42
+ self,
43
+ filename: str,
44
+ options: dict[str, Any],
45
+ fileobj: dict[str, Any] | None = None,
46
+ lineno: int = 0,
47
+ ) -> list[Message]:
48
+ del options, fileobj, lineno
49
+
50
+ print(f"Running {self.__class__.__name__} on {filename}")
51
+
52
+ with open(filename, encoding="utf8") as config_file:
53
+ data = config_file.read()
54
+ settings = yaml.load(
55
+ data.replace("{{cookiecutter.geomapfish_main_version}}", os.environ["MAJOR_VERSION"]),
56
+ Loader=yaml.SafeLoader,
57
+ )
58
+
59
+ admin_interface = settings.get("vars", {}).get("admin_interface", {})
60
+
61
+ available_metadata = []
62
+ for elem in admin_interface.get("available_metadata", []):
63
+ if "description" in elem:
64
+ location = f"admin_interface/available_metadata/{elem.get('name', '')}"
65
+ available_metadata.append(
66
+ Message(None, elem["description"].strip(), None, [], "", "", (filename, location))
67
+ )
68
+
69
+ available_functionalities = []
70
+ for elem in admin_interface.get("available_functionalities", []):
71
+ if "description" in elem:
72
+ location = f"admin_interface/available_functionalities/{elem.get('name', '')}"
73
+ available_functionalities.append(
74
+ Message(None, elem["description"].strip(), None, [], "", "", (filename, location))
75
+ )
76
+
77
+ return available_metadata + available_functionalities
@@ -1,6 +1,4 @@
1
- # -*- coding: utf-8 -*-
2
-
3
- # Copyright (c) 2020, Camptocamp SA
1
+ # Copyright (c) 2020-2024, Camptocamp SA
4
2
  # All rights reserved.
5
3
 
6
4
  # Redistribution and use in source and binary forms, with or without
@@ -28,35 +26,71 @@
28
26
  # either expressed or implied, of the FreeBSD Project.
29
27
 
30
28
 
29
+ import functools
31
30
  import logging
32
31
  from io import StringIO
33
- from typing import Set, cast # noqa, pylint: disable=unused-import
32
+ from typing import Any, Optional, cast
33
+ from xml.etree.ElementTree import Element # nosec
34
34
 
35
+ import pyramid.request
35
36
  import requests
36
37
  from defusedxml import ElementTree
38
+ from sqlalchemy.orm.session import Session
37
39
 
38
- from c2cgeoportal_commons.lib.url import add_url_params, get_url2
40
+ from c2cgeoportal_commons.lib.url import get_url2
39
41
  from c2cgeoportal_commons.models import main
40
42
 
41
43
 
42
- class dry_run_transaction: # noqa N801: class names should use CapWords convention
43
- def __init__(self, dbsession, dry_run):
44
+ class dry_run_transaction: # noqa ignore=N801: class names should use CapWords convention
45
+ def __init__(self, dbsession: Session, dry_run: bool):
44
46
  self.dbsession = dbsession
45
47
  self.dry_run = dry_run
46
48
 
47
- def __enter__(self):
49
+ def __enter__(self) -> None:
48
50
  if self.dry_run:
49
51
  self.dbsession.begin_nested()
50
52
 
51
- def __exit__(self, exc_type, exc_val, exc_tb):
53
+ def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
52
54
  if self.dry_run:
53
55
  self.dbsession.rollback()
54
56
 
55
57
 
56
58
  class OGCServerSynchronizer:
57
- def __init__(self, request, ogc_server):
59
+ """A processor which imports WMS Capabilities in layer tree."""
60
+
61
+ def __init__(
62
+ self,
63
+ request: pyramid.request.Request,
64
+ ogc_server: main.OGCServer,
65
+ force_parents: bool = False,
66
+ force_ordering: bool = False,
67
+ clean: bool = False,
68
+ ) -> None:
69
+ """
70
+ Initialize the Synchronizer.
71
+
72
+ request
73
+ The current pyramid request object. Used to retrieve the SQLAlchemy Session object,
74
+ and to construct the capabilities URL.
75
+
76
+ ogc_server
77
+ The considered OGCServer from witch to import the capabilities.
78
+
79
+ force_parents
80
+ When set to True, overwrite parents of each node with those from the capabilities.
81
+
82
+ force_ordering
83
+ When set to True, sort children of each node in order from the capabilities.
84
+
85
+ clean
86
+ When set to True, remove layers which do not exist in capabilities and remove all empty groups.
87
+ """
58
88
  self._request = request
59
89
  self._ogc_server = ogc_server
90
+ self._force_parents = force_parents
91
+ self._force_ordering = force_ordering
92
+ self._clean = clean
93
+
60
94
  self._default_wms = main.LayerWMS()
61
95
  self._interfaces = None
62
96
 
@@ -68,18 +102,20 @@ class OGCServerSynchronizer:
68
102
  self._items_found = 0
69
103
  self._themes_added = 0
70
104
  self._groups_added = 0
105
+ self._groups_removed = 0
71
106
  self._layers_added = 0
107
+ self._layers_removed = 0
72
108
 
73
- def __str__(self):
74
- return "OGCServerSynchronizer({})".format(self._ogc_server.name)
109
+ def __str__(self) -> str:
110
+ return f"OGCServerSynchronizer({self._ogc_server.name})"
75
111
 
76
- def logger(self):
112
+ def logger(self) -> logging.Logger:
77
113
  return self._logger
78
114
 
79
- def report(self):
115
+ def report(self) -> str:
80
116
  return self._log.getvalue()
81
117
 
82
- def check_layers(self):
118
+ def check_layers(self) -> None:
83
119
  capabilities = ElementTree.fromstring(self.wms_capabilities())
84
120
  layers = self._request.dbsession.query(main.LayerWMS).filter(
85
121
  main.LayerWMS.ogc_server == self._ogc_server
@@ -90,15 +126,24 @@ class OGCServerSynchronizer:
90
126
  valid = True
91
127
  reason = None
92
128
  for name in layer.layer.split(","):
93
- el = capabilities.find(".//Layer[Name='{}']".format(name))
129
+ if "'" in name:
130
+ valid = False
131
+ reason = "Layer name contains quote"
132
+ self._logger.info(reason)
133
+ break
134
+ el = capabilities.find(f".//Layer[Name='{name}']")
94
135
  if el is None:
95
136
  valid = False
96
- reason = "Layer {} does not exists on OGC server".format(name)
137
+ reason = f"Layer {name} does not exists on OGC server"
97
138
  self._logger.info(reason)
139
+ if self._clean:
140
+ self._request.dbsession.delete(layer)
141
+ self._logger.info("Removed layer %s", name)
142
+ self._layers_removed += 1
98
143
  break
99
- if layer.style and el.find("./Style/Name[.='{}']".format(layer.style)) is None:
144
+ if layer.style and el.find(f"./Style/Name[.='{layer.style}']") is None:
100
145
  valid = False
101
- reason = "Style {} does not exists in Layer {}".format(layer.style, name)
146
+ reason = f"Style {layer.style} does not exists in Layer {name}"
102
147
  self._logger.info(reason)
103
148
  break
104
149
  layer.valid = valid
@@ -106,19 +151,36 @@ class OGCServerSynchronizer:
106
151
  invalids += 1
107
152
  layer.invalid_reason = reason
108
153
  items += 1
154
+
155
+ if self._clean:
156
+ groups = self._request.dbsession.query(main.LayerGroup)
157
+ for group in groups:
158
+ if len(group.children_relation) == 0:
159
+ self._request.dbsession.delete(group)
160
+ self._logger.info("Removed empty group %s", group.name)
161
+ self._groups_removed += 1
162
+
109
163
  self._logger.info("Checked %s layers, %s are invalid", items, invalids)
110
164
 
111
- def synchronize(self, dry_run=False):
165
+ def synchronize(self, dry_run: bool = False) -> None:
166
+ """
167
+ Run the import of capabilities in layer tree.
168
+
169
+ dry_run
170
+ When set to True, do not commit but roll back transaction at end of synchronization.
171
+ """
112
172
  with dry_run_transaction(self._request.dbsession, dry_run):
113
173
  self.do_synchronize()
114
174
  if dry_run:
115
175
  self._logger.info("Rolling back transaction due to dry run")
116
176
 
117
- def do_synchronize(self):
177
+ def do_synchronize(self) -> None:
118
178
  self._items_found = 0
119
179
  self._themes_added = 0
120
180
  self._groups_added = 0
181
+ self._groups_removed = 0
121
182
  self._layers_added = 0
183
+ self._layers_removed = 0
122
184
 
123
185
  self._default_wms = cast(
124
186
  main.LayerWMS, main.LayerWMS.get_default(self._request.dbsession) or main.LayerWMS()
@@ -130,12 +192,17 @@ class OGCServerSynchronizer:
130
192
  for theme_layer in theme_layers:
131
193
  self.synchronize_layer(theme_layer)
132
194
 
133
- self._logger.info("%s items were found", self._items_found)
134
- self._logger.info("%s themes were added", self._themes_added)
135
- self._logger.info("%s groups were added", self._groups_added)
136
- self._logger.info("%s layers were added", self._layers_added)
195
+ if self._clean:
196
+ self.check_layers()
137
197
 
138
- def synchronize_layer(self, el, parent=None):
198
+ self._logger.info("%s items found", self._items_found)
199
+ self._logger.info("%s themes added", self._themes_added)
200
+ self._logger.info("%s groups added", self._groups_added)
201
+ self._logger.info("%s groups removed", self._groups_removed)
202
+ self._logger.info("%s layers added", self._layers_added)
203
+ self._logger.info("%s layers removed", self._layers_removed)
204
+
205
+ def synchronize_layer(self, el: Element, parent: main.TreeGroup | None = None) -> main.TreeItem:
139
206
  if el.find("Layer") is None:
140
207
  tree_item = self.get_layer_wms(el, parent)
141
208
  elif parent is None:
@@ -143,13 +210,37 @@ class OGCServerSynchronizer:
143
210
  else:
144
211
  tree_item = self.get_layer_group(el, parent)
145
212
 
213
+ server_children = []
146
214
  for child in el.findall("Layer"):
147
- self.synchronize_layer(child, tree_item)
215
+ child_item = self.synchronize_layer(child, tree_item)
216
+
217
+ if isinstance(tree_item, main.Theme) and isinstance(child_item, main.LayerWMS):
218
+ # We cannot add layers in themes
219
+ continue
148
220
 
149
- def get_theme(self, el):
150
- name = el.find("Name").text
221
+ server_children.append(child_item)
151
222
 
152
- theme = self._request.dbsession.query(main.Theme).filter(main.Theme.name == name).one_or_none()
223
+ if self._force_ordering and isinstance(tree_item, main.TreeGroup):
224
+ # Force children ordering, server_children first, external_children last
225
+ external_children = [item for item in tree_item.children if item not in server_children]
226
+ children = server_children + external_children
227
+ if tree_item.children != children:
228
+ tree_item._set_children( # pylint: disable=protected-access
229
+ server_children + external_children, order=True
230
+ )
231
+ self._logger.info("Children of %s have been sorted", tree_item.name)
232
+
233
+ return tree_item
234
+
235
+ def get_theme(self, el: ElementTree) -> main.Theme:
236
+ name_el = el.find("Name")
237
+ assert name_el is not None
238
+ name = name_el.text
239
+
240
+ theme = cast(
241
+ Optional[main.Theme],
242
+ self._request.dbsession.query(main.Theme).filter(main.Theme.name == name).one_or_none(),
243
+ )
153
244
 
154
245
  if theme is None:
155
246
  theme = main.Theme()
@@ -165,16 +256,24 @@ class OGCServerSynchronizer:
165
256
 
166
257
  return theme
167
258
 
168
- def get_layer_group(self, el, parent):
169
- name = el.find("Name").text
170
-
171
- group = (
172
- self._request.dbsession.query(main.LayerGroup).filter(main.LayerGroup.name == name).one_or_none()
259
+ def get_layer_group(self, el: Element, parent: main.TreeGroup) -> main.LayerGroup:
260
+ name_el = el.find("Name")
261
+ assert name_el is not None
262
+ name = name_el.text
263
+ assert name is not None
264
+
265
+ group = cast(
266
+ Optional[main.LayerGroup],
267
+ (
268
+ self._request.dbsession.query(main.LayerGroup)
269
+ .filter(main.LayerGroup.name == name)
270
+ .one_or_none()
271
+ ),
173
272
  )
174
273
 
175
274
  if group is None:
176
- group = main.LayerGroup(name=el.find("Name").text)
177
- group.parents_relation.append(main.LayergroupTreeitem(group=parent)) # noqa, pylint: no-member
275
+ group = main.LayerGroup(name=name)
276
+ group.parents_relation.append(main.LayergroupTreeitem(group=parent))
178
277
 
179
278
  self._request.dbsession.add(group)
180
279
  self._logger.info("Layer %s added as new group in theme %s", name, parent.name)
@@ -182,18 +281,28 @@ class OGCServerSynchronizer:
182
281
  else:
183
282
  self._items_found += 1
184
283
 
284
+ if self._force_parents and group.parents != [parent]:
285
+ group.parents_relation = [main.LayergroupTreeitem(group=parent)]
286
+ self._logger.info("Group %s moved to %s", name, parent.name)
287
+
185
288
  return group
186
289
 
187
- def get_layer_wms(self, el, parent):
188
- name = el.find("Name").text
290
+ def get_layer_wms(self, el: Element, parent: main.TreeGroup | None = None) -> main.LayerWMS:
291
+ name_el = el.find("Name")
292
+ assert name_el is not None
293
+ name = name_el.text
294
+ assert name is not None
189
295
 
190
- layer = self._request.dbsession.query(main.LayerWMS).filter(main.LayerWMS.name == name).one_or_none()
296
+ layer = cast(
297
+ Optional[main.LayerWMS],
298
+ self._request.dbsession.query(main.LayerWMS).filter(main.LayerWMS.name == name).one_or_none(),
299
+ )
191
300
 
192
301
  if layer is None:
193
302
  layer = main.LayerWMS()
194
303
 
195
304
  # TreeItem
196
- layer.name = el.find("Name").text
305
+ layer.name = name
197
306
  layer.description = self._default_wms.description
198
307
  layer.metadatas = [main.Metadata(name=m.name, value=m.value) for m in self._default_wms.metadatas]
199
308
 
@@ -216,17 +325,17 @@ class OGCServerSynchronizer:
216
325
 
217
326
  # LayerWMS
218
327
  layer.ogc_server = self._ogc_server
219
- layer.layer = el.find("Name").text
328
+ layer.layer = name
220
329
  layer.style = (
221
330
  self._default_wms.style
222
- if el.find("./Style/Name[.='{}']".format(self._default_wms.style)) is not None
331
+ if el.find(f"./Style/Name[.='{self._default_wms.style}']") is not None
223
332
  else None
224
333
  )
225
334
  # layer.time_mode =
226
335
  # layer.time_widget =
227
336
 
228
337
  self._request.dbsession.add(layer)
229
- if parent is None or isinstance(parent, main.Theme):
338
+ if not isinstance(parent, main.LayerGroup):
230
339
  self._logger.info("Layer %s added as new layer with no parent", name)
231
340
  else:
232
341
  layer.parents_relation.append(main.LayergroupTreeitem(group=parent))
@@ -242,30 +351,35 @@ class OGCServerSynchronizer:
242
351
  self._ogc_server.name,
243
352
  )
244
353
 
354
+ parents = [parent] if isinstance(parent, main.LayerGroup) else []
355
+ if self._force_parents and layer.parents != parents:
356
+ layer.parents_relation = [main.LayergroupTreeitem(group=parent) for parent in parents]
357
+ self._logger.info("Layer %s moved to %s", name, parent.name if parent else "root")
358
+
245
359
  return layer
246
360
 
247
- def wms_capabilities(self):
248
- errors: Set[str] = set()
361
+ @functools.lru_cache(maxsize=10)
362
+ def wms_capabilities(self) -> bytes:
363
+ errors: set[str] = set()
249
364
  url = get_url2(
250
- "The OGC server '{}'".format(self._ogc_server.name),
365
+ f"The OGC server '{self._ogc_server.name}'",
251
366
  self._ogc_server.url,
252
367
  self._request,
253
368
  errors,
254
369
  )
255
370
  if url is None:
256
- raise Exception("\n".join(errors))
371
+ raise Exception("\n".join(errors)) # pylint: disable=broad-exception-raised
257
372
 
258
373
  # Add functionality params
259
374
  # sparams = get_mapserver_substitution_params(self.request)
260
- # url = add_url_params(url, sparams)
375
+ # url.add_query(url, sparams)
261
376
 
262
- url = add_url_params(
263
- url,
377
+ url.add_query(
264
378
  {
265
379
  "SERVICE": "WMS",
266
380
  "VERSION": "1.1.1",
267
381
  "REQUEST": "GetCapabilities",
268
- "ROLE_ID": "0",
382
+ "ROLE_IDS": "0",
269
383
  "USER_ID": "0",
270
384
  },
271
385
  )
@@ -279,7 +393,7 @@ class OGCServerSynchronizer:
279
393
  headers["sec-username"] = "root"
280
394
  headers["sec-roles"] = "root"
281
395
 
282
- response = requests.get(url, headers=headers, timeout=300)
396
+ response = requests.get(url.url(), headers=headers, timeout=300)
283
397
  self._logger.info("Got response %s in %.1fs.", response.status_code, response.elapsed.total_seconds())
284
398
  response.raise_for_status()
285
399
 
@@ -288,10 +402,9 @@ class OGCServerSynchronizer:
288
402
  "application/vnd.ogc.wms_xml",
289
403
  "text/xml",
290
404
  ]:
291
- raise Exception(
292
- "GetCapabilities from URL {} returns a wrong Content-Type: {}\n{}".format(
293
- url, response.headers.get("Content-Type", ""), response.text
294
- )
405
+ raise Exception( # pylint: disable=broad-exception-raised
406
+ f"GetCapabilities from URL '{url}' returns a wrong Content-Type: "
407
+ f"{response.headers.get('Content-Type', '')}\n{response.text}"
295
408
  )
296
409
 
297
410
  return response.content
File without changes
@@ -1,6 +1,4 @@
1
- # -*- coding: utf-8 -*-
2
-
3
- # Copyright (c) 2017-2021, Camptocamp SA
1
+ # Copyright (c) 2017-2024, Camptocamp SA
4
2
  # All rights reserved.
5
3
 
6
4
  # Redistribution and use in source and binary forms, with or without
@@ -32,12 +30,13 @@ from c2cgeoform.routes import register_route, register_routes
32
30
 
33
31
 
34
32
  def includeme(config):
33
+ """Initialize the Pyramid routes."""
35
34
  config.add_static_view("c2cgeoportal_admin_node_modules", "c2cgeoportal_admin:node_modules")
36
35
  config.override_asset(
37
36
  to_override="c2cgeoportal_admin:node_modules/", override_with="/opt/c2cgeoportal/admin/node_modules"
38
37
  )
39
38
  # Because c2cgeoform widgets target {root_package}:node_modules/...
40
- asset_spec = "{}:node_modules/".format(config.root_package.__name__)
39
+ asset_spec = f"{config.root_package.__name__}:node_modules/"
41
40
  config.add_static_view("root_package_node_modules", asset_spec)
42
41
  config.override_asset(to_override=asset_spec, override_with="/opt/c2cgeoportal/admin/node_modules")
43
42
 
@@ -58,9 +57,12 @@ def includeme(config):
58
57
  from c2cgeoportal_commons.models.main import ( # pylint: disable=import-outside-toplevel
59
58
  Functionality,
60
59
  Interface,
60
+ LayerCOG,
61
61
  LayerGroup,
62
+ LayerVectorTiles,
62
63
  LayerWMS,
63
64
  LayerWMTS,
65
+ Log,
64
66
  OGCServer,
65
67
  RestrictionArea,
66
68
  Role,
@@ -71,18 +73,28 @@ def includeme(config):
71
73
  User,
72
74
  )
73
75
 
76
+ authentication_configuration = config.registry.settings.get("authentication", {})
77
+ oidc_configuration = authentication_configuration.get("openid_connect", {})
78
+ oidc_enabled = oidc_configuration.get("enabled", False)
79
+ oidc_provide_roles = oidc_configuration.get("provide_roles", False)
80
+ oauth2_configuration = authentication_configuration.get("oauth2", {})
81
+ oauth2_enabled = oauth2_configuration.get("enabled", not oidc_enabled)
82
+
74
83
  visible_routes = [
75
84
  ("themes", Theme),
76
85
  ("layer_groups", LayerGroup),
77
86
  ("layers_wms", LayerWMS),
78
87
  ("layers_wmts", LayerWMTS),
88
+ ("layers_vectortiles", LayerVectorTiles),
89
+ ("layers_cog", LayerCOG),
79
90
  ("ogc_servers", OGCServer),
80
91
  ("restriction_areas", RestrictionArea),
81
- ("users", User),
92
+ *([("users", User)] if not oidc_enabled or not oidc_provide_roles else []),
82
93
  ("roles", Role),
83
94
  ("functionalities", Functionality),
84
95
  ("interfaces", Interface),
85
- ("oauth2_clients", OAuth2Client),
96
+ *([("oauth2_clients", OAuth2Client)] if oauth2_enabled else []),
97
+ ("logs", Log),
86
98
  ]
87
99
 
88
100
  admin_interface_config = config.registry.settings["admin_interface"]