more review feedback

Author: miguelgrinberg

elasticsearch_dsl/_async/index.py

@@ -56,18 +56,20 @@ async def save(self, using=None):
 
 
 class AsyncIndex(IndexBase):
+    def __init__(self, name, using="default"):
+        """
+        :arg name: name of the index
+        :arg using: connection alias to use, defaults to ``'default'``
+        """
+        super().__init__(name, AsyncMapping, using=using)
+
     def _get_connection(self, using=None):
         if self._name is None:
             raise ValueError("You cannot perform API calls on the default index.")
         return get_connection(using or self._using)
 
     connection = property(_get_connection)
 
-    def get_or_create_mapping(self):
-        if self._mapping is None:
-            self._mapping = AsyncMapping()
-        return self._mapping
-
     def as_template(self, template_name, pattern=None, order=None):
         # TODO: should we allow pattern to be a top-level arg?
         # or maybe have an IndexPattern that allows for it and have

elasticsearch_dsl/_sync/index.py

@@ -54,18 +54,20 @@ def save(self, using=None):
 
 
 class Index(IndexBase):
+    def __init__(self, name, using="default"):
+        """
+        :arg name: name of the index
+        :arg using: connection alias to use, defaults to ``'default'``
+        """
+        super().__init__(name, Mapping, using=using)
+
     def _get_connection(self, using=None):
         if self._name is None:
             raise ValueError("You cannot perform API calls on the default index.")
         return get_connection(using or self._using)
 
     connection = property(_get_connection)
 
-    def get_or_create_mapping(self):
-        if self._mapping is None:
-            self._mapping = Mapping()
-        return self._mapping
-
     def as_template(self, template_name, pattern=None, order=None):
         # TODO: should we allow pattern to be a top-level arg?
         # or maybe have an IndexPattern that allows for it and have

elasticsearch_dsl/index_base.py

@@ -20,7 +20,7 @@
 
 
 class IndexBase:
-    def __init__(self, name, using="default"):
+    def __init__(self, name, mapping_class, using="default"):
         """
         :arg name: name of the index
         :arg using: connection alias to use, defaults to ``'default'``
@@ -31,6 +31,7 @@ def __init__(self, name, using="default"):
         self._settings = {}
         self._aliases = {}
         self._analysis = {}
+        self._mapping_class = mapping_class
         self._mapping = None
 
     def resolve_nested(self, field_path):
@@ -51,6 +52,11 @@ def resolve_field(self, field_path):
             return self._mapping.resolve_field(field_path)
         return None
 
+    def get_or_create_mapping(self):
+        if self._mapping is None:
+            self._mapping = self._mapping_class()
+        return self._mapping
+
     def mapping(self, mapping):
         """
         Associate a mapping (an instance of

tests/_async/test_document.py

@@ -588,7 +588,7 @@ async def test_update_no_fields():
         await md.update()
 
 
-async def test_search_with_custom_alias_and_index(async_mock_client):
+def test_search_with_custom_alias_and_index():
     search_object = MyDoc.search(
         using="staging", index=["custom_index1", "custom_index2"]
     )

tests/_async/test_mapping.py

@@ -17,12 +17,11 @@
 
 import json
 
-from elasticsearch_dsl import Keyword, Nested, Text, analysis
-from elasticsearch_dsl._async import mapping
+from elasticsearch_dsl import AsyncMapping, Keyword, Nested, Text, analysis
 
 
 def test_mapping_can_has_fields():
-    m = mapping.AsyncMapping()
+    m = AsyncMapping()
     m.field("name", "text").field("tags", "keyword")
 
     assert {
@@ -31,14 +30,14 @@ def test_mapping_can_has_fields():
 
 
 def test_mapping_update_is_recursive():
-    m1 = mapping.AsyncMapping()
+    m1 = AsyncMapping()
     m1.field("title", "text")
     m1.field("author", "object")
     m1.field("author", "object", properties={"name": {"type": "text"}})
     m1.meta("_all", enabled=False)
     m1.meta("dynamic", False)
 
-    m2 = mapping.AsyncMapping()
+    m2 = AsyncMapping()
     m2.field("published_from", "date")
     m2.field("author", "object", properties={"email": {"type": "text"}})
     m2.field("title", "text")
@@ -64,7 +63,7 @@ def test_mapping_update_is_recursive():
 
 
 def test_properties_can_iterate_over_all_the_fields():
-    m = mapping.AsyncMapping()
+    m = AsyncMapping()
     m.field("f1", "text", test_attr="f1", fields={"f2": Keyword(test_attr="f2")})
     m.field("f3", Nested(test_attr="f3", properties={"f4": Text(test_attr="f4")}))
 
@@ -101,7 +100,7 @@ def test_mapping_can_collect_all_analyzers_and_normalizers():
     )
     n3 = analysis.normalizer("unknown_custom")
 
-    m = mapping.AsyncMapping()
+    m = AsyncMapping()
     m.field(
         "title",
         "text",
@@ -160,7 +159,7 @@ def test_mapping_can_collect_multiple_analyzers():
         tokenizer=analysis.tokenizer("trigram", "nGram", min_gram=3, max_gram=3),
         filter=[analysis.token_filter("my_filter2", "stop", stopwords=["c", "d"])],
     )
-    m = mapping.AsyncMapping()
+    m = AsyncMapping()
     m.field("title", "text", analyzer=a1, search_analyzer=a2)
     m.field(
         "text",
@@ -194,7 +193,7 @@ def test_mapping_can_collect_multiple_analyzers():
 
 def test_even_non_custom_analyzers_can_have_params():
     a1 = analysis.analyzer("whitespace", type="pattern", pattern=r"\\s+")
-    m = mapping.AsyncMapping()
+    m = AsyncMapping()
     m.field("title", "text", analyzer=a1)
 
     assert {
@@ -203,14 +202,14 @@ def test_even_non_custom_analyzers_can_have_params():
 
 
 def test_resolve_field_can_resolve_multifields():
-    m = mapping.AsyncMapping()
+    m = AsyncMapping()
     m.field("title", "text", fields={"keyword": Keyword()})
 
     assert isinstance(m.resolve_field("title.keyword"), Keyword)
 
 
 def test_resolve_nested():
-    m = mapping.AsyncMapping()
+    m = AsyncMapping()
     m.field("n1", "nested", properties={"n2": Nested(properties={"k1": Keyword()})})
     m.field("k2", "keyword")