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

commonmeta/constants.py

@@ -623,3 +623,13 @@ CROSSREF_FUNDER_ID_TO_ROR_TRANSLATIONS = {
     "https://doi.org/10.13039/501100001711": "https://ror.org/00yjd3n13",
     "https://doi.org/10.13039/501100003043": "https://ror.org/04wfr2810",
 }
+
+
+ROR_TO_CROSSREF_FUNDER_ID_TRANSLATIONS = {
+    "https://ror.org/021nxhr62": "https://doi.org/10.13039/100000001",
+    "https://ror.org/00k4n6c32": "https://doi.org/10.13039/501100000780",
+    "https://ror.org/018mejw64": "https://doi.org/10.13039/501100001659",
+    "https://ror.org/019whta54": "https://doi.org/10.13039/501100006390",
+    "https://ror.org/00yjd3n13": "https://doi.org/10.13039/501100001711",
+    "https://ror.org/04wfr2810": "https://doi.org/10.13039/501100003043",
+}

commonmeta/crossref_utils.py

@@ -8,7 +8,7 @@ import uuid
 import pydash as py_
 from furl import furl
 
-from .constants import Commonmeta
+from .constants import Commonmeta, ROR_TO_CROSSREF_FUNDER_ID_TRANSLATIONS
 from .utils import wrap, compact, normalize_orcid, normalize_id, validate_url
 from .doi_utils import doi_from_url, validate_doi
 
@@ -362,11 +362,16 @@ def insert_funding_references(metadata, xml):
             {"name": "funder_name"},
         )
         if funding_reference.get("funderIdentifier", None) is not None:
+            funder_identifier = funding_reference.get("funderIdentifier", None)
+            
+            # translate ROR to Crossref funder ID until Crossref supports ROR
+            funder_identifier = ROR_TO_CROSSREF_FUNDER_ID_TRANSLATIONS.get(funder_identifier, funder_identifier)
+            
             etree.SubElement(
                 funder_name,
                 "assertion",
                 {"name": "funder_identifier"},
-            ).text = funding_reference.get("funderIdentifier", None)
+            ).text = funder_identifier
         if funding_reference.get("awardNumber", None) is not None:
             etree.SubElement(
                 assertion,

commonmeta/readers/json_feed_reader.py

@@ -214,13 +214,15 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
             or furl(urls[0]).host == "cordis.europa.eu"
         ):
             return [
-                {
-                    "funderName": "European Commission",
-                    "funderIdentifier": "https://doi.org/10.13039/501100000780",
-                    "funderIdentifierType": "Crossref Funder ID",
-                    "awardUri": urls[0],
-                    "awardNumber": urls[0].split("/")[-1],
-                }
+                compact(
+                    {
+                        "funderName": "European Commission",
+                        "funderIdentifier": "https://ror.org/00k4n6c32",
+                        "funderIdentifierType": "ROR",
+                        "awardUri": urls[0],
+                        "awardNumber": urls[0].split("/")[-1],
+                    }
+                )
             ]
         # Prefix 10.13039 means funder ID from Open Funder registry.
         elif len(urls) == 2 and validate_prefix(urls[0]) == "10.13039":
@@ -235,29 +237,24 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
             else:
                 award_number = f.path.segments[-1]
             return [
-                {
+                compact({
                     "funderName": funder_name,
                     "funderIdentifier": urls[0],
                     "funderIdentifierType": "Crossref Funder ID",
                     "awardUri": urls[1],
                     "awardNumber": award_number,
-                }
+                })
             ]
-        # URL is ROR ID for funder. Need to transform to Crossref Funder ID
-        # until Crossref production service supports ROR IDs.
+        # URL is ROR ID for funder.
         elif len(urls) == 2 and validate_ror(urls[0]):
             f = furl(urls[0])
             _id = f.path.segments[-1]
             response = httpx.get(f"https://api.ror.org/organizations/{_id}", timeout=10)
             ror = response.json()
             funder_name = ror.get("name", None)
