hdx-python-api 6.5.4__tar.gz → 6.5.6__tar.gz

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/.github/workflows/publish.yaml

@@ -16,13 +16,13 @@ jobs:
       id-token: write  # IMPORTANT: mandatory for trusted publishing
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Get history and tags for versioning to work
       run: |
         git fetch --prune --unshallow
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.x'
     - name: Install dependencies

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/.github/workflows/run-python-tests.yaml

@@ -26,9 +26,9 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.x'
     - name: Install dependencies

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-api
-Version: 6.5.4
+Version: 6.5.6
 Summary: HDX Python API for interacting with the Humanitarian Data Exchange
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-api
 Author: Michael Rans
@@ -29,7 +29,7 @@ Requires-Dist: ckanapi>=4.8
 Requires-Dist: defopt>=7.0.0
 Requires-Dist: email-validator
 Requires-Dist: hdx-python-country>=3.9.8
-Requires-Dist: hdx-python-utilities>=3.9.5
+Requires-Dist: hdx-python-utilities>=3.9.6
 Requires-Dist: libhxl>=5.2.2
 Requires-Dist: makefun
 Requires-Dist: quantulum3

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/documentation/index.md

@@ -899,6 +899,13 @@ The built-in configuration assumes data will be of form similar to below:
 
 ## Resource Specific Operations
 
+When creating or updating a resource that doesn't have an id, if you supply a parameter
+dataset, then the resource will be assigned to that dataset and it will be compared to
+resources in that dataset. If a match is found, then the resource will be given the
+corresponding id and that resource on HDX will be overwritten.
+
+    resource.create_in_hdx(dataset=DATASET)
+
 You can download a resource using the **download** function eg.
 
     url, path = resource.download("FOLDER_TO_DOWNLOAD_TO")

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
     "defopt>=7.0.0",
     "email_validator",
     "hdx-python-country>=3.9.8",
-    "hdx-python-utilities>=3.9.5",
+    "hdx-python-utilities>=3.9.6",
     "libhxl>=5.2.2",
     "makefun",
     "quantulum3",

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/requirements.txt

@@ -14,11 +14,11 @@ babel==2.17.0
     # via mkdocs-material
 backrefs==6.1
     # via mkdocs-material
-cachetools==6.2.2
+cachetools==6.2.4
     # via google-auth
 certifi==2025.11.12
     # via requests
-cfgv==3.4.0
+cfgv==3.5.0
     # via pre-commit
 chardet==5.2.0
     # via frictionless
@@ -32,7 +32,7 @@ click==8.3.1
     #   typer
 colorama==0.4.6
     # via mkdocs-material
-coverage==7.12.0
+coverage==7.13.0
     # via pytest-cov
 defopt==7.0.0
     # via hdx-python-api (pyproject.toml)
@@ -50,13 +50,13 @@ email-validator==2.3.0
     # via hdx-python-api (pyproject.toml)
 et-xmlfile==2.0.0
     # via openpyxl
-filelock==3.20.0
+filelock==3.20.1
     # via virtualenv
 frictionless==5.18.1
     # via hdx-python-utilities
 ghp-import==2.1.0
     # via mkdocs
-google-auth==2.43.0
+google-auth==2.45.0
     # via
     #   google-auth-oauthlib
     #   gspread
@@ -66,7 +66,7 @@ gspread==6.2.1
     # via hdx-python-api (pyproject.toml)
 hdx-python-country==3.9.8
     # via hdx-python-api (pyproject.toml)
-hdx-python-utilities==3.9.5
+hdx-python-utilities==3.9.6
     # via
     #   hdx-python-api (pyproject.toml)
     #   hdx-python-country
@@ -161,7 +161,7 @@ pathspec==0.12.1
     # via mkdocs
 petl==1.7.17
     # via frictionless
-platformdirs==4.5.0
+platformdirs==4.5.1
     # via
     #   mkdocs-get-deps
     #   virtualenv
@@ -175,7 +175,7 @@ ply==3.11
     #   libhxl
 pockets==0.9.1
     # via sphinxcontrib-napoleon
-pre-commit==4.4.0
+pre-commit==4.5.1
     # via hdx-python-api (pyproject.toml)
 pyasn1==0.6.1
     # via
@@ -183,7 +183,7 @@ pyasn1==0.6.1
     #   rsa
 pyasn1-modules==0.4.2
     # via google-auth
-pydantic==2.12.4
+pydantic==2.12.5
     # via frictionless
 pydantic-core==2.41.5
     # via pydantic
@@ -192,16 +192,16 @@ pygments==2.19.2
     #   mkdocs-material
     #   pytest
     #   rich
-pymdown-extensions==10.17.1
+pymdown-extensions==10.19.1
     # via mkdocs-material
 pyphonetics==0.5.3
     # via hdx-python-utilities
-pytest==9.0.1
+pytest==9.0.2
     # via
     #   hdx-python-api (pyproject.toml)
     #   pytest-check
     #   pytest-cov
