datastream: formatting and refactor updates

Author: 0einstein0

invenio_vocabularies/contrib/common/utils.py

@@ -15,6 +15,6 @@ def invenio_user_agent(default="Invenio"):
     """Return a User-Agent string, using Flask config if available."""
     if has_app_context():
         hostname = current_app.config.get("SITE_HOSTNAME", default)
-        ui_url = current_app.config.get("SITE_UI_URL", "")
-        return f"{hostname} (+{ui_url})"
+        ui_url = current_app.config.get("SITE_UI_URL", None)
+        return f"{hostname} (+{ui_url})" if ui_url else hostname
     return default

invenio_vocabularies/contrib/names/datastreams.py

@@ -276,11 +276,10 @@ def apply(self, stream_entry, **kwargs):
         given_names = name.get("given-names", None) if name else None
 
         if name is None or family_name is None:
-            error = TransformerError(
-                f"Missing name or family name for ORCiD ID: {orcid_id}"
+            current_app.logger.warning(
+                f"Missing name or family name for ORCID ID: {orcid_id}"
             )
-            stream_entry.errors.append(error)
-            current_app.logger.warning(str(error))
+            stream_entry.filtered = True
             return stream_entry
 
         full_name = " ".join(

tests/contrib/awards/test_awards_jsonschema.py

@@ -43,9 +43,8 @@ def test_valid_full(appctx, schema):
                 "scheme": "url",
             }
         ],
-        "title": {
-            "en": "Personalised Treatment For Cystic Fibrosis Patients With Ultra-rare CFTR Mutations (and beyond)"
-        },
+        "title": {"en": "Personalised Treatment For Cystic Fibrosis Patients With \
+                Ultra-rare CFTR Mutations (and beyond)"},
         "number": "755021",
         "funder": {"id": "ria", "name": "Research annd Innovation action"},
     }

tests/datastreams/test_transformers.py

@@ -44,7 +44,7 @@ def expected_from_xml():
 
 
 def test_xml_transformer(expected_from_xml):
-    entry = b"""
+    bytes_xml_entry = StreamEntry(b"""
         <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
         <ns:top_level_field>top-level single value</ns:top_level_field>
         <ns:top_level_object_field>
@@ -62,15 +62,14 @@ def test_xml_transformer(expected_from_xml):
                 </ns:array_element_object>
             </ns:nested_array_field array_attr="value">
         </ns:top_level_object_field>
-        """
-    bytes_xml_entry = StreamEntry(entry)
+        """)
 
     transformer = XMLTransformer()
     assert expected_from_xml == transformer.apply(bytes_xml_entry).entry
 
 
 def test_bad_xml_transformer():
-    entry = b"""
+    bytes_xml_entry = StreamEntry(b"""
         <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
         <ns:top_level_field>top-level single value</ns:top_level_field>
         <ns:top_level_object_field>
@@ -88,8 +87,7 @@ def test_bad_xml_transformer():
                 </ns:array_element_object>
             </ns:nested_array_field array_attr="value">
         </ns:top_level_object_field>
-        """
-    bytes_xml_entry = StreamEntry(entry)
+        """)
 
     transformer = XMLTransformer(root_element="field_two")