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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.58
+Version: 0.60
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Home-page: https://python.commonmeta.org
 License: MIT
@@ -38,7 +38,7 @@ Requires-Dist: nbstripout (>=0.6,<0.7)
 Requires-Dist: nh3 (>=0.2.14,<0.3.0)
 Requires-Dist: orjson (>=3.9.14,<4.0.0)
 Requires-Dist: orjsonl (>=1.0.0,<2.0.0)
-Requires-Dist: pikepdf (>=8.14.0,<9.0.0)
+Requires-Dist: pikepdf (>=8.14,<10.0)
 Requires-Dist: pycountry (>=23.12.11,<24.0.0)
 Requires-Dist: pydash (>=7.0,<8.0)
 Requires-Dist: pyjwt (>=2.8.0,<3.0.0)

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

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.58"
+__version__ = "0.60"
 __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_py-0.58 → commonmeta_py-0.60}/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_py-0.58 → commonmeta_py-0.60}/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_py-0.58 → commonmeta_py-0.60}/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_py-0.58 → commonmeta_py-0.60}/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_py-0.58 → commonmeta_py-0.60}/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,18 +1091,6 @@ def name_to_fos(name: str) -> Optional[dict]:
     return {"subject": subject}
 
 
-def encode_doi(prefix):
-    """Generate a DOI using the DOI prefix and a random base32 suffix"""
-    suffix = base32.generate(length=10, split_every=5, checksum=True)
-    return f"https://doi.org/{prefix}/{suffix}"
-
-
-def decode_doi(doi: str) -> int:
-    """Decode a DOI to a number"""
-    suffix = doi.split("/", maxsplit=5)[-1]
-    return base32.decode(suffix)
-
-
 def from_curie(id: Optional[str]) -> Optional[str]:
     """from CURIE"""
     if id is None:

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

@@ -38,7 +38,7 @@ def write_inveniordm(metadata):
             ),
         }
         for i in wrap(metadata.identifiers)
-        if i.get("identifier", None) != metadata.id
+        if i.get("identifierType", None) != "DOI"
     ]
     identifiers.append(
         {

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name="commonmeta-py"
-version="0.58"
+version="0.60"
 repository = "https://github.com/front-matter/commonmeta-py"
 homepage = "https://python.commonmeta.org"
 documentation = "https://python.commonmeta.org"
@@ -48,7 +48,7 @@ asyncclick = "^8.1.7.1"
 anyio = "^4.2.0"
 orjson = "^3.9.14"
 orjsonl = "^1.0.0"
-pikepdf = "^8.14.0"
+pikepdf = ">=8.14,<10.0"
 edtf = "^5.0.0"
 
 [tool.poetry.group.docs]