From 2640d7a6f8fcc236d3dc978c0a42ec9d10045edc Mon Sep 17 00:00:00 2001 From: Samuel Veiga Rangel Date: Wed, 3 Jun 2026 11:15:37 -0300 Subject: [PATCH 1/5] add rest_framework in THIRD_PARTY_APPS --- config/settings/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/config/settings/base.py b/config/settings/base.py index a2ebbb9..3a02f4b 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -70,6 +70,7 @@ ] THIRD_PARTY_APPS = [ + "rest_framework", "compressor", "wagtailautocomplete", ] From b0956f538a3d3dd3c98cf2be2fb3e0d623125fbf Mon Sep 17 00:00:00 2001 From: Samuel Veiga Rangel Date: Wed, 3 Jun 2026 11:15:55 -0300 Subject: [PATCH 2/5] Fix name estatus to status --- reference/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/models.py b/reference/models.py index 404c9e5..684a045 100755 --- a/reference/models.py +++ b/reference/models.py @@ -21,7 +21,7 @@ class ReferenceStatus(models.IntegerChoices): class Reference(CommonControlField, ClusterableModel): mixed_citation = models.TextField(_("Mixed Citation"), null=False, blank=True) - estatus = models.IntegerField( + status = models.IntegerField( _("Reference status"), choices=ReferenceStatus.choices, blank=True, From db126612250ac45219a0bca54715fb1135b6c0c1 Mon Sep 17 00:00:00 2001 From: Samuel Veiga Rangel Date: Wed, 3 Jun 2026 11:16:50 -0300 Subject: [PATCH 3/5] Black --- config/api_router.py | 7 +++---- markup_doc/api/v1/views.py | 22 ++++++++++------------ reference/api/v1/views.py | 30 ++++++++++++------------------ 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/config/api_router.py b/config/api_router.py index 2889ac1..7f2efaa 100644 --- a/config/api_router.py +++ b/config/api_router.py @@ -1,8 +1,7 @@ from django.conf import settings -from rest_framework.routers import DefaultRouter, SimpleRouter - -from reference.api.v1.views import ReferenceViewSet from markup_doc.api.v1.views import ArticleViewSet +from reference.api.v1.views import ReferenceViewSet +from rest_framework.routers import DefaultRouter, SimpleRouter if settings.DEBUG: router = DefaultRouter() @@ -12,4 +11,4 @@ router.register("reference", ReferenceViewSet, basename="reference") router.register("first_block", ArticleViewSet, basename="first_block") -urlpatterns = router.urls \ No newline at end of file +urlpatterns = router.urls diff --git a/markup_doc/api/v1/views.py b/markup_doc/api/v1/views.py index 66938bf..fa8a76f 100755 --- a/markup_doc/api/v1/views.py +++ b/markup_doc/api/v1/views.py @@ -1,16 +1,16 @@ -from django.shortcuts import render +import json + from django.http import JsonResponse +from rest_framework.mixins import CreateModelMixin from rest_framework.permissions import IsAuthenticated from rest_framework.viewsets import GenericViewSet -from rest_framework.mixins import CreateModelMixin -from rest_framework.response import Response + from markup_doc.api.v1.serializers import ArticleDocxSerializer from markup_doc.marker import mark_article -import json - # Create your views here. + class ArticleViewSet( GenericViewSet, # generic view functionality CreateModelMixin, # handles POSTs @@ -27,17 +27,15 @@ def create(self, request, *args, **kwargs): def api_article(self, request): try: data = json.loads(request.body) - post_text = data.get('text') # Obtiene el parámetro - post_metadata = data.get('metadata') # Obtiene el parámetro + post_text = data.get("text") # Obtiene el parámetro + post_metadata = data.get("metadata") # Obtiene el parámetro resp_data = mark_article(post_text, post_metadata) response_data = { - 'message': resp_data, + "message": resp_data, } except json.JSONDecodeError: - response_data = { - 'error': 'Error processing' - } + response_data = {"error": "Error processing"} - return JsonResponse(response_data) \ No newline at end of file + return JsonResponse(response_data) diff --git a/reference/api/v1/views.py b/reference/api/v1/views.py index 20334a6..67ef4fd 100755 --- a/reference/api/v1/views.py +++ b/reference/api/v1/views.py @@ -1,18 +1,14 @@ -from django.shortcuts import render +import json + from django.http import JsonResponse +from rest_framework.mixins import CreateModelMixin from rest_framework.permissions import IsAuthenticated from rest_framework.viewsets import GenericViewSet -from rest_framework.mixins import CreateModelMixin -from rest_framework.response import Response + from reference.api.v1.serializers import ReferenceSerializer -from reference.marker import mark_references from reference.data_utils import get_reference +from reference.models import Reference, ReferenceStatus -import json - -from reference.models import Reference, ElementCitation, ReferenceStatus - -# Create your views here. class ReferenceViewSet( GenericViewSet, # generic view functionality @@ -31,8 +27,8 @@ def create(self, request, *args, **kwargs): def api_reference(self, request): try: data = json.loads(request.body) - post_reference = data.get('reference') # Obtiene el parámetro - post_type = data.get('type') # Obtiene el parámetro + post_reference = data.get("reference") # Obtiene el parámetro + post_type = data.get("type") # Obtiene el parámetro try: reference = Reference.objects.get(mixed_citation=post_reference) @@ -46,18 +42,16 @@ def api_reference(self, request): get_reference(new_reference.id) reference = Reference.objects.get(mixed_citation=post_reference) - - if post_type == 'xml': + + if post_type == "xml": reference_data = reference.element_citation.first().marked_xml else: reference_data = reference.element_citation.first().marked response_data = { - 'message': f'reference: {reference_data}', + "message": f"reference: {reference_data}", } except json.JSONDecodeError: - response_data = { - 'error': 'Error processing' - } + response_data = {"error": "Error processing"} - return JsonResponse(response_data) \ No newline at end of file + return JsonResponse(response_data) From 9ec84f072905edf5394463f77a17e74f229f484e Mon Sep 17 00:00:00 2001 From: Samuel Veiga Rangel Date: Wed, 3 Jun 2026 11:18:20 -0300 Subject: [PATCH 4/5] Remove comentarios --- markup_doc/api/v1/views.py | 10 ++++------ reference/api/v1/views.py | 9 ++++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/markup_doc/api/v1/views.py b/markup_doc/api/v1/views.py index fa8a76f..bc33d8e 100755 --- a/markup_doc/api/v1/views.py +++ b/markup_doc/api/v1/views.py @@ -8,12 +8,10 @@ from markup_doc.api.v1.serializers import ArticleDocxSerializer from markup_doc.marker import mark_article -# Create your views here. - class ArticleViewSet( - GenericViewSet, # generic view functionality - CreateModelMixin, # handles POSTs + GenericViewSet, + CreateModelMixin ): serializer_class = ArticleDocxSerializer permission_classes = [IsAuthenticated] @@ -27,8 +25,8 @@ def create(self, request, *args, **kwargs): def api_article(self, request): try: data = json.loads(request.body) - post_text = data.get("text") # Obtiene el parámetro - post_metadata = data.get("metadata") # Obtiene el parámetro + post_text = data.get("text") + post_metadata = data.get("metadata") resp_data = mark_article(post_text, post_metadata) diff --git a/reference/api/v1/views.py b/reference/api/v1/views.py index 67ef4fd..8f3afff 100755 --- a/reference/api/v1/views.py +++ b/reference/api/v1/views.py @@ -11,8 +11,8 @@ class ReferenceViewSet( - GenericViewSet, # generic view functionality - CreateModelMixin, # handles POSTs + GenericViewSet, + CreateModelMixin ): serializer_class = ReferenceSerializer permission_classes = [IsAuthenticated] @@ -21,14 +21,13 @@ class ReferenceViewSet( ] def create(self, request, *args, **kwargs): - # Redirigir a la función api_reference() return self.api_reference(request) def api_reference(self, request): try: data = json.loads(request.body) - post_reference = data.get("reference") # Obtiene el parámetro - post_type = data.get("type") # Obtiene el parámetro + post_reference = data.get("reference") + post_type = data.get("type") try: reference = Reference.objects.get(mixed_citation=post_reference) From 11c9ae37690c67db70903da946a64d4e32d91bbb Mon Sep 17 00:00:00 2001 From: Samuel Veiga Rangel Date: Wed, 3 Jun 2026 11:18:52 -0300 Subject: [PATCH 5/5] Remove comentario --- reference/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference/models.py b/reference/models.py index 684a045..afa3f0d 100755 --- a/reference/models.py +++ b/reference/models.py @@ -47,11 +47,11 @@ class ElementCitation(Orderable): marked_xml = models.TextField(_("Marked XML"), blank=True) score = models.IntegerField( - null=True, + null=True, blank=True, validators=[ - MinValueValidator(1), # Mínimo 1 - MaxValueValidator(10) # Máximo 10 + MinValueValidator(1), + MaxValueValidator(10) ], help_text=_("Rating from 1 to 10") )