commonmeta-py 0.55__py3-none-any.whl → 0.57__py3-none-any.whl

commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.55"
+__version__ = "0.57"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

commonmeta/readers/json_feed_reader.py

@@ -50,7 +50,9 @@ def read_json_feed_item(data: Optional[dict], **kwargs) -> Commonmeta:
     url = None
     if py_.get(meta, "blog.status", None) == "active":
         url = normalize_url(meta.get("url", None))
-    elif py_.get(meta, "blog.status", None) == "archived":
+    elif py_.get(meta, "blog.status", None) == "archived" and meta.get(
+        "archive_url", None
+    ):
         url = normalize_url(meta.get("archive_url", None))
     _id = normalize_doi(read_options.get("doi", None) or meta.get("doi", None)) or url
     _type = "Article"
@@ -183,6 +185,7 @@ def get_references(references: list) -> list:
             return compact(
                 {
                     "id": id_,
+                    "key": reference.get("key", None),
                     "title": reference.get("title", None),
                     "publicationYear": reference.get("publicationYear", None),
                 }
@@ -195,6 +198,9 @@ def get_references(references: list) -> list:
             return compact(
                 {
                     "id": id_,
+                    "key": reference.get("key", None),
+                    "title": reference.get("title", None),
+                    "publicationYear": reference.get("publicationYear", None),
                 }
             )
 

commonmeta/utils.py

@@ -111,6 +111,7 @@ FOS_MAPPINGS = {
     "Agricultural biotechnology": "http://www.oecd.org/science/inno/38235147",
     "Other agricultural sciences": "http://www.oecd.org/science/inno/38235147",
     "Social science": "http://www.oecd.org/science/inno/38235147.pdf?5",
+    "Social sciences": "http://www.oecd.org/science/inno/38235147.pdf?5",
     "Psychology": "http://www.oecd.org/science/inno/38235147.pdf?5.1",
     "Economics and business": "http://www.oecd.org/science/inno/38235147.pdf?5.2",
     "Educational sciences": "http://www.oecd.org/science/inno/38235147.pdf?5.3",

commonmeta/writers/inveniordm_writer.py

@@ -15,6 +15,7 @@ from ..utils import (
     get_language,
     validate_orcid,
     id_from_url,
+    normalize_url,
     FOS_MAPPINGS,
 )
 
@@ -45,17 +46,12 @@ def write_inveniordm(metadata):
             "scheme": "url",
         }
     )
