commonmeta-py 0.38__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.38"
+__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/inveniordm_reader.py

@@ -36,7 +36,6 @@ def get_inveniordm(pid: str, **kwargs) -> dict:
 
 def read_inveniordm(data: dict, **kwargs) -> Commonmeta:
     """read_inveniordm"""
-    print(data)
     meta = data
     read_options = kwargs or {}
 
@@ -49,7 +48,6 @@ def read_inveniordm(data: dict, **kwargs) -> Commonmeta:
     resource_type = py_.get(meta, "metadata.resource_type.type") or py_.get(
         meta, "metadata.resource_type.id"
     )
-    print(resource_type)
     _type = INVENIORDM_TO_CM_TRANSLATIONS.get(resource_type, "Other")
 
     contributors = py_.get(meta, "metadata.creators")

commonmeta/readers/json_feed_reader.py

@@ -46,7 +46,6 @@ def read_json_feed_item(data: Optional[dict], **kwargs) -> Commonmeta:
     if data is None:
         return {"state": "not_found"}
     meta = data
-    print(meta)
     read_options = kwargs or {}
 
     url = normalize_url(meta.get("url", None))
@@ -168,39 +167,28 @@ def get_references(references: list) -> list:
     def get_reference(reference: dict) -> Optional[dict]:
         if reference is None or not isinstance(reference, dict):
             return None
-        try:
-            if reference.get("doi", None) and validate_doi(reference.get("doi")):
-                id_ = normalize_doi(reference.get("doi"))
-                return compact(
-                    {
-                        "id": id_,
-                        "title": reference.get("title", None),
-                        "publicationYear": reference.get("publicationYear", None),
-                    }
-                )
 
-            elif (
-                reference.get("url", None)
-                and validate_url(reference.get("url")) == "URL"
-            ):
-                response = httpx.head(reference.get("url", None), timeout=10)
-                # check that URL resolves.
-                # TODO: check for redirects
-                if response.status_code in [404]:
-                    return None
-                return {
-                    "id": reference.get("url"),
+        if reference.get("id", None) and validate_doi(reference.get("id")):
+            id_ = normalize_doi(reference.get("id"))
+            return compact(
+                {
+                    "id": id_,
+                    "title": reference.get("title", None),
+                    "publicationYear": reference.get("publicationYear", None),
                 }
-        except Exception as error:
-            print(error)
-            return None
+            )
+
+        else:
+            return {
+                "id": reference.get("id", None),
+            }
 
     def number_reference(reference: dict, index: int) -> dict:
         """number reference"""
         reference["key"] = f"ref{index +1}"
         return reference
 
-    references = [get_reference(i) for i in references]
+    references = [get_reference(i) for i in references if i.get("id", None)]
     return [
         number_reference(i, index)
         for index, i in enumerate(references)
@@ -226,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",
-                    "award_uri": 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":
@@ -247,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",
-                    "award_uri": urls[1],
+                    "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:
@@ -278,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,
-                        "award_uri": urls[1],
+                        "awardUri": urls[1],
                         "awardNumber": award_number,
-                    }
+                    })
                 )
             ]
 
@@ -302,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/readers/kbase_reader.py

@@ -186,7 +186,7 @@ def get_funding_references(funding_references: list) -> list:
                     funding_reference, "funder.organization_name", None
                 ),
                 "awardNumber": funding_reference.get("grant_id", None),
-                "award_uri": funding_reference.get("grant_url", None),
+                "awardUri": funding_reference.get("grant_url", None),
             }
         )
 

commonmeta/resources/commonmeta_v0.15.json

