commonmeta-py 0.17.2__py3-none-any.whl → 0.18__py3-none-any.whl

commonmeta/author_utils.py

@@ -108,6 +108,9 @@ def get_one_author(author, **kwargs):
         else:
             given_name = None
             family_name = None
+  
+    # support various keys for affiliations
+    affiliations = author.get("affiliation", None) or author.get("affiliations", None)
 
     # return author in commonmeta format, using name vs. given/family name
     # depending on type
@@ -119,7 +122,7 @@ def get_one_author(author, **kwargs):
             "name": name if _type == "Organization" else None,
             "givenName": given_name if _type == "Person" else None,
             "familyName": family_name if _type == "Person" else None,
-            "affiliation": presence(get_affiliations(wrap(author.get("affiliation", None)))
+            "affiliations": presence(get_affiliations(wrap(affiliations))
             ),
         }
     )

commonmeta/crossref_utils.py

@@ -131,8 +131,12 @@ def insert_crossref_contributors(metadata, xml):
     ]
     for num, contributor in enumerate(con):
         contributor_role = (
-            "author" if contributor.get("contributorRoles") == ["Author"] else "editor"
+            "author" if "Author" in contributor.get("contributorRoles") else None
         )
+        if contributor_role is None:
+            contributor_role = (
+                "editor" if "Editor" in contributor.get("contributorRoles") else None
+            )
         sequence = "first" if num == 0 else "additional"
         if (
             contributor.get("type", None) == "Organization"
@@ -153,7 +157,7 @@ def insert_crossref_contributors(metadata, xml):
                 {"contributor_role": contributor_role, "sequence": sequence},
             )
             person_name = insert_crossref_person(contributor, person_name)
-        elif contributor.get("affiliation", None) is not None:
+        elif contributor.get("affiliations", None) is not None:
             anonymous = etree.SubElement(
                 contributors,
                 "anonymous",
@@ -176,18 +180,17 @@ def insert_crossref_person(contributor, xml):
     if contributor.get("familyName", None) is not None:
         etree.SubElement(xml, "surname").text = contributor.get("familyName")
 
-    if contributor.get("affiliation", None) is not None:
+    if contributor.get("affiliations", None) is not None:
         affiliations = etree.SubElement(xml, "affiliations")
         institution = etree.SubElement(affiliations, "institution")
-        if py_.get(contributor, "affiliation.0.name") is not None:
+        if py_.get(contributor, "affiliations.0.name") is not None:
             etree.SubElement(institution, "institution_name").text = py_.get(
-                contributor, "affiliation.0.name"
+                contributor, "affiliations.0.name"
             )
-        if py_.get(contributor, "affiliation.0.id") is not None:
+        if py_.get(contributor, "affiliations.0.id") is not None:
             etree.SubElement(
                 institution, "institution_id", {"type": "ror"}
-            ).text = py_.get(contributor, "affiliation.0.id")
-
+            ).text = py_.get(contributor, "affiliations.0.id")
     orcid = normalize_orcid(contributor.get("id", None))
     if orcid is not None:
         etree.SubElement(xml, "ORCID").text = orcid
@@ -196,13 +199,13 @@ def insert_crossref_person(contributor, xml):
 
 def insert_crossref_anonymous(contributor, xml):
     """Insert crossref anonymous"""
-    if contributor.get("affiliation", None) is None:
+    if contributor.get("affiliations", None) is None:
         return xml
     affiliations = etree.SubElement(xml, "affiliations")
     institution = etree.SubElement(affiliations, "institution")
-    if py_.get(contributor, "affiliation.0.name") is not None:
+    if py_.get(contributor, "affiliations.0.name") is not None:
         etree.SubElement(institution, "institution_name").text = py_.get(
-            contributor, "affiliation.0.name"
+            contributor, "affiliations.0.name"
         )
     return xml
 
@@ -225,6 +228,8 @@ def insert_citation_list(metadata, xml):
 
     citation_list = etree.SubElement(xml, "citation_list")
     for ref in metadata.references:
+        if ref.get("id", None) is None:
+            continue
         citation = etree.SubElement(
             citation_list, "citation", {"key": ref.get("key", None)}
         )
@@ -242,10 +247,10 @@ def insert_citation_list(metadata, xml):
             etree.SubElement(citation, "cYear").text = ref.get("publicationYear")
         if ref.get("title", None) is not None:
             etree.SubElement(citation, "article_title").text = ref.get("title")
-        if ref.get("doi", None) is not None:
-            etree.SubElement(citation, "doi").text = doi_from_url(ref.get("doi"))
-        if ref.get("url", None) is not None:
-            etree.SubElement(citation, "unstructured_citation").text = ref.get("url")
+        if ref.get("id", None) is not None:
+            etree.SubElement(citation, "doi").text = doi_from_url(ref.get("id"))
+        if ref.get("unstructured", None) is not None:
+            etree.SubElement(citation, "unstructured_citation").text = ref.get("unstructured")
     return xml
 
 

commonmeta/readers/crossref_reader.py

@@ -95,7 +95,7 @@ def read_crossref(data: Optional[dict], **kwargs) -> Commonmeta:
     identifiers.append(
         compact(
             {
-                "identifier": normalize_doi(_id),
+                "identifier": _id,
                 "identifierType": "DOI",
             }
         )
@@ -144,11 +144,11 @@ def read_crossref(data: Optional[dict], **kwargs) -> Commonmeta:
         "type": _type,
         # recommended and optional properties
         "additionalType": None,
-        "archiveLocations": archive_locations,
+        "archiveLocations": presence(archive_locations),
         "container": presence(container),
         "contributors": presence(contributors),
         "date": presence(date),
-        "descriptions": descriptions,
+        "descriptions": presence(descriptions),
         "files": presence(files),
         "fundingReferences": presence(funding_references),
         "geoLocations": None,

commonmeta/readers/crossref_xml_reader.py

@@ -392,15 +392,12 @@ def crossref_reference(reference: Optional[dict]) -> Optional[dict]:
     doi = parse_attributes(reference.get("doi", None))
     unstructured = reference.get("unstructured_citation", None)
     if isinstance(unstructured, dict):
-        url = unstructured.get("u", None)
         text = unstructured.get("font", None) or unstructured.get("#text", None)
     else:
-        url = reference.get("url", None)
         text = reference.get("unstructured_citation", None)
     metadata = {
         "key": reference.get("key", None),
-        "doi": normalize_doi(doi) if doi else None,
-        "url": normalize_url(url) if url else None,
+        "id": normalize_doi(doi) if doi else None,
         "contributor": reference.get("author", None),
         "title": reference.get("article_title", None),
         "publisher": reference.get("publisher", None),
@@ -411,7 +408,7 @@ def crossref_reference(reference: Optional[dict]) -> Optional[dict]:
         "lastPage": reference.get("last_page", None),
         "containerTitle": reference.get("journal_title", None),
         "edition": None,
-        "unstructured": sanitize(text) if text and doi is None else None,
+        "unstructured": sanitize(text) if text else None,
     }
     return compact(metadata)
 

commonmeta/readers/csl_reader.py

@@ -70,7 +70,7 @@ def read_csl(data: dict, **kwargs) -> Commonmeta:
         descriptions = [
             {
                 "description": sanitize(str(meta.get("abstract"))),
-                "descriptionType": "Abstract",
+                "type": "Abstract",
             }
         ]
     else:

commonmeta/readers/datacite_reader.py

@@ -113,28 +113,26 @@ def read_datacite(data: dict, **kwargs) -> Commonmeta:
         # required properties
         "id": _id,
         "type": _type,
-        "doi": doi_from_url(_id),
-        "url": normalize_url(meta.get("url", None)),
-        "contributors": presence(contributors),
-        "titles": titles,
-        "publisher": publisher,
-        "date": compact(date),
         # recommended and optional properties
         "additionalType": additional_type,
-        "subjects": presence(subjects),
-        "language": meta.get("language", None),
+        "container": presence(container),
+        "contributors": presence(contributors),
+        "date": compact(date),
+        "descriptions": presence(descriptions),
+        "files": presence(files),
+        "fundingReferences": presence(meta.get("fundingReferences", None)),
+        "geoLocations": presence(geo_locations),
         "identifiers": presence(identifiers),
-        "version": meta.get("version", None),
+        "language": meta.get("language", None),
         "license": presence(license_),
-        "descriptions": descriptions,
-        "geoLocations": presence(geo_locations),
-        "fundingReferences": presence(meta.get("fundingReferences", None)),
+        "provider": "DataCite",
+        "publisher": publisher,
         "references": presence(references),
         "relations": presence(relations),
-        # other properties
-        "files": presence(files),
-        "container": presence(container),
-        "provider": "DataCite",
+        "subjects": presence(subjects),
+        "titles": presence(titles),
+        "url": normalize_url(meta.get("url", None)),
+        "version": meta.get("version", None),
     } | read_options
 
 

