elasticsearch9 9.2.0__py3-none-any.whl → 9.2.1__py3-none-any.whl

elasticsearch9/_sync/client/utils.py

@@ -79,6 +79,12 @@ class Stability(Enum):
     EXPERIMENTAL = auto()
 
 
+class Visibility(Enum):
+    PUBLIC = auto()
+    FEATURE_FLAG = auto()
+    PRIVATE = auto()
+
+
 _TYPE_HOSTS = Union[
     str, Sequence[Union[str, Mapping[str, Union[str, int]], NodeConfig]]
 ]
@@ -419,15 +425,23 @@ def _rewrite_parameters(
     return wrapper
 
 
-def _stability_warning(
+def _availability_warning(
     stability: Stability,
+    visibility: Visibility = Visibility.PUBLIC,
     version: Optional[str] = None,
     message: Optional[str] = None,
 ) -> Callable[[F], F]:
     def wrapper(api: F) -> F:
         @wraps(api)
         def wrapped(*args: Any, **kwargs: Any) -> Any:
-            if stability == Stability.BETA:
+            if visibility == Visibility.PRIVATE:
+                warnings.warn(
+                    "This API is private. "
+                    "Private APIs are not subject to the support SLA of official GA features.",
+                    category=GeneralAvailabilityWarning,
+                    stacklevel=warn_stacklevel(),
+                )
+            elif stability == Stability.BETA:
                 warnings.warn(
                     "This API is in beta and is subject to change. "
                     "The design and code is less mature than official GA features and is being provided as-is with no warranties. "

elasticsearch9/_sync/client/watcher.py

@@ -39,8 +39,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Acknowledge a watch.
-          Acknowledging a watch enables you to manually throttle the execution of the watch's actions.</p>
+          <p>Acknowledge a watch.</p>
+          <p>Acknowledging a watch enables you to manually throttle the execution of the watch's actions.</p>
           <p>The acknowledgement state of an action is stored in the <code>status.actions.&lt;id&gt;.ack.state</code> structure.</p>
           <p>IMPORTANT: If the specified watch is currently being executed, this API will return an error
           The reason for this behavior is to prevent overwriting the watch status from a watch execution.</p>
@@ -101,8 +101,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Activate a watch.
-          A watch can be either active or inactive.</p>
+          <p>Activate a watch.</p>
+          <p>A watch can be either active or inactive.</p>
 
 
         `<https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-activate-watch>`_
@@ -145,8 +145,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Deactivate a watch.
-          A watch can be either active or inactive.</p>
+          <p>Deactivate a watch.</p>
+          <p>A watch can be either active or inactive.</p>
 
 
         `<https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-deactivate-watch>`_
@@ -189,8 +189,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Delete a watch.
-          When the watch is removed, the document representing the watch in the <code>.watches</code> index is gone and it will never be run again.</p>
+          <p>Delete a watch.</p>
+          <p>When the watch is removed, the document representing the watch in the <code>.watches</code> index is gone and it will never be run again.</p>
           <p>Deleting a watch does not delete any watch execution records related to this watch from the watch history.</p>
           <p>IMPORTANT: Deleting a watch must be done by using only this API.
           Do not delete the watch directly from the <code>.watches</code> index using the Elasticsearch delete document API
@@ -266,8 +266,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Run a watch.
-          This API can be used to force execution of the watch outside of its triggering logic or to simulate the watch execution for debugging purposes.</p>
+          <p>Run a watch.</p>
+          <p>This API can be used to force execution of the watch outside of its triggering logic or to simulate the watch execution for debugging purposes.</p>
           <p>For testing and debugging purposes, you also have fine-grained control on how the watch runs.
           You can run the watch without running all of its actions or alternatively by simulating them.
           You can also force execution by ignoring the watch condition and control whether a watch record would be written to the watch history after it runs.</p>
@@ -362,8 +362,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Get Watcher index settings.
-          Get settings for the Watcher internal index (<code>.watches</code>).
+          <p>Get Watcher index settings.</p>
+          <p>Get settings for the Watcher internal index (<code>.watches</code>).
           Only a subset of settings are shown, for example <code>index.auto_expand_replicas</code> and <code>index.number_of_replicas</code>.</p>
 
 
@@ -476,8 +476,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Create or update a watch.
-          When a watch is registered, a new document that represents the watch is added to the <code>.watches</code> index and its trigger is immediately registered with the relevant trigger engine.
+          <p>Create or update a watch.</p>
+          <p>When a watch is registered, a new document that represents the watch is added to the <code>.watches</code> index and its trigger is immediately registered with the relevant trigger engine.
           Typically for the <code>schedule</code> trigger, the scheduler is the trigger engine.</p>
           <p>IMPORTANT: You must use Kibana or this API to create a watch.
           Do not add a watch directly to the <code>.watches</code> index by using the Elasticsearch index API.
@@ -494,9 +494,9 @@ class WatcherClient(NamespacedClient):
         :param active: The initial state of the watch. The default value is `true`, which
             means the watch is active by default.
         :param condition: The condition that defines if the actions should be run.
-        :param if_primary_term: only update the watch if the last operation that has
+        :param if_primary_term: Only update the watch if the last operation that has
             changed the watch has the specified primary term
-        :param if_seq_no: only update the watch if the last operation that has changed
+        :param if_seq_no: Only update the watch if the last operation that has changed
             the watch has the specified sequence number
         :param input: The input that defines the input that loads the data for the watch.
         :param metadata: Metadata JSON that will be copied into the history entries.
@@ -591,8 +591,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Query watches.
-          Get all registered watches in a paginated manner and optionally filter watches by a query.</p>
+          <p>Query watches.</p>
+          <p>Get all registered watches in a paginated manner and optionally filter watches by a query.</p>
           <p>Note that only the <code>_id</code> and <code>metadata.*</code> fields are queryable or sortable.</p>
 
 
@@ -667,8 +667,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Start the watch service.
-          Start the Watcher service if it is not already running.</p>
+          <p>Start the watch service.</p>
+          <p>Start the Watcher service if it is not already running.</p>
 
 
         `<https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-start>`_
@@ -732,8 +732,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Get Watcher statistics.
-          This API always returns basic metrics.
+          <p>Get Watcher statistics.</p>
+          <p>This API always returns basic metrics.
           You retrieve more metrics by using the metric parameter.</p>
 
 
@@ -784,8 +784,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Stop the watch service.
-          Stop the Watcher service if it is running.</p>
+          <p>Stop the watch service.</p>
+          <p>Stop the Watcher service if it is running.</p>
 
 
         `<https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-watcher-stop>`_
@@ -840,8 +840,8 @@ class WatcherClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Update Watcher index settings.
-          Update settings for the Watcher internal index (<code>.watches</code>).
+          <p>Update Watcher index settings.</p>
+          <p>Update settings for the Watcher internal index (<code>.watches</code>).
           Only a subset of settings can be modified.
           This includes <code>index.auto_expand_replicas</code>, <code>index.number_of_replicas</code>, <code>index.routing.allocation.exclude.*</code>,
           <code>index.routing.allocation.include.*</code> and <code>index.routing.allocation.require.*</code>.

elasticsearch9/_sync/client/xpack.py

@@ -45,8 +45,8 @@ class XPackClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Get information.
-          The information provided by the API includes:</p>
+          <p>Get information.</p>
+          <p>The information provided by the API includes:</p>
           <ul>
           <li>Build information including the build number and timestamp.</li>
           <li>License information about the currently installed license.</li>
@@ -56,7 +56,8 @@ class XPackClient(NamespacedClient):
 
         `<https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-info>`_
 
-        :param accept_enterprise: If this param is used it must be set to true
+        :param accept_enterprise: If used, this otherwise ignored parameter must be set
+            to true
         :param categories: A comma-separated list of the information categories to include
             in the response. For example, `build,license,features`.
         """
@@ -98,8 +99,8 @@ class XPackClient(NamespacedClient):
         """
         .. raw:: html
 
-          <p>Get usage information.
-          Get information about the features that are currently enabled and available under the current license.
+          <p>Get usage information.</p>
+          <p>Get information about the features that are currently enabled and available under the current license.
           The API also provides some usage statistics.</p>
 
 

elasticsearch9/_version.py

@@ -15,5 +15,5 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-__versionstr__ = "9.2.0"
-__es_specification_commit__ = "2f74c26e0a1d66c42232ce2830652c01e8717f00"
+__versionstr__ = "9.2.1"
+__es_specification_commit__ = "4ab58cf013706c9104d18daafae4361cf7351a55"

elasticsearch9/dsl/_async/document.py

@@ -31,9 +31,8 @@ from typing import (
 
 from typing_extensions import Self, dataclass_transform
 
-from elasticsearch.exceptions import NotFoundError, RequestError
-from elasticsearch.helpers import async_bulk
-
+from ...exceptions import NotFoundError, RequestError
+from ...helpers import async_bulk
 from .._async.index import AsyncIndex
 from ..async_connections import get_connection
 from ..document_base import DocumentBase, DocumentMeta, mapped_field
@@ -42,8 +41,8 @@ from ..utils import DOC_META_FIELDS, META_FIELDS, AsyncUsingType, merge
 from .search import AsyncSearch
 
 if TYPE_CHECKING:
-    from elasticsearch import AsyncElasticsearch
-    from elasticsearch.esql.esql import ESQLBase
+    from ... import AsyncElasticsearch
+    from ...esql.esql import ESQLBase
 
 
 class AsyncIndexMeta(DocumentMeta):

elasticsearch9/dsl/_async/index.py

@@ -30,7 +30,7 @@ from .update_by_query import AsyncUpdateByQuery
 if TYPE_CHECKING:
     from elastic_transport import ObjectApiResponse
 
-    from elasticsearch import AsyncElasticsearch
+    from ... import AsyncElasticsearch
 
 
 class AsyncIndexTemplate:

elasticsearch9/dsl/_async/search.py

@@ -29,9 +29,8 @@ from typing import (
 
 from typing_extensions import Self
 
-from elasticsearch.exceptions import ApiError
-from elasticsearch.helpers import async_scan
-
+from ...exceptions import ApiError
+from ...helpers import async_scan
 from ..async_connections import get_connection
 from ..response import Response
 from ..search_base import MultiSearchBase, SearchBase

elasticsearch9/dsl/_sync/document.py

@@ -31,9 +31,8 @@ from typing import (
 
 from typing_extensions import Self, dataclass_transform
 
-from elasticsearch.exceptions import NotFoundError, RequestError
-from elasticsearch.helpers import bulk
-
+from ...exceptions import NotFoundError, RequestError
+from ...helpers import bulk
 from .._sync.index import Index
 from ..connections import get_connection
 from ..document_base import DocumentBase, DocumentMeta, mapped_field
@@ -42,8 +41,8 @@ from ..utils import DOC_META_FIELDS, META_FIELDS, UsingType, merge
 from .search import Search
 
 if TYPE_CHECKING:
-    from elasticsearch import Elasticsearch
-    from elasticsearch.esql.esql import ESQLBase
+    from ... import Elasticsearch
+    from ...esql.esql import ESQLBase
 
 
 class IndexMeta(DocumentMeta):

elasticsearch9/dsl/_sync/index.py

@@ -30,7 +30,7 @@ from .update_by_query import UpdateByQuery
 if TYPE_CHECKING:
     from elastic_transport import ObjectApiResponse
 
-    from elasticsearch import Elasticsearch
+    from ... import Elasticsearch
 
 
 class IndexTemplate:

elasticsearch9/dsl/_sync/search.py

@@ -28,9 +28,8 @@ from typing import (
 
 from typing_extensions import Self
 
-from elasticsearch.exceptions import ApiError
-from elasticsearch.helpers import scan
-
+from ...exceptions import ApiError
+from ...helpers import scan
 from ..connections import get_connection
 from ..response import Response
 from ..search_base import MultiSearchBase, SearchBase

elasticsearch9/dsl/aggs.py

@@ -1495,7 +1495,7 @@ class GeohashGrid(Bucket[_R]):
             "DefaultType",
         ] = DEFAULT,
         field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
-        precision: Union[float, str, "DefaultType"] = DEFAULT,
+        precision: Union[int, str, "DefaultType"] = DEFAULT,
         shard_size: Union[int, "DefaultType"] = DEFAULT,
         size: Union[int, "DefaultType"] = DEFAULT,
         **kwargs: Any,
@@ -1579,7 +1579,7 @@ class GeotileGrid(Bucket[_R]):
         self,
         *,
         field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
-        precision: Union[float, "DefaultType"] = DEFAULT,
+        precision: Union[int, "DefaultType"] = DEFAULT,
         shard_size: Union[int, "DefaultType"] = DEFAULT,
         size: Union[int, "DefaultType"] = DEFAULT,
         bounds: Union[
@@ -2680,7 +2680,7 @@ class Percentiles(Agg[_R]):
         self,
         *,
         keyed: Union[bool, "DefaultType"] = DEFAULT,
-        percents: Union[Sequence[float], "DefaultType"] = DEFAULT,
+        percents: Union[float, Sequence[float], "DefaultType"] = DEFAULT,
         hdr: Union["types.HdrMethod", Dict[str, Any], "DefaultType"] = DEFAULT,
         tdigest: Union["types.TDigest", Dict[str, Any], "DefaultType"] = DEFAULT,
         format: Union[str, "DefaultType"] = DEFAULT,

elasticsearch9/dsl/async_connections.py

@@ -17,8 +17,7 @@
 
 from typing import Type
 
-from elasticsearch import AsyncElasticsearch
-
+from .. import AsyncElasticsearch
 from .connections import Connections
 
 

elasticsearch9/dsl/connections.py

@@ -17,8 +17,7 @@
 
 from typing import Any, Dict, Generic, Type, TypeVar, Union
 
-from elasticsearch import Elasticsearch, __versionstr__
-
+from .. import Elasticsearch, __versionstr__
 from .serializer import serializer
 
 _T = TypeVar("_T")

elasticsearch9/dsl/document_base.py

@@ -39,7 +39,7 @@ from typing_extensions import _AnnotatedAlias
 try:
     import annotationlib
 except ImportError:
-    annotationlib = None
+    annotationlib = None  # type: ignore[assignment]
 
 try:
     from types import UnionType

elasticsearch9/dsl/field.py

@@ -3892,7 +3892,7 @@ class SemanticText(Field):
             "types.SemanticTextIndexOptions", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
         chunking_settings: Union[
-            "types.ChunkingSettings", None, Dict[str, Any], "DefaultType"
+            "types.ChunkingSettings", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
         fields: Union[Mapping[str, Field], "DefaultType"] = DEFAULT,
         **kwargs: Any,

elasticsearch9/dsl/pydantic.py

@@ -20,7 +20,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Tuple, Type
 from pydantic import BaseModel, Field, PrivateAttr
 from typing_extensions import Annotated, Self, dataclass_transform
 
-from elasticsearch import dsl
+from .. import dsl
 
 
 class ESMeta(BaseModel):

elasticsearch9/dsl/query.py

@@ -370,6 +370,7 @@ class Common(Query):
         _value: Union[
             "types.CommonTermsQuery", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -666,6 +667,7 @@ class Fuzzy(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.FuzzyQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -708,6 +710,7 @@ class GeoBoundingBox(Query):
             Dict[str, Any],
             "DefaultType",
         ] = DEFAULT,
+        /,
         *,
         type: Union[Literal["memory", "indexed"], "DefaultType"] = DEFAULT,
         validation_method: Union[
@@ -771,6 +774,7 @@ class GeoDistance(Query):
             Dict[str, Any],
             "DefaultType",
         ] = DEFAULT,
+        /,
         *,
         distance: Union[str, "DefaultType"] = DEFAULT,
         distance_type: Union[Literal["arc", "plane"], "DefaultType"] = DEFAULT,
@@ -810,6 +814,7 @@ class GeoGrid(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.GeoGridQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -839,6 +844,7 @@ class GeoPolygon(Query):
         _value: Union[
             "types.GeoPolygonPoints", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
+        /,
         *,
         validation_method: Union[
             Literal["coerce", "ignore_malformed", "strict"], "DefaultType"
@@ -885,6 +891,7 @@ class GeoShape(Query):
         _value: Union[
             "types.GeoShapeFieldQuery", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
+        /,
         *,
         ignore_unmapped: Union[bool, "DefaultType"] = DEFAULT,
         boost: Union[float, "DefaultType"] = DEFAULT,
@@ -1060,6 +1067,7 @@ class Intervals(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.IntervalsQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -1151,6 +1159,7 @@ class Match(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.MatchQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -1216,6 +1225,7 @@ class MatchBoolPrefix(Query):
         _value: Union[
             "types.MatchBoolPrefixQuery", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -1276,6 +1286,7 @@ class MatchPhrase(Query):
         _value: Union[
             "types.MatchPhraseQuery", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -1301,6 +1312,7 @@ class MatchPhrasePrefix(Query):
         _value: Union[
             "types.MatchPhrasePrefixQuery", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -1784,6 +1796,7 @@ class Prefix(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.PrefixQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -1950,6 +1963,7 @@ class Range(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["wrappers.Range[Any]", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -2028,6 +2042,7 @@ class Regexp(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.RegexpQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -2198,6 +2213,7 @@ class Shape(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.ShapeFieldQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         *,
         ignore_unmapped: Union[bool, "DefaultType"] = DEFAULT,
         boost: Union[float, "DefaultType"] = DEFAULT,
@@ -2556,6 +2572,7 @@ class SpanTerm(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.SpanTermQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -2676,6 +2693,7 @@ class Term(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.TermQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -2710,6 +2728,7 @@ class Terms(Query):
             Dict[str, Any],
             "DefaultType",
         ] = DEFAULT,
+        /,
         *,
         boost: Union[float, "DefaultType"] = DEFAULT,
         _name: Union[str, "DefaultType"] = DEFAULT,
@@ -2743,6 +2762,7 @@ class TermsSet(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.TermsSetQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -2768,6 +2788,7 @@ class TextExpansion(Query):
         _value: Union[
             "types.TextExpansionQuery", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -2792,6 +2813,7 @@ class WeightedTokens(Query):
         _value: Union[
             "types.WeightedTokensQuery", Dict[str, Any], "DefaultType"
         ] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:
@@ -2813,6 +2835,7 @@ class Wildcard(Query):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["types.WildcardQuery", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         **kwargs: Any,
     ):
         if _field is not DEFAULT:

elasticsearch9/dsl/serializer.py

@@ -17,8 +17,7 @@
 
 from typing import Any
 
-from elasticsearch.serializer import JSONSerializer
-
+from ..serializer import JSONSerializer
 from .utils import AttrList
 
 

elasticsearch9/dsl/types.py

@@ -400,8 +400,6 @@ class DenseVectorIndexOptions(AttrDict[Any]):
     :arg rescore_vector: The rescore vector options. This is only
         applicable to `bbq_disk`, `bbq_hnsw`, `int4_hnsw`, `int8_hnsw`,
         `bbq_flat`, `int4_flat`, and `int8_flat` index types.
-    :arg on_disk_rescore: `true` if vector rescoring should be done on-
-        disk  Only applicable to `bbq_hnsw`
     """
 
     type: Union[
@@ -424,7 +422,6 @@ class DenseVectorIndexOptions(AttrDict[Any]):
     rescore_vector: Union[
         "DenseVectorIndexOptionsRescoreVector", Dict[str, Any], DefaultType
     ]
-    on_disk_rescore: Union[bool, DefaultType]
 
     def __init__(
         self,
@@ -449,7 +446,6 @@ class DenseVectorIndexOptions(AttrDict[Any]):
         rescore_vector: Union[
             "DenseVectorIndexOptionsRescoreVector", Dict[str, Any], DefaultType
         ] = DEFAULT,
-        on_disk_rescore: Union[bool, DefaultType] = DEFAULT,
         **kwargs: Any,
     ):
         if type is not DEFAULT:
@@ -462,8 +458,6 @@ class DenseVectorIndexOptions(AttrDict[Any]):
             kwargs["m"] = m
         if rescore_vector is not DEFAULT:
             kwargs["rescore_vector"] = rescore_vector
-        if on_disk_rescore is not DEFAULT:
-            kwargs["on_disk_rescore"] = on_disk_rescore
         super().__init__(kwargs)
 
 
@@ -947,6 +941,7 @@ class GeoDistanceSort(AttrDict[Any]):
             Dict[str, Any],
             "DefaultType",
         ] = DEFAULT,
+        /,
         *,
         mode: Union[
             Literal["min", "max", "sum", "avg", "median"], DefaultType
@@ -3278,6 +3273,7 @@ class SortOptions(AttrDict[Any]):
         self,
         _field: Union[str, "InstrumentedField", "DefaultType"] = DEFAULT,
         _value: Union["FieldSort", Dict[str, Any], "DefaultType"] = DEFAULT,
+        /,
         *,
         _score: Union["ScoreSort", Dict[str, Any], DefaultType] = DEFAULT,
         _doc: Union["ScoreSort", Dict[str, Any], DefaultType] = DEFAULT,

elasticsearch9/dsl/utils.py

@@ -44,8 +44,7 @@ from .exceptions import UnknownDslObject, ValidationException
 if TYPE_CHECKING:
     from elastic_transport import ObjectApiResponse
 
-    from elasticsearch import AsyncElasticsearch, Elasticsearch
-
+    from .. import AsyncElasticsearch, Elasticsearch
     from .document_base import DocumentOptions
     from .field import Field
     from .index_base import IndexBase

elasticsearch9/esql/esql.py

@@ -140,7 +140,7 @@ class ESQLBase(ABC):
         if re.fullmatch(r"[a-zA-Z_@][a-zA-Z0-9_\.]*", s):
             return s
         # this identifier needs to be escaped
-        s.replace("`", "``")
+        s = s.replace("`", "``")
         return f"`{s}`"
 
     @staticmethod

elasticsearch9/esql/functions.py

@@ -18,8 +18,8 @@
 import json
 from typing import Any
 
-from elasticsearch.dsl.document_base import InstrumentedExpression
-from elasticsearch.esql.esql import ESQLBase, ExpressionType
+from ..dsl.document_base import InstrumentedExpression
+from ..esql.esql import ESQLBase, ExpressionType
 
 
 def _render(v: Any) -> str: