c2cgeoportal-geoportal 2.6.0__py2.py3-none-any.whl → 2.8.1.180__py2.py3-none-any.whl

c2cgeoportal_geoportal/lib/loader.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2019-2021, Camptocamp SA
+# Copyright (c) 2019-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -29,11 +27,10 @@
 
 
 import logging
-from typing import Dict
+from typing import Any, Dict, Optional, cast
 
-import c2cwsgiutils.pyramid_logging
 from c2c.template.config import config as configuration
-from plaster_pastedeploy import Loader as BaseLoader
+from c2cwsgiutils.loader import Loader as BaseLoader
 
 from c2cgeoportal_geoportal.lib.i18n import available_locale_names
 
@@ -41,15 +38,12 @@ LOG = logging.getLogger(__name__)
 
 
 class Loader(BaseLoader):
-    def _get_defaults(self, defaults: Dict[str, str] = None) -> Dict[str, str]:
-        env: Dict[str, str] = c2cwsgiutils.pyramid_logging.get_defaults()
-        d: Dict[str, str] = {key: env[key].replace("%", "%%") for key in env}
-        if defaults:
-            d.update(defaults)
-        return super()._get_defaults(d)
-
-    def get_wsgi_app_settings(self, name: str = None, defaults: Dict[str, str] = None) -> Dict:
-        settings = super().get_wsgi_app_settings(name, defaults)
+    """The Pyramid configuration loader."""
+
+    def get_wsgi_app_settings(
+        self, name: Optional[str] = None, defaults: Optional[Dict[str, str]] = None
+    ) -> Dict[str, Any]:
+        settings = cast(Dict[str, Any], super().get_wsgi_app_settings(name, defaults))
         configuration.init(settings.get("app.cfg"))
         settings.update(configuration.get_config())
         if "available_locale_names" not in settings:
@@ -57,4 +51,5 @@ class Loader(BaseLoader):
         return settings
 
     def __repr__(self) -> str:
-        return 'c2cgeoportal_geoportal.lib.loader.Loader(uri="{0}")'.format(self.uri)
+        """Get the object representation."""
+        return f'c2cgeoportal_geoportal.lib.loader.Loader(uri="{self.uri}")'

c2cgeoportal_geoportal/lib/metrics.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (c) 2018-2021, Camptocamp SA
 # All rights reserved.
 
@@ -29,6 +27,7 @@
 
 import gc
 import sys
+from typing import Any, Dict, List, Tuple
 
 from c2cwsgiutils import broadcast
 from c2cwsgiutils.debug import get_size
@@ -39,13 +38,17 @@ from c2cgeoportal_geoportal.views.raster import Raster
 
 
 class MemoryCacheSizeProvider(Provider):
-    def __init__(self, all_=False):
+    """Get the memory used by the cache."""
+
+    def __init__(self, all_: bool = False):
         super().__init__("pod_process_memory_cache_kb", "Used memory cache")
         self.all = all_
 
-    def get_data(self):
+    def get_data(self) -> List[Tuple[Dict[str, Any], float]]:
+        elements = _get_memory_cache(all_=self.all)
+        assert elements is not None
         result = []
-        for elem in _get_memory_cache(all_=self.all):  # type: ignore
+        for elem in elements:
             if elem is not None:
                 for value in elem["values"]:
                     value[0]["pid"] = str(elem["pid"])
@@ -55,7 +58,7 @@ class MemoryCacheSizeProvider(Provider):
 
 
 @broadcast.decorator(expect_answers=True, timeout=15)
-def _get_memory_cache(all_):
+def _get_memory_cache(all_: bool) -> Dict[str, List[Tuple[Dict[str, Any], float]]]:
     values = (
         [({"key": key}, get_size(value) / 1024) for key, value in list(MEMORY_CACHE_DICT.items())]
         if all_
@@ -66,36 +69,44 @@ def _get_memory_cache(all_):
 
 
 class RasterDataSizeProvider(Provider):
-    def __init__(self):
+    """Get the memory used by Raster data cache."""
+
+    def __init__(self) -> None:
         super().__init__("pod_process_raster_data_kb", "Memory used by raster")
 
-    def get_data(self):
+    def get_data(self) -> List[Tuple[Dict[str, Any], float]]:
+        elements = _get_raster_data()
+        assert elements is not None
         result = []
-        for elem in _get_raster_data():  # type: ignore
+        for elem in elements:
             for value in elem["values"]:
                 value[0]["pid"] = str(elem["pid"])
-                value[0]["hostname"] = elem["hostname"]
+                value[0]["hostname"] = str(elem["hostname"])
                 result.append(value)
         return result
 
 
 @broadcast.decorator(expect_answers=True, timeout=15)
-def _get_raster_data():
+def _get_raster_data() -> Dict[str, List[Tuple[Dict[str, str], float]]]:
     return {"values": [({"key": key}, get_size(value) / 1024) for key, value in list(Raster.data.items())]}
 
 
 class TotalPythonObjectMemoryProvider(Provider):
-    def __init__(self):
+    """Get the memory used by Python objects."""
+
+    def __init__(self) -> None:
         super().__init__("total_python_object_memory_kb", "Memory used by raster")
 
-    def get_data(self):
+    def get_data(self) -> List[Tuple[Dict[str, str], float]]:
+        object_size = _get_python_object_size()
+        assert object_size is not None
         return [
-            ({"pid": str(val["pid"]), "hostname": val["hostname"]}, val["value"])
-            for val in _get_python_object_size()  # type: ignore
+            ({"pid": str(val["pid"]), "hostname": str(val["hostname"])}, val["value"])
+            for val in object_size
             if val is not None
         ]
 
 
 @broadcast.decorator(expect_answers=True, timeout=15)
-def _get_python_object_size():
-    return {"value": sum([sys.getsizeof(o) / 1024 for o in gc.get_objects()])}
+def _get_python_object_size() -> Dict[str, float]:
+    return {"value": sum(sys.getsizeof(o) / 1024 for o in gc.get_objects())}