commonmeta-py 0.35__py3-none-any.whl → 0.38__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.35"
+__version__ = "0.38"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

commonmeta/constants.py

@@ -612,3 +612,14 @@ INVENIORDM_IDENTIFIER_TYPES = {
     "W3ID": "w3id",
     "Other": "other",
 }
+
+
+CROSSREF_FUNDER_ID_TO_ROR_TRANSLATIONS = {
+    "https://doi.org/10.13039/100000001": "https://ror.org/021nxhr62",
+    "https://doi.org/10.13039/501100000780": "https://ror.org/00k4n6c32",
+    "https://doi.org/10.13039/501100007601": "https://ror.org/00k4n6c32",
+    "https://doi.org/10.13039/501100001659": "https://ror.org/018mejw64",
+    "https://doi.org/10.13039/501100006390": "https://ror.org/019whta54",
+    "https://doi.org/10.13039/501100001711": "https://ror.org/00yjd3n13",
+    "https://doi.org/10.13039/501100003043": "https://ror.org/04wfr2810",
+}

commonmeta/utils.py

@@ -1076,11 +1076,21 @@ def from_curie(id: Optional[str]) -> Optional[str]:
 
 def issn_as_url(issn: str) -> Optional[str]:
     """ISSN as URL"""
-    if issn is None:
+    if normalize_issn(issn) is None:
         return None
     return f"https://portal.issn.org/resource/ISSN/{issn}"
 
 