-pytest-check==2.6.0
+pytest-check==2.6.2
     # via hdx-python-api (pyproject.toml)
 pytest-cov==7.0.0
     # via hdx-python-api (pyproject.toml)
@@ -253,13 +253,13 @@ rfc3986==2.0.0
     # via frictionless
 rich==14.2.0
     # via typer
-rpds-py==0.29.0
+rpds-py==0.30.0
     # via
     #   jsonschema
     #   referencing
 rsa==4.9.1
     # via google-auth
-ruamel-yaml==0.18.16
+ruamel-yaml==0.18.17
     # via hdx-python-utilities
 ruamel-yaml-clib==0.2.15
     # via ruamel-yaml
@@ -307,7 +307,7 @@ unidecode==1.4.0
     # via
     #   libhxl
     #   pyphonetics
-urllib3==2.5.0
+urllib3==2.6.2
     # via
     #   libhxl
     #   requests

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/src/hdx/api/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '6.5.4'
-__version_tuple__ = version_tuple = (6, 5, 4)
+__version__ = version = '6.5.6'
+__version_tuple__ = version_tuple = (6, 5, 6)
 
 __commit_id__ = commit_id = None

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/src/hdx/data/dataset.py

@@ -278,7 +278,7 @@ class Dataset(HDXObject):
         self,
         resource: Union["Resource", Dict, str],
         ignore_datasetid: bool = False,
-    ) -> None:
+    ) -> "Resource":
         """Add new or update existing resource in dataset with new metadata
 
         Args:
@@ -286,7 +286,7 @@ class Dataset(HDXObject):
             ignore_datasetid (bool): Whether to ignore dataset id in the resource
 
         Returns:
-            None
+            Resource: The resource that was added after matching with any existing resource
         """
         resource = self._get_resource_from_obj(resource)
         if "package_id" in resource:
@@ -298,14 +298,15 @@ class Dataset(HDXObject):
         resource_index = ResourceMatcher.match_resource_list(self._resources, resource)
         if resource_index is None:
             self._resources.append(resource)