-    references = [
-        to_inveniordm_related_identifier(i)
-        for i in wrap(metadata.references)
-        if i.get("id", None)
-    ]
-    relations = [
+    references = [to_inveniordm_reference(i) for i in wrap(metadata.references)]
+    related_identifiers = [
         to_inveniordm_related_identifier(i)
         for i in wrap(metadata.relations)
         if i.get("id", None) and i.get("type", None) != "IsPartOf"
     ]
-    related_identifiers = references + relations
     funding = compact(
         [
             to_inveniordm_funding(i)
@@ -76,16 +72,20 @@ def write_inveniordm(metadata):
         else None
     )
     dates = []
-    if metadata.date.get("updated", None):
-        # workaround for InvenioRDM issue parsing some iso8601 strings
-        date_updated = validate_edtf(metadata.date.get("updated"))
-        if date_updated:
-            dates.append(
-                {
-                    "date": metadata.date.get("updated"),
-                    "type": {"id": "updated"},
-                }
-            )
+    for date in metadata.date.keys():
+        if metadata.date.get(date, None) is None:
+            continue
+        t = date.lower()
+        if t == "published":
+            t = "issued"
+        elif t == "accessed":
+            t = "other"
+        dates.append(
+            {
+                "date": metadata.date.get(date),
+                "type": {"id": t},
+            }
+        )
 
     subjects = [to_inveniordm_subject(i) for i in wrap(metadata.subjects)]
     data = compact(
@@ -125,6 +125,7 @@ def write_inveniordm(metadata):
                     if metadata.language
                     else None,
                     "identifiers": identifiers,
+                    "references": presence(references),
                     "related_identifiers": presence(related_identifiers),
                     "funding": presence(funding),
                     "version": metadata.version,
@@ -219,19 +220,19 @@ def to_inveniordm_affiliations(creator: dict) -> Optional[list]:
 
 
 def to_inveniordm_related_identifier(relation: dict) -> dict:
-    """Convert reference or relation to inveniordm related_identifier"""
+    """Convert relation to inveniordm related_identifier"""
     if normalize_doi(relation.get("id", None)):
         identifier = doi_from_url(relation.get("id", None))
         scheme = "doi"
-    else:
+    elif normalize_url(relation.get("id", None)):
         identifier = relation.get("id", None)
         scheme = "url"
+    else:
+        return None
 
     # normalize relation types
     relation_type = relation.get("type")
-    if relation.get("type", None) is None:
-        relation_type = "References"
-    elif relation.get("type") == "HasReview":
+    if relation.get("type") == "HasReview":
         relation_type = "IsReviewedBy"
     elif relation.get("type") == "IsPreprintOf":
         relation_type = "IsPreviousVersionOf"
@@ -247,6 +248,54 @@ def to_inveniordm_related_identifier(relation: dict) -> dict:
     )
 
 
+def to_inveniordm_reference(reference: dict) -> dict:
+    """Convert reference to inveniordm reference"""
+    print(reference)
+    if normalize_doi(reference.get("id", None)):
+        identifier = doi_from_url(reference.get("id", None))
+        scheme = "doi"
+    elif normalize_url(reference.get("id", None)):
+        identifier = reference.get("id", None)
+        scheme = "url"
+    else:
+        return None
+
+    if reference.get("unstructured", None) is None:
+        # use title as unstructured reference
+        if reference.get("title", None):
+            unstructured = reference.get("title")
+        else:
+            unstructured = "Unknown title"
+
+        if reference.get("publicationYear", None):
+            unstructured += " (" + reference.get("publicationYear") + ")."
+
+        return compact(
+            {
+                "reference": unstructured,
+                "scheme": scheme,
+                "identifier": identifier,
+            }
+        )
+    else:
+        unstructured = reference.get("unstructured")
+
+        # remove optional trailing period
+        unstructured = unstructured.rstrip(" .")
+
+        if reference.get("id", None):
+            # remove duplicate ID from unstructured reference
+            unstructured = unstructured.replace(reference.get("id"), "")
+
+        return compact(
+            {
+                "reference": unstructured,
+                "scheme": scheme,
+                "identifier": identifier,
+            }
+        )
+
+
 def to_inveniordm_funding(funding: dict) -> Optional[dict]:
     """Convert funding to inveniordm funding"""
     if funding.get("funderIdentifierType", None) == "ROR":
@@ -307,5 +356,3 @@ def to_inveniordm_funding(funding: dict) -> Optional[dict]:
             ),
         }
     )
-
-

