Merge branch 'main' into dependabot/pip/requests-2.33.0

Author: mwallschlaeger

agents.md

@@ -46,7 +46,7 @@ mkdocstrings-python==0.7.1
     # via mkdocstrings
 packaging==21.3
     # via mkdocs
-pymdown-extensions==10.16.1
+pymdown-extensions==10.21.3
     # via mkdocstrings
 pyparsing==3.0.9
     # via packaging

docs/requirements.txt

@@ -16,6 +16,8 @@ readme = "README.md"
 requires-python = '>=3.10'
 dependencies = [
     "requests==2.33.0",
+    "urllib3>=1.21.1,<3",
+    "charset-normalizer>=2.0.0,<4.0.0",
     "types-requests==2.32.0.20241016",
     "tabulate==0.9.0",
     "types-tabulate==0.9.0.20240106",

pyproject.toml

@@ -48,14 +48,15 @@ def list(self, **kwargs) -> Optional[Dict]:
             return None
         return r[self.JSON_OBJECT_NAME]
 
-    def __parse_pk_string__(self, pk: str) -> List[int]:
+    def __parse_pk_string__(self, pk) -> List[int]:
         """
         differentiate between pk range, pk list or single pk
 
         Args:
             pk (str): pk of the object, as string with range or list or single pk
         """
 
+        pk = str(pk)
         # pk range: 5-10
         if "-" in pk:
             try:

src/geonoderest/geonodeobject.py

@@ -7,7 +7,7 @@
 
 from geonoderest.cmdprint import print_json, json_decode_error_handler
 from geonoderest.datasets import GeonodeDatasetsHandler
-from geonoderest.geonodeobject import GeonodeObjectHandler
+from geonoderest.resources import GeonodeResourceHandler
 from geonoderest.geonodetypes import (
     GeonodeCmdOutListKey,
     GeonodeCmdOutDictKey,
@@ -17,7 +17,7 @@
 OGC_WCS_LINK_TYPE = "OGC:WCS"
 
 
-class GeonodeMapsHandler(GeonodeObjectHandler):
+class GeonodeMapsHandler(GeonodeResourceHandler):
     ENDPOINT_NAME = JSON_OBJECT_NAME = "maps"
     SINGULAR_RESOURCE_NAME = "map"
 

src/geonoderest/maps.py

@@ -29,6 +29,9 @@ class GeonodeResourceHandler(GeonodeObjectHandler):
         GeonodeCmdOutListKey(key="detail_url"),
     ]
 
+    def delete(self, pk: int, **kwargs):
+        return self.http_delete(endpoint=f"resources/{pk}/delete")
+
     def cmd_metadata(
         self, pk: int, metadata_type: str = DEFAULT_METADATA_TYPE, **kwargs
     ):

src/geonoderest/resources.py

@@ -22,22 +22,24 @@ def test_patch(self, mock_http_patch):
         self.assertTrue(result["success"])
 
     @patch.object(GeonodeDatasetsHandler, "http_delete")
-    def test_delete_uses_typed_endpoint(self, mock_http_delete):
-        """Ensure delete only targets datasets, not generic resources endpoint."""
+    def test_delete_uses_resources_endpoint(self, mock_http_delete):
+        """datasets API does not allow DELETE — delete must use resources/{pk}/delete."""
         mock_http_delete.return_value = {}
         handler = GeonodeDatasetsHandler(env={})
         handler.delete(pk=5)
-        mock_http_delete.assert_called_once_with(endpoint="datasets/5/")
+        mock_http_delete.assert_called_once_with(endpoint="resources/5/delete")
 
     @patch.object(GeonodeDatasetsHandler, "http_delete")
-    def test_delete_range_uses_typed_endpoint(self, mock_http_delete):
-        """Ensure range delete only calls dataset endpoint for each pk in range."""
+    def test_delete_range_uses_resources_endpoint(self, mock_http_delete):
+        """datasets API does not allow DELETE — range delete must use resources endpoint."""
         mock_http_delete.return_value = {}
         handler = GeonodeDatasetsHandler(env={})
         for pk in range(1, 4):
             handler.delete(pk=pk)
         calls = [c.kwargs["endpoint"] for c in mock_http_delete.call_args_list]
-        self.assertEqual(calls, ["datasets/1/", "datasets/2/", "datasets/3/"])
+        self.assertEqual(
+            calls, ["resources/1/delete", "resources/2/delete", "resources/3/delete"]
+        )
 
 
 if __name__ == "__main__":

tests/test_datasets.py

@@ -24,12 +24,12 @@ def test_patch(self, mock_http_patch):
         self.assertTrue(result["success"])
 
     @patch.object(GeonodeDocumentsHandler, "http_delete")
-    def test_delete_uses_typed_endpoint(self, mock_http_delete):
-        """Ensure delete only targets documents, not generic resources endpoint."""
+    def test_delete_uses_resources_endpoint(self, mock_http_delete):
+        """documents API does not allow DELETE — delete must use resources/{pk}/delete."""
         mock_http_delete.return_value = {}
         handler = GeonodeDocumentsHandler(env={})
         handler.delete(pk=7)
-        mock_http_delete.assert_called_once_with(endpoint="documents/7/")
+        mock_http_delete.assert_called_once_with(endpoint="resources/7/delete")
 
 
 if __name__ == "__main__":

tests/test_documents.py

@@ -19,12 +19,12 @@ def test_patch(self, mock_http_patch):
         self.assertTrue(result["success"])
 
     @patch.object(GeonodeMapsHandler, "http_delete")
-    def test_delete_uses_typed_endpoint(self, mock_http_delete):
-        """Ensure delete only targets maps, not generic resources endpoint."""
+    def test_delete_uses_resources_endpoint(self, mock_http_delete):
+        """maps API does not allow DELETE — delete must use resources/{pk}/delete."""
         mock_http_delete.return_value = {}
         handler = GeonodeMapsHandler(env={})
         handler.delete(pk=5)
-        mock_http_delete.assert_called_once_with(endpoint="maps/5/")
+        mock_http_delete.assert_called_once_with(endpoint="resources/5/delete")
 
 
 if __name__ == "__main__":