Upgrade to 2.9.0.567

Author: Continuous integration

CONST_create_template/env.default

@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.0.566
+GEOMAPFISH_VERSION=2.9.0.567
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish

CONST_create_template/geoportal/webpack.apps.js

@@ -23,7 +23,7 @@ for (const filename of ls(
       chunks: [name],
       vars: {
         entry_point: '${VISIBLE_ENTRY_POINT}',
-        version: '2.9.0.566',
+        version: '2.9.0.567',
         cache_version: '${CACHE_VERSION}',
       },
     })

CONST_create_template/tilegeneration/config.yaml.tmpl

@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tilecloud-chain/master/tilecloud_chain/schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tilecloud-chain/1.21/tilecloud_chain/schema.json
 
 grids:
   # grid name, I just recommends to add the min resolution because it's common to not generate all the layers at the same resolution.

build

@@ -15,11 +15,16 @@ from typing import TYPE_CHECKING, Any, List, Optional
 
 import yaml
 
-CompletedProcess = subprocess.CompletedProcess[str] if TYPE_CHECKING else subprocess.CompletedProcess
+CompletedProcess = (
+    subprocess.CompletedProcess[str] if TYPE_CHECKING else subprocess.CompletedProcess
+)
 
 
 def run(
-    args: argparse.Namespace, command: List[str], exit_on_error: bool = True, **kwargs: Any
+    args: argparse.Namespace,
+    command: List[str],
+    exit_on_error: bool = True,
+    **kwargs: Any,
 ) -> Optional[CompletedProcess]:
     if args.verbose or args.dry_run:
         print(shlex.join(command))
