From b2d7367158f69a3c0fd7537ffa13aea8c0f83429 Mon Sep 17 00:00:00 2001 From: David Marteau Date: Mon, 6 Jan 2025 13:29:35 +0100 Subject: [PATCH] Change 'py-qgis-server2' support to 'qjazz' support --- lizmap_server/context/__init__.py | 4 ++-- .../context/{py_qgis_server2.py => qjazz.py} | 12 ++++++------ lizmap_server/server_info_handler.py | 7 ++++--- 3 files changed, 12 insertions(+), 11 deletions(-) rename lizmap_server/context/{py_qgis_server2.py => qjazz.py} (91%) diff --git a/lizmap_server/context/__init__.py b/lizmap_server/context/__init__.py index 38a31984..1f078457 100644 --- a/lizmap_server/context/__init__.py +++ b/lizmap_server/context/__init__.py @@ -14,8 +14,8 @@ def create_server_context() -> ServerContext: # a py-qgis-server instance if hasattr(m, '_is_py_qgis_server'): from .py_qgis_server import Context - elif hasattr(m, '_is_py_qgis_server2'): - from .py_qgis_server2 import Context # type: ignore [assignment] + elif hasattr(m, '_is_qjazz_server'): + from .qjazz import Context # type: ignore [assignment] else: from .native import Context # type: ignore [assignment] diff --git a/lizmap_server/context/py_qgis_server2.py b/lizmap_server/context/qjazz.py similarity index 91% rename from lizmap_server/context/py_qgis_server2.py rename to lizmap_server/context/qjazz.py index 1419d38b..64d6b059 100644 --- a/lizmap_server/context/py_qgis_server2.py +++ b/lizmap_server/context/qjazz.py @@ -2,10 +2,10 @@ from functools import cached_property from typing import Dict, Iterator, List, Optional, Sequence, Tuple -from py_qgis_contrib.core.qgis import QgisPluginService -from py_qgis_contrib.core import logger -from py_qgis_cache import CacheEntry, CacheManager, ProjectMetadata -from py_qgis_cache import CheckoutStatus as Co +from qjazz_contrib.core.qgis import QgisPluginService +from qjazz_contrib.core import logger +from qjazz_cache.prelude import CacheEntry, CacheManager, ProjectMetadata +from qjazz_cache.prelude import CheckoutStatus as Co from qgis.core import QgsProject @@ -18,7 +18,7 @@ ) -SERVER_CONTEXT_NAME = 'py-qgis-server2' +SERVER_CONTEXT_NAME = 'qjazz' class Context(ContextABC): @@ -106,7 +106,7 @@ def metadata(self) -> ServerMetadata: """ Return server metadata """ from importlib import metadata - version = metadata.version('py_qgis_cache') + version = metadata.version('qjazz_cache') return ServerMetadata( name=SERVER_CONTEXT_NAME, version=version, diff --git a/lizmap_server/server_info_handler.py b/lizmap_server/server_info_handler.py index c70fa10b..8a31f54d 100755 --- a/lizmap_server/server_info_handler.py +++ b/lizmap_server/server_info_handler.py @@ -150,8 +150,9 @@ def _handleRequest(self, context): tag = "" if server_metadata: - py_qgis_server = dict( + qgis_server_meta = dict( found=True, + name=server_metadata.name, version=server_metadata.version, build_id=server_metadata.build_id, commit_id=server_metadata.commit_id, @@ -160,7 +161,7 @@ def _handleRequest(self, context): documentation_url=self._context.documentation_url, ) else: - py_qgis_server = dict(found=False, version="not used") + qgis_server_meta = dict(found=False, version="not used") data = { # Only the "qgis_server" section is forwarded in LWC source code @@ -172,7 +173,7 @@ def _handleRequest(self, context): 'commit_id': commit_id, # 288d2cacb5 if it's a dev version 'version_int': Qgis.QGIS_VERSION_INT, # 31600 }, - 'py_qgis_server': py_qgis_server, + 'py_qgis_server': qgis_server_meta, 'external_providers_tos_checks': { GOOGLE_KEY.lower(): strict_tos_check(GOOGLE_KEY), BING_KEY.lower(): strict_tos_check(BING_KEY),