commonmeta-py 0.59__py3-none-any.whl → 0.61__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.59"
+__version__ = "0.61"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 
@@ -54,7 +54,6 @@ from .utils import (
     validate_orcid,
     validate_url,
     get_language,
-    encode_doi,
     name_to_fos,
     from_json_feed,
 )
@@ -88,6 +87,8 @@ from .doi_utils import (
     doi_from_url,
     doi_as_url,
     doi_resolver,
+    decode_doi,
+    encode_doi,
     datacite_api_url,
     get_doi_ra,
     normalize_doi,

commonmeta/cli.py

@@ -5,8 +5,7 @@ import orjson as json
 
 from commonmeta import Metadata, MetadataList  # __version__
 from commonmeta.api_utils import update_ghost_post_via_api
-from commonmeta.doi_utils import validate_prefix
-from commonmeta.utils import encode_doi, decode_doi
+from commonmeta.doi_utils import validate_prefix, encode_doi, decode_doi
 from commonmeta.readers.json_feed_reader import (
     get_json_feed_item_uuid,
 )

commonmeta/doi_utils.py

@@ -4,6 +4,7 @@ import re
 from typing import Optional
 import httpx
 from furl import furl
+import base32_lib as base32
 
 from .base_utils import compact
 
@@ -131,6 +132,34 @@ def get_doi_ra(doi) -> Optional[str]:
     return response.json()[0].get("RA", None)
 
 
+def encode_doi(prefix, number: Optional[int] = None, checksum: bool = True) -> str:
+    """Generate a DOI using the DOI prefix and a random base32 suffix"""
+    if isinstance(number, int):
+        suffix = base32.encode(number, split_every=5, checksum=checksum)
+    else:
+        suffix = base32.generate(length=10, split_every=5, checksum=True)
+    print("s", suffix)
+    return f"https://doi.org/{prefix}/{suffix}"
+
+
+def decode_doi(doi: str, checksum: bool = True) -> int:
+    """Decode a DOI to a number"""
+    try:
+        doi = validate_doi(doi)
+        if doi is None:
+            return 0
+        suffix = doi.split("/", maxsplit=1)[1]
+        print(suffix, checksum)
+        if checksum:
+            number = base32.decode(suffix, checksum=True)
+            print("n", number)
+        number = base32.decode(suffix)
+        print("nn", number)
+        return number
+    except ValueError:
+        return 0
+
+
 def get_crossref_member(member_id) -> Optional[dict]:
     """Return the Crossref member for a given member_id"""
     response = httpx.get("https://api.crossref.org/members/" + member_id, timeout=10)
@@ -263,11 +292,11 @@ def is_rogue_scholar_doi(doi: str) -> bool:
     """Return True if DOI is from Rogue Scholar"""
     prefix = validate_prefix(doi)
     return prefix in [
-        "10.34732", # not managed by Front Matter
+        "10.34732",  # not managed by Front Matter
         "10.53731",
         "10.54900",
-        "10.57689", # not managed by Front Matter
-        "10.58079", # not managed by Front Matter
+        "10.57689",  # not managed by Front Matter
+        "10.58079",  # not managed by Front Matter
         "10.59348",
         "10.59349",
         "10.59350",

commonmeta/readers/crossref_reader.py

@@ -339,6 +339,8 @@ def get_container(meta: dict, issn: str) -> dict:
     )
     isbn = isbn["value"] if isbn else None
     container_title = parse_attributes(meta.get("container-title", None), first=True)
+    if not container_title and container_type in ["Periodical"]:
+        container_title = py_.get(meta, "institution.0.name")
     volume = meta.get("volume", None)
     issue = py_.get(meta, "journal-issue.issue")
     if meta.get("page", None):

commonmeta/readers/csl_reader.py

@@ -1,9 +1,9 @@
 """CSL-JSON reader for commonmeta-py"""
-from ..utils import dict_to_spdx, from_csl, normalize_id, name_to_fos, encode_doi
+from ..utils import dict_to_spdx, from_csl, normalize_id, name_to_fos
 from ..base_utils import wrap, compact, sanitize, presence
 from ..author_utils import get_authors
 from ..date_utils import get_date_from_date_parts
-from ..doi_utils import get_doi_ra, doi_from_url
+from ..doi_utils import get_doi_ra, doi_from_url, encode_doi
 from ..constants import (
     CSL_TO_CM_TRANSLATIONS,
     Commonmeta,

commonmeta/readers/json_feed_reader.py

@@ -14,7 +14,6 @@ from ..utils import (
     name_to_fos,
     validate_url,
     validate_ror,
-    encode_doi,
     issn_as_url,
 )
 from ..author_utils import get_authors
@@ -26,6 +25,7 @@ from ..doi_utils import (
     validate_doi,
     doi_from_url,
     is_rogue_scholar_doi,
+    encode_doi,
 )
 from ..constants import Commonmeta
 
@@ -188,6 +188,7 @@ def get_references(references: list) -> list:
                     "key": reference.get("key", None),
                     "title": reference.get("title", None),
                     "publicationYear": reference.get("publicationYear", None),
+                    "unstructured": reference.get("unstructured", None),
                 }
             )
 
@@ -201,12 +202,13 @@ def get_references(references: list) -> list:
                     "key": reference.get("key", None),
                     "title": reference.get("title", None),
                     "publicationYear": reference.get("publicationYear", None),
+                    "unstructured": reference.get("unstructured", None),
                 }
             )
 
     def number_reference(reference: dict, index: int) -> dict:
         """number reference"""
-        reference["key"] = f"ref{index +1}"
+        reference["key"] = f"ref{index + 1}"
         return reference
 
     references = [get_reference(i) for i in references if i.get("id", None)]

commonmeta/utils.py

@@ -11,7 +11,6 @@ from furl import furl
 import bibtexparser
 from bs4 import BeautifulSoup
 from pydash import py_
-import base32_lib as base32
 import pycountry
 
 from .base_utils import wrap, compact, parse_attributes
@@ -1092,26 +1091,6 @@ def name_to_fos(name: str) -> Optional[dict]:
     return {"subject": subject}
 
 
-def encode_doi(prefix, number: Optional[int]= None, checksum: bool = True) -> str:
-    """Generate a DOI using the DOI prefix and a random base32 suffix"""
-    if isinstance(number, int):
-        suffix = base32.encode(number, split_every=5, checksum=checksum)
-    else:
-        suffix = base32.generate(length=10, split_every=5, checksum=True)
-    return f"https://doi.org/{prefix}/{suffix}"
-
-
-def decode_doi(doi: str, checksum: bool = True) -> int:
-    """Decode a DOI to a number"""
-    try:
-        suffix = doi.split("/", maxsplit=5)[-1]
-        if checksum:
-            return base32.decode(suffix, checksum=True)
-        return base32.decode(suffix)
-    except ValueError:
-        return 0
-
-
 def from_curie(id: Optional[str]) -> Optional[str]:
     """from CURIE"""
     if id is None:

{commonmeta_py-0.59.dist-info → commonmeta_py-0.61.dist-info}/METADATA

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

{commonmeta_py-0.59.dist-info → commonmeta_py-0.61.dist-info}/RECORD

@@ -1,25 +1,25 @@
-commonmeta/__init__.py,sha256=kL83VEVl38LcgVgjuTDvDYC__UV6MEZRL0du12sjL20,1779
+commonmeta/__init__.py,sha256=mpMVDsuOZKg_uoM4S0GKd7huJDFJqyJmX4ER-SIp1wc,1795
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=zBIPTgP5n7Zx57xomJ2h7x0dvC0AV8gJ2gPoYeDy5Lo,8348
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
-commonmeta/cli.py,sha256=0IJF1SQ1sKPg7M0Gb8fpX2nBps-G0L13o01__M6c5Z0,6104
+commonmeta/cli.py,sha256=sOI9BJTePnljVcXcZ95N7TKXDT283XpjUaak7bMnbr0,6076
 commonmeta/constants.py,sha256=VfjXLkwoV4A5uztH3vgDJ_qrt7PaWGO6QtHbAt4r03c,17501
 commonmeta/crossref_utils.py,sha256=qJlTZtfKR2shAXQDm8VBYUujKFkTtZTUz19GuMUANaI,22198
 commonmeta/date_utils.py,sha256=rJRV4YmWKQWU__iAV8www3cqwaefC0iRKyHwvxrr_XY,6316
