hdx-python-api 6.7.7__py3-none-any.whl → 6.7.9__py3-none-any.whl

hdx/api/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '6.7.7'
-__version_tuple__ = version_tuple = (6, 7, 7)
+__version__ = version = '6.7.9'
+__version_tuple__ = version_tuple = (6, 7, 9)
 
 __commit_id__ = commit_id = None

hdx/api/configuration.py

@@ -200,7 +200,7 @@ class Configuration(UserDict):
             if hdx_read_only is None:
                 hdx_read_only = False
         self.hdx_read_only = hdx_read_only
-        logger.info(f"Read only access to HDX: {str(self.hdx_read_only)}")
+        logger.info(f"Read only access to HDX: {self.hdx_read_only!s}")
 
         if self.hdx_site == "hdx_custom_site":
             hdx_key = None

hdx/api/utilities/date_helper.py

@@ -63,7 +63,7 @@ class DateHelper:
     def get_time_period_info(
         hdx_time_period: str,
         date_format: str | None = None,
-        today: datetime = now_utc(),
+        today: datetime | None = None,
     ) -> dict:
         """Get time period as datetimes and strings in specified format.
         If no format is supplied, the ISO 8601 format is used. Returns a
@@ -80,6 +80,8 @@ class DateHelper:
         Returns:
             Dictionary of date information
         """
+        if today is None:
+            today = now_utc()
         result = {}
         if hdx_time_period:
             if hdx_time_period[0] == "[" and hdx_time_period[-1] == "]":

hdx/api/utilities/hdx_error_handler.py

@@ -1,6 +1,7 @@
 import logging
 from collections.abc import Sequence
 from os import getenv
+from types import TracebackType
 from typing import Any
 
 from hdx.utilities.dictandlist import dict_of_sets_add
@@ -32,7 +33,7 @@ class HDXErrorHandler(ErrorHandler):
     ):
         super().__init__(should_exit_on_error)
         if write_to_hdx is None:
-            write_to_hdx = getenv("ERR_TO_HDX", True)
+            write_to_hdx = getenv("ERR_TO_HDX", "True")
         if write_to_hdx in (False, 0, "false", "False", "FALSE", "N", "n", ""):
             self._write_to_hdx = False
             logger.info("Errors won't be written to HDX")
@@ -210,7 +211,12 @@ class HDXErrorHandler(ErrorHandler):
         if self._write_to_hdx:
             self.write_errors_to_hdx()
 
-    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
         if self._write_to_hdx:
             self.write_errors_to_hdx()
         super().__exit__(exc_type, exc_value, traceback)

hdx/data/dataset.py

@@ -10,6 +10,7 @@ from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     Any,
+    ClassVar,
     Optional,
     Union,
 )
