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

commonmeta/doi_utils.py

@@ -356,7 +356,7 @@ def generate_wordpress_doi(prefix: str, slug: str, guid: str) -> str:
     return doi
 
 
-def generate_doi_from_guid(prefix: str, guid: str) -> str:
+def generate_doi_from_guid(prefix: str, guid: str, checksum=True) -> Optional[str]:
     """Validates a GUID that is a DOI"""
     import base32_lib as base32
 
@@ -374,13 +374,11 @@ def generate_doi_from_guid(prefix: str, guid: str) -> str:
     suffix = doi.split("/")[-1]
 
     try:
-        number = base32.decode(suffix, checksum=True)
+        number = base32.decode(suffix, checksum)
         if number != 0:
             return doi
     except (ValueError, IndexError):
-        pass
-
-    return ""
+        return None
 
 
 def generate_substack_doi(prefix: str, guid: str) -> str:

commonmeta/readers/jsonfeed_reader.py

@@ -75,7 +75,10 @@ def read_jsonfeed(data: Optional[dict], **kwargs) -> Commonmeta:
             elif generator == "Substack" and prefix and guid:
                 _id = generate_substack_doi(prefix, guid)
             elif prefix and guid:
-                _id = generate_doi_from_guid(prefix, guid)
+                # don't use checksum as some legacy GUIDs (generated with commonmeta Go between May 2024
+                # and April 2025) don't have valued checksum
+                guid = guid[:-2]  # remove checksum
+                _id = generate_doi_from_guid(prefix, guid, checksum=False)
 
         # If still no DOI but prefix provided and not registered for DOI generation
         elif py_.get(meta, "blog.prefix") and not py_.get(meta, "blog.doi_reg", False):

commonmeta/utils.py

@@ -1325,24 +1325,19 @@ def subjects_as_string(subjects):
     return ", ".join(keywords)
 
 
-def string_to_slug(text):
-    """makes a string lowercase and removes non-alphanumeric characters"""
-    # Remove FOS (Fields of Science) prefix
+def string_to_slug(text: str) -> str:
+    """Makes a string lowercase and removes non-alphanumeric characters"""
+
+    # Remove optional FOS (Fields of Science) prefix
     text = text.removeprefix("FOS: ")
-    # Lookup FOS name
-    slug = FOS_TO_STRING_MAPPINGS.get(text, None)
-    if slug is not None:
-        return slug.lower()
-
-    # Replace spaces with hyphens
-    slug = re.sub(r"\s+", "-", text.lower())
-    # Remove special characters
-    slug = re.sub(r"[^a-z0-9-]", "", slug)
-    # Remove multiple consecutive hyphens
-    slug = re.sub(r"-+", "-", slug)
-    # Remove leading and trailing hyphens
-    slug = slug.strip("-")
-    return slug
+
+    # Convert to lowercase and keep only letters and numbers
+    result = ""
+    for char in text:
+        if char.isalnum():
+            result += char.lower()
+
+    return result
 
 
 # def reverse():

commonmeta/writers/inveniordm_writer.py

@@ -7,7 +7,6 @@ from typing import Dict, Optional
 import orjson as json
 import pydash as py_
 import requests
-from urllib3._collections import HTTPHeaderDict
 
 from ..base_utils import compact, parse_attributes, presence, wrap
 from ..constants import (
@@ -760,17 +759,13 @@ def update_legacy_record(record, legacy_key: str, field: str = None) -> dict:
         return record
 
 
-def search_by_slug(slug: str, type_value: str, host: str, token: str) -> Optional[str]:
+def search_by_slug(slug: str, type: str, host: str, token: str) -> Optional[str]:
     """Search for a community by slug in InvenioRDM"""
     headers = {
         "Authorization": f"Bearer {token}",
         "Content-Type": "application/json",
     }
-    params = HTTPHeaderDict()
-    params.add("q", f"slug:{slug}")
-    params.add("type", type_value)
-    params.add("type", "subject")
-    params.add("size", 1)
+    params = [("q", f"slug:{slug}"), ("type", type), ("type", "subject"), ("size", 1)]
     try:
         response = requests.get(
             f"https://{host}/api/communities", headers=headers, params=params

{commonmeta_py-0.127.dist-info → commonmeta_py-0.129.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.127
+Version: 0.129
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Project-URL: Homepage, https://python.commonmeta.org
 Project-URL: Repository, https://github.com/front-matter/commonmeta-py

{commonmeta_py-0.127.dist-info → commonmeta_py-0.129.dist-info}/RECORD

@@ -1,16 +1,16 @@
-commonmeta/__init__.py,sha256=42EVUELvqJzvTf3X-JSjCvuqNyS1chKRYTzVrwp8ZY0,2118
+commonmeta/__init__.py,sha256=nPzfcuE2fYAyGTTViV59VAGrNY25hfNfaouB6J9OXY0,2118
 commonmeta/api_utils.py,sha256=P8LMHHYiF4OTi97_5k4KstcBreooMkOAKZ4ebxsAv4o,2691
 commonmeta/author_utils.py,sha256=3lYW5s1rOUWNTKs1FP6XLfEUY3yCLOe_3L_VdJTDMp0,8585
 commonmeta/base_utils.py,sha256=-MGy9q2uTiJEkPWQUYOJMdq-3tRpNnvBwlLjvllQ5g8,11164
 commonmeta/cli.py,sha256=pdBpBosLNq3RS9buO-Voqawc9Ay1eSt-xP5O97iOft4,8480
 commonmeta/constants.py,sha256=wSTEUiHeRdXLwjXEQD9AU2hxFyEKi5OTX2iHOKO6nF0,19844
 commonmeta/date_utils.py,sha256=H2cCobX0JREIUOT_cCigGd3MG7prGiQpXk1m4ZNrFwU,6318
-commonmeta/doi_utils.py,sha256=cOogLatKg6qea2jgMd3yLALSTfaTNUgr-IkBXIK4xZw,11498
+commonmeta/doi_utils.py,sha256=WCERy6sJ8C7KRxYU-ZGnvmFe6YIdl_jtYO4lQ23aeYA,11510
 commonmeta/file_utils.py,sha256=eFYDWyR8Gr722nvFmp542hCm-TGmO_q4ciZ85IPHpjA,2893
 commonmeta/metadata.py,sha256=90aTe47d071wHxwcNsOqU5lSVPKP8wAPnPHhddj3Fuo,18443
 commonmeta/schema_utils.py,sha256=zn3gqAHciUOQmrw9okR68weFs-yqPPyORFt-Zl1D3Lw,1924
 commonmeta/translators.py,sha256=CBMK4jrXRmGZiAhCh6wsJjhbDJWbcsda8UvXFXxccAw,1363
-commonmeta/utils.py,sha256=HzgVlcRqtDXMwlbTXL0AKL3jHB6E9kEAljS5nXKdOm0,53852
+commonmeta/utils.py,sha256=1Q6vh1mhQRTcPsEEymAPPJxBgDfNOR1ZXF_UaaW9ZoM,53612
 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=HMFK6QIg_XIlhmYIWL4EfIyuidYl5L_0TAwyG78XPlU,6244
@@ -22,7 +22,7 @@ commonmeta/readers/csl_reader.py,sha256=OxzC2AZKfv43BCah4XGYvlK_LUK-5mxXFcjdzB5v
 commonmeta/readers/datacite_reader.py,sha256=4b_AP8m_aOUNVnVB0nU9j4-a8WTpmYJA8QPr5v35qyw,12219
 commonmeta/readers/datacite_xml_reader.py,sha256=nsPc7JBbIKgx6Yaauq8vmhUE-o6K0t_MAuExv6FO2AU,13205
 commonmeta/readers/inveniordm_reader.py,sha256=DtSloEZDu8bL-QLQAqAW1aDsS6ESTDZyhme379IekjY,8502
-commonmeta/readers/jsonfeed_reader.py,sha256=zcPxxuyAGW8W7w0-VwP9AhpX97qVWHQJUIJ5p4bBbfE,15655
+commonmeta/readers/jsonfeed_reader.py,sha256=sLwQwoFuOJ5yVqSi-EQVHSCo0VkwY_l6WxLGURP8yPo,15889
 commonmeta/readers/kbase_reader.py,sha256=0Y9cHRNs_7kHyocN4IESXbgmXJiq4TXoxvGeUYGml1s,6896
 commonmeta/readers/openalex_reader.py,sha256=4HUkBsut_iUjhUcC5c1GHgxnKsYQc-fgY43QILgVZEg,12826
 commonmeta/readers/ris_reader.py,sha256=nwK8Eux0wPjwKqXFWS4Cfd6FAY7Id4Mi_hgkTwPntHs,3766
@@ -80,11 +80,11 @@ commonmeta/writers/commonmeta_writer.py,sha256=QpfyhG__7o_XpsOTCPWxGymO7YKwZi2LQ
 commonmeta/writers/crossref_xml_writer.py,sha256=rcPOfrGxU4mX7_fFywYWDW2FFUoKW9wD-JzW8nX1ipI,33915
 commonmeta/writers/csl_writer.py,sha256=4gDYs1EzK4_L2UIRTfs25wgHmYRwdRP2zmfxF9387oU,2779
 commonmeta/writers/datacite_writer.py,sha256=bcinpwhq7XnVthKHH8-sdXA34dSlvFH4ImYH768iaQU,6428
-commonmeta/writers/inveniordm_writer.py,sha256=w4DTPjWk1YBtva9RWAq9DnDzmhpa0ejws2h2h-Pfz7A,26854
+commonmeta/writers/inveniordm_writer.py,sha256=tiuq9JEkz02l615yVe9wUcJQqiIPJLUqNDyofEE8Aus,26726
 commonmeta/writers/ris_writer.py,sha256=3SdyEvMRaPRP1SV1MB-MXBlunE7x6og7RF1zuWtetPc,2094
 commonmeta/writers/schema_org_writer.py,sha256=s18_x0ReXwAGBoEAwp2q-HCgFQ-h5qRg6JyAlqCoSFE,5871
-commonmeta_py-0.127.dist-info/METADATA,sha256=JHsi5YfGnb7zlq9vkkG_rh0PqIRbfKnLC7bM5QF8v1I,7656
-commonmeta_py-0.127.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.127.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.127.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
-commonmeta_py-0.127.dist-info/RECORD,,
+commonmeta_py-0.129.dist-info/METADATA,sha256=cza-xH9MAPp1KGy_yyrDnXHaN63rR_6_YFeajR1blyI,7656
+commonmeta_py-0.129.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.129.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.129.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
+commonmeta_py-0.129.dist-info/RECORD,,