Allow loading from null JSON files

Update requirements.txt

Author: Mike

requirements.txt

@@ -1,7 +1,7 @@
 ckanapi==4.7
 defopt==6.3.0
 email_validator==1.2.1
-hdx-python-country==3.2.4
+hdx-python-country==3.2.5
 ndg-httpsclient==0.5.1
 pyasn1==0.4.8
 pyOpenSSL==22.0.0

setup.cfg

@@ -45,7 +45,7 @@ install_requires =
     ckanapi >= 4.7
     defopt
     email_validator
-    hdx-python-country>=3.2.4
+    hdx-python-country>=3.2.5
     ndg-httpsclient
     pyasn1
     pyOpenSSL

src/hdx/data/dataset.py

@@ -196,18 +196,22 @@ def save_to_json(self, path: str):
         save_json(self.get_dataset_dict(), path)
 
     @staticmethod
-    def load_from_json(path: str) -> "Dataset":
+    def load_from_json(path: str) -> Optional["Dataset"]:
         """Load dataset from JSON
 
         Args:
             path (str): Path to load dataset
 
         Returns:
-            Dataset: Dataset created from JSON
+            Optional[Dataset]: Dataset created from JSON or None
         """
-        dataset = Dataset(load_json(path))
-        dataset.separate_resources()
-        return dataset
+        with open(path) as f:
+            jsonobj = json.loads(f.read())
+            if jsonobj is None:
+                return None
+            dataset = Dataset(jsonobj)
+            dataset.separate_resources()
+            return dataset
 
     def init_resources(self) -> None:
         """Initialise self.resources list

tests/hdx/data/test_dataset_noncore.py

@@ -10,6 +10,7 @@
 from hdx.utilities.dateparse import parse_date_range
 from hdx.utilities.downloader import Download
 from hdx.utilities.path import temp_dir
+from hdx.utilities.saver import save_text
 
 from hdx.api.configuration import Configuration
 from hdx.data.dataset import Dataset
@@ -1719,3 +1720,7 @@ def test_load_save_to_json(self, vocabulary_read):
             )
             assert dataset.get_tags() == tags
             assert dataset.get_resource()["name"] == resource_name
+
+            save_text("null", path)
+            dataset = Dataset.load_from_json(path)
+            assert dataset is None