{commonmeta_py-0.55.dist-info → commonmeta_py-0.57.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.55
+Version: 0.57
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Home-page: https://python.commonmeta.org
 License: MIT

{commonmeta_py-0.55.dist-info → commonmeta_py-0.57.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=GjhFP1p3u1oRLsytjPJgLU7qHz-CpHtKmkinPaGJclE,1779
+commonmeta/__init__.py,sha256=X8zPmm3FIxB46NHT9abDSezCrBfHCzcwmvQRbG_p_J0,1779
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=zBIPTgP5n7Zx57xomJ2h7x0dvC0AV8gJ2gPoYeDy5Lo,8348
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
@@ -19,7 +19,7 @@ commonmeta/readers/csl_reader.py,sha256=5V_sHSJwcAWJmhB8SYk199nB96BWYX1Sq9vkQ3iE
 commonmeta/readers/datacite_reader.py,sha256=CdOtxhthrakBoQMsLTdPx6sUCmqtEWo5ICYE6ZsWDdo,12026
 commonmeta/readers/datacite_xml_reader.py,sha256=nhnO92fZihr1HZlbXjyem-HJXc9_DWLgJ2zeltuPMIg,13041
 commonmeta/readers/inveniordm_reader.py,sha256=jzv0rXzT8OCdPD_MShBXTnlwD-F9tpTX7OKZGn8smzs,7480
-commonmeta/readers/json_feed_reader.py,sha256=uJrFTbHEfjTcydnR9U0ce81IF0X94xti72DiQVcR_A8,13731
+commonmeta/readers/json_feed_reader.py,sha256=0g5e7uBZWFEFK-Gxgf5dSgPzbAZQUW_S8ZPB7gjR0h8,14027
 commonmeta/readers/kbase_reader.py,sha256=ehKXQsJyPCtaq2FmBxNb2Jb5Nktpx8pNscpmEM6N0A4,6763
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
 commonmeta/readers/schema_org_reader.py,sha256=xyWzO2XAWlI2pYVl2EbVRsUmfiWXEwP64CHRBQNRN-M,16835
@@ -58,7 +58,7 @@ commonmeta/resources/styles/modern-language-association.csl,sha256=HI2iU4krze1aH
 commonmeta/resources/styles/vancouver.csl,sha256=lun3_i2oTilgsANk4LjFao2UDPQlGj_hgFgKAWC_DF8,12878
 commonmeta/schema_utils.py,sha256=gg3l1jd_lFtRkQlO1DYGMVbC10nEmVTN4AWacxC4AAE,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
-commonmeta/utils.py,sha256=MkcI2v9hr_tJuSHzopOHbPZXkmmvL3ooQvt2RUq5c_M,43992
+commonmeta/utils.py,sha256=YaKAWk37DQ1-gSk9QK5s9Pm7B7jIlmaO_Vd--3HBK1o,44066
 commonmeta/writers/__init__.py,sha256=47-snms6xBHkoEXKYV1DBtH1npAtlVtvY29Z4Zr45qI,45
 commonmeta/writers/bibtex_writer.py,sha256=s3hIJIgWvSG7TAriZMRQEAyuitw6ebwWSI1YcYFQ-do,4971
 commonmeta/writers/citation_writer.py,sha256=RjaNh9EALxq6gfODLRWVJxGxPArGd6ZiHUlkYnCT6MA,2355
@@ -66,11 +66,11 @@ commonmeta/writers/commonmeta_writer.py,sha256=2qlttCfYpGhfVjrYkjzbIra7AywssRLT3
 commonmeta/writers/crossref_xml_writer.py,sha256=0Ds494RnXfdfjWw5CLX1kwV2zP7gqffdVqO-X74Uc6c,492
 commonmeta/writers/csl_writer.py,sha256=rlCeShkvC6ui9By0yVfNCMay_JfaZ4AooUPOPg-g-2M,2819
 commonmeta/writers/datacite_writer.py,sha256=G7Lr0aZ4sAEdbfXe3dG4Y6AyGUKA9UWr_iiaQRDnV24,6233
-commonmeta/writers/inveniordm_writer.py,sha256=UMFjUC_uvF8Bkm-Le5mR_nDolagqr9M6XTUH-x2sxYc,9994
+commonmeta/writers/inveniordm_writer.py,sha256=2EptJ9H328vqXlEm9d0delY101zdPt4c-_gIzEz-saY,11422
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.55.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.55.dist-info/METADATA,sha256=GiA00Kruv5kxWUbo1-G866EDBKVW6p25DG-FM58DGFM,8282
-commonmeta_py-0.55.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-commonmeta_py-0.55.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.55.dist-info/RECORD,,
+commonmeta_py-0.57.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.57.dist-info/METADATA,sha256=OAb3iqk3hSgEWg6J1PU57i6hPhSiUkaxsgvaaLeA5CU,8282
+commonmeta_py-0.57.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+commonmeta_py-0.57.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.57.dist-info/RECORD,,