2nd round of feedback addressed

Author: miguelgrinberg

elasticsearch/dsl/connections.py

@@ -17,7 +17,7 @@
 
 from typing import Any, Dict, Generic, Type, TypeVar, Union
 
-from elasticsearch import Elasticsearch
+from elasticsearch import Elasticsearch, __versionstr__
 
 from .serializer import serializer
 
@@ -116,16 +116,14 @@ def get_connection(self, alias: Union[str, _T] = "default") -> _T:
             raise KeyError(f"There is no connection with alias {alias!r}.")
 
     def _with_user_agent(self, conn: _T) -> _T:
-        from elasticsearch import (
-            __versionstr__,  # this is here to avoid circular imports
-        )
-
         # try to inject our user agent
         if hasattr(conn, "_headers"):
             is_frozen = conn._headers.frozen
             if is_frozen:
                 conn._headers = conn._headers.copy()
-            conn._headers.update({"user-agent": f"elasticsearch-py/{__versionstr__}"})
+            conn._headers.update(
+                {"user-agent": f"elasticsearch-dsl-py/{__versionstr__}"}
+            )
             if is_frozen:
                 conn._headers.freeze()
         return conn

test_elasticsearch/test_dsl/test_connections.py

@@ -124,19 +124,19 @@ def test_connection_has_correct_user_agent() -> None:
     assert (
         c.get_connection("testing")
         ._headers["user-agent"]
-        .startswith("elasticsearch-py/")
+        .startswith("elasticsearch-dsl-py/")
     )
 
     my_client = Elasticsearch(hosts=["http://localhost:9200"])
     my_client = my_client.options(headers={"user-agent": "my-user-agent/1.0"})
     c.add_connection("default", my_client)
-    assert c.get_connection()._headers["user-agent"].startswith("elasticsearch-py/")
+    assert c.get_connection()._headers["user-agent"].startswith("elasticsearch-dsl-py/")
 
     my_client = Elasticsearch(hosts=["http://localhost:9200"])
     assert (
         c.get_connection(my_client)
         ._headers["user-agent"]
-        .startswith("elasticsearch-py/")
+        .startswith("elasticsearch-dsl-py/")
     )
 
     not_a_client = object()