@@ -0,0 +1,574 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://commonmeta.org/commonmeta_v0.15.json",
+  "title": "Commonmeta v0.15",
+  "description": "JSON representation of the Commonmeta schema.",
+  "commonmeta": {
+    "anyOf": [
+      { "$ref": "#/definitions/commonmeta"
+      },
+      {
+        "type": "array",
+        "description": "An array of commonmeta objects.",
+        "items": { "$ref": "#/definitions/commonmeta" }
+      }
+    ]
+  },
+  "definitions": {
+    "affiliations": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "organization": { "$ref": "#/definitions/organization" }
+        }
+      }
+    },
+    "commonmeta": {
+      "description": "A commonmeta object.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "id": { "$ref": "#/definitions/id" },
+        "type": { "$ref": "#/definitions/type" },
+        "additionalType": {
+          "description": "The additional type of the resource.",
+          "type": "string"
+        },
+        "archiveLocations": {
+          "description": "The location where content is archived.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "CLOCKSS",
+              "LOCKSS",
+              "Portico",
+              "KB",
+              "Internet Archive",
+              "DWT"
+            ]
+          }
+        },
+        "container": {
+          "description": "The container of the resource.",
+          "type": "object",
+          "properties": {
+            "identifier": {
+              "description": "The identifier for the container.",
+              "type": "string"
+            },
+            "identifierType": {
+              "description": "The identifierType for the container.",
+              "type": "string"
+            },
+            "type": {
+              "description": "The type of the container.",
+              "type": "string",
+              "enum": [
+                "Book",
+                "BookSeries",
+                "Journal",
+                "Proceedings",
+                "ProceedingsSeries",
+                "Repository",
+                "DataRepository",
+                "Periodical",
+                "Series"
+              ]
+            },
+            "title": {
+              "description": "The title of the container.",
+              "type": "string"
+            },
+            "firstPage": {
+              "description": "The first page of the resource.",
+              "type": "string"
+            },
+            "lastPage": {
+              "description": "The last page of the resource.",
+              "type": "string"
+            },
+            "volume": {
+              "description": "The volume of the resource.",
+              "type": "string"
+            },
+            "issue": {
+              "description": "The issue of the resource.",
+              "type": "string"
+            }
+          }
+        },
+        "contributors": {
+          "description": "The contributors to the resource.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "organization": { "$ref": "#/definitions/organization" },
+              "person": { "$ref": "#/definitions/person" },
+              "contributorRoles": {
+                "description": "List of roles assumed by the contributor when working on the resource.",
+                "items": {
+                  "$ref": "#/definitions/contributorRole"
+                },
+                "type": "array"
+              }
+            }
+          },
+          "minItems": 1
+        },
+        "date": {
+          "description": "The dates for the resource.",
+          "$comment": "The date fields are not required. Dates should be formatted as ISO 8601 dates.",
+          "type": "object",
+          "properties": {
+            "created": {
+              "description": "The date the resource was created.",
+              "type": "string"
+            },
+            "submitted": {
+              "description": "The date the resource was submitted.",
+              "type": "string"
+            },
+            "accepted": {
+              "description": "The date the resource was accepted.",
+              "type": "string"
+            },
+            "published": {
+              "description": "The date the resource was published.",
+              "type": "string"
+            },
+            "updated": {
+              "description": "The date the resource was updated.",
+              "type": "string"
+            },
+            "accessed": {
+              "description": "The date the resource was accessed.",
+              "type": "string"
+            },
+            "available": {
+              "description": "The date the resource was made available.",
+              "type": "string"
+            },
+            "withdrawn": {
+              "description": "The date the resource was withdrawn.",
+              "type": "string"
+            }
+          }
+        },
+        "descriptions": {
+          "description": "The descriptions of the resource.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "description": {
+                "description": "The description of the resource.",
+                "type": "string"
+              },
+              "type": {
+                "description": "The type of the description.",
+                "type": "string",
+                "enum": ["Abstract", "Summary", "Methods", "TechnicalInfo", "Other"]
+              },
+              "language": {
+                "description": "The language of the title. Use one of the language codes from the IETF BCP 47 standard.",
+                "type": "string"
+              }
+            },
+            "required": ["description"]
+          }
+        },
+        "files": {
+          "description": "The downloadable files for the resource.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "bucket": { "type": "string" },
+              "key": { "type": "string" },
+              "checksum": { "type": "string" },
+              "url": { "type": "string", "format": "uri" },
+              "size": { "type": "integer" },
+              "mimeType": { "type": "string" }
+            },
+            "required": ["url"]
+          },
+          "minItems": 1
+        },
+        "fundingReferences": {
+          "description": "The funding references for the resource.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "funderIdentifier": { "type": "string" },
+              "funderIdentifierType": {
+                "type": "string",
+                "enum": [
+                  "Crossref Funder ID",
+                  "ROR",
+                  "GRID",
+                  "ISNI",
+                  "Ringgold",
+                  "Other"
+                ]
+              },
+              "funderName": { "type": "string" },
+              "awardNumber": { "type": "string" },
+              "awardTitle": { "type": "string" },
+              "awardUri": { "type": "string", "format": "uri" }
+            },
+            "required": ["funderName"]
+          }
+        },
+        "geoLocations": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "geoLocationPlace": { "type": "string" },
+              "geoLocationPoint": { "$ref": "#/definitions/geoLocationPoint" },
+              "geoLocationBox": { "$ref": "#/definitions/geoLocationBox" },
+              "geoLocationPolygons": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "polygonPoints": {
+                      "type": "array",
+                      "items": { "$ref": "#/definitions/geoLocationPoint" },
+                      "minItems": 4
+                    },
+                    "inPolygonPoint": { "$ref": "#/definitions/geoLocationPoint" }
+                  },
+                  "required": ["polygonPoints"]
+                },
+                "uniqueItems": true
+              }
+            }
+          },
+          "uniqueItems": true
+        },
+        "identifiers": {
+          "description": "Identifiers for the resource, including the id.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "identifier": { "type": "string" },
+              "identifierType": {
+                "type": "string",
+                "enum": [
+                  "ARK",
+                  "arXiv",
+                  "Bibcode",
+                  "DOI",
+                  "Handle",
+                  "ISBN",
+                  "ISSN",
+                  "PMID",
+                  "PMCID",
+                  "PURL",
+                  "URL",
+                  "URN",
+                  "UUID",
+                  "Other"
+                ]
+              }
+            },
+            "required": ["identifier", "identifierType"]
+          }
+        },
+        "language": {
+          "description": "The language of the resource. Use one of the language codes from the IETF BCP 47 standard.",
+          "type": "string"
+        },
+        "license": {
+          "description": "The license for the resource. Use one of the SPDX license identifiers.",
+          "type": "object",
+          "properties": {
+            "id": { "type": "string" },
+            "url": { "type": "string", "format": "uri" }
+          }
+        },
+        "provider": {
+          "description": "The provider of the resource. This can be a DOI registration agency or a repository.",
+          "type": "string",
+          "enum": ["Crossref", "DataCite", "GitHub", "JaLC", "KISTI", "mEDRA", "OP"]
+        },
+        "publisher": {
+          "description": "The publisher of the resource.",
+          "type": "object",
+          "properties": {
+            "organization": { "$ref": "#/definitions/organization" }
+          }
+        },
+        "relations": {
+          "description": "Other resolvable persistent unique IDs related to the resource.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "format": "uri"
+              },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "IsNewVersionOf",
+                  "IsPreviousVersionOf",
+                  "IsVersionOf",
+                  "HasVersion",
+                  "IsPartOf",
+                  "HasPart",
+                  "IsVariantFormOf",
+                  "IsOriginalFormOf",
+                  "IsIdenticalTo",
+                  "IsTranslationOf",
+                  "HasTranslation",
+                  "IsReviewedBy",
+                  "Reviews",
+                  "HasReview",
+                  "IsPreprintOf",
+                  "HasPreprint",
+                  "IsSupplementTo",
+                  "IsSupplementedBy"
+                ]
+              }
+            },
+            "required": ["id", "type"]
+          },
+          "minItems": 1
+        },
+        "references": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "id": { "$ref": "#/definitions/id" },
+              "type": { "$ref": "#/definitions/type" },
+              "key": { "type": "string" },
+              "contributor": { "type": "string" },
+              "title": { "type": "string" },
+              "publisher": { "type": "string" },
+              "publicationYear": { "type": "string" },
+              "volume": { "type": "string" },
+              "issue": { "type": "string" },
+              "firstPage": { "type": "string" },
+              "lastPage": { "type": "string" },
+              "containerTitle": { "type": "string" },
+              "edition": { "type": "string" },
+              "unstructured": { "type": "string" }
+            },
+            "required": ["key"]
+          }
+        },
+        "subjects": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "subject": { "type": "string" },
+              "language": {
+                "description": "The language of the subject. Use one of the language codes from the IETF BCP 47 standard.",
+                "type": "string"
+              }
+            },
+            "required": ["subject"]
+          }
+        },
+        "titles": {
+          "description": "The titles of the resource.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "title": {
+                "description": "The title of the resource.",
+                "type": "string"
+              },
+              "type": {
+                "description": "The type of the title.",
+                "type": "string",
+                "enum": ["AlternativeTitle", "Subtitle", "TranslatedTitle"]
+              },
+              "language": {
+                "description": "The language of the title. Use one of the language codes from the IETF BCP 47 standard.",
+                "type": "string"
+              }
+            },
+            "required": ["title"]
+          }
+        },
+        "url": {
+          "description": "The URL of the resource.",
+          "type": "string",
+          "format": "uri"
+        },
+        "version": {
+          "description": "The version of the resource.",
+          "type": "string"
+        }
+      },
+      "required": ["id", "type"]
+    },
+    "contributorRole": {
+      "description": "The type of contribution made by a contributor",
+      "enum": [
+        "Author",
+        "Editor",
+        "Chair",
+        "Reviewer",
+        "ReviewAssistant",
+        "StatsReviewer",
+        "ReviewerExternal",
+        "Reader",
+        "Translator",
+        "ContactPerson",
+        "DataCollector",
+        "DataManager",
+        "Distributor",
+        "HostingInstitution",
+        "Producer",
+        "ProjectLeader",
+        "ProjectManager",
+        "ProjectMember",
+        "RegistrationAgency",
+        "RegistrationAuthority",
+        "RelatedPerson",
+        "ResearchGroup",
+        "RightsHolder",
+        "Researcher",
+        "Sponsor",
+        "WorkPackageLeader",
+        "Conceptualization",
+        "DataCuration",
+        "FormalAnalysis",
+        "FundingAcquisition",
+        "Investigation",
+        "Methodology",
+        "ProjectAdministration",
+        "Resources",
+        "Software",
+        "Supervision",
+        "Validation",
+        "Visualization",
+        "WritingOriginalDraft",
+        "WritingReviewEditing",
+        "Maintainer",
+        "Other"
+      ],
+      "type": "string"
+    },
+    "geoLocationBox": {
+      "type": "object",
+      "properties": {
+        "westBoundLongitude": { "$ref": "#/definitions/longitude" },
+        "eastBoundLongitude": { "$ref": "#/definitions/longitude" },
+        "southBoundLatitude": { "$ref": "#/definitions/latitude" },
+        "northBoundLatitude": { "$ref": "#/definitions/latitude" }
+      }
+    },
+    "geoLocationPoint": {
+      "type": "object",
+      "properties": {
+        "pointLongitude": { "$ref": "#/definitions/longitude" },
+        "pointLatitude": { "$ref": "#/definitions/latitude" }
+      }
+    },
+    "id": {
+      "description": "The unique identifier for the resource.",
+      "type": "string",
+      "format": "uri"
+    },
+    "latitude": {
+      "type": "number",
+      "minimum": -90,
+      "maximum": 90
+    },
+    "longitude": {
+      "type": "number",
+      "minimum": -180,
+      "maximum": 180
+    },
+    "organization": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "The unique identifier for the organization.",
+          "type": "string",
+          "format": "uri"
+        },
+        "type": { "type": "string", "const": "Organization" },
+        "name": {
+          "description": "The name of the organization.",
+          "type": "string"
+        }
+      },
+      "required": ["name", "type"]
+    },
+    "person": {
+      "type": "object",
+      "properties": {
+        "id": { "type": "string", "format": "uri" },
+        "type": { "type": "string", "const": "Person" },
+        "givenName": {
+          "description": "The given name of the person.",
+          "type": "string"
+        },
+        "familyName": {
+          "description": "The family name of the person.",
+          "type": "string"
+        },
+        "affiliation": { "$ref": "#/definitions/affiliations" }
+      },
+      "required": ["familyName", "type"]
+    },
+    "type": {
+      "type": "string",
+      "enum": [
+        "Article",
+        "Audiovisual",
+        "BookChapter",
+        "BookPart",
+        "BookSection",
+        "BookSeries",
+        "BookSet",
+        "Book",
+        "Collection",
+        "Component",
+        "Database",
+        "Dataset",
+        "Dissertation",
+        "Document",
+        "Entry",
+        "Event",
+        "Grant",
+        "Image",
+        "Instrument",
+        "InteractiveResource",
+        "JournalArticle",
+        "JournalIssue",
+        "JournalVolume",
+        "Journal",
+        "PeerReview",
+        "PhysicalObject",
+        "Presentation",
+        "ProceedingsArticle",
+        "ProceedingsSeries",
+        "Proceedings",
+        "ReportComponent",
+        "ReportSeries",
+        "Report",
+        "Software",
+        "Standard",
+        "StudyRegistration",
+        "WebPage",
+        "Other"
+      ]
+    }
+  }
+}

commonmeta/schema_utils.py

@@ -7,7 +7,7 @@ from jsonschema import Draft202012Validator, ValidationError
 def json_schema_errors(instance, schema: str = "commonmeta"):
     """validate against JSON schema"""
     schema_map = {
-        "commonmeta": "commonmeta_v0.14",
+        "commonmeta": "commonmeta_v0.15",
         "datacite": "datacite-v4.5",
         "crossref": "crossref-v0.2",
         "csl": "csl-data",

commonmeta/writers/inveniordm_writer.py

@@ -41,8 +41,6 @@ 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)
@@ -225,17 +223,18 @@ def to_inveniordm_related_identifier(relation: dict) -> dict:
         scheme = "url"
 
     # normalize relation types
+    relation_type = relation.get("type")
     if relation.get("type", None) is None:
-        relation["type"] = "References"
+        relation_type = "References"
     if relation.get("type") == "HasReview":
-        relation["type"] = "IsReviewedBy"
-    relation_type = relation.get("type").lower()
+        relation_type = "IsReviewedBy"
+
     return compact(
         {
             "identifier": identifier,
             "scheme": scheme,
             "relation_type": {
-                "id": relation_type,
+                "id": relation_type.lower(),
             },
         }
     )
@@ -244,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(
@@ -254,30 +253,43 @@ def to_inveniordm_funding(funding: dict) -> Optional[dict]:
         )
     else:
         funder_identifier = None
