review feedback

Author: miguelgrinberg

elasticsearch/__init__.py

@@ -27,15 +27,15 @@
 from ._version import __versionstr__
 
 # Ensure that a compatible version of elastic-transport is installed.
-_version_groups = tuple(int(x) for x in re.search(r"^(\d+)\.(\d+)\.(\d+)", _elastic_transport_version).groups())  # type: ignore
+_version_groups = tuple(int(x) for x in re.search(r"^(\d+)\.(\d+)\.(\d+)", _elastic_transport_version).groups())  # type: ignore[union-attr]
 if _version_groups < (8, 0, 0) or _version_groups > (9, 0, 0):
     raise ImportError(
         "An incompatible version of elastic-transport is installed. Must be between "
         "v8.0.0 and v9.0.0. Install the correct version with the following command: "
         "$ python -m pip install 'elastic-transport>=8, <9'"
     )
 
-_version_groups = re.search(r"^(\d+)\.(\d+)\.(\d+)", __versionstr__).groups()  # type: ignore
+_version_groups = re.search(r"^(\d+)\.(\d+)\.(\d+)", __versionstr__).groups()  # type: ignore[assignment, union-attr]
 _major, _minor, _patch = (int(x) for x in _version_groups)
 VERSION = __version__ = (_major, _minor, _patch)
 

elasticsearch/_async/helpers.py

@@ -257,7 +257,7 @@ async def map_actions() -> AsyncIterable[_TYPE_BULK_ACTION_HEADER_AND_BODY]:
                 ]
                 ok: bool
                 info: Dict[str, Any]
