Fix managment apis

    - Follow backport for qgis/QGIS#45439

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+* Fix api managment:
+    - Follow backport for https://github.com/qgis/QGIS/issues/45439
+    - Fix regression from static cache implementation
+
 ## 1.7.14 - 2022-01-18
 
 * Define explicit `CACHE_DEFAULT_HANDLER` configuration option 

pyqgisserver/management/apis/cache.py

@@ -18,8 +18,6 @@
 
 from .handler import RequestHandler, register_handlers
 
-from qgis.core import Qgis
-
 LOGGER = logging.getLogger('SRVLOG')
 
 
@@ -49,11 +47,9 @@ def get(self, key: str=None) -> None:
 def register( serverIface ):
     """ Register plugins api handlers
     """
-    # XXX See https://github.com/qgis/QGIS/issues/45439
-    prefix = '/cache' if Qgis.QGIS_VERSION_INT < 32200 else ''
     register_handlers(serverIface, "/cache","CacheManagment",
                       [
-                          (rf'{prefix}/(?P<key>.+)$', CacheCollection),
+                          (r'/(?P<key>.+)$', CacheCollection),
                           (r'/', CacheCollection),
                       ])
 

pyqgisserver/management/apis/plugins.py

@@ -18,8 +18,6 @@
 from pyqgisserver.plugins import plugin_list, plugin_metadata, failed_plugins
 from .handler import RequestHandler, register_handlers
 
-from qgis.core import Qgis
-
 LOGGER = logging.getLogger('SRVLOG')
 
 
@@ -38,22 +36,26 @@ def get(self, name: Optional[str]=None) -> None:
                 raise HTTPError(404)
             self.write({'name': name, 'status': 'loaded', 'metadata': metadata })
         else:
-            def link(name):
-                return self.public_url(f"/{name}")
+            def _link(name, status):
+                return { 
+                    'href': self.public_url(f"/{name}"),
+                    'status': status,
+                    'name': name,
+                    'type': 'application/json',
+                    'title': f'Details for plugin {name}',
+                }
             # List all loaded plugins
-            plugins = [{ 'name': n, 'status': 'loaded', 'link': link(n) } for n in plugin_list()]
-            plugins.extend([{ 'name' : n, 'status': 'failed', 'link': link(n) } for n in failed_plugins])
-            self.write({'plugins': plugins })
+            plugins = [_link(n,'loaded') for n in plugin_list()]
+            plugins.extend([_link(n,'failed') for n in failed_plugins])
+            self.write({'links': plugins })
 
 
 def register( serverIface ):
     """ Register plugins api handlers
     """
-    # XXX See https://github.com/qgis/QGIS/issues/45439
-    prefix = '/plugins' if Qgis.QGIS_VERSION_INT < 32200 else ''
     register_handlers(serverIface, "/plugins","PluginsManagment",
                       [
-                          (rf'{prefix}/(?P<name>[^\/]+)/?$', PluginCollection),
+                          (r'/(?P<name>[^\/]+)/?$', PluginCollection),
                           (r'/', PluginCollection),
                       ])
 

pyqgisserver/management/server.py

@@ -54,7 +54,6 @@ class _ReportHandler(_PoolHandler):
     async def get(self) -> Awaitable[None]:
         """ Return worker reports
         """
-        # Broadcast 'restart' to workers
         req = self.request
         reports = await self._poolserver.get_reports()
         for w in reports:

pyqgisserver/qgscache/cachemanager.py

@@ -17,6 +17,8 @@
 from collections import namedtuple, OrderedDict
 from pathlib import Path
 from datetime import datetime
+from enum import Enum
+from itertools import chain
 
 from ..utils.lru import lrucache
 from ..config import confservice
@@ -63,6 +65,12 @@ def _merge_qs( query1: str, query2: str ) -> str:
     return '&'.join('%s=%s' % (k,v[0]) for k,v in params_2.items())
 
 
+class CacheType(Enum): 
+    LRU = 'lru'
+    STATIC = 'static'
+    ALL = 'all'
+
+
 @componentmanager.register_factory(CACHE_MANAGER_CONTRACTID)
 class QgsCacheManager:
     """ Handle Qgis project cache 
@@ -111,11 +119,13 @@ def clear(self) -> None:
         self._lru_cache.clear()
         self._static_cache.clear()
 
-    def lru_items(self) -> Sequence[Tuple[str,CacheDetails]]:
-        return self._lru_cache.items()
-
-    def static_items(self) -> Sequence[Tuple[str,CacheDetails]]:
-        return self._static_cache.items()
+    def items(self, cachetype: CacheType = CacheType.ALL) -> Sequence[Tuple[str,CacheDetails]]:
+        if cachetype == CacheType.ALL:
+            return chain(self._lru_cache.items(), self._static_cache.items())
+        elif cachetype == CacheType.LRU:
+            return self._lru_cache.items()
+        elif cachetype == CacheType.STATIC:
+            return self._static_cache.items()
 
     def remove_entry(self, key: str) -> None:
         """ Remove cache entry

tests/unittests/test_cache.py

@@ -6,6 +6,7 @@
 
 from pathlib import Path
 from pyqgisserver.qgscache.cachemanager import (QgsCacheManager, 
+                                                CacheType,
                                                 PathNotAllowedError,
                                                 preload_projects_file)
 from pyqgisserver.config import confservice
@@ -175,7 +176,7 @@ def test_preload_projects(data) -> None:
     # raster_layer.qgs (invalid layer)
 
     # Ensure  that items are in static cache
-    items = list(k for k,_ in cacheservice.static_items())
+    items = list(k for k,_ in cacheservice.items(CacheType.STATIC))
     assert "file:france_parts.qgs" in items
     assert "project_simple.qgs" in items