restore sync examples unasynced by mistake

Author: miguelgrinberg

Diff for: examples/alias_migration.py

@@ -35,7 +35,7 @@
       will have index set to the concrete index whereas the class refers to the
       alias.
 """
-import asyncio
+import os
 from datetime import datetime
 from fnmatch import fnmatch
 
@@ -125,9 +125,9 @@ def migrate(move_data=True, update_alias=True):
         )
 
 
-def main():
+if __name__ == "__main__":
     # initiate the default connection to elasticsearch
-    connections.create_connection(hosts=["http://localhost:9200"])
+    connections.create_connection(hosts=[os.environ["ELASTICSEARCH_URL"]])
 
     # create the empty index
     setup()
@@ -143,10 +143,3 @@ def main():
 
     # create new index
     migrate()
-
-    # close the connection
-    connections.get_connection().close()
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

Diff for: examples/completion.py

@@ -26,7 +26,6 @@
 that does ascii folding.
 """
 
-import asyncio
 import os
 from itertools import permutations
 
@@ -73,7 +72,7 @@ class Index:
         settings = {"number_of_shards": 1, "number_of_replicas": 0}
 
 
-def main():
+if __name__ == "__main__":
     # initiate the default connection to elasticsearch
     connections.create_connection(hosts=[os.environ["ELASTICSEARCH_URL"]])
 
@@ -98,10 +97,3 @@ def main():
         # print out all the options we got
         for option in response.suggest.auto_complete[0].options:
             print("%10s: %25s (%d)" % (text, option._source.name, option._score))
-
-    # close the connection
-    connections.get_connection().close()
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

Diff for: examples/composite_agg.py

@@ -15,7 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-import asyncio
 import os
 
 from elasticsearch_dsl import A, Search, connections
@@ -37,16 +36,15 @@ def run_search(**kwargs):
 
     response = run_search()
     while response.aggregations.comp.buckets:
-        for b in response.aggregations.comp.buckets:
-            yield b
+        yield from response.aggregations.comp.buckets
         if "after_key" in response.aggregations.comp:
             after = response.aggregations.comp.after_key
         else:
             after = response.aggregations.comp.buckets[-1].key
         response = run_search(after=after)
 
 
-def main():
+if __name__ == "__main__":
     # initiate the default connection to elasticsearch
     connections.create_connection(hosts=[os.environ["ELASTICSEARCH_URL"]])
 
@@ -59,10 +57,3 @@ def main():
             "File %s has been modified %d times, first seen at %s."
             % (b.key.files, b.doc_count, b.first_seen.value_as_string)
         )
-
-    # close the connection
-    connections.get_connection().close()
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

Diff for: examples/parent_child.py

@@ -39,7 +39,6 @@
           particular parent
 
 """
-import asyncio
 import os
 from datetime import datetime
 
@@ -166,7 +165,7 @@ def get_answers(self):
         """
         if "inner_hits" in self.meta and "answer" in self.meta.inner_hits:
             return self.meta.inner_hits.answer.hits
-        return [a for a in self.search_answers()]
+        return list(self.search_answers())
 
     def save(self, **kwargs):
         self.question_answer = "question"
@@ -209,7 +208,7 @@ def setup():
     index_template.save()
 
 
-def main():
+if __name__ == "__main__":
     # initiate the default connection to elasticsearch
     connections.create_connection(hosts=[os.environ["ELASTICSEARCH_URL"]])
 
@@ -244,12 +243,3 @@ def main():
     )
     question.save()
     answer = question.add_answer(honza, "Just use `elasticsearch-py`!")
-
-    # close the connection
-    connections.get_connection().close()
-
-    return answer
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

Diff for: examples/percolate.py

@@ -15,7 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-import asyncio
 import os
 
 from elasticsearch_dsl import (
@@ -92,15 +91,8 @@ def setup():
     ).save(refresh=True)
 
 
-def main():
+if __name__ == "__main__":
     # initiate the default connection to elasticsearch
     connections.create_connection(hosts=[os.environ["ELASTICSEARCH_URL"]])
 
     setup()
