OpenConceptLab/ocl_issues#2277 | API to reevaluate expansion in place

Author: snyaggarwal

core/collections/models.py

@@ -1303,7 +1303,8 @@ def delete_expressions(self, expressions):  # Deprecated: Old way, must use dele
             batch_index_resources.apply_async(('concept', concepts_filters), queue='indexing', permanent=False)
             batch_index_resources.apply_async(('mapping', mappings_filters), queue='indexing', permanent=False)
 
-    def add_references(self, references, index=True, is_adding_all=False, attempt_reevaluate=True):  # pylint: disable=too-many-locals,too-many-statements,too-many-branches
+    def add_references(  # pylint: disable=too-many-locals,too-many-statements,too-many-branches,too-many-arguments
+            self, references, index=True, is_adding_all=False, attempt_reevaluate=True, force_reevaluate=False):
         include_refs, exclude_refs = self.to_ref_list_separated(references)
         explicit_valueset_versions = []
         explicit_system_versions = []
@@ -1323,7 +1324,7 @@ def add_references(self, references, index=True, is_adding_all=False, attempt_re
         index_concepts = index_mappings = False
 
         # attempt_reevaluate is False for delete reference(s)
-        should_reevaluate = attempt_reevaluate and not self.is_auto_generated
+        should_reevaluate = force_reevaluate or (attempt_reevaluate and not self.is_auto_generated)
 
         include_system_versions = []
         system_versions = self.parameters.get(ExpansionParameters.INCLUDE_SYSTEM)
@@ -1479,8 +1480,10 @@ def index_resources(self, concepts, mappings):
         if mappings:
             self.index_mappings()
 
-    def seed_children(self, index=True):
-        return self.add_references(self.collection_version.references, index, True)
+    def seed_children(self, index=True, force_reevaluate=False):
+        return self.add_references(
+            references=self.collection_version.references, index=index,
+            is_adding_all=True, force_reevaluate=force_reevaluate)
 
     def wait_until_processed(self):  # pragma: no cover
         processing = self.is_processing

core/collections/urls.py

@@ -146,6 +146,11 @@
         views.CollectionVersionExpansionView.as_view(),
         name='collection-version-expansion-detail'
     ),
+    path(
+        '<str:collection>/<str:version>/expansions/<str:expansion>/re-evaluate/',
+        views.CollectionVersionExpansionReEvaluateView.as_view(),
+        name='collection-version-expansion-re-evaluate'
+    ),
     path(
         "<str:collection>/<str:version>/expansions/<str:expansion>/concepts/<str:concept>/mappings/",
         views.CollectionVersionConceptMappingsView.as_view(),

core/collections/views.py

@@ -54,7 +54,7 @@
     include_facets_header, sort_asc_param, sort_desc_param, updated_since_param, include_retired_param, limit_param, \
     canonical_url_param
 from core.common.tasks import add_references, export_collection, delete_collection, index_expansion_concepts, \
-    index_expansion_mappings
+    index_expansion_mappings, seed_children_to_expansion
 from core.common.throttling import ThrottleUtil
 from core.common.utils import compact_dict_by_values, parse_boolean_query_param
 from core.common.views import BaseAPIView, BaseLogoView, ConceptContainerExtraRetrieveUpdateDestroyView
@@ -895,6 +895,27 @@ def destroy(self, request, *args, **kwargs):  # pylint: disable=unused-argument
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
+class CollectionVersionExpansionReEvaluateView(CollectionVersionExpansionBaseView, TaskMixin):
+    serializer_class = TaskSerializer
+    permission_classes = (CanViewConceptDictionary, )
+
+    def post(self, request, **kwargs):  # pylint: disable=unused-argument
+        obj = self.get_object()
+
+        if obj.is_processing:
+            return Response({'detail': 'Expansion is already being processed'}, status=status.HTTP_409_CONFLICT)
+
+        obj.is_processing = True
+        obj.save(update_fields=['is_processing', 'updated_at'])
+
+        result = self.perform_task(seed_children_to_expansion, (obj.id, True, True), queue='indexing')
+
+        if isinstance(result, Response):
+            return result
+
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+
 class CollectionVersionExpansionChildrenView(CollectionVersionExpansionBaseView, ListWithHeadersMixin):
     def get_queryset(self):
         expansion = super().get_queryset().first()

core/common/tasks.py

@@ -415,11 +415,11 @@ def seed_children_to_new_version(self, resource, obj_id, export=True, sync=False
 
 
 @app.task
-def seed_children_to_expansion(expansion_id, index=True):
+def seed_children_to_expansion(expansion_id, index=True, force_reevaluate=False):
     from core.collections.models import Expansion
     expansion = Expansion.objects.filter(id=expansion_id).first()
     if expansion:
-        expansion.seed_children(index=index)
+        expansion.seed_children(index=index, force_reevaluate=force_reevaluate)
         if expansion.is_processing:
             expansion.is_processing = False
             expansion.save()