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

commonmeta/writers/inveniordm_writer.py

@@ -1,8 +1,9 @@
 """InvenioRDM writer for commonmeta-py"""
 
+import logging
 import re
 from time import time
-from typing import Optional
+from typing import Any, Dict, Optional, Tuple
 from urllib.parse import urlparse
 
 import orjson as json
@@ -15,6 +16,7 @@ from ..constants import (
     COMMUNITY_TRANSLATIONS,
     CROSSREF_FUNDER_ID_TO_ROR_TRANSLATIONS,
     INVENIORDM_IDENTIFIER_TYPES,
+    Commonmeta,
 )
 from ..date_utils import get_iso8601_date
 from ..doi_utils import doi_from_url, normalize_doi
@@ -28,6 +30,7 @@ from ..utils import (
     validate_ror,
 )
 
+logger = logging.getLogger(__name__)
 
 def write_inveniordm(metadata):
     """Write inveniordm"""
@@ -384,7 +387,12 @@ def write_inveniordm_list(metalist):
     return [write_inveniordm(item) for item in metalist.items]
 
 
-def push_inveniordm(metadata, host: str, token: str, legacy_key: str):
+def push_inveniordm(
+        metadata: Commonmeta,
+        host: str,
+        token: str,
+        legacy_key: str
+    ) -> Tuple[Dict[str, Any], Optional[Exception]]:
     """Push record to InvenioRDM"""
 
     record = {}
@@ -392,22 +400,22 @@ def push_inveniordm(metadata, host: str, token: str, legacy_key: str):
 
     try:
         # Remove IsPartOf relation with InvenioRDM community identifier after storing it
-        community_index = None
-        if hasattr(metadata, "relations") and metadata.relations:
-            for i, relation in enumerate(metadata.relations):
-                if relation.get("type") == "IsPartOf" and relation.get(
-                    "id", ""
-                ).startswith("https://rogue-scholar.org/api/communities/"):
-                    slug = relation.get("id").split("/")[5]
-                    community_id, _ = search_by_slug(slug, "blog", host, token)
-                    if community_id:
-                        record["community"] = slug
-                        record["community_id"] = community_id
-                        community_index = i
-
-            # Remove the relation if we found and processed it
-            if community_index is not None and hasattr(metadata, "relations"):
-                metadata.relations.pop(community_index)
+        # community_index = None
+        # if hasattr(metadata, "relations") and metadata.relations:
+        #     for i, relation in enumerate(metadata.relations):
+        #         if relation.get("type") == "IsPartOf" and relation.get(
+        #             "id", ""
+        #         ).startswith("https://rogue-scholar.org/api/communities/"):
+        #             slug = relation.get("id").split("/")[5]
+        #             community_id, _ = search_by_slug(slug, "blog", host, token)
+        #             if community_id:
+        #                 record["community"] = slug
+        #                 record["community_id"] = community_id
+        #                 community_index = i
+
+        #     # Remove the relation if we found and processed it
+        #     if community_index is not None and hasattr(metadata, "relations"):
+        #         metadata.relations.pop(community_index)
 
         # Remove InvenioRDM rid after storing it
         # rid_index = None
@@ -450,7 +458,8 @@ def push_inveniordm(metadata, host: str, token: str, legacy_key: str):
 
         if hasattr(metadata, "subjects"):
             for subject in metadata.subjects:
-                slug = string_to_slug(subject.get("subject", ""))
+                subject_name = subject.get("subject", "")
+                slug = string_to_slug(subject_name)
                 if slug in COMMUNITY_TRANSLATIONS:
                     slug = COMMUNITY_TRANSLATIONS[slug]
 
@@ -477,7 +486,11 @@ def push_inveniordm(metadata, host: str, token: str, legacy_key: str):
         if host == "rogue-scholar.org" and legacy_key is not None:
             record = update_legacy_record(record, legacy_key)
     except Exception as e:
-        raise InvenioRDMError(f"Unexpected error: {str(e)}")
+        logger.error(f"Unexpected error in push_inveniordm: {str(e)}", exc_info=True, extra={
+            "host": host,
+            "record_id": record.get("id")
+        })
+        record["status"] = "error"
 
     return record
 
@@ -504,11 +517,12 @@ def search_by_doi(doi, host, token) -> Optional[str]:
         )
         response.raise_for_status()
         data = response.json()
-        if py_.get(data, "hits.total") or 0 > 0:
+        if py_.get(data, "hits.total", 0) > 0:
             return py_.get(data, "hits.hits.0.id")
         return None
     except requests.exceptions.RequestException as e:
-        raise InvenioRDMError(f"Error searching for DOI: {str(e)}")
+        logger.error(f"Error searching for DOI {doi}: {str(e)}", exc_info=True)
+        return None
 
 
 def create_draft_record(record, host, token, input):
@@ -525,17 +539,19 @@ def create_draft_record(record, host, token, input):
             record["status"] = "failed_rate_limited"
             return record
         if response.status_code != 201:
-            print(response.json())
+            logger.error(f"Failed to create draft record: {response.status_code} - {response.json()}")
             record["status"] = "failed_create_draft"
             return record
         data = response.json()
-        record["id"]: data.get("id", None)
+        record["id"] = data.get("id", None)
         record["created"] = data.get("created", None)
         record["updated"] = data.get("updated", None)
         record["status"] = "draft"
         return record
     except requests.exceptions.RequestException as e:
-        raise InvenioRDMError(f"Error creating draft record: {str(e)}")
+        logger.error(f"Error creating draft record: {str(e)}", exc_info=True)
+        record["status"] = "error_draft"
+        return record
 
 
 def edit_published_record(record, host, token):
@@ -554,7 +570,9 @@ def edit_published_record(record, host, token):
         record["status"] = "edited"
         return record
     except requests.exceptions.RequestException as e:
-        raise InvenioRDMError(f"Error creating draft from published record: {str(e)}")
+        logger.error(f"Error creating draft from published record: {str(e)}", exc_info=True)
+        record["status"] = "error_edit_published_record"
+        return record
 
 
 def update_draft_record(record, host, token, inveniordm_data):
@@ -576,7 +594,9 @@ def update_draft_record(record, host, token, inveniordm_data):
         record["status"] = "updated"
         return record
     except requests.exceptions.RequestException as e:
-        raise InvenioRDMError(f"Error updating draft record: {str(e)}")
+        logger.error(f"Error updating draft record: {str(e)}", exc_info=True)
+        record["status"] = "error_update_draft_record"
+        return record
 
 
 def publish_draft_record(record, host, token):
@@ -585,9 +605,10 @@ def publish_draft_record(record, host, token):
         "Authorization": f"Bearer {token}",
         "Content-Type": "application/json",
     }
-    if not record.get("id", None):
-        raise InvenioRDMError("Error publishing draft record")
     try:
+        if not record.get("id", None):
+            raise InvenioRDMError("Missing record id")
+
         response = requests.post(
             f"https://{host}/api/records/{record['id']}/draft/actions/publish",
             headers=headers,
@@ -596,8 +617,8 @@ def publish_draft_record(record, host, token):
             record["status"] = "failed_rate_limited"
             return record
         if response.status_code != 202:
-            print(response.json())
-            record["status"] = "failed_publish_draft"
+            logger.error(f"Failed to publish draft record: {response.status_code} - {response.json()}")
+            record["status"] = "error_publish_draft_record"
             return record
         data = response.json()
         record["uuid"] = py_.get(data, "metadata.identifiers.0.identifier")
@@ -606,7 +627,9 @@ def publish_draft_record(record, host, token):
         record["status"] = "published"
         return record
     except requests.exceptions.RequestException as e:
-        raise InvenioRDMError(f"Error publishing draft record: {str(e)}")
+        logger.error(f"Error publishing draft record: {str(e)}", exc_info=True)
+        record["status"] = "error_publish_draft_record"
+        return record
 
 
 def add_record_to_community(record, host, token, community_id):
@@ -624,49 +647,47 @@ def add_record_to_community(record, host, token, community_id):
         response.raise_for_status()
         return record
     except requests.exceptions.RequestException as e:
-        raise InvenioRDMError(f"Error adding record to community: {str(e)}")
+        logger.error(f"Error adding record to community: {str(e)}", exc_info=True)
+        return record
 
 
 def update_legacy_record(record, legacy_key: str):
     """Update corresponding record in Rogue Scholar legacy database."""
 
     legacy_host = "bosczcmeodcrajtcaddf.supabase.co"
-
-    if not legacy_key:
-        raise ValueError("no legacy key provided")
-    if not record.get("uuid", None):
-        raise ValueError("no UUID provided")
-
-    now = f"{int(time())}"
-    if record.get("id", None) is not None:
-        output = {
-            "rid": record.get("id"),
-            "indexed_at": now,
-            "indexed": "true",
-            "archived": "true",
-        }
-    elif record.get("doi", None) is not None:
-        output = {
-            "doi": record.get("doi"),
-            "indexed_at": now,
-            "indexed": "true",
-            "archived": "true",
-        }
-    else:
-        print(f"nothing to update for id {record.get("uuid")}")
-        return record # nothing to update
-
-    request_url = f"https://{legacy_host}/rest/v1/posts?id=eq.{record['uuid']}"
-    headers = {
-        "Content-Type": "application/json",
-        "apikey": legacy_key,
-        "Authorization": f"Bearer {legacy_key}",
-        "Prefer": "return=minimal",
-    }
-
     try:
+        if not legacy_key:
+            raise ValueError("no legacy key provided")
+        if not record.get("uuid", None):
+            raise ValueError("no UUID provided")
+
+        now = f"{int(time())}"
+        if record.get("id", None) is not None:
+            output = {
+                "rid": record.get("id"),
+                "indexed_at": now,
+                "indexed": "true",
+                "archived": "true",
+            }
+        elif record.get("doi", None) is not None:
+            output = {
+                "doi": record.get("doi"),
+                "indexed_at": now,
+                "indexed": "true",
+                "archived": "true",
+            }
+        else:
+            print(f"nothing to update for id {record.get("uuid")}")
+            return record # nothing to update
+
+        request_url = f"https://{legacy_host}/rest/v1/posts?id=eq.{record['uuid']}"
+        headers = {
+            "Content-Type": "application/json",
+            "apikey": legacy_key,
+            "Authorization": f"Bearer {legacy_key}",
+            "Prefer": "return=minimal",
+        }
         response = requests.patch(request_url, json=output, headers=headers, timeout=30)
-        response.raise_for_status()
         if response.status_code != 204:
             return Exception(f"Unexpected status code: {response.status_code}")
 
@@ -674,7 +695,9 @@ def update_legacy_record(record, legacy_key: str):
         return record
 
     except requests.exceptions.RequestException as e:
-        raise InvenioRDMError(f"Error updating legacy record: {str(e)}")
+        logger.error(f"Error updating legacy record: {str(e)}", exc_info=True)
+        record["status"] = "error_update_legacy_record"
+        return record
 
 
 def search_by_slug(slug, type_value, host, token) -> Optional[str]:
@@ -690,15 +713,16 @@ def search_by_slug(slug, type_value, host, token) -> Optional[str]:
         )
         response.raise_for_status()
         data = response.json()
-        if py_.get(data, "hits.total") or 0 > 0:
+        if py_.get(data, "hits.total", 0) > 0:
             return py_.get(data, "hits.hits.0.id")
         return None
     except requests.exceptions.RequestException as e:
-        raise InvenioRDMError(f"Error searching for community: {str(e)}")
+        logger.error(f"Error searching for community: {str(e)}", exc_info=True)
+        return None
 
 
 def string_to_slug(text):
-    """Convert a string to a slug format"""
+    """makes a string lowercase and removes non-alphanumeric characters"""
     # Replace spaces with hyphens
     slug = re.sub(r"\s+", "-", text.lower())
     # Remove special characters

{commonmeta_py-0.116.dist-info → commonmeta_py-0.118.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.116
+Version: 0.118
 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.116.dist-info → commonmeta_py-0.118.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=BlEBVV1F2oGv-LZdRZvwqFf6_KmiMaahHV-G8Uq1Quk,2098
+commonmeta/__init__.py,sha256=RbBIG26IxRjdvGzHH77sogy-rtAEHC51It7TQ6wPjS0,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
@@ -80,11 +80,11 @@ commonmeta/writers/commonmeta_writer.py,sha256=QpfyhG__7o_XpsOTCPWxGymO7YKwZi2LQ
 commonmeta/writers/crossref_xml_writer.py,sha256=d-Rb2Vd_g3UW8GM4APIT7fivSQ5GMssZ6Ubi3OykHaw,33479
 commonmeta/writers/csl_writer.py,sha256=4gDYs1EzK4_L2UIRTfs25wgHmYRwdRP2zmfxF9387oU,2779
 commonmeta/writers/datacite_writer.py,sha256=bcinpwhq7XnVthKHH8-sdXA34dSlvFH4ImYH768iaQU,6428
-commonmeta/writers/inveniordm_writer.py,sha256=IxWEAQBzvPWQqROISJtEuTuWr7bZybhHAz_SqZTQtZY,24577
+commonmeta/writers/inveniordm_writer.py,sha256=el4Eapa9HHg1ceddHb9rd4d1MAsM1ZBZ1F4jQUV8mbI,25717
 commonmeta/writers/ris_writer.py,sha256=3SdyEvMRaPRP1SV1MB-MXBlunE7x6og7RF1zuWtetPc,2094
 commonmeta/writers/schema_org_writer.py,sha256=s18_x0ReXwAGBoEAwp2q-HCgFQ-h5qRg6JyAlqCoSFE,5871
-commonmeta_py-0.116.dist-info/METADATA,sha256=aWZQLapM3o9hI0t4EgePoyAGCEj_X8HDDdMp-vbHVEc,7652
-commonmeta_py-0.116.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.116.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.116.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
-commonmeta_py-0.116.dist-info/RECORD,,
+commonmeta_py-0.118.dist-info/METADATA,sha256=BD1a2ouuh4hYizCty5tBGQuQM3m6LWVf1zfmTQwnFPU,7652
+commonmeta_py-0.118.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.118.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.118.dist-info/licenses/LICENSE,sha256=wsIvxF9Q9GC9vA_s79zTWP3BkXJdfUNRmALlU8GbW1s,1074
+commonmeta_py-0.118.dist-info/RECORD,,