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

commonmeta/readers/inveniordm_reader.py

@@ -11,6 +11,7 @@ from ..utils import (
     name_to_fos,
     from_inveniordm,
     get_language,
+    validate_ror,
 )
 from ..base_utils import compact, wrap, presence, sanitize
 from ..author_utils import get_authors
@@ -111,6 +112,7 @@ def read_inveniordm(data: dict, **kwargs) -> Commonmeta:
 
     references = get_references(wrap(py_.get(meta, "metadata.related_identifiers")))
     relations = get_relations(wrap(py_.get(meta, "metadata.related_identifiers")))
+    funding_references = get_funding_references(wrap(py_.get(meta, "metadata.funding")))
     if meta.get("conceptdoi", None):
         relations.append(
             {
@@ -138,7 +140,7 @@ def read_inveniordm(data: dict, **kwargs) -> Commonmeta:
         "license": presence(license_),
         "descriptions": descriptions,
         "geoLocations": None,
-        # "funding_references": presence(meta.get("fundingReferences", None)),
+        "fundingReferences": presence(funding_references),
         "references": presence(references),
         "relations": presence(relations),
         # other properties
@@ -180,6 +182,23 @@ def get_references(references: list) -> list:
     return [map_reference(i) for i in references if is_reference(i)]
 
 
+def get_funding_references(funding_references: list) -> list:
+    """get_funding_references"""
+
+    def map_funding(funding: dict) -> dict:
+        """map_funding"""
+
+        return compact({
+            "funderName": py_.get(funding, "funder.name"),
+            "funderIdentifier": py_.get(funding, "funder.id"),
+            "funderIdentifierType": "ROR" if validate_ror(py_.get(funding, "funder.id")) else None,
+            "awardTitle": py_.get(funding, "award.title.en"),
+            "awardNumber": py_.get(funding, "award.number"),
+            "awardUri": py_.get(funding, "award.identifiers[0].identifier"),
+        })
+    
+    return [map_funding(i) for i in funding_references]
+
 def get_file(file: dict) -> str:
     """get_file"""
     _type = file.get("type", None)

commonmeta/readers/json_feed_reader.py

@@ -205,7 +205,7 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
 
     if meta is None or not isinstance(meta, dict):
         return None
-
+    
     def format_funding(urls: list) -> list:
         """format funding. URLs can either be a list of grant IDs or a funder identifier
         (Open Funder Registry ID or ROR), followed by a grant URL"""
@@ -286,19 +286,11 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
             if i.get("type", None) == "HasAward"
         ]
     )
-    funding = py_.get(meta, "blog.funding")
-    if funding is not None:
-        awards += [
-            {
-                "funderName": funding.get("funder_name", None),
-                "funderIdentifier": funding.get("funder_id", None),
-                "funderIdentifierType": "Crossref Funder ID",
-                "awardNumber": funding.get("award_number", None),
-            }
-        ]
     funding_references = py_.get(meta, "funding_references")
     if funding_references is not None:
         awards += [compact(i) for i in funding_references]
+    
+    awards += wrap(py_.get(meta, "blog.funding"))
     return awards
 
 

commonmeta/writers/inveniordm_writer.py

