Update PR accordng to comments

Author: Vlad0n20

conftest.py

@@ -361,6 +361,6 @@ def helpful_thing(self):
 @pytest.fixture(autouse=True)
 def mock_gravy_valet_get_links():
 
-    with mock.patch('osf.external.gravy_valet.translations.get_links') as mock_get_links:
+    with mock.patch('osf.external.gravy_valet.translations.get_verified_links') as mock_get_links:
         mock_get_links.return_value = []
         yield mock_get_links

osf/metadata/serializers/datacite/datacite_tree_walker.py

@@ -6,7 +6,9 @@
 
 import rdflib
 
+from framework import sentry
 from osf.exceptions import MetadataSerializationError
+from osf.external.gravy_valet.request_helpers import get_verified_links
 from osf.metadata import gather
 from osf.metadata.rdfutils import (
     RDF,
@@ -396,18 +398,21 @@ def _visit_related_and_verified_links(self, parent_el):
         from osf.models import AbstractNode
 
         if isinstance(osf_item, AbstractNode):
-            gv_verified_link_list = osf_item.get_links()
+            gv_verified_link_list = get_verified_links(node_guid=osf_item._id)
+            non_url_verified_links = []
             for item in gv_verified_link_list:
-                verified_link, resource_type = item.get('target_url', None), item.get('resource_type', None)
+                verified_link, resource_type = item.attributes.get('target_url', None), item.attributes.get('resource_type', None)
                 if verified_link and resource_type:
-                    if verified_link and isinstance(verified_link, str) and smells_like_iri(verified_link):
+                    if smells_like_iri(verified_link):
                         self.visit(related_identifiers_el, 'relatedIdentifier', text=verified_link, attrib={
                             'relatedIdentifierType': 'URL',
                             'relationType': 'IsReferencedBy',
                             'resourceTypeGeneral': resource_type.title()
                         })
                     else:
-                        logger.warning('skipping non-URL verified link "%s"', verified_link)
+                        non_url_verified_links.append(verified_link)
+            if non_url_verified_links:
+                sentry.log_message(f'Skipped - {','.join(non_url_verified_links)} for node {osf_item._id}')
 
     def _visit_name_identifiers(self, parent_el, agent_iri):
         for identifier in sorted(self.basket[agent_iri:DCTERMS.identifier]):

osf/models/identifiers.py

@@ -86,8 +86,8 @@ def request_identifier(self, category):
     def request_identifier_update(self, category, create=False):
         '''Noop if no existing identifier value for the category.'''
 
-        if not self.get_identifier_value(category) and not create:
-            return
+        # if not self.get_identifier_value(category) and not create:
+        #     return
 
         client = self.get_doi_client()
         if client:

website/identifiers/clients/datacite.py

@@ -57,8 +57,6 @@ def create_identifier(self, node, category, doi_value=None):
         doi_value = doi_value or self._get_doi_value(node)
         metadata_record_xml = self.build_metadata(node, doi_value, as_xml=True)
         if settings.DATACITE_ENABLED:
-            if isinstance(metadata_record_xml, bytes):
-                metadata_record_xml = metadata_record_xml.decode('utf-8')
 
             resp = self._client.metadata_post(metadata_record_xml)
             # Typical response: 'OK (10.70102/FK2osf.io/cq695)' to doi 10.70102/FK2osf.io/cq695

website/identifiers/tasks.py

@@ -1,10 +1,13 @@
 import logging
 from django.apps import apps
 
+from osf.external.gravy_valet.exceptions import GVException
 from framework.celery_tasks import app as celery_app
 from framework.celery_tasks.handlers import queued_task
 from framework import sentry
 
+logger = logging.getLogger(__name__)
+
 @celery_app.task(bind=True, max_retries=5, acks_late=True)
 def task__update_doi_metadata_on_change(self, target_guid):
     sentry.log_message('Updating DOI for guid', extra_data={'guid': target_guid}, level=logging.INFO)
@@ -20,24 +23,18 @@ def update_doi_metadata_on_change(target_guid):
 
 @celery_app.task(bind=True, max_retries=5, acks_late=True)
 def task__update_doi_metadata_with_verified_links(self, target_guid):
-    sentry.log_message('Updating DOI with verified links for guid',
-                      extra_data={'guid': target_guid},
-                      level=logging.INFO)
+    logger.info(f'Updating DOI with verified links for guid - {target_guid}')
 
     Guid = apps.get_model('osf.Guid')
     target_object = Guid.load(target_guid).referent
     try:
 
         target_object.request_identifier_update(category='doi')
 
-        sentry.log_message('DOI metadata with verified links updated for guid',
-                         extra_data={'guid': target_guid},
-                         level=logging.INFO)
-    except Exception as exc:
-        sentry.log_message('Failed to update DOI metadata with verified links',
-                         extra_data={'guid': target_guid, 'error': str(exc)},
-                         level=logging.ERROR)
-        raise self.retry(exc=exc)
+        logger.info(f'DOI metadata with verified links updated for guid - {target_guid}')
+    except GVException as e:
+        logger.info(f'Failed to update DOI metadata with verified links for guid - {target_guid}')
+        raise self.retry(exc=e)
 
 @queued_task
 @celery_app.task(ignore_results=True)