commonmeta/readers/datacite_xml_reader.py

@@ -93,7 +93,7 @@ def read_datacite_xml(data: dict, **kwargs) -> Commonmeta:
                 {
                     "subject": subject.get("#text", None),
                     "subjectScheme": subject.get("subjectScheme", None),
-                    "lang": subject.get("xml:lang", None),
+                    "language": subject.get("xml:lang", None),
                 }
             )
         return None

commonmeta/readers/inveniordm_reader.py

@@ -127,9 +127,9 @@ def get_references(references: list) -> list:
         identifier = reference.get("relatedIdentifier", None)
         identifier_type = reference.get("relatedIdentifierType", None)
         if identifier and identifier_type == "DOI":
-            reference["doi"] = normalize_doi(identifier)
+            reference["id"] = normalize_doi(identifier)
         elif identifier and identifier_type == "URL":
-            reference["url"] = normalize_url(identifier)
+            reference["id"] = normalize_url(identifier)
         reference = py_.omit(
             reference,
             [

commonmeta/readers/json_feed_reader.py

@@ -102,7 +102,7 @@ def read_json_feed_item(data: Optional[dict], **kwargs) -> Commonmeta:
     description = meta.get("summary", None)
     if description is not None:
         descriptions = [
-            {"description": sanitize(description), "descriptionType": "Abstract"}
+            {"description": sanitize(description), "type": "Abstract"}
         ]
     else:
         descriptions = None
@@ -165,13 +165,12 @@ def get_references(references: list) -> list:
             return None
         try:
             if reference.get("doi", None) and validate_doi(reference.get("doi")):
-                doi = normalize_doi(reference.get("doi"))
+                id_ = normalize_doi(reference.get("doi"))
                 return compact(
                     {
-                        "doi": doi,
+                        "id": id_,
                         "title": reference.get("title", None),
                         "publicationYear": reference.get("publicationYear", None),
-                        "url": reference.get("url", None),
                     }
                 )
 
@@ -185,7 +184,7 @@ def get_references(references: list) -> list:
                 if response.status_code in [404]:
                     return None
                 return {
-                    "url": reference.get("url"),
+                    "id": reference.get("url"),
                 }
         except Exception as error:
             print(error)

commonmeta/resources/commonmeta_v0.13.json

@@ -12,8 +12,7 @@
         "properties": {
           "organization": { "$ref": "#/definitions/organization" }
         }
-      },
-      "uniqueItems": true
+      }
     },
     "contributorRole": {
       "description": "The type of contribution made by a contributor",
@@ -63,13 +62,21 @@
       ],
       "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" }
-      },
-      "required": ["pointLongitude", "pointLatitude"]
+      }
     },
     "id": {
       "description": "The unique identifier for the resource.",
@@ -137,9 +144,11 @@
         "Dissertation",
         "Document",
         "Entry",
+        "Event",
         "Grant",
         "Image",
         "Instrument",
+        "InteractiveResource",
         "JournalArticle",
         "JournalIssue",
         "JournalVolume",
@@ -182,8 +191,7 @@
           "Internet Archive",
           "DWT"
         ]
