fix: refresh and parallel option of the CLI now use the settings as default

Author: qcoumes

django_opensearch_dsl/apps.py

@@ -35,6 +35,11 @@ def auto_refresh_enabled(cls):
         """Return whether auto refresh is enabled."""
         return getattr(settings, "OPENSEARCH_DSL_AUTO_REFRESH", False)
 
+    @classmethod
+    def parallel_enabled(cls):
+        """Return whether parallel operation is enabled."""
+        return getattr(settings, "OPENSEARCH_DSL_PARALLEL", False)
+
     @classmethod
     def default_queryset_pagination(cls):
         """Return `OPENSEARCH_DSL_QUERYSET_PAGINATION`."""

django_opensearch_dsl/management/commands/opensearch.py

@@ -16,6 +16,7 @@
 
 from django_opensearch_dsl.registries import registry
 
+from ...apps import DODConfig
 from ..enums import OpensearchAction
 from ..types import parse
 
@@ -324,20 +325,30 @@ def add_arguments(self, parser):
         subparser.add_argument(
             "-c", "--count", type=int, default=None, help="Update at most COUNT objects (0 to index everything)."
         )
-        subparser.add_argument(
-            "-p",
-            "--parallel",
-            action="store_true",
-            default=False,
-            help="Parallelize the communication with Opensearch.",
-        )
-        subparser.add_argument(
+        refresh = subparser.add_mutually_exclusive_group()
+        refresh.add_argument(
             "-r",
             "--refresh",
             action="store_true",
-            default=False,
-            help="Make operations performed on the indices immediatly available for search.",
+            default=DODConfig.auto_refresh_enabled(),
+            help=(
+                "Whether the operations performed on the indices are immediately available for search. Default to "
+                "`OPENSEARCH_DSL_AUTO_REFRESH` (which default to `False`)"
+            ),
+        )
+        refresh.add_argument("--no-refresh", action="store_false")
+        parallel = subparser.add_mutually_exclusive_group()
+        parallel.add_argument(
+            "-p",
+            "--parallel",
+            action="store_true",
+            default=DODConfig.parallel_enabled(),
+            help=(
+                "Whether to run bulk operations in parallel. Default to `OPENSEARCH_DSL_PARALLEL` (which default to "
+                "`False`)"
+            ),
         )
+        refresh.add_argument("--no-parallel", action="store_false")
         subparser.add_argument(
             "-m",
             "--missing",

docs/settings.md

@@ -39,8 +39,7 @@ an [index refresh](https://www.elastic.co/guide/en/elasticsearch/reference/curre
 
 Default: `False`
 
-Run indexing in parallel using OpenSearch's parallel_bulk() method. Note that some databases (e.g. SQLite)
-do not play well with this option.
+Run bulk operations in parallel. Note that some databases (e.g. sqlite) do not play well with this option.
 
 ## `OPENSEARCH_DSL_QUERYSET_PAGINATION`
 

tests/tests/management/test_index.py

@@ -8,12 +8,15 @@
 from django_opensearch_dsl import fields
 from django_opensearch_dsl.registries import registry
 
-devnull = open(os.devnull, "w")
-call_command = functools.partial(call_command, stdout=devnull, stderr=devnull)
-
 
 class IndexTestCase(SimpleTestCase):
 
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        devnull = open(os.devnull, "w")
+        cls.call_command = functools.partial(call_command, stdout=devnull, stderr=devnull)
+
     def setUp(self) -> None:
         indices = registry.get_indices()
         for i in indices: