fixed bugs in invenio.py

Author: notactuallyfinn

src/hermes/commands/deposit/invenio.py

@@ -442,7 +442,8 @@ def upload_artifacts(self) -> None:
         if self.command.args.file:
             files = *self.config.files, *[f[0] for f in self.command.args.file]
         else:
-            files = tuple(*self.config.files)
+            files = tuple(self.config.files)
+
         for path_arg in files:
             path = Path(path_arg)
 
@@ -511,11 +512,17 @@ def _codemeta_to_invenio_deposition(self) -> dict:
             creator = {}
             if len(affils := [name for affil in author["affiliation"] for name in affil["legalname"]]) != 0:
                 creator["affiliation"] = affils
-            given_names_str = " ".join(author["givenName"])
-            names = [f"{family_name}, {given_names_str}" for family_name in author["familyName"]]
-            names.extend(author["names"])
-            if len(names) != 0:
-                creator["name"] = names
+            if len(author["familyName"]) > 1:
+                raise HermesValidationError(f"Author has too many family names: {author.to_python()}")
+            if len(author["familyName"]) == 1:
+                given_names_str = " ".join(author["givenName"])
+                name = f"{author["familyName"][0]}, {given_names_str}"
+            elif len(author["name"]) != 1:
+                raise HermesValidationError(f"Author has too many names: {author.to_python()}")
+            else:
+                name = author["name"][0]
+            if len(name) != 0:
+                creator["name"] = name
             if (id := author.get("@id", None)) is not None:
                 creator["orcid"] = id.replace("https://orcid.org/", "")
             if creator:

test/hermes_test/model/test_api_e2e.py

@@ -205,7 +205,7 @@ def test_cff_harvest(tmp_path, monkeypatch, cff, res):
 
     # FIXME: update to compare the SoftwareMetadata objects instead of the data_dicts (in multiple places)
     # after merge with refactor/data-model and/or refactor/423-implement-public-api
-    assert result.data_dict == res.data_dict
+    assert result == res
 
 
 @pytest.mark.parametrize(
@@ -363,7 +363,7 @@ def test_codemeta_harvest(tmp_path, monkeypatch, codemeta, res):
     finally:
         sys.argv = orig_argv
 
-    assert result.data_dict == res.data_dict
+    assert result == res
 
 
 @pytest.mark.parametrize(
@@ -402,7 +402,7 @@ def test_file_deposit(tmp_path, monkeypatch, deposit, res):
     finally:
         sys.argv = orig_argv
 
-    assert result.data_dict == res.data_dict
+    assert result == res
 
 
 @pytest.mark.parametrize(
@@ -432,12 +432,12 @@ def test_invenio_deposit(tmp_path, monkeypatch, sandbox_auth, metadata):
 
     config_file = tmp_path / "hermes.toml"
     config_file.write_text(f"""[deposit]
-target = \"invenio\"
+target = "invenio"
 [deposit.invenio]
-site_url = \"https://sandbox.zenodo.org\"
-access_right = \"closed\"
-auth_token = \"{sandbox_auth}\"
-file = []
+site_url = "https://sandbox.zenodo.org"
+access_right = "closed"
+auth_token = "{sandbox_auth}"
+files = ["hermes.toml"]
 [deposit.invenio.api_paths]
 licenses = "api/vocabularies/licenses"
 """)
@@ -455,9 +455,7 @@ def test_invenio_deposit(tmp_path, monkeypatch, sandbox_auth, metadata):
     finally:
         sys.argv = orig_argv
 
-    assert result.data_dict == metadata.data_dict
+    assert result == metadata
 
-# TODO:
-#   - handle get() on Softwaremetadata objects in invenio.py
-#   - Sophie genaueres bezüglich Zeiten für Arbeitszeiterhöhung und -zeitraumerweiterung schicken
+# TODO: handle get() on Softwaremetadata objects in invenio.py