-      },
-      "uniqueItems": true
+      }
     },
     "container": {
       "description": "The container of the resource.",
@@ -247,14 +255,11 @@
             "items": {
               "$ref": "#/definitions/contributorRole"
             },
-            "type": "array",
-            "minItems": 1,
-            "uniqueItems": true
+            "type": "array"
           }
         }
       },
-      "minItems": 1,
-      "uniqueItems": true
+      "minItems": 1
     },
     "date": {
       "description": "The dates for the resource.",
@@ -333,8 +338,7 @@
         },
         "required": ["url"]
       },
-      "minItems": 1,
-      "uniqueItems": true
+      "minItems": 1
     },
     "fundingReferences": {
       "description": "The funding references for the resource.",
@@ -368,21 +372,7 @@
         "properties": {
           "geoLocationPlace": { "type": "string" },
           "geoLocationPoint": { "$ref": "#/definitions/geoLocationPoint" },
-          "geoLocationBox": {
-            "type": "object",
-            "properties": {
-              "westBoundLongitude": { "$ref": "#/definitions/longitude" },
-              "eastBoundLongitude": { "$ref": "#/definitions/longitude" },
-              "southBoundLatitude": { "$ref": "#/definitions/latitude" },
-              "northBoundLatitude": { "$ref": "#/definitions/latitude" }
-            },
-            "required": [
-              "westBoundLongitude",
-              "eastBoundLongitude",
-              "southBoundLatitude",
-              "northBoundLatitude"
-            ]
-          },
+          "geoLocationBox": { "$ref": "#/definitions/geoLocationBox" },
           "geoLocationPolygons": {
             "type": "array",
             "items": {
@@ -493,8 +483,7 @@
         },
         "required": ["id", "type"]
       },
-      "minItems": 1,
-      "uniqueItems": true
+      "minItems": 1
     },
     "references": {
       "type": "array",
@@ -517,8 +506,7 @@
           "unstructured": { "type": "string" }
         },
         "required": ["key"]
-      },
-      "uniqueItems": true
+      }
     },
     "subjects": {
       "type": "array",
@@ -532,8 +520,7 @@
           }
         },
         "required": ["subject"]
-      },
-      "uniqueItems": true
+      }
     },
     "titles": {
       "description": "The titles of the resource.",
@@ -556,8 +543,7 @@
           }
         },
         "required": ["title"]
-      },
-      "uniqueItems": true
+      }
     },
     "url": {
       "description": "The URL of the resource.",

commonmeta/resources/commonmeta_v0.14.json

@@ -0,0 +1,573 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://commonmeta.org/commonmeta_v0.14.json",
+  "title": "Commonmeta v0.14",
+  "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" },
+              "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.13",
+        "commonmeta": "commonmeta_v0.14",
         "datacite": "datacite-v4.5",
         "crossref": "crossref-v0.2",
         "csl": "csl-data",

commonmeta/writers/datacite_writer.py

@@ -160,7 +160,7 @@ def to_datacite_creator(creator: dict) -> dict:
             "familyName": creator.get("familyName", None),
             "nameType": _type + "al" if _type else None,
             "nameIdentifiers": name_identifiers,
-            "affiliation": creator.get("affiliation", None),
+            "affiliation": creator.get("affiliations", None),
         }
     )
 

{commonmeta_py-0.17.2.dist-info → commonmeta_py-0.18.dist-info}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2023 Front Matter
+Copyright (c) 2022-2024 Front Matter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{commonmeta_py-0.17.2.dist-info → commonmeta_py-0.18.dist-info}/METADATA

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

{commonmeta_py-0.17.2.dist-info → commonmeta_py-0.18.dist-info}/RECORD

@@ -1,10 +1,10 @@
 commonmeta/__init__.py,sha256=GEUiZwiQG_SxD0Fwl1CRMGOtq2Sfek1mSqMVJLgEhh8,1781
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
-commonmeta/author_utils.py,sha256=sABlti_yy-noT6RwCdRy4DklKaQDKpFvq0rivzcLgJQ,8217
+commonmeta/author_utils.py,sha256=04iA1K2dMp-8xu0cH10tcWgWKIKW3aajYkxrYLzG2l4,8333
 commonmeta/base_utils.py,sha256=0t6fr9XGeeTBoMlKSAMI7p_EmKsA6wYRW0roEBXVcc8,3722
 commonmeta/cli.py,sha256=0IJF1SQ1sKPg7M0Gb8fpX2nBps-G0L13o01__M6c5Z0,6104
 commonmeta/constants.py,sha256=9MPQosZUqnScIbdzG2S8vpE7OXqsFDk6PVnw-1hdXxI,15598
-commonmeta/crossref_utils.py,sha256=XzbkITA5Yq1XSlCBr1x_T8q5QqBn0fZOIkgsjqmoOVY,21723
+commonmeta/crossref_utils.py,sha256=hBodNdeHi1HilfTjazz9gDkN7FQiCZxA_qgzSBO4uA4,21972
 commonmeta/date_utils.py,sha256=amF3E0ZJlh8yY5eY3aVXQyAO1x2WuZHJXw-ajOEcdUQ,5808
 commonmeta/doi_utils.py,sha256=zzqoGZf0H3DYUUM9_zioNSnXOvcxzfLpPie7rpXD2es,7797
 commonmeta/metadata.py,sha256=wKVOL-M3nDBIat5NMjuxr_HvnSPvc1hZ83se7uumBgU,12259
@@ -13,19 +13,20 @@ commonmeta/readers/bibtex_reader.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 commonmeta/readers/cff_reader.py,sha256=5HMFUvjE1zb-zfpQSNM8vtB0YunD0reom99hn8N0xKc,6144
 commonmeta/readers/codemeta_reader.py,sha256=efv2V1WPfdrKLQNxgSvoripdWqS2M6CwXWSGiRuzRtU,3658
 commonmeta/readers/commonmeta_reader.py,sha256=gNjdsJ-671-pXmBdzy1NybkQ29q9_qtorFoK2D-zStA,302
-commonmeta/readers/crossref_reader.py,sha256=bB-_pIkVm0ub9we9U-j1z-V6jqm9Y7KK1YVBKzK8VQU,12322
-commonmeta/readers/crossref_xml_reader.py,sha256=ytMAozgLBmvS6fDJ0xv5dTp8rXgBLjrRXwT7HfClA_c,18771
-commonmeta/readers/csl_reader.py,sha256=WndJ__wa-JKuHZCT6XVha3iuW2IsDYzp7xz5dgntRa8,3179
-commonmeta/readers/datacite_reader.py,sha256=pjixmWvFJhLU-KlWOuFr-Eg923VEbw9klm32gJDUUgg,12108
-commonmeta/readers/datacite_xml_reader.py,sha256=NGdmVAsiMUIARFaQv2RTVR8A1Y5V-SW4JmVi_PQe2ZI,13122
-commonmeta/readers/inveniordm_reader.py,sha256=aotm77ZlSGXQiw3J1K8S96DtjFPgdZJENEwWa2C2OBo,6297
-commonmeta/readers/json_feed_reader.py,sha256=Azu0NHVGsd7i-HfKN84Ew2lgkQ2xo8VIZXDHZ-MuyQw,13847
+commonmeta/readers/crossref_reader.py,sha256=ySzzyhrWQ4Xd2uFpoZ7NP1KpHXSoqY_VYJdJ-WlPs6E,12327
+commonmeta/readers/crossref_xml_reader.py,sha256=QF1A-r3OJbykBTH9YMSxusT3-KSKmmz7d6Ch8S0OM0I,18619
+commonmeta/readers/csl_reader.py,sha256=bq0uGpUUbYcZ-4XaY1RBGYacLRpxeL2vvEFpLCqUFDg,3168
+commonmeta/readers/datacite_reader.py,sha256=Mud4IKFjDUg3wHXoyLLo39yGe31HCOsCLxRZ-vdyJQE,12067
+commonmeta/readers/datacite_xml_reader.py,sha256=I5tr0ekN-fa_8_t9Xq09w8Jhi-ODnOgA-ZBl5WguTMQ,13126
+commonmeta/readers/inveniordm_reader.py,sha256=sAmJ9zTHPp1iCdcTQJh-VkNo0MKbubJA3Tx8XIKrdmY,6295
+commonmeta/readers/json_feed_reader.py,sha256=ZEmMphAOAQDYhbHwpZVuS65SivyNylkSBNpscsL6F0c,13775
 commonmeta/readers/kbase_reader.py,sha256=NpIK-_fh5QFN4Q_ArqcrnH4tS5zR1gqbPew6VEjrUbs,6764
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
 commonmeta/readers/schema_org_reader.py,sha256=_iUwZDzOGkiU4oeYB1wFWt3r_Er_ibyCCfELa4_4HU4,16624
 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=3o9tzgxUfM3DqMHc78z_cDe3gnK2HkypxhHsKCW_WzI,16236
