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

commonmeta/author_utils.py

@@ -63,7 +63,6 @@ def get_one_author(author, **kwargs):
     ) or parse_attributes(
         author.get("contributorName", None), content="type", first=True
     )
-    print(author)
     # also handle Crossref, JSON Feed, or DataCite metadata
     _id = (
         author.get("id", None)

commonmeta/constants.py

@@ -238,9 +238,9 @@ INVENIORDM_TO_CM_TRANSLATIONS = {
     "book": "Book",
     "section": "BookChapter",
     "conferencepaper": "ProceedingsArticle",
-    "article": "JournalArticle",
     "patent": "Patent",
     "publication": "JournalArticle",
+    "publication-preprint": "Article",
     "report": "Report",
     "softwaredocumentation": "Software",
     "thesis": "Dissertation",

commonmeta/readers/inveniordm_reader.py

@@ -1,4 +1,5 @@
 """InvenioRDM reader for Commonmeta"""
+
 import httpx
 from pydash import py_
 from furl import furl
@@ -40,19 +41,24 @@ def read_inveniordm(data: dict, **kwargs) -> Commonmeta:
     read_options = kwargs or {}
 
     url = normalize_url(py_.get(meta, "links.self_html"))
-    _id = doi_as_url(meta.get("doi", None)) or url
-    resource_type = py_.get(meta, "metadata.resource_type.type") or py_.get(meta, "metadata.resource_type.id")
-    resource_type = resource_type.split("-")[0]
+    _id = (
+        doi_as_url(meta.get("doi", None))
+        or doi_as_url(py_.get(meta, "pids.doi.identifier"))
+        or url
+    )
+    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")
-    print(contributors)
-    
     contributors = get_authors(
         from_inveniordm(wrap(contributors)),
     )
-    publisher = {"name": meta.get("publisher", None) or py_.get(meta, "metadata.publisher") or "Zenodo"}
-
+    publisher = meta.get("publisher", None) or py_.get(meta, "metadata.publisher")
+    if publisher:
+        publisher = {"name": publisher}
     title = py_.get(meta, "metadata.title")
     titles = [{"title": sanitize(title)}] if title else None
     additional_titles = py_.get(meta, "metadata.additional_titles")
@@ -73,26 +79,33 @@ def read_inveniordm(data: dict, **kwargs) -> Commonmeta:
                 "title": "Zenodo",
             }
         )
-    elif f.host in ["rogue-scholar.org", "beta.rogue-scholar.org", "demo.front-matter.io"]:
-        container = compact(
-            {
-                "type": "Repository",
-                "title": "Rogue Scholar",
-            }
-        )
     else:
-        container = None
-    license_ = py_.get(meta, "metadata.license.id")
+        container = py_.get(meta, "custom_fields.journal:journal")
+        if container:
+            issn = py_.get(meta, "custom_fields.journal:journal.issn")
+            container = compact(
+                {
+                    "type": "Periodical",
+                    "title": container.get("title", None),
+                    "identifier": issn,
+                    "identifierType": "ISSN" if issn else None,
+                }
+            )
+    license_ = py_.get(meta, "metadata.rights[0].id") or py_.get(
+        meta, "metadata.license.id"
+    )
     if license_:
         license_ = dict_to_spdx({"id": license_})
-
+    print(license_)
     descriptions = format_descriptions(
         [
             py_.get(meta, "metadata.description"),
             py_.get(meta, "metadata.notes"),
         ]
     )
-    language = py_.get(meta, "metadata.language") or py_.get(meta, "metadata.languages[0].id")
+    language = py_.get(meta, "metadata.language") or py_.get(
+        meta, "metadata.languages[0].id"
+    )
     subjects = [name_to_fos(i) for i in wrap(py_.get(meta, "metadata.keywords"))]
 
     references = get_references(wrap(py_.get(meta, "metadata.related_identifiers")))
@@ -188,7 +201,9 @@ def get_relations(relations: list) -> list:
         """map_relation"""
         identifier = relation.get("identifier", None)
         scheme = relation.get("scheme", None)
-        relation_type = relation.get("relation", None) or relation.get("relation_type", None)
+        relation_type = relation.get("relation", None) or relation.get(
+            "relation_type", None
+        )
         if scheme == "doi":
             identifier = doi_as_url(identifier)
         else:

commonmeta/writers/inveniordm_writer.py

@@ -1,6 +1,7 @@
 """InvenioRDM writer for commonmeta-py"""
 
 import orjson as json
+import pydash as py_
 
 from ..utils import to_inveniordm
 from ..base_utils import compact, wrap, presence, parse_attributes
@@ -27,26 +28,44 @@ def write_inveniordm(metadata):
         for i in wrap(metadata.identifiers)
         if i.get("id", None) != metadata.id
     ]