-
-    # close the connection
-    connections.get_connection().close()
-
-
-if __name__ == "__main__":
-    asyncio.run(main())

Diff for: tests/test_integration/test_examples/_async/alias_migration.py

@@ -15,8 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from . import alias_migration
-from .alias_migration import ALIAS, PATTERN, BlogPost, migrate
+from ..async_examples import alias_migration
+from ..async_examples.alias_migration import ALIAS, PATTERN, BlogPost, migrate
 
 
 async def test_alias_migration(async_write_client):

Diff for: tests/test_integration/test_examples/_async/completion.py

@@ -16,7 +16,7 @@
 #  under the License.
 
 
-from .completion import Person
+from ..async_examples.completion import Person
 
 
 async def test_person_suggests_on_all_variants_of_name(async_write_client):

Diff for: tests/test_integration/test_examples/_async/composite_agg.py

@@ -17,7 +17,7 @@
 
 from elasticsearch_dsl import A, AsyncSearch
 
-from .composite_agg import scan_aggs
+from ..async_examples.composite_agg import scan_aggs
 
 
 async def test_scan_aggs_exhausts_all_files(async_data_client):

Diff for: tests/test_integration/test_examples/_async/parent_child.py

@@ -21,7 +21,7 @@
 
 from elasticsearch_dsl import Q
 
-from .parent_child import Answer, Comment, Question, User, setup
+from ..async_examples.parent_child import Answer, Comment, Question, User, setup
 
 honza = User(
     id=42,

Diff for: tests/test_integration/test_examples/_async/percolate.py

@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from .percolate import BlogPost, setup
+from ..async_examples.percolate import BlogPost, setup
 
 
 async def test_post_gets_tagged_automatically(async_write_client):

Diff for: tests/test_integration/test_examples/_async/test_alias_migration.py

@@ -15,8 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from . import alias_migration
-from .alias_migration import ALIAS, PATTERN, BlogPost, migrate
+from ..examples import alias_migration
+from ..examples.alias_migration import ALIAS, PATTERN, BlogPost, migrate
 
 
 def test_alias_migration(write_client):

Diff for: tests/test_integration/test_examples/_async/test_completion.py

@@ -16,7 +16,7 @@
 #  under the License.
 
 
-from .completion import Person
+from ..examples.completion import Person
 
 
 def test_person_suggests_on_all_variants_of_name(write_client):

Diff for: tests/test_integration/test_examples/_async/test_composite_aggs.py

@@ -17,7 +17,7 @@
 
 from elasticsearch_dsl import A, Search
 
-from .composite_agg import scan_aggs
+from ..examples.composite_agg import scan_aggs
 
 
 def test_scan_aggs_exhausts_all_files(data_client):

Diff for: tests/test_integration/test_examples/_async/test_parent_child.py

@@ -21,7 +21,7 @@
 
 from elasticsearch_dsl import Q
 
-from .parent_child import Answer, Comment, Question, User, setup
+from ..examples.parent_child import Answer, Comment, Question, User, setup
 
 honza = User(
     id=42,

Diff for: tests/test_integration/test_examples/_async/test_percolate.py

@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from .percolate import BlogPost, setup
+from ..examples.percolate import BlogPost, setup
 
 
 def test_post_gets_tagged_automatically(write_client):

Diff for: tests/test_integration/test_examples/_sync/alias_migration.py

@@ -0,0 +1 @@
+../../../examples/async

Diff for: tests/test_integration/test_examples/_sync/completion.py

@@ -0,0 +1 @@
+../../../examples

Diff for: tests/test_integration/test_examples/_sync/composite_agg.py

@@ -55,6 +55,7 @@ def main(check=False):
         "async_data_client": "data_client",
         "async_write_client": "write_client",
         "async_pull_request": "pull_request",
+        "async_examples": "examples",
         "assert_awaited_once_with": "assert_called_once_with",
     }
     rules = [