+commonmeta/resources/commonmeta_v0.13.json,sha256=2-WSZGijR13zVu97S_YHXr-cyeLW7hzHXYMlr6nIjdw,15787
+commonmeta/resources/commonmeta_v0.14.json,sha256=nACmkTe4IrZkygd5AeJnAv9P4EWfzCwW9oL5AhubvnE,17657
 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
@@ -53,7 +54,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=OnzVqIw-Jt1yd6i4QUtBtk0u1zyVDjxQH4oVFOWz4jc,915
+commonmeta/schema_utils.py,sha256=Ep8suJgqtgDAvbjVkQxwzAY1MqwwqPwNRKDTMAxMQTg,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
 commonmeta/utils.py,sha256=ZIJaE8zkUo0xvCmSr1BzQll0SFI64jEIBC8WUoTkZ3Y,38502
 commonmeta/writers/__init__.py,sha256=47-snms6xBHkoEXKYV1DBtH1npAtlVtvY29Z4Zr45qI,45
@@ -62,11 +63,11 @@ commonmeta/writers/citation_writer.py,sha256=RjaNh9EALxq6gfODLRWVJxGxPArGd6ZiHUl
 commonmeta/writers/commonmeta_writer.py,sha256=2qlttCfYpGhfVjrYkjzbIra7AywssRLT30FlxEWgXGw,1844
 commonmeta/writers/crossref_xml_writer.py,sha256=0Ds494RnXfdfjWw5CLX1kwV2zP7gqffdVqO-X74Uc6c,492
 commonmeta/writers/csl_writer.py,sha256=ep1U2oc8c0h9tXtVXu05o92ZR4_2pk0dEFa2iBiW7Jk,2807
-commonmeta/writers/datacite_writer.py,sha256=M9L5k_ARMVkjX3JM8QORG2Vgt6QEYqcEe6dqcSFWkX4,6190
+commonmeta/writers/datacite_writer.py,sha256=dVlP2GOd6z5NhVfEJuAv1GyQzMPqjjurWSV1YkchfS4,6191
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=72cpjBpvaLkTph6I0xkjqI6ne4fKSihHKOsht4_CdmY,5698
-commonmeta_py-0.17.2.dist-info/LICENSE,sha256=lv-z2BuPoDWRiA17Q4K1QsG2F6EPGBD36iEVjOnmHt4,1074
-commonmeta_py-0.17.2.dist-info/METADATA,sha256=tFLRQYBDc1McuU23TrISqMBnKixlICcJWasE1lqIocs,8333
-commonmeta_py-0.17.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-commonmeta_py-0.17.2.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.17.2.dist-info/RECORD,,
+commonmeta_py-0.18.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.18.dist-info/METADATA,sha256=iG-k7EOuiX9prNF1jAdYnFJp3JTXN5BFlTIpwA9kQzo,8331
+commonmeta_py-0.18.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+commonmeta_py-0.18.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.18.dist-info/RECORD,,