+    award_number = funding.get("awardNumber", None)
     award_title = funding.get("awardTitle", None)
     if award_title:
         award_title = {"title": {"en": award_title}}
     if funding.get("awardUri", None):
+        award_identifier = funding.get("awardUri", None)
+        scheme = "doi" if normalize_doi(award_identifier) else "url"
+        if scheme == "doi":
+            award_identifier = doi_from_url(award_identifier)
         award_identifiers = [
             {
-                "scheme": "url",
-                "identifier": funding.get("awardUri", None),
+                "scheme": scheme,
+                "identifier": award_identifier,
             },
         ]
     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,
-                }
-            ),
+
+    if award_number or award_title or award_identifiers:
+        return compact(
+            {
+                "funder": compact(
+                    {
+                        "name": funding.get("funderName"),
+                        "id": funder_identifier,
+                    }
+                ),
+                "award": compact(
+                    {
+                        "number": award_number,
+                        "title": award_title,
+                        "identifiers": award_identifiers,
+                    }
+                ),
+            }
         )
-    else:
-        award = None
+
     return compact(
         {
             "funder": compact(
@@ -286,6 +298,5 @@ def to_inveniordm_funding(funding: dict) -> Optional[dict]:
                     "id": funder_identifier,
                 }
             ),
-            "award": award,
         }
     )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.38