-        else:
-            updated_resource = merge_two_dictionaries(
-                self._resources[resource_index], resource
-            )
-            if resource.get_file_to_upload():
-                updated_resource.set_file_to_upload(resource.get_file_to_upload())
-            if resource.is_marked_data_updated():
-                updated_resource.mark_data_updated()
+            return resource
+        updated_resource = merge_two_dictionaries(
+            self._resources[resource_index], resource
+        )
+        if resource.get_file_to_upload():
+            updated_resource.set_file_to_upload(resource.get_file_to_upload())
+        if resource.is_marked_data_updated():
+            updated_resource.mark_data_updated()
+        return updated_resource
 
     def add_update_resources(
         self,

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/src/hdx/data/resource.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import hdx.data.dataset
+import hdx.data.resource_matcher
 from hdx.api.configuration import Configuration
 from hdx.api.utilities.date_helper import DateHelper
 from hdx.api.utilities.size_hash import get_size_and_hash
@@ -460,6 +461,57 @@ class Resource(HDXObject):
         self._merge_hdx_update("resource", "id", files, True, **kwargs)
         return status
 
+    def _get_resource_id(self, **kwargs: Any) -> Optional[str]:
+        """Helper function to get resource id if available from given resource or by
+        comparing ot a given dataset's resources.
+
+        Args:
+            **kwargs: See below
+            dataset (Dataset): Existing dataset if available to obtain resource id
+
+        Returns:
+            Optional[str]: Resource id or None
+        """
+        loadedid = self.data.get("id")
+        if loadedid is None:
+            dataset = kwargs.get("dataset")
+            if dataset:
+                dataset_id = dataset.get("id")
+                if not dataset_id:
+                    dataset_name = dataset.get("name")
+                    if dataset_name:
+                        dataset = hdx.data.dataset.Dataset.read_from_hdx(dataset_name)
+                        if dataset:
+                            dataset_id = dataset["id"]
+                    else:
+                        raise HDXError("No dataset id or name in dataset!")
+                if dataset_id:
+                    package_id = self.data.get("package_id")
+                    if package_id and package_id != dataset_id:
+                        logger.warning(
+                            f"Using dataset id {dataset_id} from dataset parameter which doesn't match {package_id} in resource!"
+                        )
+            else:
+                dataset_id = self.data.get("package_id")
+                if dataset_id:
+                    dataset = hdx.data.dataset.Dataset.read_from_hdx(dataset_id)
+                    if not dataset:
+                        dataset_id = None
+            if dataset_id:
+                self.data["package_id"] = dataset["id"]
+                dataset_resources = dataset.get_resources()
+                matching_index = (
+                    hdx.data.resource_matcher.ResourceMatcher.match_resource_list(
+                        dataset_resources, self
+                    )
+                )
+                if matching_index:
+                    matching_resource = dataset_resources[matching_index]
+                    loadedid = matching_resource.get("id")
+                    if loadedid:
+                        self.data["id"] = loadedid
+        return loadedid
+
     def update_in_hdx(self, **kwargs: Any) -> int:
         """Check if resource exists in HDX and if so, update it. To indicate
         that the data in an external resource (given by a URL) has been
@@ -482,11 +534,13 @@ class Resource(HDXObject):
             data_updated (bool): If True, set last_modified to now. Defaults to False.
             date_data_updated (datetime): Date to use for last_modified. Default to None.
             force_update (bool): Force file to be updated even if it hasn't changed. Defaults to False.
+            dataset (Dataset): Existing dataset if available to obtain resource id
 
         Returns:
             int: Status code
         """
         self.check_both_url_filetoupload()
+        _ = self._get_resource_id(**kwargs)
         self._check_load_existing_object("resource", "id")
         return self._resource_merge_hdx_update(**kwargs)
 
@@ -513,15 +567,18 @@ class Resource(HDXObject):
             data_updated (bool): If True, set last_modified to now. Defaults to False.
             date_data_updated (datetime): Date to use for last_modified. Default to None.
             force_update (bool): Force file to be updated even if it hasn't changed. Defaults to False.
+            dataset (Dataset): Existing dataset if available to obtain resource id
 
         Returns:
             int: Status code
         """
         self.check_both_url_filetoupload()
-        id = self.data.get("id")
-        if id and self._load_from_hdx("resource", id):
-            logger.warning(f"{'resource'} exists. Updating {id}")
-            return self._resource_merge_hdx_update(**kwargs)
+        loadedid = self._get_resource_id(**kwargs)
+        if loadedid:
+            if self._load_from_hdx("resource", loadedid):
+                logger.warning(f"{'resource'} exists. Updating {loadedid}")
+                return self._resource_merge_hdx_update(**kwargs)
+            logger.warning(f"Failed to load resource with id {loadedid}")
 
         self.set_types()
         self.correct_format(self.data)

{hdx_python_api-6.5.4 → hdx_python_api-6.5.6}/tests/hdx/data/test_resource.py

@@ -12,6 +12,7 @@ import pytest
 from .. import MockResponse, dataset_resultdict, resource_data
 from .test_resource_view import resource_view_list, resource_view_mocklist
 from hdx.api.configuration import Configuration
+from hdx.data.dataset import Dataset
 from hdx.data.hdxobject import HDXError
 from hdx.data.resource import Resource
 from hdx.utilities.dateparse import parse_date
@@ -234,11 +235,20 @@ def mockdataset(url, datadict):
             404,
             '{"success": false, "error": {"message": "TEST ERROR: Not show", "__type": "TEST ERROR: Not Show Error"}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}',
         )
-    result = json.dumps(dataset_resultdict)
+    if datadict["id"] in (
+        "1234",
+        "6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d",
+        "test_dataset",
+    ):
+        result = json.dumps(dataset_resultdict)
+        return MockResponse(
+            200,
+            '{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}'
+            % result,
+        )
     return MockResponse(
-        200,
-        '{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}'
-        % result,
+        404,
+        '{"success": false, "error": {"message": "Not found", "__type": "Not Found Error"}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=package_show"}',
     )
 
 
@@ -1068,3 +1078,51 @@ class TestResource:
         )
         del resource["id"]
         assert resource.get_api_url() is None
+
+    def test_get_resource_id(self, configuration, post_dataset):
+        resources = [
+            {"id": "abcd", "name": "Resource1", "format": "CSV"},
+            {"id": "efgh", "name": "Resource2", "format": "CSV"},
+            {"id": "ijkl", "name": "Resource3", "format": "XLSX"},
+        ]
+        dataset = Dataset({"id": "1234", "name": "test_dataset", "format": "CSV"})
+        dataset.add_update_resources(resources)
+
+        # Uses resource["name"] and resource["format"]
+        resource = Resource({"name": "Resource2", "format": "CSV"})
+        result = resource._get_resource_id(dataset=dataset)
+        assert result == "efgh"
+
+        # Uses resource["id"]
+        result = resource._get_resource_id(dataset=dataset)
+        assert result == "efgh"
+
+        # Uses dataset["name"]
+        del resource["id"]
+        del resource["package_id"]
+        del dataset["id"]
+        result = resource._get_resource_id(dataset=dataset)
+        assert result == "3d777226-96aa-4239-860a-703389d16d1f"
+
+        # Uses resource["package id"]
+        del resource["id"]
+        result = resource._get_resource_id()
+        assert result == "3d777226-96aa-4239-860a-703389d16d1f"
+
+        # Uses resource["package id"]
+        del resource["id"]
+        resource["package_id"] = "NOTFOUND"
+        result = resource._get_resource_id()
+        assert result is None
+
+        # resource["package id"] != dataset["id"]
+        resource["package_id"] = "NOTFOUND"
+        result = resource._get_resource_id(dataset=dataset)
+        assert result == "3d777226-96aa-4239-860a-703389d16d1f"
+
+        # Invalid dataset
+        del resource["id"]
+        del resource["package_id"]
+        del dataset["name"]
+        with pytest.raises(HDXError):
+            resource._get_resource_id(dataset=dataset)