more replacing es with client

Author: iuliaferoli

docs/guide/examples.asciidoc

@@ -22,14 +22,14 @@ To index a document, you need to specify three pieces of information: `index`,
 ----------------------------
 from datetime import datetime
 from elasticsearch import Elasticsearch
-es = Elasticsearch('https://localhost:9200')
+client = Elasticsearch('https://localhost:9200')
 
 doc = {
     'author': 'author_name',
     'text': 'Interesting content...',
     'timestamp': datetime.now(),
 }
-resp = es.index(index="test-index", id=1, document=doc)
+resp = client.index(index="test-index", id=1, document=doc)
 print(resp['result'])
 ----------------------------
 
@@ -42,7 +42,7 @@ To get a document, you need to specify its `index` and `id`:
 
 [source,py]
 ----------------------------
-resp = es.get(index="test-index", id=1)
+resp = client.get(index="test-index", id=1)
 print(resp['_source'])
 ----------------------------
 
@@ -55,7 +55,7 @@ You can perform the refresh operation on an index:
 
 [source,py]
 ----------------------------
-es.indices.refresh(index="test-index")
+client.indices.refresh(index="test-index")
 ----------------------------
 
 
@@ -67,7 +67,7 @@ The `search()` method returns results that are matching a query:
 
 [source,py]
 ----------------------------
-resp = es.search(index="test-index", query={"match_all": {}})
+resp = client.search(index="test-index", query={"match_all": {}})
 print("Got %d Hits:" % resp['hits']['total']['value'])
 for hit in resp['hits']['hits']:
     print("%(timestamp)s %(author)s: %(text)s" % hit["_source"])

docs/guide/integrations.asciidoc

@@ -23,8 +23,8 @@ The opaque ID can be set via the `opaque_id` parameter via the client `.options(
 
 [source,python]
 ------------------------------------
-es = Elasticsearch(...)
-es.options(opaque_id="request-id-...").search(...)
+client = Elasticsearch(...)
+client.options(opaque_id="request-id-...").search(...)
 ------------------------------------
 
 
@@ -41,8 +41,8 @@ If we write a script that has a type error like using `request_timeout` with a `
 # script.py
 from elasticsearch import Elasticsearch
 
-es = Elasticsearch(...)
-es.options(
+client = Elasticsearch(...)
+client.options(
     request_timeout="5"  # type error!
 ).search(...)
 

docs/guide/overview.asciidoc

@@ -42,14 +42,14 @@ Simple use-case:
 >>> from elasticsearch import Elasticsearch
 
 # Connect to 'http://localhost:9200'
->>> es = Elasticsearch("http://localhost:9200")
+>>> client = Elasticsearch("http://localhost:9200")
 
 # Datetimes will be serialized:
->>> es.index(index="my-index-000001", id=42, document={"any": "data", "timestamp": datetime.now()})
+>>> client.index(index="my-index-000001", id=42, document={"any": "data", "timestamp": datetime.now()})
 {'_id': '42', '_index': 'my-index-000001', '_type': 'test-type', '_version': 1, 'ok': True}
 
 # ...but not deserialized
->>> es.get(index="my-index-000001", id=42)['_source']
+>>> client.get(index="my-index-000001", id=42)['_source']
 {'any': 'data', 'timestamp': '2013-05-12T19:45:31.804229'}
 ------------------------------------
 

examples/fastapi-apm/app.py

@@ -15,14 +15,14 @@
 apm = make_apm_client(
     {"SERVICE_NAME": "fastapi-app", "SERVER_URL": "http://apm-server:8200"}
 )
-es = AsyncElasticsearch(os.environ["ELASTICSEARCH_HOSTS"])
+client = AsyncElasticsearch(os.environ["ELASTICSEARCH_HOSTS"])
 app = FastAPI()
 app.add_middleware(ElasticAPM, client=apm)
 
 
 @app.on_event("shutdown")
 async def app_shutdown():
-    await es.close()
+    await client.close()
 
 
 async def download_games_db():
@@ -35,16 +35,16 @@ async def download_games_db():
 
 @app.get("/")
 async def index():
-    return await es.cluster.health()
+    return await client.cluster.health()
 
 
 @app.get("/ingest")
 async def ingest():
-    if not (await es.indices.exists(index="games")):
-        await es.indices.create(index="games")
+    if not (await client.indices.exists(index="games")):
+        await client.indices.create(index="games")
 
     async for _ in async_streaming_bulk(
-        client=es, index="games", actions=download_games_db()
+        client=client, index="games", actions=download_games_db()
     ):
         pass
 
@@ -53,34 +53,34 @@ async def ingest():
 
 @app.get("/search/{query}")
 async def search(query):
-    return await es.search(
+    return await client.search(
         index="games", body={"query": {"multi_match": {"query": query}}}
     )
 
 
 @app.get("/delete")
 async def delete():
-    return await es.delete_by_query(index="games", body={"query": {"match_all": {}}})
+    return await client.delete_by_query(index="games", body={"query": {"match_all": {}}})
 
 
 @app.get("/delete/{id}")
 async def delete_id(id):
     try:
-        return await es.delete(index="games", id=id)
+        return await client.delete(index="games", id=id)
     except NotFoundError as e:
         return e.info, 404
 
 
 @app.get("/update")
 async def update():
     response = []
-    docs = await es.search(
+    docs = await client.search(
         index="games", body={"query": {"multi_match": {"query": ""}}}
     )
     now = datetime.datetime.utcnow()
     for doc in docs["hits"]["hits"]:
         response.append(
-            await es.update(
+            await client.update(
                 index="games", id=doc["_id"], body={"doc": {"modified": now}}
             )
         )
@@ -91,11 +91,11 @@ async def update():
 @app.get("/error")
 async def error():
     try:
-        await es.delete(index="games", id="somerandomid")
+        await client.delete(index="games", id="somerandomid")
     except NotFoundError as e:
         return e.info
 
 
 @app.get("/doc/{id}")
 async def get_doc(id):
-    return await es.get(index="games", id=id)
+    return await client.get(index="games", id=id)