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

commonmeta/constants.py

@@ -1,4 +1,5 @@
 """Constants for commonmeta-py"""
+
 from typing import Optional, TypedDict, List
 
 
@@ -585,3 +586,29 @@ COMMONMETA_CONTRIBUTOR_ROLES = [
     "Maintainer",
     "Other",
 ]
+
+INVENIORDM_IDENTIFIER_TYPES = {
+    "Ark": "ark",
+    "ArXiv": "arxiv",
+    "Bibcode": "ads",
+    "CrossrefFunderID": "crossreffunderid",
+    "DOI": "doi",
+    "EAN13": "ean13",
+    "EISSN": "eissn",
+    "GRID": "grid",
+    "Handle": "handle",
+    "IGSN": "igsn",
+    "ISBN": "isbn",
+    "ISNI": "isni",
+    "ISSN": "issn",
+    "ISTC": "istc",
+    "LISSN": "lissn",
+    "LSID": "lsid",
+    "PMID": "pmid",
+    "PURL": "purl",
+    "UPC": "upc",
+    "URL": "url",
+    "URN": "urn",
+    "W3ID": "w3id",
+    "Other": "other",
+}

commonmeta/utils.py

@@ -1106,3 +1106,16 @@ def timer_func(func):
         return value
 
     return function_timer
+
+
+def id_from_url(url: Optional[str]) -> Optional[str]:
+    """Return a ID from a URL"""
+    if url is None:
+        return None
+    
+    f = furl(url)
+    # check for allowed scheme if string is a URL
+    if f.host is not None and f.scheme not in ["http", "https", "ftp"]:
+        return None
+    
+    return str(f.path).strip("/")

commonmeta/writers/inveniordm_writer.py

@@ -1,13 +1,13 @@
 """InvenioRDM writer for commonmeta-py"""
 
 import orjson as json
-import pydash as py_
+from typing import Optional
 
-from ..utils import to_inveniordm
-from ..base_utils import compact, wrap, presence, parse_attributes
-from ..doi_utils import doi_from_url, validate_suffix
-from ..constants import CM_TO_INVENIORDM_TRANSLATIONS
-from ..utils import pages_as_string, get_language, validate_orcid
+from ..base_utils import compact, wrap, parse_attributes
+from ..date_utils import get_iso8601_date
+from ..doi_utils import doi_from_url
+from ..constants import CM_TO_INVENIORDM_TRANSLATIONS, INVENIORDM_IDENTIFIER_TYPES
+from ..utils import get_language, validate_orcid, id_from_url
 
 
 def write_inveniordm(metadata):
@@ -23,7 +23,9 @@ def write_inveniordm(metadata):
     identifiers = [
         {
             "identifier": i.get("identifier", None),
-            "scheme": i.get("identifierType", None),
+            "scheme": INVENIORDM_IDENTIFIER_TYPES.get(
+                i.get("identifierType", None), "other"
+            ),
         }
         for i in wrap(metadata.identifiers)
         if i.get("id", None) != metadata.id
@@ -40,6 +42,8 @@ def write_inveniordm(metadata):
         if container.get("identifierType", None) == "ISSN"
         else None
     )