-                async for data, (ok, info) in azip(  # type: ignore
+                async for data, (ok, info) in azip(  # type: ignore[assignment, misc]
                     bulk_data,
                     _process_bulk_chunk(
                         client,

elasticsearch/_sync/client/utils.py

@@ -232,7 +232,7 @@ def host_mapping_to_node_config(host: Mapping[str, Union[str, int]]) -> NodeConf
         )
         options["path_prefix"] = options.pop("url_prefix")
 
-    return NodeConfig(**options)  # type: ignore
+    return NodeConfig(**options)  # type: ignore[arg-type]
 
 
 def cloud_id_to_node_configs(cloud_id: str) -> List[NodeConfig]:

elasticsearch/dsl/__init__.py

@@ -104,9 +104,6 @@
 from .utils import AttrDict, AttrList, DslBase
 from .wrappers import Range
 
-VERSION = (8, 17, 1)
-__version__ = VERSION
-__versionstr__ = ".".join(map(str, VERSION))
 __all__ = [
     "A",
     "Agg",

elasticsearch/dsl/_async/document.py

@@ -241,11 +241,11 @@ async def mget(
             error_ids = [doc["_id"] for doc in error_docs]
             message = "Required routing not provided for documents %s."
             message %= ", ".join(error_ids)
-            raise RequestError(400, message, error_docs)  # type: ignore
+            raise RequestError(400, message, error_docs)  # type: ignore[arg-type]
         if missing_docs:
             missing_ids = [doc["_id"] for doc in missing_docs]
             message = f"Documents {', '.join(missing_ids)} not found."
-            raise NotFoundError(404, message, {"docs": missing_docs})  # type: ignore
+            raise NotFoundError(404, message, {"docs": missing_docs})  # type: ignore[arg-type]
         return objs
 
     async def delete(

elasticsearch/dsl/_sync/document.py

@@ -235,11 +235,11 @@ def mget(
             error_ids = [doc["_id"] for doc in error_docs]
             message = "Required routing not provided for documents %s."
             message %= ", ".join(error_ids)
-            raise RequestError(400, message, error_docs)  # type: ignore
+            raise RequestError(400, message, error_docs)  # type: ignore[arg-type]
         if missing_docs:
             missing_ids = [doc["_id"] for doc in missing_docs]
             message = f"Documents {', '.join(missing_ids)} not found."
-            raise NotFoundError(404, message, {"docs": missing_docs})  # type: ignore
+            raise NotFoundError(404, message, {"docs": missing_docs})  # type: ignore[arg-type]
         return objs
 
     def delete(

elasticsearch/dsl/aggs.py

@@ -193,7 +193,7 @@ def pipeline(
         return cast("Pipeline[_R]", self._agg(False, name, agg_type, *args, **params))
 
     def result(self, search: "SearchBase[_R]", data: Any) -> AttrDict[Any]:
-        return BucketData(self, search, data)  # type: ignore
+        return BucketData(self, search, data)  # type: ignore[arg-type]
 
 
 class Bucket(AggBase[_R], Agg[_R]):

elasticsearch/dsl/analysis.py

@@ -37,9 +37,9 @@ def _type_shortcut(
             return name_or_instance  # type: ignore[return-value]
 
         if not (type or kwargs):
-            return cls.get_dsl_class("builtin")(name_or_instance)  # type: ignore
+            return cls.get_dsl_class("builtin")(name_or_instance)  # type: ignore[no-any-return, attr-defined]
 
-        return cls.get_dsl_class(type, "custom")(  # type: ignore
+        return cls.get_dsl_class(type, "custom")(  # type: ignore[no-any-return, attr-defined]
             name_or_instance, type or "custom", **kwargs
         )
 
@@ -54,13 +54,13 @@ def __init__(self, filter_name: str, builtin_type: str = "custom", **kwargs: Any
 
     def to_dict(self) -> Dict[str, Any]:
         # only name to present in lists
-        return self._name  # type: ignore
+        return self._name  # type: ignore[return-value]
 
     def get_definition(self) -> Dict[str, Any]:
-        d = super().to_dict()  # type: ignore
+        d = super().to_dict()  # type: ignore[misc]
         d = d.pop(self.name)
         d["type"] = self._builtin_type
-        return d  # type: ignore
+        return d  # type: ignore[no-any-return]
 
 
 class CustomAnalysisDefinition(CustomAnalysis):
@@ -111,7 +111,7 @@ def __init__(self, name: str):
 
     def to_dict(self) -> Dict[str, Any]:
         # only name to present in lists
-        return self._name  # type: ignore
+        return self._name  # type: ignore[return-value]
 
 
 class Analyzer(AnalysisBase, DslBase):

elasticsearch/dsl/connections.py

@@ -116,16 +116,16 @@ 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 . import __versionstr__  # this is here to avoid circular imports
+        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-dsl-py/{__versionstr__}"}
-            )
+            conn._headers.update({"user-agent": f"elasticsearch-py/{__versionstr__}"})
             if is_frozen:
                 conn._headers.freeze()
         return conn

elasticsearch/dsl/document_base.py

@@ -36,7 +36,7 @@
 try:
     from types import UnionType
 except ImportError:
-    UnionType = None  # type: ignore
+    UnionType = None  # type: ignore[assignment, misc]
 
 from typing_extensions import dataclass_transform
 
@@ -81,14 +81,14 @@ def __init__(self, name: str, field: Field):
     def __getattr__(self, attr: str) -> "InstrumentedField":
         try:
             # first let's see if this is an attribute of this object
-            return super().__getattribute__(attr)  # type: ignore
+            return super().__getattribute__(attr)  # type: ignore[no-any-return]
         except AttributeError:
             try:
                 # next we see if we have a sub-field with this name
                 return InstrumentedField(f"{self._name}.{attr}", self._field[attr])
             except KeyError:
                 # lastly we let the wrapped field resolve this attribute
-                return getattr(self._field, attr)  # type: ignore
+                return getattr(self._field, attr)  # type: ignore[no-any-return]
 
     def __pos__(self) -> str:
         """Return the field name representation for ascending sort order"""
@@ -226,7 +226,7 @@ def __init__(self, name: str, bases: Tuple[type, ...], attrs: Dict[str, Any]):
                     field_args = [type_]
                 elif type_ in self.type_annotation_map:
                     # use best field type for the type hint provided
-                    field, field_kwargs = self.type_annotation_map[type_]  # type: ignore
+                    field, field_kwargs = self.type_annotation_map[type_]  # type: ignore[assignment]
 
                 if field:
                     field_kwargs = {