-            funder_identifier = py_.get(ror, "external_ids.FUNDREF.all.0")
-            if funder_identifier is not None:
-                funder_identifier = f"https://doi.org/{funder_identifier}"
-                funder_identifier_type = "Crossref Funder ID"
-            else:
-                funder_identifier = urls[0]
-                funder_identifier_type = "ROR"
+            funder_identifier = urls[0]
+            funder_identifier_type = "ROR"
+            
             f = furl(urls[1])
             # url is for NSF grant
             if f.args["awd_id"] is not None:
@@ -266,13 +263,13 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
                 award_number = f.path.segments[-1]
             return [
                 compact(
-                    {
+                    compact({
                         "funderName": funder_name,
                         "funderIdentifier": funder_identifier,
                         "funderIdentifierType": funder_identifier_type,
                         "awardUri": urls[1],
                         "awardNumber": award_number,
-                    }
+                    })
                 )
             ]
 
@@ -290,7 +287,6 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
                 "funderName": funding.get("funder_name", None),
                 "funderIdentifier": funding.get("funder_id", None),
                 "funderIdentifierType": "Crossref Funder ID",
-                "awardTitle": funding.get("award", None),
                 "awardNumber": funding.get("award_number", None),
             }
         ]

commonmeta/writers/inveniordm_writer.py

@@ -243,7 +243,7 @@ def to_inveniordm_related_identifier(relation: dict) -> dict:
 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)
+        funder_identifier = id_from_url(funding.get("funderIdentifier", None))
     elif funding.get("funderIdentifierType", None) == "Crossref Funder ID":
         # convert to ROR
         funder_identifier = id_from_url(

{commonmeta_py-0.39.dist-info → commonmeta_py-0.40.dist-info}/METADATA

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

{commonmeta_py-0.39.dist-info → commonmeta_py-0.40.dist-info}/RECORD

@@ -1,10 +1,10 @@
-commonmeta/__init__.py,sha256=Yb35HxY9mUSmG9MYb6v3qVEfQF7Zt6PWJr8hehffPNU,1779
+commonmeta/__init__.py,sha256=Xc4MVM80sSD7NZdUZZB6CqIuzR5xxY7Fy-dFmKTeNqI,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=aMD7vG_kJD5ja5YOqDjsfuokWcRMnWOF7jv0YV3-OXw,16973
-commonmeta/crossref_utils.py,sha256=xyS8jFXO8unzumCC6YXK45kzz16PQAAOkWUHgjqawAo,22063
+commonmeta/constants.py,sha256=cank4niDCO-VvjjRIgCxOAqFEnV1R8xyGC6xEL1iDsw,17461
+commonmeta/crossref_utils.py,sha256=LBYfmhIldYryaBUYohfLnv870aWGMDm043Ny8Wav6Bg,22370
 commonmeta/date_utils.py,sha256=amF3E0ZJlh8yY5eY3aVXQyAO1x2WuZHJXw-ajOEcdUQ,5808
 commonmeta/doi_utils.py,sha256=Dt6K9ADD2ga2WNsOzfX9f29gnubhn7xqeKL7U5pEpBs,8209
 commonmeta/metadata.py,sha256=dqqk4IW-_OwtS_PVs0i7AuxrkNqOYjJCqhQJ2X-I1DQ,12398
@@ -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=x7TjLq5nJsYw-MpDfYeiAWn2RbvqrIVkdOjQFW_Y7EE,13403
+commonmeta/readers/json_feed_reader.py,sha256=y-sX_l9AD0I71pSZSZWr2x2tLTlD4mxoB2eF0vf0rWk,13034
 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
@@ -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=zPGji-ccaGwTmXM0uYUQYi0SWCkJxijz3g974d8QkAk,9622
+commonmeta/writers/inveniordm_writer.py,sha256=sCDmPC4DEOWjuKtA14dZhjrr--IiO0rgeTXL2O2hre4,9642
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.39.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.39.dist-info/METADATA,sha256=00-S7EqflCWSm8Db0wNxmoXkVRC5AR7CMBEXt1MZI-Q,8331
-commonmeta_py-0.39.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-commonmeta_py-0.39.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.39.dist-info/RECORD,,
+commonmeta_py-0.40.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.40.dist-info/METADATA,sha256=bB20Im9gNUUGJIt7TnMLFpGouHdnpmV7GkC_fiZmk7I,8331
+commonmeta_py-0.40.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+commonmeta_py-0.40.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.40.dist-info/RECORD,,