+
+    subjects = [to_inveniordm_subject(i) for i in wrap(metadata.subjects)]
     data = compact(
         {
             "pids": {
@@ -60,15 +64,16 @@ def write_inveniordm(metadata):
                     "publisher": metadata.publisher.get("name", None)
                     if metadata.publisher
                     else None,
-                    "publication_date": metadata.date.get("published")
+                    "publication_date": get_iso8601_date(metadata.date.get("published"))
                     if metadata.date.get("published", None)
                     else None,
                     "dates": [
-                        {"date": metadata.date.get("updated"), "type": "updated"}
+                        {
+                            "date": metadata.date.get("updated"),
+                            "type": {"id": "updated"},
+                        }
                     ],
-                    "subjects": parse_attributes(
-                        wrap(metadata.subjects), content="subject", first=False
-                    ),
+                    "subjects": subjects,
                     "description": parse_attributes(
                         metadata.descriptions, content="description", first=True
                     ),
@@ -112,15 +117,47 @@ def to_inveniordm_creator(creator: dict) -> dict:
     elif creator.get("name", None):
         name = creator.get("name", None)
 
-    return {
-        "person_or_org": compact(
+    return compact(
+        {
+            "person_or_org": compact(
+                {
+                    "name": name,
+                    "given_name": creator.get("givenName", None),
+                    "family_name": creator.get("familyName", None),
+                    "type": _type.lower() + "al" if _type else None,
+                    "identifiers": format_identifier(creator.get("id", None)),
+                }
+            ),
+            "affiliations": to_inveniordm_affiliations(creator),
+        }
+    )
+
+
+def to_inveniordm_subject(subject: dict) -> dict:
+    """Convert subjects to inveniordm subjects"""
+    return compact(
+        {
+            "id": subject.get("id", None),
+            "subject": subject.get("subject", None),
+        }
+    )
+
+
+def to_inveniordm_affiliations(creator: dict) -> Optional[list]:
+    """Convert affiliations to inveniordm affiliations.
+    Returns None if creator is not a person."""
+
+    def format_affiliation(affiliation):
+        return compact(
             {
-                "name": name,
-                "given_name": creator.get("givenName", None),
-                "family_name": creator.get("familyName", None),
-                "type": _type.lower() + "al" if _type else None,
-                "identifiers": format_identifier(creator.get("id", None)),
-                "affiliation": creator.get("affiliations", None),
+                "id": id_from_url(affiliation.get("id", None)),
+                "name": affiliation.get("name", None),
             }
         )
-    }
+
+    if creator.get("type", None) != "Person":
+        return None
+
+    return compact(
+        [format_affiliation(i) for i in wrap(creator.get("affiliations", None))]
+    )

{commonmeta_py-0.30.dist-info → commonmeta_py-0.32.dist-info}/METADATA

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

{commonmeta_py-0.30.dist-info → commonmeta_py-0.32.dist-info}/RECORD

@@ -1,9 +1,9 @@
-commonmeta/__init__.py,sha256=XHZvIRHYbOUr54ZbWsDXfsLaA652FoU7zL-j_wX9_hM,1779
+commonmeta/__init__.py,sha256=39W6oIc0av4brPAFRuXXJ5wLX43-XDRtrl6X1evn1Oc,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=L9WeJL6e5G_PlSmmjYFBCILGfVeLlLrkujGBH-Yy-rA,15885
+commonmeta/constants.py,sha256=fB2oMjnPYCJG3Zx6080u0R0ujmXkPRLGSgYOulWyOFw,16411
 commonmeta/crossref_utils.py,sha256=uffkjbs3732yCzD7hEA5lZ9ZZ648Mftl_n0GGcnEPHc,21918
 commonmeta/date_utils.py,sha256=amF3E0ZJlh8yY5eY3aVXQyAO1x2WuZHJXw-ajOEcdUQ,5808
 commonmeta/doi_utils.py,sha256=Dt6K9ADD2ga2WNsOzfX9f29gnubhn7xqeKL7U5pEpBs,8209
@@ -57,7 +57,7 @@ commonmeta/resources/styles/modern-language-association.csl,sha256=HI2iU4krze1aH
 commonmeta/resources/styles/vancouver.csl,sha256=lun3_i2oTilgsANk4LjFao2UDPQlGj_hgFgKAWC_DF8,12878
 commonmeta/schema_utils.py,sha256=Ep8suJgqtgDAvbjVkQxwzAY1MqwwqPwNRKDTMAxMQTg,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
-commonmeta/utils.py,sha256=qJOEnjKbpLGPEhc2n_VGB0ifRohE_zWT1VtyUv8_OFY,39463
+commonmeta/utils.py,sha256=3OX4BfOkDTkHye4-xpGoTfMrPMvN-02FdS_IBOfoRvw,39796
 commonmeta/writers/__init__.py,sha256=47-snms6xBHkoEXKYV1DBtH1npAtlVtvY29Z4Zr45qI,45
 commonmeta/writers/bibtex_writer.py,sha256=s3hIJIgWvSG7TAriZMRQEAyuitw6ebwWSI1YcYFQ-do,4971
 commonmeta/writers/citation_writer.py,sha256=RjaNh9EALxq6gfODLRWVJxGxPArGd6ZiHUlkYnCT6MA,2355
@@ -65,11 +65,11 @@ commonmeta/writers/commonmeta_writer.py,sha256=2qlttCfYpGhfVjrYkjzbIra7AywssRLT3
 commonmeta/writers/crossref_xml_writer.py,sha256=0Ds494RnXfdfjWw5CLX1kwV2zP7gqffdVqO-X74Uc6c,492
 commonmeta/writers/csl_writer.py,sha256=rlCeShkvC6ui9By0yVfNCMay_JfaZ4AooUPOPg-g-2M,2819
 commonmeta/writers/datacite_writer.py,sha256=G7Lr0aZ4sAEdbfXe3dG4Y6AyGUKA9UWr_iiaQRDnV24,6233
-commonmeta/writers/inveniordm_writer.py,sha256=lfuNdyHxyQa3rfioM8kGZh-p6h8Grl2B581f_feN8f8,4464
+commonmeta/writers/inveniordm_writer.py,sha256=oWxGweLdIUSw0pcP9SHlS0XCUYV-WqiuR4owKdkAps4,5499
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.30.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.30.dist-info/METADATA,sha256=GUODVocf6zYFgKtJ52NJqmgXvnQmNLdSiD32HYX0xv0,8331
-commonmeta_py-0.30.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-commonmeta_py-0.30.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.30.dist-info/RECORD,,
+commonmeta_py-0.32.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.32.dist-info/METADATA,sha256=jrhitlV03nvAJ8VaKjwqHHK6tegUJrnsvEi9TcpfbqI,8331
+commonmeta_py-0.32.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+commonmeta_py-0.32.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.32.dist-info/RECORD,,