Repository navigation
Conversation
cslzchen
left a comment
There was a problem hiding this comment.
Looks good overall. In addition to my questions/comments:
- Can we add logs of the output of the logs for you local run?
- We should also work with CE to test this command with a copy of production DB.
There was a problem hiding this comment.
Looks good 👍
- Make sure we test this against a copy of prod DB before running this on prod.
- If there are errors, need look further on why they fail, and probably another fix.
- Test if the default batch size is good, how long does it take, and also see how many times we need to repeat this.
- Make sure whoever uses this command knows that we need to repeatedly run this command.
| help=( | ||
| 'Maximum number of preprints to process per run (default: 500). ' | ||
| 'The command processes the first N eligible preprints and exits; ' | ||
| 're-run the command to continue with the next batch.' | ||
| ), |
There was a problem hiding this comment.
Oh, I see. This is an OK alternative to the loop I suggested. Just need to make sure whoever runs this command is aware of the fact that they need to keep running this command until none exists. Cc @adlius for your input on this.
e803a0c to
e1d4931
Compare
|
LGTM |
|
|
||
| user.date_last_logged_in = timezone.now() | ||
| user.external_identity[provider][provider_id] = 'VERIFIED' | ||
| if provider.lower() in OSFUser.SOCIAL_FIELDS: |
There was a problem hiding this comment.
Is this part of this ticket?
adlius
left a comment
There was a problem hiding this comment.
So I have a couple of suggestions. Since Crossref has a limit of 10000 submissions from a single user, might as well set the default batch size to 1000 and no rate limit. Instead let's run the task every five minutes so that we can send about 12000 requests per hour.
Also there are some commits from other branches that is in this PR.
| assert len(user.system_tags) == 1 | ||
|
|
||
| tag = Tag.all_tags.get(name=tag_name, system=True) | ||
| tag = Tag.all_tags.get(name=tag_name.lower(), system=True) |
There was a problem hiding this comment.
Same here. Is this part of this ticket?
| return qs | ||
|
|
||
|
|
||
| def resync_preprint_dois_v1(dry_run=True, batch_size=500, rate_limit=100, provider_id=None): |
There was a problem hiding this comment.
The rate limit of 100 is perhaps to restrictive. According to conversations with Crossref, they have a limit of 10000 pending items for each user.
There was a problem hiding this comment.
A 500 batch size is also perhaps too small.
|
|
||
| if rate_limit and not record_number % rate_limit: | ||
| logger.info(f'Rate limit reached at {record_number} preprints, sleeping {RATE_LIMIT_SLEEP}s') | ||
| time.sleep(RATE_LIMIT_SLEEP) |
There was a problem hiding this comment.
I am afraid this would clog the celery worker when this is run as a celery beat task.
brianjgeiger
left a comment
There was a problem hiding this comment.
Drive by:
- What queue are the tasks going onto? The default queue? We should probably ensure that they go on the Low Priority queue to keep from clogging the pipes too much.
- If we have a cron job that happens every five minutes, how are you going to run this in a
dry-runscenario to make sure it's going to work before the cron job runs? We might want to rethink our strategy here.
adlius
left a comment
There was a problem hiding this comment.
Some issues found during local testing.
adlius
left a comment
There was a problem hiding this comment.
Some more issues to fix.
| def create_identifier(self, preprint, category, include_relation=True): | ||
| if category == 'doi': | ||
| metadata = self.build_metadata(preprint, include_relation) | ||
| metadata = self.build_metadata(preprint, include_relation, include_unversioned_doi=True) |
There was a problem hiding this comment.
One more issue found during local testing: on an unmoderated preprint provider, when a user creates a new version but never publish that version, build_unversioned_posted_content would read preprint.get_guid().referent, which hands back that unpublished draft instead of the preprint actually being deposited. This is problematic because the unpublished draft will have date_published to be None and that would fail when building the payload.
| @@ -48,6 +49,23 @@ def post(self, request): | |||
| if record.get('status').lower() == 'success' and doi: | |||
| msg = record.find('msg').text | |||
| created = bool(msg == 'Successfully added') | |||
There was a problem hiding this comment.
So a DOI in the doi_unversioned category is only written when Crossref replies Successfully added. This could be a potential issue because if the DOI
is already registered, the email probably comes back with something like Successfully updated, so for those preprints
this branch never runs.
This would affect legacy preprints that exists before versioning was a thing. Their base guid is their original guid, so the DOI deposit here is the one registered years ago.
I checked against a local copy of prod db. One of preprint 22hq2 has 10.31219/osf.io/22hq2 already registered with crossref. So it's possible that the crossref response email wouldn't contain Successfully added but Successfully updated or some other language. Will need to confirm if that is indeed the case.
If that is the case, one possible fix is that for an unversioned DOI, store doi_unversioned on any successful record rather than only on Successfully added.
There was a problem hiding this comment.
There is another problem: if we run the resync task every five minutes, and if the preprint that was resynced in the last run still haven't received an email back confirming the update of the DOI, then in the next run it will be included in the resync task again. So we'd have to rethink how we should do this. One idea suggested by @cslzchen is that we follow the example in this PR and monitory the number of active tasks and spawn new tasks if the number of active task falls below a certain number (say 1000). In this case, we don't have to worry about running the task every five minutes.
| ).exclude( | ||
| tags__name='qatest', | ||
| tags__system=True, | ||
| ).select_related('provider').distinct() |
There was a problem hiding this comment.
we probably need an order_by here otherwise the ordering of the queryset would be undeterministic.
ecac94f to
71a3038
Compare
| ).first() | ||
| if v1_preprint: | ||
| v1_preprint.set_identifier_value(category='doi_unversioned', value=doi) | ||
| Preprint.objects.filter(id=v1_preprint.id).update(doi_resync_queued_at=None) |
There was a problem hiding this comment.
PR comment: Added doi_resync_queued_at, so not include them to eligible for resync
| _, version = Guid.split_guid(guid) if guid else (None, None) | ||
| if not version: | ||
| logger.info(f'Unversioned DOI confirmed by CrossRef: {doi}') | ||
| if created and guid: |
There was a problem hiding this comment.
PR comment: removed created so preprints which have updated status have also been processed
| return posted_content | ||
|
|
||
| def build_unversioned_posted_content(self, preprint, element): | ||
| latest = preprint.get_guid().referent |
There was a problem hiding this comment.
PR comment: removed referent which hands back that unpublished draft instead of the preprint actually being deposite
|
|
||
|
|
||
| @dataclass | ||
| class ResyncPassResult: |
There was a problem hiding this comment.
PR comments: added helper methods.
|
|
||
| try: | ||
| async_request_identifier_update.apply_async(kwargs={'preprint_id': preprint._id}) | ||
| Preprint.objects.filter(id=preprint.id).update(doi_resync_queued_at=timezone.now()) |
There was a problem hiding this comment.
PR comment: set doi_resync_queued_at so the preprint be marked and we know it is processing
|
|
||
| try: | ||
| async_request_identifier_update.apply_async(kwargs={'preprint_id': preprint._id}) | ||
| Preprint.objects.filter(id=preprint.id).update(doi_resync_queued_at=timezone.now()) |
There was a problem hiding this comment.
PR comment: set doi_resync_queued_at so the preprint be marked and we know it is processing
| return max(0, self.total - self.queued) | ||
|
|
||
|
|
||
| def get_in_flight_doi_resync_count(): |
There was a problem hiding this comment.
PR comment: The count of the preprints is being processed right now
| elif 'possible preprint/vor pair' not in msg.lower(): | ||
| # Directly updates the identifier | ||
| preprint.set_identifier_value(category='doi', value=doi) | ||
| Preprint.objects.filter(id=preprint.id).update(doi_resync_queued_at=None) |
There was a problem hiding this comment.
PR comment: set doi_resync_queued_at to None when preprint is being processed
| continue | ||
|
|
||
| try: | ||
| async_request_identifier_update.apply_async(kwargs={'preprint_id': preprint._id}) |
There was a problem hiding this comment.
How is this line different from line 123? If line 123 submits a doi record for the v1 version, then this would also submit a doi record for the v1 version, right? Doesn't that mean the unversioned DOI would now associate with the earliest version instead of the latest version? Am I missing something here?
| body.append(self.build_posted_content(preprint, element, include_relation)) | ||
|
|
||
| if include_unversioned_doi: | ||
| body.append(self.build_unversioned_posted_content(preprints[0], element)) |
There was a problem hiding this comment.
This is related to the previous comment: if we always use preprints[0] for the include_unversioned_doi, then that means we would use whatever preprint that gets passed to this function for the unversioned doi, instead of the latest version.
| f'Skipping preprint {preprint._id}: ' | ||
| f'provider {preprint.provider._id} has no DOI prefix' | ||
| ) | ||
| skipped += 1 |
There was a problem hiding this comment.
Would it actually get skipped? Cuz it seems that the queryset never excludes preprints whose provider doesn't have a doi_prefix, resulting in the same preprint getting queued up and skipped again and again without actually skipping.
| versioned_guids__version__lt=preprint.version, | ||
| include_rejected=False, | ||
| ) | ||
| ) if include_relation else [] |
There was a problem hiding this comment.
This is where I don't quite understand: what does include_relation means and why we only care about preprint_versions when include_relation is true? We seem to be adding new meaning to the include_relation flag here, which seems to be only meant for whether there is an article_doi to the preprint.
Ticket
Purpose
Changes
Side Effects
QE Notes
CE Notes
Documentation