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

commonmeta/metadata.py

@@ -484,7 +484,7 @@ class MetadataList:
 
         if to == "crossref_xml":
             response = push_crossref_xml_list(
-                self, login_id=self.login_id, login_passwd=self.login_passwd
+                self, login_id=self.login_id, login_passwd=self.login_passwd, legacy_key=self.legacy_key
             )
             return response
         elif to == "datacite":

commonmeta/writers/crossref_xml_writer.py

@@ -16,8 +16,9 @@ from requests_toolbelt.multipart.encoder import MultipartEncoder
 
 from ..base_utils import compact, parse_xml, unparse_xml, unparse_xml_list, wrap
 from ..constants import Commonmeta
-from ..doi_utils import doi_from_url, validate_doi
+from ..doi_utils import doi_from_url, is_rogue_scholar_doi, validate_doi
 from ..utils import validate_url
+from .inveniordm_writer import update_legacy_record
 
 logger = logging.getLogger(__name__)
 
@@ -384,7 +385,7 @@ def write_crossref_xml_list(metalist) -> Optional[str]:
     return unparse_xml_list(crossref_xml_list, dialect="crossref", head=head)
 
 
-def push_crossref_xml_list(metalist, login_id: str, login_passwd: str) -> bytes:
+def push_crossref_xml_list(metalist, login_id: str, login_passwd: str, legacy_key:str=None) -> bytes:
     """Push crossref_xml list to Crossref API, returns the API response."""
 
     input = write_crossref_xml_list(metalist)
@@ -416,24 +417,34 @@ def push_crossref_xml_list(metalist, login_id: str, login_passwd: str) -> bytes:
     # Parse the response
     response = parse_xml(resp.content)
     status = py_.get(response, "html.body.h2")
-    if status == "SUCCESS":
-        items = []
-        for item in metalist.items:
-            items.append(
-                {
-                    "doi": item.id,
-                    "updated": datetime.now().isoformat("T", "seconds"),
-                    "status": "submitted",
-                }
-            )
+    if status != "SUCCESS":
+        # Handle error response
+        message = py_.get(response, "html.body.p")
+        logger.error(f"Crossref API error: {message}")
+        return "{}"
+
+    items = []
+    for item in metalist.items:
+        record = {
+                "doi": item.id,
+                "updated": datetime.now().isoformat("T", "seconds"),
+                "status": "submitted",
+            }
+
+        # update rogue-scholar legacy record if legacy_key is provided
+        if is_rogue_scholar_doi(item.id, ra="crossref") and legacy_key is not None:
+             record = update_legacy_record(record, legacy_key=legacy_key, field="doi")
+        items.append(record)
+
+    # Return JSON response
+    return json.dumps(items, option=json.OPT_INDENT_2)
+
+
+
+
+
 
-        # Return JSON response
-        return json.dumps(items, option=json.OPT_INDENT_2)
 
-    # Handle error response
-    message = py_.get(response, "html.body.p")
-    logger.error(f"Crossref API error: {message}")
-    return "{}"
 
 
 def get_attributes(obj, **kwargs) -> dict:

commonmeta/writers/inveniordm_writer.py

@@ -484,7 +484,7 @@ def push_inveniordm(
 
         # optionally update rogue-scholar legacy record
         if host == "rogue-scholar.org" and legacy_key is not None:
-            record = update_legacy_record(record, legacy_key)
+            record = update_legacy_record(record, legacy_key=legacy_key, field="rid")
     except Exception as e:
         logger.error(f"Unexpected error in push_inveniordm: {str(e)}", exc_info=True, extra={
             "host": host,
@@ -651,7 +651,7 @@ def add_record_to_community(record, host, token, community_id):
         return record
 
 
-def update_legacy_record(record, legacy_key: str):
+def update_legacy_record(record, legacy_key: str, field:str=None) -> dict:
     """Update corresponding record in Rogue Scholar legacy database."""
 
     legacy_host = "bosczcmeodcrajtcaddf.supabase.co"
@@ -662,7 +662,7 @@ def update_legacy_record(record, legacy_key: str):
             raise ValueError("no UUID provided")
 
         now = f"{int(time())}"
-        if record.get("id", None) is not None:
+        if field == "rid" and record.get("id", None) is not None:
             output = {
                 "rid": record.get("id"),
                 "indexed_at": now,

{commonmeta_py-0.119.dist-info → commonmeta_py-0.120.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.119
+Version: 0.120
 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
@@ -36,7 +36,6 @@ Requires-Dist: pyyaml>=5.4
 Requires-Dist: requests-toolbelt>=1.0.0
 Requires-Dist: requests>=2.31.0
 Requires-Dist: requests>=2.32.3
-Requires-Dist: setuptools<81,>=70.3.0
 Requires-Dist: simplejson~=3.18
 Requires-Dist: types-beautifulsoup4<5,>=4.11
 Requires-Dist: types-dateparser~=1.1

{commonmeta_py-0.119.dist-info → commonmeta_py-0.120.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=V-Y0A2HSjqUF0gh_o1M-VRLMSbZAFWTSfKunBeX02UE,2098
+commonmeta/__init__.py,sha256=rWmoYjzULmmEdcjXnYZxNQk0qJ2tGwxTycmYxXoH65A,2098
 commonmeta/api_utils.py,sha256=y5KLfIOWOjde7LXZ36u-eneQJ-Q53yXUZg3hWpCBS2E,2685
 commonmeta/author_utils.py,sha256=3lYW5s1rOUWNTKs1FP6XLfEUY3yCLOe_3L_VdJTDMp0,8585
 commonmeta/base_utils.py,sha256=-MGy9q2uTiJEkPWQUYOJMdq-3tRpNnvBwlLjvllQ5g8,11164
@@ -7,7 +7,7 @@ commonmeta/constants.py,sha256=wSTEUiHeRdXLwjXEQD9AU2hxFyEKi5OTX2iHOKO6nF0,19844
 commonmeta/date_utils.py,sha256=H2cCobX0JREIUOT_cCigGd3MG7prGiQpXk1m4ZNrFwU,6318
 commonmeta/doi_utils.py,sha256=cOogLatKg6qea2jgMd3yLALSTfaTNUgr-IkBXIK4xZw,11498
 commonmeta/file_utils.py,sha256=eFYDWyR8Gr722nvFmp542hCm-TGmO_q4ciZ85IPHpjA,2893
-commonmeta/metadata.py,sha256=U9uYOkKAdgqLiQwQKXMXjrAFvO6avMWp9heJG4cNAAY,18893
+commonmeta/metadata.py,sha256=m9UtE95t9awrlo9w9qZtwF7Y9sRfABpA5JKUZdyz5b4,18921
 commonmeta/schema_utils.py,sha256=WGpmMj9cfNMg_55hhgwY9qpO0A1HSvTLQC2equjBftI,1770
 commonmeta/translators.py,sha256=CBMK4jrXRmGZiAhCh6wsJjhbDJWbcsda8UvXFXxccAw,1363
 commonmeta/utils.py,sha256=pJnh3EzOU1E2nutnAZsopY_NsUX6zYmxoj5bIYqqWvE,50574
@@ -77,14 +77,14 @@ commonmeta/writers/__init__.py,sha256=47-snms6xBHkoEXKYV1DBtH1npAtlVtvY29Z4Zr45q
 commonmeta/writers/bibtex_writer.py,sha256=doAdyl1NEp60mPkHPo3GMH8B-HA6MzLAdlyNsIecTzU,4972
 commonmeta/writers/citation_writer.py,sha256=qs_4X3BjrSqHexmJFPvPDTp0mRIqzb0F70_Wuc7S9x0,2343
 commonmeta/writers/commonmeta_writer.py,sha256=QpfyhG__7o_XpsOTCPWxGymO7YKwZi2LQh8Zic44bdc,1365
-commonmeta/writers/crossref_xml_writer.py,sha256=1zEln2yJwcY62jFde5X-6BHWfnKOqadRRjx5z8Nt5CY,33540
+commonmeta/writers/crossref_xml_writer.py,sha256=Z5vhtWH-uz5WcBz1W_KOxyrvB5OQ2nTixV6EOhjOBnc,33859
 commonmeta/writers/csl_writer.py,sha256=4gDYs1EzK4_L2UIRTfs25wgHmYRwdRP2zmfxF9387oU,2779
 commonmeta/writers/datacite_writer.py,sha256=bcinpwhq7XnVthKHH8-sdXA34dSlvFH4ImYH768iaQU,6428
-commonmeta/writers/inveniordm_writer.py,sha256=mmCCxNi1OVSALeWdw-1g0ZzB84GGOcH3r7va3Abj9W4,25672
+commonmeta/writers/inveniordm_writer.py,sha256=eLllddYulFqg8qfRIScpYpnAJ82NCHXotCFJb09mHX8,25739
 commonmeta/writers/ris_writer.py,sha256=3SdyEvMRaPRP1SV1MB-MXBlunE7x6og7RF1zuWtetPc,2094
 commonmeta/writers/schema_org_writer.py,sha256=s18_x0ReXwAGBoEAwp2q-HCgFQ-h5qRg6JyAlqCoSFE,5871
-commonmeta_py-0.119.dist-info/METADATA,sha256=Jq7ojg3cdi-sxDsoujwL8SzWLGzulwv9rFIZole3yJ4,7656
-commonmeta_py-0.119.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.119.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.119.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
-commonmeta_py-0.119.dist-info/RECORD,,
+commonmeta_py-0.120.dist-info/METADATA,sha256=BxKd_hZcarnoQQUklRQ0leX_vAUu3hxYP1KGSTpH89E,7618
+commonmeta_py-0.120.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.120.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.120.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
+commonmeta_py-0.120.dist-info/RECORD,,