@@ -19,7 +20,6 @@ from hdx.utilities.base_downloader import BaseDownload
 from hdx.utilities.dateparse import (
     default_date,
     default_enddate,
-    now_utc,
     now_utc_notz,
     parse_date,
     parse_date_range,
@@ -34,12 +34,11 @@ import hdx.api.utilities.url_utils
 import hdx.data.organization as org_module
 import hdx.data.resource as res_module
 import hdx.data.showcase as sc_module
-import hdx.data.user as user
-import hdx.data.vocabulary as vocabulary
 from hdx.api.configuration import Configuration
 from hdx.api.locations import Locations
 from hdx.api.utilities.date_helper import DateHelper
 from hdx.api.utilities.filestore_helper import FilestoreHelper
+from hdx.data import user, vocabulary
 from hdx.data.activity import Activity
 from hdx.data.hdxobject import HDXError, HDXObject
 from hdx.data.resource_matcher import ResourceMatcher
@@ -67,7 +66,7 @@ class Dataset(HDXObject):
 
     max_attempts = 5
     max_int = sys.maxsize
-    update_frequencies = {
+    update_frequencies: ClassVar[dict[str, str]] = {
         "-2": "As needed",
         "-1": "Never",
         "0": "Live",
@@ -224,7 +223,7 @@ class Dataset(HDXObject):
             session = hdx.api.utilities.url_utils.get_ckan_ready_session(
                 self.configuration
             )
-            for resource in dataset_dict.get("resources", tuple()):
+            for resource in dataset_dict.get("resources", ()):
                 resource["url"] = hdx.api.utilities.url_utils.follow_url(
                     resource["url"], session=session
                 )
@@ -295,11 +294,10 @@ class Dataset(HDXObject):
             The resource that was added after matching with any existing resource
         """
         resource = self._get_resource_from_obj(resource)
-        if "package_id" in resource:
-            if not ignore_datasetid:
-                raise HDXError(
-                    f"Resource {resource['name']} being added already has a dataset id!"
-                )
+        if "package_id" in resource and not ignore_datasetid:
+            raise HDXError(
+                f"Resource {resource['name']} being added already has a dataset id!"
+            )
         resource.check_both_url_filetoupload()
         resource_index = ResourceMatcher.match_resource_list(self._resources, resource)
         if resource_index is None:
@@ -331,11 +329,10 @@ class Dataset(HDXObject):
         resource_objects = []
         for resource in resources:
             resource = self._get_resource_from_obj(resource)
-            if "package_id" in resource:
-                if not ignore_datasetid:
-                    raise HDXError(
-                        f"Resource {resource['name']} being added already has a dataset id!"
-                    )
+            if "package_id" in resource and not ignore_datasetid:
+                raise HDXError(
+                    f"Resource {resource['name']} being added already has a dataset id!"
+                )
             resource.check_both_url_filetoupload()
             resource_objects.append(resource)
         (
@@ -371,9 +368,8 @@ class Dataset(HDXObject):
         Returns:
             True if resource removed or False if not
         """
-        if isinstance(resource, str):
-            if is_valid_uuid(resource) is False:
-                raise HDXError(f"{resource} is not a valid resource id!")
+        if isinstance(resource, str) and is_valid_uuid(resource) is False:
+            raise HDXError(f"{resource} is not a valid resource id!")
         return self._remove_hdxobject(self._resources, resource, delete=delete)
 
     def get_resources(self) -> list["Resource"]:
@@ -593,8 +589,8 @@ class Dataset(HDXObject):
     def revise(
         match: dict[str, Any],
         filter: Sequence[str] = (),
-        update: dict[str, Any] = {},
-        files_to_upload: dict[str, str] = {},
+        update: dict[str, Any] | None = None,
+        files_to_upload: dict[str, str] | None = None,
         configuration: Configuration | None = None,
         **kwargs: Any,
     ) -> "Dataset":
@@ -611,6 +607,10 @@ class Dataset(HDXObject):
         Returns:
             Dataset object
         """
+        if files_to_upload is None:
+            files_to_upload = {}
+        if update is None:
+            update = {}
         separators = (",", ":")
         data = {"match": json.dumps(match, separators=separators)}
         if filter:
@@ -667,21 +667,90 @@ class Dataset(HDXObject):
             if "batch_mode" not in kwargs:
                 kwargs["batch_mode"] = "DONT_GROUP"
 
+    def _merge_list_fields(self, dataset_data_to_update: dict) -> list[str]:
+        """Merges each non-resource list in dataset_data_to_update with the
+        existing list of the same key (see _merge_list) in place.
+
+        Args:
+            dataset_data_to_update: Dataset data to be updated
+
+        Returns:
+            Keys whose merged list differs from the existing one
+        """
+        changed_keys = []
+        for key, value in dataset_data_to_update.items():
+            if (
+                key == "resources"
+                or not isinstance(value, list)
+                or key not in self._old_data
+            ):
+                continue
+            orig_list = self._old_data[key]
+            if not isinstance(orig_list, list):
+                orig_list = []
+            merged_list = self._merge_list(orig_list, value)
+            dataset_data_to_update[key] = merged_list
+            if merged_list != orig_list:
+                changed_keys.append(key)
+        return changed_keys
+
+    @staticmethod
+    def _merge_list(orig_list: list, new_list: list) -> list:
+        """Merges each dict in new_list that has an id or name with the dict in
+        orig_list with the same id (or failing that, name) so that fields not
+        given in new_list are kept. Other elements of new_list are kept as is.
+        Elements of orig_list that are not matched are dropped.
+
+        Args:
+            orig_list: Existing list
+            new_list: Updated list
+
+        Returns:
+            Merged list
+        """
+        merged_list = []
+        for new_value in new_list:
+            if not isinstance(new_value, dict):
+                merged_list.append(new_value)
+                continue
+            match = {}
+            for field in ("id", "name"):
+                field_value = new_value.get(field)
+                if not field_value:
+                    continue
+                match = next(
+                    (
+                        orig_value
+                        for orig_value in orig_list
+                        if isinstance(orig_value, dict)
+                        and orig_value.get(field) == field_value
+                    ),
+                    {},
+                )
+                if match:
+                    break
+            merged_list.append(match | new_value)
+        return merged_list
+
     def _revise_filter(
         self,
-        dataset_data_to_update: dict,
         keys_to_delete: Sequence[str],
         resources_to_delete: Sequence[int],
-    ):
+        changed_list_keys: Sequence[str],
+    ) -> list[str]:
         """Returns the revise filter parameter adding to it any keys in the
-        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
+        dataset metadata and resources that are specified to be deleted. Keys
+        of changed lists are also added so that package_revise replaces those
+        lists rather than merging them by position (which keeps the existing
+        elements' ids eg. for groups).
 
         Args:
-            dataset_data_to_update: Dataset data to be updated
             keys_to_delete: List of top level metadata keys to delete
             resources_to_delete: List of indexes of resources to delete
+            changed_list_keys: Keys of lists that differ from the existing ones
+
+        Returns:
+            Revise filter
         """
         revise_filter = []
         for key in keys_to_delete:
@@ -689,46 +758,9 @@ class Dataset(HDXObject):
         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
-            if key not in self._old_data:
-                continue
-            orig_list = self._old_data[key]
-            elements_to_remove = []
-            for i, orig_value in enumerate(orig_list):
-                if isinstance(orig_value, dict) and any(
-                    x in orig_value for x in ("id", "name")
-                ):
-                    # Where lists have an id or name, we use one of those to
-                    # match elements and work out what needs to be deleted
-                    # ie. any elements in the original list that don't exist
-                    # in the updated list
-                    el_id = orig_value.get("id")
-                    el_name = orig_value.get("name")
-                    present = False
-                    for value_dict in value:
-                        if el_id and "id" in value_dict and value_dict["id"] == el_id:
-                            present = True
-                            break
-                        if (
-                            el_name
-                            and "name" in value_dict
-                            and value_dict["name"] == el_name
-                        ):
-                            present = True
-                            break
-                    if not present:
-                        elements_to_remove.append(i)
-                elif orig_value not in value:
-                    # Otherwise we do a simple exact match of list elements
-                    # and delete any elements that are in the original list but
-                    # not in the updated list
-                    elements_to_remove.append(i)
-            for element_index in reversed(elements_to_remove):
-                del orig_list[element_index]
-                if element_index == len(orig_list):
-                    revise_filter.append(f"-{key}__{element_index}")
+        for key in changed_list_keys:
+            if key not in keys_to_delete:
+                revise_filter.append(f"-{key}")
         return revise_filter
 
     def _revise_files_to_upload_resource_deletions(
@@ -750,11 +782,11 @@ class Dataset(HDXObject):
             for resource_index in resources_to_delete:
                 del resources_to_update[resource_index]
                 new_fsresources = {}
-                for index in filestore_resources:
+                for index, fsresource in filestore_resources.items():
                     if index > resource_index:
-                        new_fsresources[index - 1] = filestore_resources[index]
+                        new_fsresources[index - 1] = fsresource
                     else:
-                        new_fsresources[index] = filestore_resources[index]
+                        new_fsresources[index] = fsresource
                 filestore_resources = new_fsresources
             for (
                 resource_index,
@@ -806,8 +838,9 @@ class Dataset(HDXObject):
         ):  # 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"
+        changed_list_keys = self._merge_list_fields(dataset_data_to_update)
         revise_filter = self._revise_filter(
-            dataset_data_to_update, keys_to_delete, resources_to_delete
+            keys_to_delete, resources_to_delete, changed_list_keys
         )
         files_to_upload = self._revise_files_to_upload_resource_deletions(
             resources_to_update,
@@ -1048,8 +1081,8 @@ class Dataset(HDXObject):
             **kwargs,
         )
         keep_crisis_tags = kwargs.get("keep_crisis_tags", True)
-        if keep_crisis_tags:
-            old_tags = self._old_data.get("tags", [])
+        if keep_crisis_tags and "tags" in self._old_data:
+            old_tags = self._old_data["tags"]
             for tag in self.data.get("tags", []):
                 tag_name = tag["name"]
                 if tag_name[:7] != "crisis-":
@@ -1061,7 +1094,6 @@ class Dataset(HDXObject):
                         break
                 if not found:
                     old_tags.append(tag)
-            self._old_data["tags"] = old_tags
         self._prepare_hdx_call(self._old_data, kwargs)
         revise_call = self._revise_dataset(
             allow_no_resources,
@@ -1182,15 +1214,13 @@ class Dataset(HDXObject):
         """
         self.check_resources_url_filetoupload()
         loadedid = self.data.get("id")
-        if loadedid is not None:
-            if not self._dataset_load_from_hdx(loadedid):
-                logger.warning(f"Failed to load dataset with id {loadedid}")
-                loadedid = None
+        if loadedid is not None and not self._dataset_load_from_hdx(loadedid):
+            logger.warning(f"Failed to load dataset with id {loadedid}")
+            loadedid = None
         if not loadedid:
             loadedid = self.data.get("name")
-            if loadedid is not None:
-                if not self._dataset_load_from_hdx(loadedid):
-                    loadedid = None
+            if loadedid is not None and not self._dataset_load_from_hdx(loadedid):
+                loadedid = None
         if loadedid:
             statuses, _ = self._dataset_hdx_update(
                 allow_no_resources=allow_no_resources,
@@ -1433,8 +1463,7 @@ class Dataset(HDXObject):
         """
         resources = []
         for dataset in datasets:
-            for resource in dataset.get_resources():
-                resources.append(resource)
+            resources.extend(dataset.get_resources())
         return resources
 
     def get_activities(self, all_pages: bool = False, **kwargs: Any) -> list[Activity]:
@@ -1479,7 +1508,7 @@ class Dataset(HDXObject):
     def get_time_period(
         self,
         date_format: str | None = None,
-        today: datetime = now_utc(),
+        today: datetime | None = None,
     ) -> dict:
         """Get dataset date as datetimes and strings in specified format. If no format is supplied, the ISO 8601
         format is used. Returns a dictionary containing keys startdate (start date as datetime), enddate (end
@@ -1595,7 +1624,7 @@ class Dataset(HDXObject):
             int(update_frequency)
         except ValueError:
             update_frequency = Dataset.transform_update_frequency(update_frequency)
-        if update_frequency not in Dataset.update_frequencies.keys():
+        if update_frequency not in Dataset.update_frequencies:
             raise HDXError("Invalid update frequency supplied!")
         self.data["data_update_frequency"] = update_frequency
 
@@ -1748,7 +1777,7 @@ class Dataset(HDXObject):
         Returns:
             True if country added or False if country already present
         """
-        iso3, match = Country.get_iso3_country_code_fuzzy(country, use_live=use_live)
+        iso3, _match = Country.get_iso3_country_code_fuzzy(country, use_live=use_live)
         if iso3 is None:
             raise HDXError(f"Country: {country} - cannot find iso3 code!")
         return self.add_other_location(
@@ -1883,7 +1912,7 @@ class Dataset(HDXObject):
         Returns:
             None
         """
-        if isinstance(maintainer, user.User) or isinstance(maintainer, dict):
+        if isinstance(maintainer, (user.User, dict)):
             if "id" not in maintainer:
                 maintainer = user.User.read_from_hdx(
                     maintainer["name"], configuration=self.configuration
@@ -1918,9 +1947,7 @@ class Dataset(HDXObject):
         Returns:
             None
         """
-        if isinstance(organization, org_module.Organization) or isinstance(
-            organization, dict
-        ):
+        if isinstance(organization, (org_module.Organization, dict)):
             if "id" not in organization:
                 organization = org_module.Organization.read_from_hdx(
                     organization["name"], configuration=self.configuration
@@ -1966,7 +1993,7 @@ class Dataset(HDXObject):
         Returns:
             Dataset showcase dict
         """
-        if isinstance(showcase, sc_module.Showcase) or isinstance(showcase, dict):
+        if isinstance(showcase, (sc_module.Showcase, dict)):
             if "id" not in showcase:
                 showcase = sc_module.Showcase.read_from_hdx(showcase["name"])
             showcase = showcase["id"]
@@ -1981,7 +2008,7 @@ class Dataset(HDXObject):
     def add_showcase(
         self,
         showcase: Union["Showcase", dict, str],
-        showcases_to_check: Sequence["Showcase"] = None,
+        showcases_to_check: Sequence["Showcase"] | None = None,
     ) -> bool:
         """Add dataset to showcase
 
@@ -1995,8 +2022,8 @@ class Dataset(HDXObject):
         dataset_showcase = self._get_dataset_showcase_dict(showcase)
         if showcases_to_check is None:
             showcases_to_check = self.get_showcases()
-        for showcase in showcases_to_check:
-            if dataset_showcase["showcase_id"] == showcase["id"]:
+        for showcase_to_check in showcases_to_check:
+            if dataset_showcase["showcase_id"] == showcase_to_check["id"]:
                 return False
         showcase = sc_module.Showcase(
             {"id": dataset_showcase["showcase_id"]},
@@ -2008,7 +2035,7 @@ class Dataset(HDXObject):
     def add_showcases(
         self,
         showcases: Sequence[Union["Showcase", dict, str]],
-        showcases_to_check: Sequence["Showcase"] = None,
+        showcases_to_check: Sequence["Showcase"] | None = None,
     ) -> bool:
         """Add dataset to multiple showcases
 
@@ -2229,7 +2256,7 @@ class Dataset(HDXObject):
         """
         if isinstance(resource, int) and not isinstance(resource, bool):
             resource = self._resources[resource]
-        if isinstance(resource, res_module.Resource) or isinstance(resource, dict):
+        if isinstance(resource, (res_module.Resource, dict)):
             res = resource.get("id")
             if res is None:
                 resource = resource["name"]
@@ -2576,12 +2603,10 @@ class Dataset(HDXObject):
                 return None
             startdate = result.get("startdate")
             if startdate is not None:
-                if startdate < dates[0]:
-                    dates[0] = startdate
+                dates[0] = min(dates[0], startdate)
             enddate = result.get("enddate")
             if enddate is not None:
-                if enddate > dates[1]:
-                    dates[1] = enddate
+                dates[1] = max(dates[1], enddate)
             return row
 
         filepath = Path(folder) / filename

hdx/data/hdxobject.py

@@ -425,7 +425,7 @@ class HDXObject(UserDict, ABC):
         try:
             if files_to_upload:
                 for key, value in files_to_upload.items():
-                    open_files_to_upload[key] = open(value, "rb")
+                    open_files_to_upload[key] = open(value, "rb")  # noqa: SIM115
             return self.configuration.call_remoteckan(
                 self.actions()[action], data, files=open_files_to_upload
             )
@@ -603,7 +603,7 @@ class HDXObject(UserDict, ABC):
             return False
         if isinstance(obj, str):
             obj_id = obj
-        elif isinstance(obj, dict) or isinstance(obj, HDXObject):
+        elif isinstance(obj, (dict, HDXObject)):
             obj_id = obj.get(matchon)
         else:
             raise HDXError("Type of object not a string, dict or T<=HDXObject")
@@ -613,7 +613,7 @@ class HDXObject(UserDict, ABC):
             objid = objdata.get(matchon)
             if objid and objid == obj_id:
                 if delete:
-                    objlist[i].delete_from_hdx()
+                    objdata.delete_from_hdx()
                 del objlist[i]
                 return True
         return False

hdx/data/location.py

@@ -2,11 +2,12 @@
 
 import logging
 from collections.abc import Sequence
+from contextlib import suppress
 from typing import Any, Optional
 
 from hdx.api.configuration import Configuration
 from hdx.data.activity import Activity
-from hdx.data.hdxobject import HDXObject
+from hdx.data.hdxobject import HDXError, HDXObject
 
 logger = logging.getLogger(__name__)
 
@@ -187,12 +188,10 @@ class Location(HDXObject):
             if name in compiled_locations:
                 final_locations.append(compiled_locations[name])
             else:
-                try:
+                with suppress(HDXError):
                     missing_location = location._write_to_hdx("show", {"id": name})
                     if missing_location:
                         final_locations.append(missing_location)
-                except Exception:
-                    pass
 
         return final_locations
 

hdx/data/organization.py

@@ -2,6 +2,7 @@
 
 import logging
 from collections.abc import Sequence
+from contextlib import suppress
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional, Union
 
@@ -303,12 +304,10 @@ class Organization(HDXObject):
             if name in compiled_orgs:
                 final_orgs.append(compiled_orgs[name])
             else:
-                try:
+                with suppress(HDXError):
                     missing_org = organization._write_to_hdx("show", {"id": name})
                     if missing_org:
                         final_orgs.append(missing_org)
-                except Exception:
-                    pass
 
         return final_orgs
 

hdx/data/resource.py

@@ -8,7 +8,7 @@ from pathlib import Path, PureWindowsPath
 from typing import Any, Optional
 from urllib.parse import urlsplit
 
-from hdx.utilities.dateparse import now_utc, now_utc_notz, parse_date
+from hdx.utilities.dateparse import now_utc_notz, parse_date
 from hdx.utilities.downloader import Download
 from hdx.utilities.file_hashing import get_size_and_hash
 from hdx.utilities.retriever import Retrieve
@@ -132,7 +132,7 @@ class Resource(HDXObject):
     def get_date_of_resource(
         self,
         date_format: str | None = None,
-        today: datetime = now_utc(),
+        today: datetime | None = None,
     ) -> dict:
         """Get resource date as datetimes and strings in specified format. If no format
         is supplied, the ISO 8601 format is used. Returns a dictionary containing keys
@@ -446,7 +446,7 @@ class Resource(HDXObject):
         if self._file_to_upload is None and "url" not in self.data:
             raise HDXError("Either a url or a file to upload must be supplied!")
 
-    def correct_format(self, data: dict = None) -> None:
+    def correct_format(self, data: dict | None = None) -> None:
         """Correct the format of the file
 
         Args:
@@ -744,7 +744,7 @@ class Resource(HDXObject):
 
         resources = []
         resource = Resource(configuration=configuration)
-        success, result = resource._read_from_hdx(
+        _success, result = resource._read_from_hdx(
             "resource", query, "query", Resource.actions()["search"]
         )
         if result:
@@ -1257,7 +1257,7 @@ class Resource(HDXObject):
             if is_valid_uuid(resource_view_id) is False:
                 raise HDXError(f"{resource_view} is not a valid resource view id!")
             ids.append(resource_view_id)
-        _, result = self._read_from_hdx(
+        self._read_from_hdx(
             "resource view",
             self.data["id"],
             "id",

hdx/data/resource_matcher.py

@@ -46,9 +46,8 @@ class ResourceMatcher:
         for i, name1 in enumerate(names1):
             if name1 != name2:
                 continue
-            if name1 in dupnames:
-                if formats1[i] != format2:
-                    continue
+            if name1 in dupnames and formats1[i] != format2:
+                continue
             index1_match = i
         return index1_match
 
@@ -83,10 +82,9 @@ class ResourceMatcher:
             for j, id2 in enumerate(ids2):
                 if id2 is None:
                     continue
-                if id1 == id2:
-                    if groups1[i] == groups2[j]:
-                        index1_matches.append(i)
-                        index2_matches.append(j)
+                if id1 == id2 and groups1[i] == groups2[j]:
+                    index1_matches.append(i)
+                    index2_matches.append(j)
         dupnames1 = {
             item for item, count in collections.Counter(names1).items() if count > 1
         }
@@ -102,9 +100,8 @@ class ResourceMatcher:
                     continue
                 if name1 != name2:
                     continue
-                if name1 in dupnames:
-                    if formats1[i] != formats2[j]:
-                        continue
+                if name1 in dupnames and formats1[i] != formats2[j]:
+                    continue
                 if groups1[i] == groups2[j]:
                     index1_matches.append(i)
                     index2_matches.append(j)

hdx/data/showcase.py

@@ -246,7 +246,7 @@ class Showcase(HDXObject):
         Returns:
             showcase dataset dict
         """
-        if isinstance(dataset, hdx.data.dataset.Dataset) or isinstance(dataset, dict):
+        if isinstance(dataset, (hdx.data.dataset.Dataset, dict)):
             if "id" not in dataset:
                 dataset = hdx.data.dataset.Dataset.read_from_hdx(dataset["name"])
             dataset = dataset["id"]
@@ -261,7 +261,7 @@ class Showcase(HDXObject):
     def add_dataset(
         self,
         dataset: Union["Dataset", dict, str],  # noqa: F821
-        datasets_to_check: Sequence["Dataset"] = None,  # noqa: F821
+        datasets_to_check: Sequence["Dataset"] | None = None,  # noqa: F821
     ) -> bool:
         """Add a dataset
 
@@ -275,8 +275,8 @@ class Showcase(HDXObject):
         showcase_dataset = self._get_showcase_dataset_dict(dataset)
         if datasets_to_check is None:
             datasets_to_check = self.get_datasets()
-        for dataset in datasets_to_check:
-            if showcase_dataset["package_id"] == dataset["id"]:
+        for dataset_to_check in datasets_to_check:
+            if showcase_dataset["package_id"] == dataset_to_check["id"]:
                 return False
         self._write_to_hdx("associate", showcase_dataset, "package_id")
         return True
@@ -284,7 +284,7 @@ class Showcase(HDXObject):
     def add_datasets(
         self,
         datasets: Sequence[Union["Dataset", dict, str]],  # noqa: F821
-        datasets_to_check: Sequence["Dataset"] = None,  # noqa: F821
+        datasets_to_check: Sequence["Dataset"] | None = None,  # noqa: F821
     ) -> bool:
         """Add multiple datasets
 

hdx/data/user.py

@@ -263,7 +263,7 @@ class User(HDXObject):
             **kwargs,
         )
 
-    def get_organization_dicts(self, permission: str = "read") -> list[dict]:  # noqa: F821
+    def get_organization_dicts(self, permission: str = "read") -> list[dict]:
         """Get organization dictionaries (not organization objects)  in HDX that this user is a member of.
 
         Args:
@@ -340,7 +340,7 @@ class User(HDXObject):
             return user.configuration.call_remoteckan(
                 cls.actions()["listorgs"], {"permission": permission}
             )
-        except Exception:
+        except Exception:  # noqa: BLE001
             return []
 
     @classmethod

hdx/data/vocabulary.py

@@ -34,7 +34,7 @@ class Vocabulary(HDXObject):
     def __init__(
         self,
         initial_data: dict | None = None,
-        name: str = None,
+        name: str | None = None,
         tags: list | None = None,
         configuration: Configuration | None = None,
     ) -> None:
@@ -361,9 +361,7 @@ class Vocabulary(HDXObject):
         Returns:
             True if tag is approved, False if not
         """
-        if tag.lower() in cls.approved_tags(configuration):
-            return True
-        return False
+        return tag.lower() in cls.approved_tags(configuration)
 
     @classmethod
     def read_tags_mappings(

hdx/facades/infer_arguments.py

@@ -85,11 +85,10 @@ def facade(projectmainfn: Callable[[Any], None], **kwargs: Any):
     main_sig = f"{projectmainname}({','.join(param_names)})"
 
     argv = sys.argv[1:]
-    for key in kwargs:
+    for key, value in kwargs.items():
         name = f"--{key.replace('_', '-')}"
         if name not in argv:
             argv.append(name)
-            value = kwargs[key]
             if isinstance(value, Path):
                 value = str(value)
             argv.append(value)

{hdx_python_api-6.7.7.dist-info → hdx_python_api-6.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-api
-Version: 6.7.7
+Version: 6.7.9
 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
@@ -27,8 +27,8 @@ Requires-Python: >=3.11
 Requires-Dist: ckanapi>=4.11
 Requires-Dist: defopt>=7.0.0
 Requires-Dist: email-validator
-Requires-Dist: hdx-python-country>=4.2.6
-Requires-Dist: hdx-python-utilities>=4.2.5
+Requires-Dist: hdx-python-country>=4.3.1
+Requires-Dist: hdx-python-utilities>=4.2.7
 Requires-Dist: makefun
 Requires-Dist: requests
 Provides-Extra: docs

hdx_python_api-6.7.9.dist-info/RECORD

@@ -0,0 +1,33 @@
+hdx/api/__init__.py,sha256=11ozJKiUsqDCZ3_mcAHhGYUyGK_Unl54djVSBBExFB4,59
+hdx/api/_version.py,sha256=mqZBEZ3sW4hFzYhXwQAxPeU7oI9pRVlb2fo16Eapuxc,520
+hdx/api/configuration.py,sha256=40DTsYVCe1tQ5IVQPFdhW83CemzkEXMjNBk6WVeUkj8,23802
+hdx/api/hdx_base_configuration.yaml,sha256=jj2t5b7NnI499rHVwOjj3Q5BAjE8i7NDGVKnWZ5P5-4,2222
+hdx/api/locations.py,sha256=bFl_cKz_AEQzkE_xWOkrRlUQ0GT2LMPSk-G_LsbV-Ns,4099
+hdx/api/remotehdx.py,sha256=IjKwP3jutlkrjvWCJPP7YM-xzg3pP_QVmiJfblllBY0,2079
+hdx/api/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hdx/api/utilities/date_helper.py,sha256=MIUh-QRGXTqjmbhCx0YDrpbfS4hcYN83cq-KYtW16oo,6413
+hdx/api/utilities/filestore_helper.py,sha256=0FcUpGHpYlAzlNDpDxdXbSqV6VHFfGCLakCmK37hieU,6917
+hdx/api/utilities/hdx_error_handler.py,sha256=jmgp6dtflhYDlZ1y8pMBDZF9eJhoIxS-ZccIBculVeg,8841
+hdx/api/utilities/hdx_state.py,sha256=KzrK0A-H5R6cRPqwF4d23_S_zfIa1ow4K5u46FesGmY,2442
+hdx/api/utilities/hdx_stats.py,sha256=JlEcF9LN-OjcVeh6C0te-nAlcO7W-JIpD5JJWTiWxs0,2847
+hdx/api/utilities/url_utils.py,sha256=Pb4r-BAqIHYmeoB_i7QjutDp6nOAUh_OHvCtiNLda3Y,4534
+hdx/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hdx/data/activity.py,sha256=YNa7hAgsMP96EIUX7UMInxAXnJ8TynE1KpecRrv8Vso,9200
+hdx/data/dataset.py,sha256=wbo2ShjXjelZcLm4I8V9wx-RDf_lXf2FsUjH-74VvWU,106379
+hdx/data/hdxobject.py,sha256=SCrnmOhBtP-6-1EdKzjgV4u0aclTzDhA4QghsaQ0qN4,28379
+hdx/data/location.py,sha256=eEdHZGEYKa9qRDyYqGTwAh22TB4XBkcTu47Mz39fmEs,11171
+hdx/data/organization.py,sha256=T2lITJXEYDN5t8dYkfcQTe-x0joULTtgp3Vn9JeVh-k,13133
+hdx/data/resource.py,sha256=3U91qdeDBUPPfB1eVLk42QOGc_tNooN8KCSWx0zhgWM,57590
+hdx/data/resource_matcher.py,sha256=JM4Lg1ONAediSDIwAPEFeE6QNneeRM_4F2IdFBgNMbU,4175
+hdx/data/resource_view.py,sha256=GcYkh0iDAe6_m2ErY_A6i3Z7ZFX949eGt1TLnLZv_8s,7346
+hdx/data/showcase.py,sha256=tXtE29JR_kTvXm5n9Rsd2D5KTAMfSBBPTgIQrzjabXo,14073
+hdx/data/user.py,sha256=3qwX945-Jj-F1tMRltB-3CDj5bKN67nTw3XkbYRfrXE,17322
+hdx/data/vocabulary.py,sha256=1gAfg_TEBKvvkhTDDJxr3IkL40OWaT5wA_xHCsTY8qM,20741
+hdx/facades/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hdx/facades/infer_arguments.py,sha256=3Z5vPPkni0Cgg9cUb7wDF_8TxeX1TiiffcnGqyahtiY,4015
+hdx/facades/keyword_arguments.py,sha256=aVapHCfqBO6H7xxBgTdK9ISdgrBFsNypPDWihfQ3edU,1125
+hdx/facades/simple.py,sha256=QWsBkaHG_UM6X3Zu2u3LWVOQzeR24q-EUClrfsL_mkM,1064
+hdx_python_api-6.7.9.dist-info/METADATA,sha256=640fkpkJHrkSRiYLy1UUP9hJ-jxQgEWMz-GIB8U5Dr0,4895
+hdx_python_api-6.7.9.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+hdx_python_api-6.7.9.dist-info/licenses/LICENSE,sha256=wc-4GpMn-ODs-U_bTe1YCiPVgvcjzrpYOx2wPuyAeII,1079
+hdx_python_api-6.7.9.dist-info/RECORD,,

{hdx_python_api-6.7.7.dist-info → hdx_python_api-6.7.9.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.4
+Generator: hatchling 1.33.0
 Root-Is-Purelib: true
 Tag: py3-none-any

hdx_python_api-6.7.7.dist-info/RECORD

@@ -1,33 +0,0 @@
-hdx/api/__init__.py,sha256=11ozJKiUsqDCZ3_mcAHhGYUyGK_Unl54djVSBBExFB4,59
-hdx/api/_version.py,sha256=vmqSkLqNCymV_Igs64SsTf8xbvuIFzv8XLWjCoHHoKw,520
-hdx/api/configuration.py,sha256=9WvuVI-3th2Dv70_t_4VoyrlJwB_9qUSN5_zUKbp4sQ,23805
-hdx/api/hdx_base_configuration.yaml,sha256=jj2t5b7NnI499rHVwOjj3Q5BAjE8i7NDGVKnWZ5P5-4,2222
-hdx/api/locations.py,sha256=bFl_cKz_AEQzkE_xWOkrRlUQ0GT2LMPSk-G_LsbV-Ns,4099
-hdx/api/remotehdx.py,sha256=IjKwP3jutlkrjvWCJPP7YM-xzg3pP_QVmiJfblllBY0,2079
-hdx/api/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdx/api/utilities/date_helper.py,sha256=KZE2sG0LM4gRa8ubNMaPFOoQl6giYoJUd7QNWQQf798,6355
-hdx/api/utilities/filestore_helper.py,sha256=0FcUpGHpYlAzlNDpDxdXbSqV6VHFfGCLakCmK37hieU,6917
-hdx/api/utilities/hdx_error_handler.py,sha256=x1rb2qBO0C6CJjqToSFj_XB1F3pf3nHpA8otxXfTFzA,8711
-hdx/api/utilities/hdx_state.py,sha256=KzrK0A-H5R6cRPqwF4d23_S_zfIa1ow4K5u46FesGmY,2442
-hdx/api/utilities/hdx_stats.py,sha256=JlEcF9LN-OjcVeh6C0te-nAlcO7W-JIpD5JJWTiWxs0,2847
-hdx/api/utilities/url_utils.py,sha256=Pb4r-BAqIHYmeoB_i7QjutDp6nOAUh_OHvCtiNLda3Y,4534
-hdx/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdx/data/activity.py,sha256=YNa7hAgsMP96EIUX7UMInxAXnJ8TynE1KpecRrv8Vso,9200
-hdx/data/dataset.py,sha256=-GQO08PK8u19O0qRWttg3AuPskPCwjffcE2mPq-7dQE,105903
-hdx/data/hdxobject.py,sha256=EG5KkVpi-yF6m6HVF79EqDneq1W7mo5M-bPJHG79T0I,28383
-hdx/data/location.py,sha256=UJPGKc8euAYFJsUFkdQtViLUwqNWYOWwaLELApAMHk4,11168
-hdx/data/organization.py,sha256=IRen2F2NsXLC8r-PVTS9eQp7LTn_44OcDUa1S7SCKiQ,13140
-hdx/data/resource.py,sha256=XgYDGD5mYc89uaiRi0oamVJ5FTFSOV6QO_Nx-9_rjpo,57601
-hdx/data/resource_matcher.py,sha256=Yzk9pWa4zk1p09m6zcZMj0XZf5Y16Pa3KToOdUt7rP8,4247
-hdx/data/resource_view.py,sha256=GcYkh0iDAe6_m2ErY_A6i3Z7ZFX949eGt1TLnLZv_8s,7346
-hdx/data/showcase.py,sha256=vnRZ45xd9Ct65eFQkWZtMIJPFifZfKOrH4obO5D5Pvc,14062
-hdx/data/user.py,sha256=NXBuvUu-pNVSEelL59wdNQgeWmDgeWke_6JxViww3Cc,17320
-hdx/data/vocabulary.py,sha256=sDDVh9ivCbZlPKXIdOoj0ltTdRufL0ypfGZUirIb2IA,20776
-hdx/facades/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hdx/facades/infer_arguments.py,sha256=DvyDuozfOPmoaV7HjhQySojGIrMWW9nos31auQBVVl8,4032
-hdx/facades/keyword_arguments.py,sha256=aVapHCfqBO6H7xxBgTdK9ISdgrBFsNypPDWihfQ3edU,1125
-hdx/facades/simple.py,sha256=QWsBkaHG_UM6X3Zu2u3LWVOQzeR24q-EUClrfsL_mkM,1064
-hdx_python_api-6.7.7.dist-info/METADATA,sha256=aCpCaXGb8JL15Aw2wnOZkEMEflXwdQGXe7IY7RzL0y4,4895
-hdx_python_api-6.7.7.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-hdx_python_api-6.7.7.dist-info/licenses/LICENSE,sha256=wc-4GpMn-ODs-U_bTe1YCiPVgvcjzrpYOx2wPuyAeII,1079
-hdx_python_api-6.7.7.dist-info/RECORD,,