bibtex: added doi and url fields.

invenio_rdm_records/resources/serializers/bibtex/schema.py

@@ -40,6 +40,7 @@ class BibTexSchema(BaseSerializerSchema, CommonFieldsMixin):
     pages = fields.Method("get_pages")
     note = fields.Method("get_note")
     venue = fields.Method("get_venue")
+    url = fields.Method("get_url")
 
     entry_mapper = {
         # Publication fields
@@ -148,6 +149,14 @@ def get_school(self, obj):
         """
         return obj.get("custom_fields", {}).get("thesis:university")
 
+    def get_url(self, obj):
+        """Generate url."""
+        doi = obj.get("pids", {}).get("doi", {}).get("identifier")
+        url = None
+        if doi:
+            url = f"https://doi.org/{doi}"
+        return url
+
     @post_dump(pass_original=True)
     def dump_record(self, data, original, many, **kwargs):
         """Dumps record."""
@@ -227,9 +236,7 @@ def _fetch_fields_map(self, data):
             "doi": data.get("doi", None),
             "month": data.get("date_created", {}).get("month", None),
             "version": data.get("version", None),
-            "url": (lambda doi: None if doi is None else "https://doi.org/" + doi)(
-                data.get("doi", None)
-            ),
+            "url": data.get("url", None),
             "school": data.get("school", None),
             "journal": data.get("journal", None),
             "volume": data.get("volume", None),
@@ -261,7 +268,7 @@ def _format_output_row(self, field, value):
         elif field == "month":
             out = "  {0:<12} = {1},\n".format(field, value)
         elif field == "url":
-            out == "  {0:<12} = {{{1}}}\n".format(field, value)
+            out = "  {0:<12} = {{{1}}}\n".format(field, value)
         else:
             if not isinstance(value, list) and value.isdigit():
                 out = "  {0:<12} = {1},\n".format(field, value)

invenio_rdm_records/resources/serializers/bibtex/schema_formats.py

@@ -21,14 +21,14 @@ class BibTexFormatter:
     book = {
         "name": "book",
         "req_fields": ["author", "title", "publisher", "year"],
-        "opt_fields": ["volume", "address", "month", "note"],
+        "opt_fields": ["volume", "address", "month", "note", "doi", "url"],
     }
     """A single-volume book."""
 
     booklet = {
         "name": "booklet",
         "req_fields": ["title"],
-        "opt_fields": ["author", "address", "month", "year", "note"],
+        "opt_fields": ["author", "address", "month", "year", "note", "doi", "url"],
     }
     """A book-like work without a formal publisher or sponsoring institution."""
 
@@ -43,49 +43,60 @@ class BibTexFormatter:
             "note",
             "publisher",
             "version",
+            "doi",
+            "url",
         ],
     }
     """A fallback type for entries which do not fit into any other category."""
 
     in_proceedings = {
         "name": "inproceedings",
         "req_fields": ["author", "title", "booktitle", "year"],
-        "opt_fields": ["pages", "publisher", "address", "month", "note", "venue"],
+        "opt_fields": [
+            "pages",
+            "publisher",
+            "address",
+            "month",
+            "note",
+            "venue",
+            "doi",
+            "url",
+        ],
     }
     """An article in a conference proceedings."""
 
     proceedings = {
         "name": "proceedings",
         "req_fields": ["title", "year"],
-        "opt_fields": ["publisher", "address", "month", "note"],
+        "opt_fields": ["publisher", "address", "month", "note", "doi", "url"],
     }
     """A single-volume conference proceedings."""
 
     article = {
         "name": "article",
         "req_fields": ["author", "title", "journal", "year"],
-        "opt_fields": ["volume", "number", "pages", "month", "note"],
+        "opt_fields": ["volume", "number", "pages", "month", "note", "doi", "url"],
     }
     """An article in a journal, magazine, newspaper, or other periodical which forms a self-contained unit with its own title."""
 
     unpublished = {
         "name": "unpublished",
         "req_fields": ["author", "title", "note"],
-        "opt_fields": ["month", "year"],
+        "opt_fields": ["month", "year", "doi", "url"],
     }
     """A work with an author and a title which has not been formally published."""
 
     thesis = {
         "name": "phdthesis",
         "req_fields": ["author", "title", "school", "year"],
-        "opt_fields": ["address", "month", "note"],
+        "opt_fields": ["address", "month", "note", "doi", "url"],
     }
     """A thesis written for an educational institution."""
 
     manual = {
         "name": "manual",
         "req_fields": ["title"],
-        "opt_fields": ["author", "address", "month", "year", "note"],
+        "opt_fields": ["author", "address", "month", "year", "note", "doi", "url"],
     }
     """Technical or other documentation, not necessarily in printed form."""
 
@@ -100,6 +111,8 @@ class BibTexFormatter:
             "note",
             "publisher",
             "version",
+            "doi",
+            "url",
         ],
     }
     """A data set or a similar collection of (mostly) raw data."""
@@ -115,6 +128,8 @@ class BibTexFormatter:
             "note",
             "publisher",
             "version",
+            "doi",
+            "url",
         ],
     }
     """Computer software."""

tests/resources/serializers/test_bibtex_serializer.py

@@ -73,6 +73,8 @@ def test_bibtex_serializer_full_record(running_app, updated_full_record):
             "  year         = 2023,",
             "  publisher    = {InvenioRDM},",
             "  version      = {v1.0},",
+            "  doi          = {10.1234/inveniordm.1234},",
+            "  url          = {https://doi.org/10.1234/inveniordm.1234}",
             "}",
         ]
     )