HDXDSYS-2330 Double dataset updates required to produce desired end result

pyproject.toml

@@ -37,8 +37,8 @@ dependencies = [
     "ckanapi>=4.8",
     "defopt>=7.0.0",
     "email_validator",
-    "hdx-python-country>=3.9.4",
-    "hdx-python-utilities>=3.8.7",
+    "hdx-python-country>=3.9.6",
+    "hdx-python-utilities>=3.8.8",
     "libhxl>=5.2.2",
     "makefun",
     "quantulum3",

requirements.txt

@@ -2,7 +2,7 @@
 #    uv pip compile pyproject.toml --resolver=backtracking --all-extras -o requirements.txt
 annotated-types==0.7.0
     # via pydantic
-astdoc==1.2.1
+astdoc==1.3.0
     # via mkapi
 attrs==25.3.0
     # via
@@ -12,11 +12,11 @@ attrs==25.3.0
     #   referencing
 babel==2.17.0
     # via mkdocs-material
-backrefs==5.8
+backrefs==5.9
     # via mkdocs-material
 cachetools==5.5.2
     # via google-auth
-certifi==2025.6.15
+certifi==2025.7.14
     # via requests
 cfgv==3.4.0
     # via pre-commit
@@ -32,11 +32,11 @@ click==8.2.1
     #   typer
 colorama==0.4.6
     # via mkdocs-material
-coverage==7.9.1
+coverage==7.9.2
     # via pytest-cov
 defopt==7.0.0
     # via hdx-python-api (pyproject.toml)
-distlib==0.3.9
+distlib==0.4.0
     # via virtualenv
 dnspython==2.7.0
     # via email-validator
@@ -64,9 +64,9 @@ google-auth-oauthlib==1.2.2
     # via gspread
 gspread==6.2.1
     # via hdx-python-api (pyproject.toml)
-hdx-python-country==3.9.4
+hdx-python-country==3.9.6
     # via hdx-python-api (pyproject.toml)
-hdx-python-utilities==3.8.7
+hdx-python-utilities==3.8.8
     # via
     #   hdx-python-api (pyproject.toml)
     #   hdx-python-country
@@ -96,7 +96,7 @@ jsonlines==4.0.0
     # via hdx-python-utilities
 jsonpath-ng==1.7.0
     # via libhxl
-jsonschema==4.24.0
+jsonschema==4.25.0
     # via
     #   frictionless
     #   tableschema-to-template
@@ -110,7 +110,7 @@ loguru==0.7.3
     # via hdx-python-utilities
 makefun==1.16.0
     # via hdx-python-api (pyproject.toml)
-markdown==3.8
+markdown==3.8.2
     # via
     #   mkdocs
     #   mkdocs-material
@@ -129,15 +129,15 @@ mergedeep==1.3.4
     # via
     #   mkdocs
     #   mkdocs-get-deps
-mkapi==4.4.1
+mkapi==4.4.4
     # via hdx-python-api (pyproject.toml)
 mkdocs==1.6.1
     # via
     #   mkapi
     #   mkdocs-material
 mkdocs-get-deps==0.2.0
     # via mkdocs
-mkdocs-material==9.6.14
+mkdocs-material==9.6.15
     # via mkapi
 mkdocs-material-extensions==1.3.1
     # via mkdocs-material
@@ -147,7 +147,7 @@ nodeenv==1.9.1
     # via pre-commit
 num2words==0.5.14
     # via quantulum3
-oauthlib==3.2.2
+oauthlib==3.3.1
     # via requests-oauthlib
 openpyxl==3.1.5
     # via hdx-python-utilities
@@ -159,7 +159,7 @@ paginate==0.5.7
     # via mkdocs-material
 pathspec==0.12.1
     # via mkdocs
-petl==1.7.16
+petl==1.7.17
     # via frictionless
 platformdirs==4.3.8
     # via
@@ -187,16 +187,16 @@ pydantic==2.11.7
     # via frictionless
 pydantic-core==2.33.2
     # via pydantic
-pygments==2.19.1
+pygments==2.19.2
     # via
     #   mkdocs-material
     #   pytest
     #   rich
-pymdown-extensions==10.15
+pymdown-extensions==10.16
     # via mkdocs-material
 pyphonetics==0.5.3
     # via hdx-python-utilities
-pytest==8.4.0
+pytest==8.4.1
     # via
     #   hdx-python-api (pyproject.toml)
     #   pytest-check
@@ -253,7 +253,7 @@ rfc3986==2.0.0
     # via frictionless
 rich==14.0.0
     # via typer
-rpds-py==0.25.1
+rpds-py==0.26.0
     # via
     #   jsonschema
     #   referencing
@@ -289,11 +289,11 @@ tenacity==9.1.2
     # via hdx-python-country
 text-unidecode==1.3
     # via python-slugify
-typeguard==4.4.3
+typeguard==4.4.4
     # via inflect
 typer==0.16.0
     # via frictionless
-typing-extensions==4.14.0
+typing-extensions==4.14.1
     # via
     #   frictionless
     #   pydantic
@@ -307,13 +307,13 @@ unidecode==1.4.0
     # via
     #   libhxl
     #   pyphonetics
-urllib3==2.4.0
+urllib3==2.5.0
     # via
     #   libhxl
     #   requests
 validators==0.35.0
     # via frictionless
-virtualenv==20.31.2
+virtualenv==20.32.0
     # via pre-commit
 watchdog==6.0.0
     # via mkdocs
@@ -325,7 +325,7 @@ xlrd3==1.1.0
     # via libhxl
 xlsx2csv==0.8.4
     # via hdx-python-utilities
-xlsxwriter==3.2.3
+xlsxwriter==3.2.5
     # via tableschema-to-template
 xlwt==1.3.0
     # via hdx-python-utilities

src/hdx/data/dataset.py

@@ -652,20 +652,27 @@ def _prepare_hdx_call(self, data: Dict, kwargs: Any) -> None:
                 kwargs["batch_mode"] = "DONT_GROUP"
 
     def _revise_filter(
-        self, dataset_data_to_update: Dict, keys_to_delete: ListTuple[str]
+        self,
+        dataset_data_to_update: Dict,
+        keys_to_delete: ListTuple[str],
+        resources_to_delete: ListTuple[int],
     ):
         """Returns the revise filter parameter adding to it any keys in the
-        dataset metadata that are specified to be deleted. Also compare lists
-        in original and updated metadata to see if any have had elements
+        dataset metadata and resources that are specified to be deleted. Also compare
+        lists in original and updated metadata to see if any have had elements
         removed in which case these should be added to the filter
 
         Args:
             dataset_data_to_update (Dict): Dataset data to be updated
             keys_to_delete (ListTuple[str]): List of top level metadata keys to delete
+            resources_to_delete (ListTuple[int]): List of indexes of resources to delete
         """
         revise_filter = []
         for key in keys_to_delete:
             revise_filter.append(f"-{key}")
+        if not self.is_requestable():
+            for resource_index in resources_to_delete:
+                revise_filter.append(f"-resources__{resource_index}")
         for key, value in dataset_data_to_update.items():
             if not isinstance(value, list):
                 continue
@@ -710,17 +717,14 @@ def _revise_filter(
 
     def _revise_files_to_upload_resource_deletions(
         self,
-        revise_filter: List[str],
         resources_to_update: ListTuple["Resource"],
         resources_to_delete: ListTuple[int],
         filestore_resources: Dict[int, str],
     ):
-        """Returns the files to be uploaded and updates the revise filter with
-        any resources to be deleted also updating filestore_resources to
-        reflect any deletions.
+        """Returns the files to be uploaded and updates resources_to_update and
+        filestore_resources to reflect any deletions.
 
         Args:
-            revise_filter (List[str]): Keys and list elements to delete
             resources_to_update (ListTuple[Resource]): Resources to update
             resources_to_delete (ListTuple[int]): List of indexes of resources to delete
             filestore_resources (Dict[int, str]): List of (index of resources, file to upload)
@@ -729,8 +733,6 @@ def _revise_files_to_upload_resource_deletions(
         if not self.is_requestable():
             for resource_index in resources_to_delete:
                 del resources_to_update[resource_index]
-                if resource_index == len(resources_to_update):
-                    revise_filter.append(f"-resources__{resource_index}")
                 new_fsresources = {}
                 for index in filestore_resources:
                     if index > resource_index:
@@ -788,9 +790,10 @@ def _revise_dataset(
         ):  # Whether or not CKAN should perform validation steps (checking fields present)
             dataset_data_to_update["skip_validation"] = kwargs["skip_validation"]
         dataset_data_to_update["state"] = "active"
-        revise_filter = self._revise_filter(dataset_data_to_update, keys_to_delete)
+        revise_filter = self._revise_filter(
+            dataset_data_to_update, keys_to_delete, resources_to_delete
+        )
         files_to_upload = self._revise_files_to_upload_resource_deletions(
-            revise_filter,
             resources_to_update,
             resources_to_delete,
             filestore_resources,

tests/hdx/api/test_ckan.py

@@ -32,7 +32,7 @@ class TestCKAN:
     def configuration(self):
         hdx_key = getenv("HDX_KEY_TEST")
         Configuration._create(
-            hdx_site="stage",
+            hdx_site="demo",
             user_agent="test",
             hdx_key=hdx_key,
         )

tests/hdx/data/test_update_logic.py

@@ -166,7 +166,7 @@ def test_update_logic_1(
             hxl_update=False,
             test=True,
         )
-        assert results["filter"] == []
+        assert results["filter"] == ["-resources__13"]
         update = results["update"]
         del update["updated_by_script"]
         assert update == {
@@ -1118,7 +1118,7 @@ def test_update_logic_3(
             hxl_update=False,
             test=True,
         )
-        assert results["filter"] == []
+        assert results["filter"] == ["-resources__2", "-resources__1"]
         update = results["update"]
         del update["updated_by_script"]
         assert update == {