Skip to content

Commit

Permalink
global: fix formatting
Browse files Browse the repository at this point in the history
Signed-off-by: pamfilos <[email protected]>
  • Loading branch information
pamfilos authored and drjova committed Feb 15, 2024
1 parent c54a69c commit 0b450a0
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
9 changes: 4 additions & 5 deletions scoap3/articles/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
from datetime import datetime

from celery import shared_task
from django.core.paginator import Paginator
from django_opensearch_dsl.registries import registry

from scoap3.articles.models import Article, ComplianceReport
from scoap3.misc.utils import fetch_doi_registration_date
Expand Down Expand Up @@ -164,18 +166,15 @@ def compliance_checks(article_id):
return f"Compliance checks completed for article {article_id}"


from django.core.paginator import Paginator
from scoap3.articles.models import Article
from django_opensearch_dsl.registries import registry

@shared_task
def index_article_batch(article_ids):
articles = Article.objects.filter(id__in=article_ids)
for article in articles:
registry.update(article)


def index_all_articles(batch_size=100):
all_articles = Article.objects.all().values_list('id', flat=True)
all_articles = Article.objects.all().values_list("id", flat=True)
paginator = Paginator(all_articles, batch_size)

for page_number in paginator.page_range:
Expand Down
5 changes: 1 addition & 4 deletions scoap3/management/commands/articles_index.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import math

from django.core.files.storage import storages
from django.core.management.base import BaseCommand, CommandParser

from scoap3.articles.tasks import index_all_articles
Expand All @@ -27,4 +24,4 @@ def add_arguments(self, parser: CommandParser) -> None:
)

def handle(self, *args, **options):
index_all_articles(options['batch_size'])
index_all_articles(options["batch_size"])
5 changes: 4 additions & 1 deletion scoap3/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ def _create_article(data, licenses):
"subtitle": data["titles"][0].get("subtitle", ""),
"abstract": data["abstracts"][0].get("value", ""),
}
if article_data.get("id") and Article.objects.filter(pk=article_data["id"]).exists():
if (
article_data.get("id")
and Article.objects.filter(pk=article_data["id"]).exists()
):
article = Article.objects.get(pk=article_data["id"])
article.__dict__.update(**article_data)
else:
Expand Down
2 changes: 0 additions & 2 deletions scoap3/utils/tools.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import logging
from collections import Counter

from opensearchpy import Q

from scoap3.articles.documents import ArticleDocument
from scoap3.articles.util import (
get_arxiv_primary_category,
Expand Down

0 comments on commit 0b450a0

Please sign in to comment.