[Fixes #107] Bug: patching not working properly

Author: mwallschlaeger

pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = 'geonodectl'
-version="0.3.0"
+version="0.3.1"
 description="a commandline interface tool for Geonode Rest API v2"
 authors = [{ name = "marcel wallschlaeger", email="marcel.wallschlaeger@zalf.de" }]
 readme = "README.md"

src/geonoderest/datasets.py

@@ -176,19 +176,18 @@ def upload(
             content_length=content_length,
         )
 
-
-def patch(
-    self,
-    pk: int,
-    json_content: Optional[Dict] = None,
-    **kwargs,
-):
-    # remove attribute fields if present
-    if json_content is not None and "attribute" in json_content:
-        json_content.pop("attribute", None)
-    if json_content is not None and "attribute_set" in json_content:
-        json_content.pop("attribute_set", None)
-
-    return super(GeonodeResourceHandler, self).patch(
-        pk=pk, json_content=json_content, **kwargs
-    )
+    def patch(
+        self,
+        pk: int,
+        json_content: Optional[Dict] = None,
+        **kwargs,
+    ):
+        # remove attribute fields if present
+        if json_content is not None and "attribute" in json_content:
+            json_content.pop("attribute", None)
+        if json_content is not None and "attribute_set" in json_content:
+            json_content.pop("attribute_set", None)
+
+        return super(GeonodeResourceHandler, self).patch(
+            pk=pk, json_content=json_content, **kwargs
+        )

src/geonoderest/geonodectl.py

@@ -1084,7 +1084,6 @@ def geonodectl():
         raise NameError(
             f"provided geonode url: {url} not ends with 'api/v2/'. Please make sure to provide full rest v2api url ..."
         )
-
     geonode_env = GeonodeApiConf(url=url, auth_basic=basic, verify=args.ssl_verify)
     g_obj: Union[GeonodeObjectHandler, GeonodeExecutionRequestHandler]
     match args.command:

src/geonoderest/geonodeobject.py

@@ -132,7 +132,9 @@ def patch(
         json_content: Optional[Dict] = None,
         **kwargs,
     ):
-        obj = self.http_patch(endpoint=f"{self.ENDPOINT_NAME}/{pk}/", json=json_content)
+        obj = self.http_patch(
+            endpoint=f"{self.ENDPOINT_NAME}/{pk}/", json_content=json_content
+        )
         return obj
 
     def cmd_describe(self, pk: int, **kwargs):

src/geonoderest/maps.py

@@ -310,12 +310,3 @@ def create(
         if r is None:
             return None
         return r[self.SINGULAR_RESOURCE_NAME]
-
-    # def patch(
-    #     self,
-    #     pk: int,
-    #     json_content: Optional[Dict] = None,
-    #     **kwargs,
-    # ):
-    #     obj = self.http_patch(endpoint=f"resources/{pk}/", json=json_content)
-    #     return obj

src/geonoderest/users.py

@@ -157,7 +157,9 @@ def patch(
         # The JSON content is sent as part of the request parameters.
         # The response from the API is returned.
 
-        obj = self.http_patch(endpoint=f"{self.ENDPOINT_NAME}/{pk}/", json=json_content)
+        obj = self.http_patch(
+            endpoint=f"{self.ENDPOINT_NAME}/{pk}/", json_content=json_content
+        )
         return obj
 
     def cmd_create(