load: revise entrytype setting

Author: Gerit Wagner

colrev/loader/load_utils.py

@@ -160,10 +160,15 @@ def bib_entrytype_setter(entrytype: dict) -> None:
         entrytype[Fields.ENTRYTYPE] = ENTRYTYPES.MISC
 
 
+def _noop_entrytype_setter(entrytype: dict) -> None:
+    """Default for non-BibTeX loaders: do nothing."""
+    return
+
+
 def load(  # type: ignore
     filename: Path,
     *,
-    entrytype_setter: typing.Callable = lambda x: x,
+    entrytype_setter: typing.Callable[[dict], None] | None = None,
     field_mapper: typing.Callable = lambda x: x,
     id_labeler: typing.Callable = lambda x: x,
     unique_id_field: str = "",
@@ -183,6 +188,8 @@ def load(  # type: ignore
 
     if filename.suffix == ".bib":
         parser = colrev.loader.bib.BIBLoader  # type: ignore
+        if entrytype_setter is None:
+            entrytype_setter = bib_entrytype_setter
     elif filename.suffix in [".csv", ".xls", ".xlsx"]:
         parser = colrev.loader.table.TableLoader  # type: ignore
     elif filename.suffix == ".ris":
@@ -198,6 +205,10 @@ def load(  # type: ignore
     else:
         raise NotImplementedError(f"Unsupported file type: {filename.suffix}")
 
+    # For non-bib files, if still None, use a no-op setter
+    if entrytype_setter is None:
+        entrytype_setter = _noop_entrytype_setter
+
     return parser(
         filename=filename,
         entrytype_setter=entrytype_setter,

colrev/loader/loader.py

@@ -63,14 +63,14 @@ def _set_entrytypes(self, records_dict: dict) -> None:
         assert all(
             Fields.ENTRYTYPE in r for r in records_dict.values()
         ), "ENTRYTYPE not set in all records"
-        invalid_entrytypes = [
-            r[Fields.ENTRYTYPE]
-            for r in records_dict.values()
-            if r[Fields.ENTRYTYPE] not in ENTRYTYPES.get_all()
-        ]
-        assert (
-            len(invalid_entrytypes) == 0
-        ), f"Invalid ENTRYTYPE in some records: {invalid_entrytypes}"
+
+        for r in records_dict.values():
+            if r[Fields.ENTRYTYPE] in ENTRYTYPES.get_all():
+                continue
+            self.logger.warning(
+                f"Invalid ENTRYTYPE in {r[Fields.ID]}: {r[Fields.ENTRYTYPE]}, setting to misc"
+            )
+            r[Fields.ENTRYTYPE] = ENTRYTYPES.MISC
 
     def _set_fields(self, records_dict: dict) -> None:
         for record_dict in records_dict.values():