-    publisher = metadata.publisher or {}
+    container = metadata.container if metadata.container else {}
+    journal = (
+        container.get("title", None)
+        if _type not in ["inbook", "inproceedings"]
+        and container.get("type") in ["Journal", "Periodical"]
+        else None
+    )
+    issn = (
+        container.get("identifier", None)
+        if container.get("identifierType", None) == "ISSN"
+        else None
+    )
     data = compact(
         {
+            "pids": {
+                "doi": {
+                    "identifier": doi_from_url(metadata.id),
+                    "provider": "external",
+                },
+            },
+            "access": {"record": "public", "files": "public"},
+            "files": {"enabled": True},
             "metadata": {
                 "resource_type": {"id": _type},
-                "doi": doi_from_url(metadata.id),
                 "creators": creators,
                 "title": parse_attributes(metadata.titles, content="title", first=True),
-                "publisher": publisher.get("name", None),
+                "publisher": metadata.publisher.get("name", None) if metadata.publisher else None,
                 "publication_date": metadata.date.get("published")
                 if metadata.date.get("published", None)
                 else None,
+                "dates": [{"date": metadata.date.get("updated"), "type": "updated"}],
                 "subjects": parse_attributes(
                     wrap(metadata.subjects), content="subject", first=False
                 ),
-                "contributors": to_inveniordm(wrap(metadata.contributors)),
                 "description": parse_attributes(
                     metadata.descriptions, content="description", first=True
                 ),
-                "license": metadata.license.get("id", None)
+                "rights": [{"id": metadata.license.get("id", None)}]
                 if metadata.license
                 else None,
                 "languages": [{"id": get_language(metadata.language, format="alpha_3")}]
@@ -55,6 +74,9 @@ def write_inveniordm(metadata):
                 "identifiers": identifiers,
                 "version": metadata.version,
             },
+            "custom_fields": {
+                "journal:journal": compact({"title": journal, "issn": issn}),
+            },
         }
     )
     return json.dumps(data)

{commonmeta_py-0.26.dist-info → commonmeta_py-0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.26
+Version: 0.27
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Home-page: https://python.commonmeta.org
 License: MIT
@@ -102,7 +102,7 @@ Commometa-py reads and/or writes these metadata formats:
 | [CSV](ttps://en.wikipedia.org/wiki/Comma-separated_values)                                       | csv           | text/csv                               | no      | later   |
 | [BibTex](http://en.wikipedia.org/wiki/BibTeX)                                                    | bibtex        | application/x-bibtex                   | later | yes     |
 | [RIS](http://en.wikipedia.org/wiki/RIS_(file_format))                                            | ris           | application/x-research-info-systems    | yes   | yes     |
-| [InvenioRDM](https://inveniordm.docs.cern.ch/reference/metadata/)                                | inveniordm    | application/vnd.inveniordm.v1+json     | later | yes     |
+| [InvenioRDM](https://inveniordm.docs.cern.ch/reference/metadata/)                                | inveniordm    | application/vnd.inveniordm.v1+json     | yes   | yes     |
 | [JSON Feed](https://www.jsonfeed.org/)                                                           | json_feed_item     | application/feed+json    | yes | later     |
 
 _commonmeta_: the Commonmeta format is the native format for the library and used internally.

{commonmeta_py-0.26.dist-info → commonmeta_py-0.27.dist-info}/RECORD

@@ -1,9 +1,9 @@
-commonmeta/__init__.py,sha256=faTsPZccLid5s4xeIiaz30oYt4u3Kzs8K64gRYM0kF4,1779
+commonmeta/__init__.py,sha256=_iH5WihLf4sQNUkDVnMlVNm0CabhZKxSYHa6b0Qd93A,1779
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
-commonmeta/author_utils.py,sha256=wNYUofQtxzuTr55SQflEsZaOswmrF6kZOuXJN16FsD4,8366
+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=VZdkvk-pnzwf4Ze0jwc67wX4a7dIZ_T7neeMQbRxdq0,15879
+commonmeta/constants.py,sha256=L9WeJL6e5G_PlSmmjYFBCILGfVeLlLrkujGBH-Yy-rA,15885
 commonmeta/crossref_utils.py,sha256=uffkjbs3732yCzD7hEA5lZ9ZZ648Mftl_n0GGcnEPHc,21918
 commonmeta/date_utils.py,sha256=amF3E0ZJlh8yY5eY3aVXQyAO1x2WuZHJXw-ajOEcdUQ,5808
 commonmeta/doi_utils.py,sha256=Dt6K9ADD2ga2WNsOzfX9f29gnubhn7xqeKL7U5pEpBs,8209
@@ -18,7 +18,7 @@ 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=aYFMkeOZHJvIYwhtwRPi-SIlP-n2iecavA5JlcL5UYo,7129
+commonmeta/readers/inveniordm_reader.py,sha256=Itm8HfN5PnNw0PMiw3FImmthpcCI_tCKpgHCstGKvb8,7502
 commonmeta/readers/json_feed_reader.py,sha256=Ke-J_xZJk6DltFMPrdFBF8iGhs_3EMzpBbDg7wcw678,13773
 commonmeta/readers/kbase_reader.py,sha256=NpIK-_fh5QFN4Q_ArqcrnH4tS5zR1gqbPew6VEjrUbs,6764
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
@@ -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=tX24ml2tkaS_pmCwBH4hkK0MNwS4L-O0ovGy2dbuQ_g,3339
+commonmeta/writers/inveniordm_writer.py,sha256=wEQV2L4F3cCCw2i72g-1ClfOwuRjpfsM0fTAszBmWKM,4137
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.26.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.26.dist-info/METADATA,sha256=e48KQlX574s7KHVkZXpvMcsW0cFTMCwv_UeqYYOZSxc,8331
-commonmeta_py-0.26.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-commonmeta_py-0.26.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.26.dist-info/RECORD,,
+commonmeta_py-0.27.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.27.dist-info/METADATA,sha256=4AaRJYyOpBiWd2_niOGGC_LJqBbJsVV223gy-LuqOZk,8331
+commonmeta_py-0.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+commonmeta_py-0.27.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.27.dist-info/RECORD,,