more fixes

Author: miguelgrinberg

elasticsearch/dsl/_async/document.py

@@ -126,10 +126,10 @@ def search(
         Create an :class:`~elasticsearch.dsl.Search` instance that will search
         over this ``Document``.
         """
-        s = AsyncSearch(
+        s = AsyncSearch[Self](
             using=cls._get_using(using), index=cls._default_index(index), doc_type=[cls]
         )
-        return s.source(cls._get_field_names())
+        return s.source(cls._get_field_names())  # type: ignore[arg-type]
 
     @classmethod
     async def get(

elasticsearch/dsl/_sync/document.py

@@ -120,10 +120,10 @@ def search(
         Create an :class:`~elasticsearch.dsl.Search` instance that will search
         over this ``Document``.
         """
-        s = Search(
+        s = Search[Self](
             using=cls._get_using(using), index=cls._default_index(index), doc_type=[cls]
         )
-        return s.source(cls._get_field_names())
+        return s.source(cls._get_field_names())  # type: ignore[arg-type]
 
     @classmethod
     def get(

test_elasticsearch/test_dsl/test_integration/_async/test_search.py

@@ -135,7 +135,7 @@ async def test_inner_hits_are_serialized_to_dict(
 
 @pytest.mark.anyio
 async def test_scan_respects_doc_types(async_data_client: AsyncElasticsearch) -> None:
-    repos = [repo async for repo in Repository.search().scan()]
+    repos = [repo async for repo in Repository.search().source("organization").scan()]
 
     assert 1 == len(repos)
     assert isinstance(repos[0], Repository)

test_elasticsearch/test_dsl/test_integration/_sync/test_search.py

@@ -135,7 +135,7 @@ def test_inner_hits_are_serialized_to_dict(
 
 @pytest.mark.sync
 def test_scan_respects_doc_types(data_client: Elasticsearch) -> None:
-    repos = [repo for repo in Repository.search().scan()]
+    repos = [repo for repo in Repository.search().source("organization").scan()]
 
     assert 1 == len(repos)
     assert isinstance(repos[0], Repository)