+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.38.dist-info → commonmeta_py-0.40.dist-info}/RECORD

@@ -1,10 +1,10 @@
-commonmeta/__init__.py,sha256=s5OSvyoLPJlih0ohip5DGhb84c9rFKXbEFMkyidzEG4,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
@@ -18,15 +18,16 @@ commonmeta/readers/crossref_xml_reader.py,sha256=QF1A-r3OJbykBTH9YMSxusT3-KSKmmz
 commonmeta/readers/csl_reader.py,sha256=5V_sHSJwcAWJmhB8SYk199nB96BWYX1Sq9vkQ3iEmAY,3164
 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=ejhpj4KX6bJU79lKrkTQeG3AATw0h2DdNdieNlx5j0w,7521
-commonmeta/readers/json_feed_reader.py,sha256=YUJlZ7P44HEb-VKZHGr84ePGmHTVnfco_K36koooKnQ,13917
-commonmeta/readers/kbase_reader.py,sha256=NpIK-_fh5QFN4Q_ArqcrnH4tS5zR1gqbPew6VEjrUbs,6764
+commonmeta/readers/inveniordm_reader.py,sha256=jzv0rXzT8OCdPD_MShBXTnlwD-F9tpTX7OKZGn8smzs,7480
+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
 commonmeta/resources/cff_v1.2.0.json,sha256=MpfjDYgX7fN9PLiG54ISZ2uu9WItNqfh-yaRuTf6Ptg,46691
 commonmeta/resources/commonmeta_v0.12.json,sha256=HUSNReXh2JN3Q6YWSt7CE69js8dh50OlpMYGTyU98oU,16762
 commonmeta/resources/commonmeta_v0.13.json,sha256=2-WSZGijR13zVu97S_YHXr-cyeLW7hzHXYMlr6nIjdw,15787
 commonmeta/resources/commonmeta_v0.14.json,sha256=nACmkTe4IrZkygd5AeJnAv9P4EWfzCwW9oL5AhubvnE,17657
