Add safety checks to translators for cases where jq returns None inst…

…ead of expected empty list

Co-Authored-By: Fede Raimondo <f.raimondo@fz-juelich.de>

datalad_catalog/translators/bids_dataset_translator.py

@@ -143,20 +143,20 @@ def get_authors(self):
             '"email":"", "honorificSuffix":"", "identifiers":[]}]'
         )
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
-
+        return result if result is not None and len(result) > 0 else None
+    
     def get_keywords(self):
         program = ". as $parent | .entities.task + .variables.dataset"
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_funding(self):
         program = (
             "[.Funding[]? as $fund | "
             '{"name": "", "grant":"", "description":$fund}]'
         )
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_publications(self):
         program = (
@@ -170,12 +170,12 @@ def get_publications(self):
             '"authors": []}]'
         )
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_additional_display(self):
         program = '[{"name": "BIDS", "content": .entities}]'
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_top_display(self):
         program = (
@@ -185,7 +185,7 @@ def get_top_display(self):
             '{"name": "Runs", "value": (.entities.run | length)}]'
         )
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def translate(self):
         translated_record = {

datalad_catalog/translators/datacite_gin_translator.py

@@ -117,7 +117,7 @@ def get_license(self):
         program = '.license | { "name": .name, "url": .url}'
         result = jq.first(program, self.extracted_metadata)
         # todo check for license info missing
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_authors(self):
         program = (
@@ -130,7 +130,7 @@ def get_authors(self):
             "else null end]"
         )
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_keywords(self):
         return self.extracted_metadata.get("keywords")
@@ -141,7 +141,7 @@ def get_funding(self):
             '{"name": $element, "identifier": "", "description": ""}]'
         )
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_publications(self):
         program = (
@@ -155,7 +155,7 @@ def get_publications(self):
             '"authors": []}]'
         )
         result = jq.first(program, self.extracted_metadata)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def translate(self):
         translated_record = {

datalad_catalog/translators/metalad_core_translator.py

@@ -140,7 +140,7 @@ def get_subdatasets(self):
             '"dirs_from_path": []}]'
         )
         result = jq.first(program, self.graph)
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_file_url(self):
         program = ".distribution? | .url?"

datalad_catalog/translators/metalad_studyminimeta_translator.py

@@ -168,7 +168,7 @@ def get_funding(self):
             '{"name": .name, "identifier": "", "description": ""}]'
         )
         result = jq.first(program, self.graph)  #  [] if nothing found
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def get_publications(self):
         if self.combinedpersonspubs is not None:
@@ -194,7 +194,7 @@ def get_subdatasets(self):
             '"dataset_path": .name, "dirs_from_path": []}]'
         )
         result = jq.first(program, self.graph)  #  [] if nothing found
-        return result if len(result) > 0 else None
+        return result if result is not None and len(result) > 0 else None
 
     def translate(self):
         translated_record = {