c2cgeoportal-geoportal 2.9.0.147__py3-none-any.whl → 2.9.0.150__py3-none-any.whl

c2cgeoportal_geoportal/scripts/theme2fts.py

@@ -29,6 +29,7 @@
 import gettext
 import os
 import sys
+import time
 from argparse import ArgumentParser, Namespace
 from collections.abc import Iterator
 from typing import TYPE_CHECKING, Any, Optional
@@ -89,6 +90,11 @@ def get_argparser() -> ArgumentParser:
         "--no-layers", action="store_false", dest="layers", help="do not import the layers (tree leaf)"
     )
     parser.add_argument("--package", help="the application package")
+    parser.add_argument(
+        "--stats",
+        action="store_true",
+        help="Print out statistics information",
+    )
     fill_arguments(parser)
     return parser
 
@@ -130,20 +136,8 @@ class Import:
             else:
                 raise KeyError(KeyError(msg))
 
-        # must be done only once we have loaded the project config
-        from c2cgeoportal_commons.models.main import (  # pylint: disable=import-outside-toplevel
-            FullTextSearch,
-            Interface,
-            LayerGroup,
-            LayerWMS,
-            LayerWMTS,
-            Role,
-            Theme,
-        )
-
-        self.session = session
-        self.session.execute(FullTextSearch.__table__.delete().where(FullTextSearch.from_theme))
-
+        print("Loading translations")
+        start_time = time.time()
         self._: dict[str, gettext.NullTranslations] = {}
         for lang in self.languages:
             try:
@@ -155,15 +149,42 @@ class Import:
             except OSError as e:
                 self._[lang] = gettext.NullTranslations()
                 print(f"Warning: {e} (language: {lang})")
+        if self.options.stats:
+            print(
+                f"Translations loaded in {time.time() - start_time:.2f} seconds "
+                f"({len(self.languages)} languages)"
+            )
 
-        query = self.session.query(Interface)
-        if options.interfaces is not None:
-            query = query.filter(Interface.name.in_(options.interfaces))
-        else:
-            query = query.filter(Interface.name.notin_(options.exclude_interfaces))
-        self.interfaces = query.all()
+        print("Loading the database")
+        # Must be done only once we have loaded the project config
+        from c2cgeoportal_commons.models.main import (  # pylint: disable=import-outside-toplevel
+            FullTextSearch,
+            Interface,
+            LayerGroup,
+            LayerWMS,
+            LayerWMTS,
+            Role,
+            Theme,
+        )
+
+        self.session = session
+        if self.options.stats:
+            print(
+                f"Session loaded in {time.time() - start_time:.2f} seconds "
+                f"({len(self.languages)} languages)"
+            )
+
+        print("Delete the full-text search table")
+        start_time = time.time()
+        self.session.execute(FullTextSearch.__table__.delete().where(FullTextSearch.from_theme))
+        if self.options.stats:
+            print(
+                f"Deleted old entries in the full-text search table in "
+                f"{time.time() - start_time:.2f} seconds"
+            )
 
         print("Create cache")
+        start_time = time.time()
         self._layerswms_cache = (
             self.session.query(LayerWMS).options(sqlalchemy.orm.subqueryload(LayerWMS.metadatas)).all()
         )
@@ -186,8 +207,28 @@ class Import:
             )
             .all()
         )
+        if self.options.stats:
+            print(
+                f"Cache created in {time.time() - start_time:.2f} seconds "
+                f"({len(self._layerswms_cache)} layerswms, "
+                f"{len(self._layerswmts_cache)} layerswmts, "
+                f"{len(self._layergroup_cache)} layergroups, "
+                f"{len(all_themes)} themes)"
+            )
+
+        print("Loading interfaces")
+        start_time = time.time()
+        query = self.session.query(Interface)
+        if options.interfaces is not None:
+            query = query.filter(Interface.name.in_(options.interfaces))
+        else:
+            query = query.filter(Interface.name.notin_(options.exclude_interfaces))
+        self.interfaces = query.all()
+        if self.options.stats:
+            print(f"Loaded {len(self.interfaces)} interfaces in " f"{time.time() - start_time:.2f} seconds")
 
         print("Collecting data")
+        start_time = time.time()
 
         self.public_theme: dict[int, list[int]] = {}
         self.public_group: dict[int, list[int]] = {}
@@ -204,7 +245,14 @@ class Import:
             for theme in all_themes:
                 self._add_theme(theme, role)
 
+        if self.options.stats:
+            print(
+                f"Collected {len(self.full_text_search)} entries in "
+                f"{time.time() - start_time:.2f} seconds"
+            )
+
         print(f"Starting to fill the full-text search table with {len(self.full_text_search)} entries")
+        start_time = time.time()
         self.session.execute(
             sqlalchemy.insert(FullTextSearch).values(
                 {
@@ -220,6 +268,12 @@ class Import:
             ),
             self.full_text_search,
         )
+        if self.options.stats:
+            print(
+                f"Filled the full-text search table in "
+                f"{time.time() - start_time:.2f} seconds "
+                f"({len(self.full_text_search)} entries)"
+            )
 
     def _add_fts(
         self,

{c2cgeoportal_geoportal-2.9.0.147.dist-info → c2cgeoportal_geoportal-2.9.0.150.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.9.0.147
+Version: 2.9.0.150
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.9.0.147.dist-info → c2cgeoportal_geoportal-2.9.0.150.dist-info}/RECORD

@@ -147,7 +147,7 @@ c2cgeoportal_geoportal/scripts/c2cupgrade.py,sha256=oWgl5ngJaUVXDKJqJ33aZB8ET_Xc
 c2cgeoportal_geoportal/scripts/create_demo_theme.py,sha256=-SL-fvAPjgiJZEKYcbhXsZm713txhtWQB18X231k6xQ,3263
 c2cgeoportal_geoportal/scripts/manage_users.py,sha256=Ih3X_V_xUw59Ums4a1x6qQQtz9VtE7PaxAj-tiZIOPg,5586
 c2cgeoportal_geoportal/scripts/pcreate.py,sha256=xU87K_JYwFE6U4zEGjHvqNj2iiSuAhPkfWMpI576mZ8,11245
-c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=6JqfRO5mjuimMOMjdMCpK9whSaR4DT8UdEJEp7ob2zE,15584
+c2cgeoportal_geoportal/scripts/theme2fts.py,sha256=tVEeqf1l_PaTw3qpNX2ZvJHu4JO6IgY6upir24HPxJM,17616
 c2cgeoportal_geoportal/scripts/urllogin.py,sha256=qGOOvx2ZN3qnENGzo8NScRqfFC06l1yc48vU6Qx3MBo,3319
 c2cgeoportal_geoportal/templates/login.html,sha256=Jy8CUw2KrSviePknsvWJLDqCUXam-vPhnMUv7UcD4Pc,2475
 c2cgeoportal_geoportal/templates/notlogin.html,sha256=XLCwJ8q7hqk6GIaxwhyMOaMZZZvsD_MMZaCERO8n2AY,1528
@@ -187,8 +187,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.9.0.147.dist-info/METADATA,sha256=YNcOXV1RXATyE4ZB-mR5edhnxllGfMw-4Rv01hFyfvw,1923
-c2cgeoportal_geoportal-2.9.0.147.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9.0.147.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9.0.147.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9.0.147.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9.0.150.dist-info/METADATA,sha256=7oUFqenYAbtCl1Ahdks-xjb3VtPQ0eQEoq9ufFXGf7g,1923
+c2cgeoportal_geoportal-2.9.0.150.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9.0.150.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9.0.150.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9.0.150.dist-info/RECORD,,