+commonmeta/resources/commonmeta_v0.15.json,sha256=tOc1QL2n9HYngEgxIZDwBFWEXxX1bd2wtOqCqI0usnw,17707
 commonmeta/resources/crossref/AccessIndicators.xsd,sha256=en-G2FFt4ewIFRw5C6g4YA8Nc0M66fCM2CygiO_ZqqY,2825
 commonmeta/resources/crossref/JATS-journalpublishing1-3d2-mathml3-elements.xsd,sha256=l5jJMFm4xx09bavH2Gc3EqIdr-0PTf6M9YBTNpUaZhY,415409
 commonmeta/resources/crossref/JATS-journalpublishing1-3d2-mathml3.xsd,sha256=goO2ckm12fF2-kGFZC_FaTBdi4BK3YCRwb_ESur8dfY,2210
@@ -55,7 +56,7 @@ commonmeta/resources/styles/harvard-cite-them-right.csl,sha256=XmLVFDrfsgkECYaAb
 commonmeta/resources/styles/ieee.csl,sha256=DfuN__z8FZ5Rcdaj_Myc5y_FmB-fHwfRVTeS9-hOgmQ,15854
 commonmeta/resources/styles/modern-language-association.csl,sha256=HI2iU4krze1aHYc9VSQCUyw_2I6fEQYnA9xIWo-xNus,11594
 commonmeta/resources/styles/vancouver.csl,sha256=lun3_i2oTilgsANk4LjFao2UDPQlGj_hgFgKAWC_DF8,12878
-commonmeta/schema_utils.py,sha256=Ep8suJgqtgDAvbjVkQxwzAY1MqwwqPwNRKDTMAxMQTg,915
+commonmeta/schema_utils.py,sha256=gg3l1jd_lFtRkQlO1DYGMVbC10nEmVTN4AWacxC4AAE,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
 commonmeta/utils.py,sha256=dblEYOmR0q6qZgsqnQOunm_Zj7YP4bugzwK1ps5SYq8,42583
 commonmeta/writers/__init__.py,sha256=47-snms6xBHkoEXKYV1DBtH1npAtlVtvY29Z4Zr45qI,45
@@ -65,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=xOLIrWTSXYDmri80yUuZmoU257UX9ojpkVf3JeHLyUM,9252
+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.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,,
+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,,