skip when empty objects (#83)

Co-authored-by: Abdellatif <[email protected]>

Author: 2 people

django_opensearch_dsl/documents.py

@@ -109,7 +109,7 @@ def get_indexing_queryset(
         """Divide the queryset into chunks."""
         chunk_size = batch_size or self.django.queryset_pagination
         qs = self.get_queryset(filter_=filter_, exclude=exclude, count=count, alias=alias)
-        qs = qs.order_by("pk")
+        qs = qs.order_by("pk") if not qs.query.is_sliced else qs
         count = qs.count()
         model = self.django.model.__name__
         action = action.present_participle.title()
@@ -118,11 +118,15 @@ def get_indexing_queryset(
         if verbose:
             stdout.write(f"{action} {model}: 0% ({self._eta(start, done, count)})\r")
 
+        if count == 0:
+            stdout.write(f"No {model} objects to {action.lower()}.\n")
+            return
+
         if batch_type == "pk_filters":
             pks = qs.aggregate(min=Min("pk"), max=Max("pk"))
             total_batches = (pks["max"] - pks["min"]) // chunk_size
             for batch_number, offset in enumerate(range(pks["min"], pks["max"] + 1, chunk_size), start=1):
-                batch_qs = list(copy.deepcopy(qs.filter(pk__gte=offset, pk__lt=offset + chunk_size)))
+                batch_qs = list(qs.filter(pk__gte=offset, pk__lt=offset + chunk_size))
                 stdout.write(f"Processing batch {batch_number}/{total_batches}: \n")
                 for obj in batch_qs:
                     done += 1
@@ -132,11 +136,11 @@ def get_indexing_queryset(
                         )
                     yield obj
                 if len(batch_qs) > 0:
-                    stdout.write(f"Max primary key in the current batch: {batch_qs[-1].pk}\n")
+                    stdout.write(f"Max primary key in the current {model} batch: {batch_qs[-1].pk}\n")
         else:
             total_batches = (count + chunk_size - 1) // chunk_size
             for batch_number, offset in enumerate(range(0, count, chunk_size), start=1):
-                batch_qs = list(copy.deepcopy(qs[offset : offset + chunk_size].all()))
+                batch_qs = list(qs[offset : offset + chunk_size].all())
                 stdout.write(f"Processing batch {batch_number}/{total_batches}: \n")
                 for obj in batch_qs:
                     done += 1
@@ -146,7 +150,7 @@ def get_indexing_queryset(
                         )
                     yield obj
                 if len(batch_qs) > 0:
-                    stdout.write(f"Max primary key in the current batch: {batch_qs[-1].pk}\n")
+                    stdout.write(f"Max primary key in the current {model} batch: {batch_qs[-1].pk}\n")
 
     def init_prepare(self):
         """Initialise the data model preparers once here.

django_opensearch_dsl/utils/__init__.py

@@ -1,2 +1,2 @@
-from .documen_management import manage_document
+from .document_management import manage_document
 from .index_management import manage_index

django_opensearch_dsl/utils/document_management.py

@@ -5,7 +5,7 @@
 from typing import Any, List, Tuple
 
 from django.core.exceptions import FieldError
-from django.core.management.base import OutputWrapper
+from django.core.management.base import CommandError, OutputWrapper
 from django.core.management.color import color_style
 from django.db.models import Q
 from opensearchpy import OpenSearch
@@ -54,7 +54,7 @@ def manage_document(
                 valid_models.append(model)
             else:
                 stderr.write(f"Unknown object '{model}', choices are: '{registered_models}'")
-                exit(1)
+                raise CommandError
 
     # Filter indices
     if indices:
@@ -63,7 +63,7 @@ def manage_document(
         unknown = set(indices) - set(known_name)
         if unknown:
             stderr.write(f"Unknown indices '{list(unknown)}', choices are: '{known_name}'")
-            exit(1)
+            raise CommandError
 
         # Only keep given indices
         indices = list(filter(lambda i: i._name in indices, known))  # noqa
@@ -75,7 +75,7 @@ def manage_document(
     if not_created:
         stderr.write(f"The following indices are not created : {not_created}")
         stderr.write("Use 'python3 manage.py opensearch list' to list indices' state.")
-        exit(1)
+        raise CommandError
 
     # Check field, preparing to display expected actions
     s = f"The following documents will be {action.past}:"
@@ -103,7 +103,7 @@ def manage_document(
                 qs = model().get_queryset(filter_=filter_, exclude=exclude_, count=count, alias=database).count()
             except FieldError as e:
                 stderr.write(f"Error while filtering on '{model.django.model.__name__}':\n{e}'")  # noqa
-                exit(1)
+                raise CommandError
             else:
                 s += f"\n\t- {qs} {model.django.model.__name__}."
     else:
@@ -121,7 +121,7 @@ def manage_document(
             except FieldError as e:
                 model = index._doc_types[0].django.model.__name__  # noqa
                 stderr.write(f"Error while filtering on '{model}' (from index '{index._name}'):\n{e}'")  # noqa
-                exit(1)
+                raise CommandError
             else:
                 s += f"\n\t- {qs} {document.django.model.__name__}."
 
@@ -137,7 +137,7 @@ def manage_document(
                 stdout.write("\n")
                 break
             elif p.lower() in ["no", "n"]:
-                exit(1)
+                raise CommandError
 
     result = "\n"
     if objects:

django_opensearch_dsl/utils/index_management.py

@@ -2,7 +2,7 @@
 from typing import List
 
 import opensearchpy
-from django.core.management.base import OutputWrapper
+from django.core.management.base import CommandError, OutputWrapper
 from django.core.management.color import color_style
 
 from django_opensearch_dsl.enums import CommandAction
@@ -41,7 +41,7 @@ def manage_index(
         unknown = set(indices) - set(known_name)
         if unknown:
             stderr.write(f"Unknown indices '{list(unknown)}', choices are: '{known_name}'")
-            exit(1)
+            raise CommandError
 
         # Only keep given indices
         indices = list(filter(lambda i: i._name in indices, known))  # noqa
@@ -63,7 +63,7 @@ def manage_index(
                 stdout.write("")
                 break
             elif p.lower() in ["no", "n"]:
-                exit(1)
+                raise CommandError
 
     pp = action.present_participle.title()
     for index in indices:
@@ -99,7 +99,7 @@ def manage_index(
                 stderr.write(f"{pp} index '{index._name}'...\n{error}")  # noqa
             if not ignore_error:
                 stderr.write("exiting...")
-                exit(1)
+                raise CommandError
         else:
             if verbosity:
                 stdout.write(f"{pp} index '{index._name}'... {style.SUCCESS('OK')}")  # noqa