@@ -36,14 +41,22 @@ def run(
 
 def main() -> None:
     parser = argparse.ArgumentParser(description="Build the project")
-    parser.add_argument("--verbose", action="store_true", help="Display the Docker build commands")
     parser.add_argument(
-        "--dry-run", action="store_true", help="Display the docker build commands without executing them"
+        "--verbose", action="store_true", help="Display the Docker build commands"
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Display the docker build commands without executing them",
     )
     parser.add_argument("--service", help="Build only the specified service")
     parser.add_argument("--env", action="store_true", help="Build only the .env file")
-    parser.add_argument("--simple", action="store_true", help="Force simple application mode")
-    parser.add_argument("--not-simple", action="store_true", help="Force not simple application mode")
+    parser.add_argument(
+        "--simple", action="store_true", help="Force simple application mode"
+    )
+    parser.add_argument(
+        "--not-simple", action="store_true", help="Force not simple application mode"
+    )
     parser.add_argument("--upgrade", help="Start upgrading the project to version")
     parser.add_argument(
         "--reload",
@@ -59,9 +72,12 @@ def main() -> None:
         help="Do not pull external or base images for faster rebuild during development.",
     )
     parser.add_argument(
-        "--debug", help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure"
+        "--debug",
+        help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure",
+    )
+    parser.add_argument(
+        "--stack-trace", action="store_true", help="Display the stack trace on error"
     )
-    parser.add_argument("--stack-trace", action="store_true", help="Display the stack trace on error")
     parser.add_argument("env_files", nargs="*", help="The environment config")
     args = parser.parse_args()
 
@@ -123,7 +139,11 @@ def main() -> None:
             if args.not_simple:
                 simple = False
 
-            git_hash = run(args, ["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE).stdout.decode().strip()
+            git_hash = (
+                run(args, ["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE)
+                .stdout.decode()
+                .strip()
+            )
 
             dest.write(f"SIMPLE={str(simple).upper()}\n")
             dest.write(f"GIT_HASH={git_hash}\n")
@@ -174,7 +194,16 @@ def main() -> None:
     if args.reload is not None:
         run(args, [*docker_compose_command, "rm", "--force", "-v", "config"])
         for service in services:
-            run(args, [*docker_compose_command, "up", "--detach", "--force-recreate", service])
+            run(
+                args,
+                [
+                    *docker_compose_command,
+                    "up",
+                    "--detach",
+                    "--force-recreate",
+                    service,
+                ],
+            )
 
 
 if __name__ == "__main__":

ci/docker-compose-check

@@ -11,11 +11,15 @@ def _main() -> None:
 
     services = [
         s.strip()
-        for s in subprocess.run(["docker", "compose", "ps"], check=True, stdout=subprocess.PIPE)
+        for s in subprocess.run(
+            ["docker", "compose", "ps"], check=True, stdout=subprocess.PIPE
+        )
         .stdout.decode("utf-8")
         .splitlines()
     ]
-    errors_statuses = [s for s in services if " Exit " in s and not s.endswith(" Exit 0")]
+    errors_statuses = [
+        s for s in services if " Exit " in s and not s.endswith(" Exit 0")
+    ]
     if errors_statuses:
         print("\n".join(errors_statuses))
         sys.exit(1)

custom/custom/views/cog.py

@@ -14,12 +14,17 @@
 
 def _get_azure_container_client(container: str) -> ContainerClient:
     """Get the Azure blog storage client."""
-    if "AZURE_STORAGE_CONNECTION_STRING" in os.environ and os.environ["AZURE_STORAGE_CONNECTION_STRING"]:
+    if (
+        "AZURE_STORAGE_CONNECTION_STRING" in os.environ
+        and os.environ["AZURE_STORAGE_CONNECTION_STRING"]
+    ):
         return BlobServiceClient.from_connection_string(
             os.environ["AZURE_STORAGE_CONNECTION_STRING"]
         ).get_container_client(container=container)
     if "AZURE_STORAGE_BLOB_CONTAINER_URL" in os.environ:
-        return ContainerClient.from_container_url(os.environ["AZURE_STORAGE_BLOB_CONTAINER_URL"])
+        return ContainerClient.from_container_url(
+            os.environ["AZURE_STORAGE_BLOB_CONTAINER_URL"]
+        )
 
     return BlobServiceClient(
         account_url=os.environ["AZURE_STORAGE_ACCOUNT_URL"],
@@ -54,9 +59,13 @@ def swissalti3d(request: pyramid.request.Request) -> pyramid.response.Response:
 
     blob_properties = blob.get_blob_properties()
     _LOGGING.debug(blob_properties)
-    request.response.headers["Content-Range"] = f"bytes {start}-{end}/{blob_properties.size}"
+    request.response.headers["Content-Range"] = (
+        f"bytes {start}-{end}/{blob_properties.size}"
+    )
     request.response.headers["Accept-Ranges"] = "bytes"
-    request.response.headers["Content-Type"] = blob_properties.content_settings.content_type
+    request.response.headers["Content-Type"] = (
+        blob_properties.content_settings.content_type
+    )
 
     blob_data = blob.download_blob(offset=start, length=end - start + 1)
     request.response.body = blob_data.readall()

custom/custom/views/feedback.py

@@ -17,7 +17,11 @@
     description="The feedback service",
     path="/feedback",
     cors_origins=(
-        (f"https://{os.environ['VISIBLE_WEB_HOST']}" if "VISIBLE_WEB_HOST" in os.environ else "*"),
+        (
+            f"https://{os.environ['VISIBLE_WEB_HOST']}"
+            if "VISIBLE_WEB_HOST" in os.environ
+            else "*"
+        ),
         *(
             ["https://localhost:3002"]
             if os.environ.get("DEV", "false").lower() in ("1", "true", "yes")
@@ -62,7 +66,9 @@ def feedback_post(request: pyramid.request.Request) -> Any:
     request.dbsession.flush()
 
     mail_list = (
-        [request.registry.settings["admin_email"]] if "admin_email" in request.registry.settings else []
+        [request.registry.settings["admin_email"]]
+        if "admin_email" in request.registry.settings
+        else []
     )
 
     if email_optional is not None and email_optional != "":

custom/custom/views/swisscom_heatmap/entry.py

@@ -20,7 +20,11 @@
     description="The swisscom-heatmap get config service",
     path="/swisscom-heatmap/get-config.json",
     cors_origins=(
-        (f"https://{os.environ['VISIBLE_WEB_HOST']}" if "VISIBLE_WEB_HOST" in os.environ else "*"),
+        (
+            f"https://{os.environ['VISIBLE_WEB_HOST']}"
+            if "VISIBLE_WEB_HOST" in os.environ
+            else "*"
+        ),
         *(
             ["https://localhost:3002"]
             if os.environ.get("DEV", "false").lower() in ("1", "true", "yes")
@@ -35,7 +39,11 @@
     description="The swisscom-heatmap dwell density service",
     path="/swisscom-heatmap/dwell-density.json",
     cors_origins=(
-        (f"https://{os.environ['VISIBLE_WEB_HOST']}" if "VISIBLE_WEB_HOST" in os.environ else "*"),
+        (
+            f"https://{os.environ['VISIBLE_WEB_HOST']}"
+            if "VISIBLE_WEB_HOST" in os.environ
+            else "*"
+        ),
         *(
             ["https://localhost:3002"]
             if os.environ.get("DEV", "false").lower() in ("1", "true", "yes")
@@ -50,7 +58,11 @@
     description="The swisscom-heatmap dwell demographics service",
     path="/swisscom-heatmap/dwell-demographics.json",
     cors_origins=(
-        (f"https://{os.environ['VISIBLE_WEB_HOST']}" if "VISIBLE_WEB_HOST" in os.environ else "*"),
+        (
+            f"https://{os.environ['VISIBLE_WEB_HOST']}"
+            if "VISIBLE_WEB_HOST" in os.environ
+            else "*"
+        ),
         *(
             ["https://localhost:3002"]
             if os.environ.get("DEV", "false").lower() in ("1", "true", "yes")

custom/custom/views/swisscom_heatmap/query_swisscom_heatmap_api.py

@@ -12,8 +12,12 @@
 
 LOG = logging.getLogger(__name__)
 
-CLIENT_ID = os.getenv("SWISSCOM_CLIENT_ID", "")  # customer key in the Swisscom digital marketplace
-CLIENT_SECRET = os.getenv("SWISSCOM_CLIENT_SECRET", "")  # customer secret in the Swisscom digital marketplace
+CLIENT_ID = os.getenv(
+    "SWISSCOM_CLIENT_ID", ""
+)  # customer key in the Swisscom digital marketplace
+CLIENT_SECRET = os.getenv(
+    "SWISSCOM_CLIENT_SECRET", ""
+)  # customer secret in the Swisscom digital marketplace
 MIN_DATE = os.getenv("MIN_DATE", "03.10.2022")
 MAX_DATE = os.getenv("MAX_DATE", "16.10.2022")
 MAX_NB_TILES_REQUEST = int(os.getenv("MAX_NB_TILES_REQUEST", "100"))
@@ -47,18 +51,24 @@ def auth(self) -> OAuth2Session:
         # Fetch an access token
         client = BackendApplicationClient(client_id=CLIENT_ID)
         oauth = OAuth2Session(client=client)
-        oauth.fetch_token(token_url=TKN_URL, client_id=CLIENT_ID, client_secret=CLIENT_SECRET)
+        oauth.fetch_token(
+            token_url=TKN_URL, client_id=CLIENT_ID, client_secret=CLIENT_SECRET
+        )
         return oauth
 
     def get_tiles_ids(self, oauth: OAuth2Session, postal_code: int) -> list[int]:
         # For muni/district id, see https://www.atlas.bfs.admin.ch/maps/13/fr/17804_229_228_227/27579.html
         # Municipalities and Districts doesn't work well probably because of the free plan
         # Get all the first MAX_NB_TILES_REQUEST tile ids associated with the postal code of interest
-        muni_tiles_json = oauth.get(BASE_URL + f"/grids/postal-code-areas/{postal_code}", headers=HEADERS)
+        muni_tiles_json = oauth.get(
+            BASE_URL + f"/grids/postal-code-areas/{postal_code}", headers=HEADERS
+        )
         self.check_api_error(muni_tiles_json)
         tiles = muni_tiles_json.json()["tiles"]
         LOG.info("Nb tiles received: %s", len(tiles))
-        return [t["tileId"] for t in muni_tiles_json.json()["tiles"]][:MAX_NB_TILES_REQUEST]
+        return [t["tileId"] for t in muni_tiles_json.json()["tiles"]][
+            :MAX_NB_TILES_REQUEST
+        ]
 
     def query_api_generic(
         self, oauth: OAuth2Session, path: str, postal_code: int, date_time: datetime
@@ -79,24 +89,32 @@ def response_to_geojson_result(self, data: dict[str, Any]) -> FeatureCollection:
             features.append(Feature(geometry=Point(coordinate), properties=element))
         return FeatureCollection(features)
 
-    def get_dwell_density(self, postal_code: int, date_time: datetime) -> FeatureCollection | Response:
+    def get_dwell_density(
+        self, postal_code: int, date_time: datetime
+    ) -> FeatureCollection | Response:
         self.error = None
         try:
             self.limit_query()
             oauth = self.auth()
-            api_request = self.query_api_generic(oauth, "/dwell-density/hourly", postal_code, date_time)
+            api_request = self.query_api_generic(
+                oauth, "/dwell-density/hourly", postal_code, date_time
+            )
             response = oauth.get(api_request, headers=HEADERS)
             self.check_api_error(response)
         except (ExternalAPIError, APIUsageExceededError):
             return self.error
         return self.response_to_geojson_result(response.json())
 
-    def get_dwell_demographics(self, postal_code: int, date_time: datetime) -> FeatureCollection | Response:
+    def get_dwell_demographics(
+        self, postal_code: int, date_time: datetime
+    ) -> FeatureCollection | Response:
         self.error = None
         try:
             self.limit_query()
             oauth = self.auth()
-            api_request = self.query_api_generic(oauth, "/dwell-demographics/hourly", postal_code, date_time)
+            api_request = self.query_api_generic(
+                oauth, "/dwell-demographics/hourly", postal_code, date_time
+            )
             response = oauth.get(api_request, headers=HEADERS)
             self.check_api_error(response)
         except (ExternalAPIError, APIUsageExceededError):

env.default

@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.0.566
+GEOMAPFISH_VERSION=2.9.0.567
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish