commonmeta-py 0.56__tar.gz → 0.58__tar.gz

{commonmeta_py-0.56 → commonmeta_py-0.58}/PKG-INFO

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

{commonmeta_py-0.56 → commonmeta_py-0.58}/commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.56"
+__version__ = "0.58"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

{commonmeta_py-0.56 → commonmeta_py-0.58}/commonmeta/readers/json_feed_reader.py

@@ -50,7 +50,9 @@ def read_json_feed_item(data: Optional[dict], **kwargs) -> Commonmeta:
     url = None
     if py_.get(meta, "blog.status", None) == "active":
         url = normalize_url(meta.get("url", None))
-    elif py_.get(meta, "blog.status", None) == "archived":
+    elif py_.get(meta, "blog.status", None) == "archived" and meta.get(
+        "archive_url", None
+    ):
         url = normalize_url(meta.get("archive_url", None))
     _id = normalize_doi(read_options.get("doi", None) or meta.get("doi", None)) or url
     _type = "Article"
@@ -183,6 +185,7 @@ def get_references(references: list) -> list:
             return compact(
                 {
                     "id": id_,
+                    "key": reference.get("key", None),
                     "title": reference.get("title", None),
                     "publicationYear": reference.get("publicationYear", None),
                 }
@@ -195,6 +198,9 @@ def get_references(references: list) -> list:
             return compact(
                 {
                     "id": id_,
+                    "key": reference.get("key", None),
+                    "title": reference.get("title", None),
+                    "publicationYear": reference.get("publicationYear", None),
                 }
             )
 

{commonmeta_py-0.56 → commonmeta_py-0.58}/commonmeta/utils.py

@@ -111,6 +111,7 @@ FOS_MAPPINGS = {
     "Agricultural biotechnology": "http://www.oecd.org/science/inno/38235147",
     "Other agricultural sciences": "http://www.oecd.org/science/inno/38235147",
     "Social science": "http://www.oecd.org/science/inno/38235147.pdf?5",
+    "Social sciences": "http://www.oecd.org/science/inno/38235147.pdf?5",
     "Psychology": "http://www.oecd.org/science/inno/38235147.pdf?5.1",
     "Economics and business": "http://www.oecd.org/science/inno/38235147.pdf?5.2",
     "Educational sciences": "http://www.oecd.org/science/inno/38235147.pdf?5.3",

{commonmeta_py-0.56 → commonmeta_py-0.58}/commonmeta/writers/inveniordm_writer.py

@@ -15,6 +15,7 @@ from ..utils import (
     get_language,
     validate_orcid,
     id_from_url,
+    normalize_url,
     FOS_MAPPINGS,
 )
 
@@ -45,17 +46,12 @@ def write_inveniordm(metadata):
             "scheme": "url",
         }
     )
-    references = [
-        to_inveniordm_related_identifier(i)
-        for i in wrap(metadata.references)
-        if i.get("id", None)
-    ]
-    relations = [
+    references = [to_inveniordm_reference(i) for i in wrap(metadata.references)]
+    related_identifiers = [
         to_inveniordm_related_identifier(i)
         for i in wrap(metadata.relations)
         if i.get("id", None) and i.get("type", None) != "IsPartOf"
     ]
-    related_identifiers = references + relations
     funding = compact(
         [
             to_inveniordm_funding(i)
@@ -129,6 +125,7 @@ def write_inveniordm(metadata):
                     if metadata.language
                     else None,
                     "identifiers": identifiers,
+                    "references": presence(references),
                     "related_identifiers": presence(related_identifiers),
                     "funding": presence(funding),
                     "version": metadata.version,
@@ -223,19 +220,19 @@ def to_inveniordm_affiliations(creator: dict) -> Optional[list]:
 
 
 def to_inveniordm_related_identifier(relation: dict) -> dict:
-    """Convert reference or relation to inveniordm related_identifier"""
+    """Convert relation to inveniordm related_identifier"""
     if normalize_doi(relation.get("id", None)):
         identifier = doi_from_url(relation.get("id", None))
         scheme = "doi"
-    else:
+    elif normalize_url(relation.get("id", None)):
         identifier = relation.get("id", None)
         scheme = "url"
+    else:
+        return None
 
     # normalize relation types
     relation_type = relation.get("type")
-    if relation.get("type", None) is None:
-        relation_type = "References"
-    elif relation.get("type") == "HasReview":
+    if relation.get("type") == "HasReview":
         relation_type = "IsReviewedBy"
     elif relation.get("type") == "IsPreprintOf":
         relation_type = "IsPreviousVersionOf"
@@ -251,6 +248,53 @@ def to_inveniordm_related_identifier(relation: dict) -> dict:
     )
 
 
+def to_inveniordm_reference(reference: dict) -> dict:
+    """Convert reference to inveniordm reference"""
+    if normalize_doi(reference.get("id", None)):
+        identifier = doi_from_url(reference.get("id", None))
+        scheme = "doi"
+    elif normalize_url(reference.get("id", None)):
+        identifier = reference.get("id", None)
+        scheme = "url"
+    else:
+        return None
+
+    if reference.get("unstructured", None) is None:
+        # use title as unstructured reference
+        if reference.get("title", None):
+            unstructured = reference.get("title")
+        else:
+            unstructured = "Unknown title"
+
+        if reference.get("publicationYear", None):
+            unstructured += " (" + reference.get("publicationYear") + ")."
+
+        return compact(
+            {
+                "reference": unstructured,
+                "scheme": scheme,
+                "identifier": identifier,
+            }
+        )
+    else:
+        unstructured = reference.get("unstructured")
+
+        # remove optional trailing period
+        unstructured = unstructured.rstrip(" .")
+
+        if reference.get("id", None):
+            # remove duplicate ID from unstructured reference
+            unstructured = unstructured.replace(reference.get("id"), "")
+
+        return compact(
+            {
+                "reference": unstructured,
+                "scheme": scheme,
+                "identifier": identifier,
+            }
+        )
+
+
 def to_inveniordm_funding(funding: dict) -> Optional[dict]:
     """Convert funding to inveniordm funding"""
     if funding.get("funderIdentifierType", None) == "ROR":
@@ -311,5 +355,3 @@ def to_inveniordm_funding(funding: dict) -> Optional[dict]:
             ),
         }
     )
-
-

{commonmeta_py-0.56 → commonmeta_py-0.58}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name="commonmeta-py"
-version="0.56"
+version="0.58"
 repository = "https://github.com/front-matter/commonmeta-py"
 homepage = "https://python.commonmeta.org"
 documentation = "https://python.commonmeta.org"