+def issn_from_url(url: str) -> Optional[str]:
+    """ISSN from URL"""
+    if url is None:
+        return None
+    match = re.match(r"\Ahttps://portal.issn.org/resource/ISSN/(.+)\Z", url)
+    if match is None:
+        return None
+    return match.group(1)
+
+
 def get_language(lang: str, format: str = "alpha_2") -> Optional[str]:
     """Provide a language string based on ISO 639, with either a name in English,
     ISO 639-1, or ISO 639-3 code as input. Optionally format as alpha_2 (defaul),

commonmeta/writers/inveniordm_writer.py

@@ -2,12 +2,23 @@
 
 import orjson as json
 from typing import Optional
+from furl import furl
 
 from ..base_utils import compact, wrap, parse_attributes, presence
 from ..date_utils import get_iso8601_date
-from ..doi_utils import doi_from_url
-from ..constants import CM_TO_INVENIORDM_TRANSLATIONS, INVENIORDM_IDENTIFIER_TYPES
-from ..utils import get_language, validate_orcid, id_from_url, FOS_MAPPINGS
+from ..doi_utils import doi_from_url, normalize_doi
+from ..constants import (
+    CM_TO_INVENIORDM_TRANSLATIONS,
+    INVENIORDM_IDENTIFIER_TYPES,
+    CROSSREF_FUNDER_ID_TO_ROR_TRANSLATIONS,
+)
+from ..utils import (
+    get_language,
+    validate_orcid,
+    id_from_url,
+    issn_from_url,
+    FOS_MAPPINGS,
+)
 
 
 def write_inveniordm(metadata):
@@ -30,6 +41,26 @@ def write_inveniordm(metadata):
         for i in wrap(metadata.identifiers)
         if i.get("id", None) != metadata.id
     ]
+    print(metadata.references)
+    print(metadata.relations)
+    references = [
+        to_inveniordm_related_identifier(i)
+        for i in wrap(metadata.references)
+        if i.get("id", None)
+    ]
+    relations = [
+        to_inveniordm_related_identifier(i)
+        for i in wrap(metadata.relations)
+        if i.get("id", None) and i.get("type", None)
+    ]
+    related_identifiers = references + relations
+    funding = compact(
+        [
+            to_inveniordm_funding(i)
+            for i in wrap(metadata.funding_references)
+            if i.get("funderName", None)
+        ]
+    )
     container = metadata.container if metadata.container else {}
     journal = (
         container.get("title", None)
@@ -42,6 +73,14 @@ def write_inveniordm(metadata):
         if container.get("identifierType", None) == "ISSN"
         else None
     )
+    dates = []
+    if metadata.date.get("updated", None):
+        dates.append(
+            {
+                "date": metadata.date.get("updated"),
+                "type": {"id": "updated"},
+            }
+        )
 
     subjects = [to_inveniordm_subject(i) for i in wrap(metadata.subjects)]
     data = compact(
@@ -67,12 +106,7 @@ def write_inveniordm(metadata):
                     "publication_date": get_iso8601_date(metadata.date.get("published"))
                     if metadata.date.get("published", None)
                     else None,
-                    "dates": compact([
-                        {
-                            "date": metadata.date.get("updated"),
-                            "type": {"id": "updated"},
-                        }
-                    ]),
+                    "dates": presence(dates),
                     "subjects": presence(subjects),
                     "description": parse_attributes(
                         metadata.descriptions, content="description", first=True
@@ -86,6 +120,8 @@ def write_inveniordm(metadata):
                     if metadata.language
                     else None,
                     "identifiers": identifiers,
+                    "related_identifiers": presence(related_identifiers),
+                    "funding": presence(funding),
                     "version": metadata.version,
                 }
             ),
@@ -171,3 +207,85 @@ def to_inveniordm_affiliations(creator: dict) -> Optional[list]:
     return compact(
         [format_affiliation(i) for i in wrap(creator.get("affiliations", None))]
     )
+
+
+def to_inveniordm_related_identifier(relation: dict) -> dict:
+    """Convert reference or relation to inveniordm related_identifier"""
+    if normalize_doi(relation.get("id", None)):
+        identifier = doi_from_url(relation.get("id", None))
+        scheme = "doi"
+    elif (
+        relation.get("type", None) == "IsPartOf"
+        and furl(relation.get("id", None)).host == "portal.issn.org"
+    ):
+        identifier = issn_from_url(relation.get("id", None))
+        scheme = "issn"
+    else:
+        identifier = relation.get("id", None)
+        scheme = "url"
+
+    # normalize relation types
+    if relation.get("type", None) is None:
+        relation["type"] = "References"
+    if relation.get("type") == "HasReview":
+        relation["type"] = "IsReviewedBy"
+    relation_type = relation.get("type").lower()
+    return compact(
+        {
+            "identifier": identifier,
+            "scheme": scheme,
+            "relation_type": {
+                "id": relation_type,
+            },
+        }
+    )
+
+
+def to_inveniordm_funding(funding: dict) -> Optional[dict]:
+    """Convert funding to inveniordm funding"""
+    if funding.get("funderIdentifierType", None) == "ROR":
+        funder_identifier = id_from_url(funder_identifier)
+    elif funding.get("funderIdentifierType", None) == "Crossref Funder ID":
+        # convert to ROR
+        funder_identifier = id_from_url(
+            CROSSREF_FUNDER_ID_TO_ROR_TRANSLATIONS.get(
+                funding.get("funderIdentifier", None), None
+            )
+        )
+    else:
+        funder_identifier = None
+    award_title = funding.get("awardTitle", None)
+    if award_title:
+        award_title = {"title": {"en": award_title}}
+    if funding.get("awardUri", None):
+        award_identifiers = [
+            {
+                "scheme": "url",
+                "identifier": funding.get("awardUri", None),
+            },
+        ]
+    else:
+        award_identifiers = None
+    if funding.get("awardNumber", None) or award_title or award_identifiers:
+        award = (
+            compact(
+                {
+                    "number": funding.get("awardNumber", None),
+                    "title": award_title,
+                    "identifiers": award_identifiers,
+                }
+            ),
+        )
+    else:
+        award = None
+    return compact(
+        {
+            "funder": compact(
+                {
+                    "name": funding.get("funderName"),
+                    "id": funder_identifier,
+                }
+            ),
+            "award": award,
+        }
+    )

{commonmeta_py-0.35.dist-info → commonmeta_py-0.38.dist-info}/METADATA

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

{commonmeta_py-0.35.dist-info → commonmeta_py-0.38.dist-info}/RECORD

@@ -1,9 +1,9 @@
-commonmeta/__init__.py,sha256=oWSEoQVeEN53dfh-cUa8cexOwQoKRoQNwbNXhXmqHxU,1779
+commonmeta/__init__.py,sha256=s5OSvyoLPJlih0ohip5DGhb84c9rFKXbEFMkyidzEG4,1779
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=zBIPTgP5n7Zx57xomJ2h7x0dvC0AV8gJ2gPoYeDy5Lo,8348
 commonmeta/base_utils.py,sha256=0t6fr9XGeeTBoMlKSAMI7p_EmKsA6wYRW0roEBXVcc8,3722
 commonmeta/cli.py,sha256=0IJF1SQ1sKPg7M0Gb8fpX2nBps-G0L13o01__M6c5Z0,6104
-commonmeta/constants.py,sha256=fB2oMjnPYCJG3Zx6080u0R0ujmXkPRLGSgYOulWyOFw,16411
+commonmeta/constants.py,sha256=aMD7vG_kJD5ja5YOqDjsfuokWcRMnWOF7jv0YV3-OXw,16973
 commonmeta/crossref_utils.py,sha256=xyS8jFXO8unzumCC6YXK45kzz16PQAAOkWUHgjqawAo,22063
 commonmeta/date_utils.py,sha256=amF3E0ZJlh8yY5eY3aVXQyAO1x2WuZHJXw-ajOEcdUQ,5808
 commonmeta/doi_utils.py,sha256=Dt6K9ADD2ga2WNsOzfX9f29gnubhn7xqeKL7U5pEpBs,8209
@@ -57,7 +57,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=Ep8suJgqtgDAvbjVkQxwzAY1MqwwqPwNRKDTMAxMQTg,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
-commonmeta/utils.py,sha256=TjspdiI9g6WEcbvEiUOc6ARV7j_PHAdY2nRrEHrNXQs,42310
+commonmeta/utils.py,sha256=dblEYOmR0q6qZgsqnQOunm_Zj7YP4bugzwK1ps5SYq8,42583
 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
@@ -65,11 +65,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=YltGec0aCViddX_EYZRIn4oqmu4rCzbKSRX_3ENLZGA,5814
+commonmeta/writers/inveniordm_writer.py,sha256=xOLIrWTSXYDmri80yUuZmoU257UX9ojpkVf3JeHLyUM,9252
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.35.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.35.dist-info/METADATA,sha256=Ij3V3EjAGk2-K3V-DCrnINOH0o4vrdIoNGhAejI_zyM,8331
-commonmeta_py-0.35.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-commonmeta_py-0.35.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.35.dist-info/RECORD,,
+commonmeta_py-0.38.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.38.dist-info/METADATA,sha256=SyjvOE8BUdQ_1xOaiEPIigazkzniQ9oBo6YRsrxIsOY,8331
+commonmeta_py-0.38.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+commonmeta_py-0.38.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.38.dist-info/RECORD,,