@@ -14,6 +14,7 @@ from ..constants import (
 from ..utils import (
     get_language,
     validate_orcid,
+    validate_ror,
     id_from_url,
     normalize_url,
     FOS_MAPPINGS,
@@ -299,9 +300,7 @@ def to_inveniordm_reference(reference: 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(funding.get("funderIdentifier", None))
-    elif funding.get("funderIdentifierType", None) == "Crossref Funder ID":
+    if funding.get("funderIdentifierType", None) == "Crossref Funder ID":
         # convert to ROR
         funder_identifier = id_from_url(
             CROSSREF_FUNDER_ID_TO_ROR_TRANSLATIONS.get(
@@ -309,11 +308,11 @@ def to_inveniordm_funding(funding: dict) -> Optional[dict]:
             )
         )
     else:
-        funder_identifier = None
+        funder_identifier = validate_ror(funding.get("funderIdentifier", None))
     award_number = funding.get("awardNumber", None)
     award_title = funding.get("awardTitle", None)
     if award_title:
-        award_title = {"title": {"en": award_title}}
+        award_title = {"en": award_title}
     if funding.get("awardUri", None):
         award_identifier = funding.get("awardUri", None)
         scheme = "doi" if normalize_doi(award_identifier) else "url"

{commonmeta_py-0.87.dist-info → commonmeta_py-0.89.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.87
+Version: 0.89
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Project-URL: Homepage, https://python.commonmeta.org
 Project-URL: Repository, https://github.com/front-matter/commonmeta-py

{commonmeta_py-0.87.dist-info → commonmeta_py-0.89.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=ToXvSGATGxDBN50c9wETUrtKhpMS0J7cUJ7d5_-sA4U,1911
+commonmeta/__init__.py,sha256=UmlY6KWhmga2K4KGz6RomP17GxZSv1leFctEt3jMM8w,1911
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=1oQQfxaq7aMQI3rLt8XMufksuBeC8Zht96aJ8vz09Ug,8459
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
@@ -21,8 +21,8 @@ commonmeta/readers/crossref_xml_reader.py,sha256=yZOh66_4tVS5i0TdEyOa48ckpl7_cj6
 commonmeta/readers/csl_reader.py,sha256=ynqJeqK9TlHFsmgMREPmKGlcj6tVycpnqDN0N0LjIpw,3201
 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=uS92St68UkO4Adh3PsCu9ox81aO0kek3Y0vneBSDkts,7584
-commonmeta/readers/json_feed_reader.py,sha256=yMwLDBe0SUJT0hHSEIHTPLXVpstYqZ_m8E8oKEZJf0A,13596
+commonmeta/readers/inveniordm_reader.py,sha256=F0syoLZ3amzkrEk8efb9WxwhMDY8QM8ctOH32E3fGqM,8358
+commonmeta/readers/json_feed_reader.py,sha256=vzT3RpPhmPuJHLQWk3HajIuCTzut83L0ZfLR__ErP0g,13265
 commonmeta/readers/kbase_reader.py,sha256=ehKXQsJyPCtaq2FmBxNb2Jb5Nktpx8pNscpmEM6N0A4,6763
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
 commonmeta/readers/schema_org_reader.py,sha256=78vYWCZqrYevZsSbx7oVVLm3mlNzi323WNW5E_PL9o0,17234
@@ -67,11 +67,11 @@ commonmeta/writers/commonmeta_writer.py,sha256=mu-yXQvQs_xdYM4MxbTTxxYB5n0lJA5Bq
 commonmeta/writers/crossref_xml_writer.py,sha256=0Ds494RnXfdfjWw5CLX1kwV2zP7gqffdVqO-X74Uc6c,492
 commonmeta/writers/csl_writer.py,sha256=W3lryCg4TwXEoBuNhEc2GdU6fe1OrDZ37s1-0h1IGzc,2807
 commonmeta/writers/datacite_writer.py,sha256=UpDp4Brg5xrmS5T3QYoNi6PPXKdRxAo254eTqnlmNyQ,6304
-commonmeta/writers/inveniordm_writer.py,sha256=yWDMYorsJJ4vFNHOmjU8d1_uAfqMwkBxzeV7jtBoC1Q,11515
+commonmeta/writers/inveniordm_writer.py,sha256=-GsTcVMPlbbB9kSTmHP00ZJ1aHIbA21K0LkcuPWBMm8,11429
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.87.dist-info/METADATA,sha256=aBKlcvfgtgTUgW5-Z7QbncVPnyMkCkeuH0-SEBLhoxI,7429
-commonmeta_py-0.87.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.87.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.87.dist-info/licenses/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.87.dist-info/RECORD,,
+commonmeta_py-0.89.dist-info/METADATA,sha256=M2Wjppi09_3V2op_xctTMRyJmcicLzVksMmp-LKxvaQ,7429
+commonmeta_py-0.89.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.89.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.89.dist-info/licenses/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.89.dist-info/RECORD,,