geoservercloud 0.8.12.dev6__tar.gz → 0.8.13.dev2__tar.gz

{geoservercloud-0.8.12.dev6 → geoservercloud-0.8.13.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: geoservercloud
-Version: 0.8.12.dev6
+Version: 0.8.13.dev2
 Summary: Lightweight Python client to interact with GeoServer Cloud REST API, GeoServer ACL and OGC services
 License: BSD-2-Clause
 Author: Camptocamp

{geoservercloud-0.8.12.dev6 → geoservercloud-0.8.13.dev2}/geoserver_acceptance_tests/compose/ci.compose.yaml

@@ -1,6 +1,6 @@
 services:
   geoserver:
-    image: docker.osgeo.org/geoserver:3.0-RC
+    image: docker.osgeo.org/geoserver:3.0.1
     ports:
       - "8080:8080"
     environment:

{geoservercloud-0.8.12.dev6 → geoservercloud-0.8.13.dev2}/geoservercloud/services/restclient.py

@@ -1,3 +1,4 @@
+import re
 from typing import Any
 
 import requests
@@ -6,6 +7,13 @@ from .restlogger import gs_logger
 
 TIMEOUT = 120
 
+# Depending on the order of the jars in WEB-INF/lib, vanilla GeoServer answers these
+# GWC "not found" errors with 500 instead of 404, keeping GWC's message as the
+# text/plain body.
+GWC_NOT_FOUND_MESSAGE = re.compile(
+    r'Unknown layer: .+|Failed to get GridSet\. A GridSet with name ".+" does not exist\.'
+)
+
 
 class RestClient:
     """
@@ -46,6 +54,7 @@ class RestClient:
             full_url,
             extra={"response": response},
         )
+        self.restore_gwc_not_found_status(response)
         if response.status_code != 404:
             response.raise_for_status()
         return response
@@ -130,10 +139,22 @@ class RestClient:
             full_url,
             extra={"response": response},
         )
+        self.restore_gwc_not_found_status(response)
         if response.status_code != 404:
             response.raise_for_status()
         return response
 
+    def restore_gwc_not_found_status(self, response: requests.Response) -> None:
+        if response.status_code != 500:
+            return
+        if not GWC_NOT_FOUND_MESSAGE.fullmatch(response.text.strip()):
+            return
+        gs_logger.warning(
+            "GeoServer answered a GWC not found error with 500, treating it as 404: %s",
+            response.url,
+        )
+        response.status_code = 404
+
     def log_payload(
         self, method: str, json: dict | None, data: bytes | str | None
     ) -> None:

{geoservercloud-0.8.12.dev6 → geoservercloud-0.8.13.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geoservercloud"
-version = "0.8.12.dev6"
+version = "0.8.13.dev2"
 description = "Lightweight Python client to interact with GeoServer Cloud REST API, GeoServer ACL and OGC services"
 authors = ["Camptocamp <info@camptocamp.com>"]
 license = "BSD-2-Clause"