-commonmeta/doi_utils.py,sha256=uIlWi065ButcaB17unaRpSqu3c6uKwj9MgLJ6i8viMo,8319
+commonmeta/doi_utils.py,sha256=xlYQq-qkqhz07CLKpL_WfxZBT8maXgB9-TvQHlL2ZoY,9266
 commonmeta/metadata.py,sha256=cjvCcxW1FMtKCbNKan0zXX0FN6z5orHFGPYsgkp6fSI,12480
 commonmeta/readers/__init__.py,sha256=vOf7UsOKNoh_ZCuyexxhAmPMt8wjB-pF_CfpWRaN8pk,45
 commonmeta/readers/bibtex_reader.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=6rC3q-YGzA0bP0fk2zTch_N7-8agxcsFqufvKmfxWJo,12331
+commonmeta/readers/crossref_reader.py,sha256=zIMD81eYwpx9RlHaDwiZs2f9O4_kdasVzt3MkM7cEOc,12458
 commonmeta/readers/crossref_xml_reader.py,sha256=QF1A-r3OJbykBTH9YMSxusT3-KSKmmz7d6Ch8S0OM0I,18619
-commonmeta/readers/csl_reader.py,sha256=5V_sHSJwcAWJmhB8SYk199nB96BWYX1Sq9vkQ3iEmAY,3164
+commonmeta/readers/csl_reader.py,sha256=IO8uj-L_BzPFWgfRzYCF9VbK5rBPBzDqak7iBELgNNs,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=jzv0rXzT8OCdPD_MShBXTnlwD-F9tpTX7OKZGn8smzs,7480
-commonmeta/readers/json_feed_reader.py,sha256=0g5e7uBZWFEFK-Gxgf5dSgPzbAZQUW_S8ZPB7gjR0h8,14027
+commonmeta/readers/json_feed_reader.py,sha256=ctlASyxByjXDVgREzdeYOCZezn9aFFv3yKogDFd8WNs,14174
 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
@@ -58,7 +58,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=gg3l1jd_lFtRkQlO1DYGMVbC10nEmVTN4AWacxC4AAE,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
-commonmeta/utils.py,sha256=S3uzmQLzY7W-I7t0GSm-9WbILb0IcfWYU7thHmE4_Hk,44401
+commonmeta/utils.py,sha256=0ky8xyDQWVND5nJWApPgyVhbjXdPPzfpx4fJpX9ivyw,43674
 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
@@ -69,8 +69,8 @@ commonmeta/writers/datacite_writer.py,sha256=G7Lr0aZ4sAEdbfXe3dG4Y6AyGUKA9UWr_ii
 commonmeta/writers/inveniordm_writer.py,sha256=oVcXdHYtuugbfDgKO8JwTRXmP7AK2U96uK4YF0eKXAY,11399
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.59.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.59.dist-info/METADATA,sha256=BP49AZs8BJ6GIPnRbieOEomK9qfvrfWlQAzALU6F55A,8279
-commonmeta_py-0.59.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-commonmeta_py-0.59.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.59.dist-info/RECORD,,
+commonmeta_py-0.61.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.61.dist-info/METADATA,sha256=y-HIlL_4UrT-S2JKmeR88cqbEvQHkYA4petMmujIoCw,8279
+commonmeta_py-0.61.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+commonmeta_py-0.61.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.61.dist-info/RECORD,,