[7.x] Sort imports with isort and regenerate APIs

CONTRIBUTING.md

@@ -52,7 +52,7 @@ The process for contributing to any of the Elasticsearch repositories is similar
     $ python -m pip install nox
     
     # Auto-format and lint your changes
-    $ nox -s blacken
+    $ nox -s format
    
     # Run the test suite
     $ python setup.py test

dev-requirements.txt

@@ -13,6 +13,7 @@ pandas
 # not amending that requirement to the package. :(
 pyyaml<5.3
 
+isort
 black; python_version>="3.6"
 twine
 

docs/sphinx/xpack.rst

@@ -166,6 +166,16 @@ to encrypt communications in your Elasticsearch cluster.
 .. autoclass:: SslClient
    :members:
 
+Text Structure
+--------------
+
+`Text Structure API <https://www.elastic.co/guide/en/elasticsearch/reference/master/ml-find-file-structure.html>`_
+finds the structure of a text file. The text file must contain data that is
+suitable to be ingested into Elasticsearch.
+
+.. autoclass:: TextStructureClient
+   :members:
+
 Transform
 ---------
 

elasticsearch/__init__.py

@@ -18,9 +18,9 @@
 # flake8: noqa
 from __future__ import absolute_import
 
+import logging
 import re
 import sys
-import logging
 import warnings
 
 from ._version import __versionstr__
@@ -34,26 +34,26 @@
 logger.addHandler(logging.NullHandler())
 
 from .client import Elasticsearch
-from .transport import Transport
-from .connection_pool import ConnectionPool, ConnectionSelector, RoundRobinSelector
-from .serializer import JSONSerializer
 from .connection import Connection, RequestsHttpConnection, Urllib3HttpConnection
+from .connection_pool import ConnectionPool, ConnectionSelector, RoundRobinSelector
 from .exceptions import (
-    ImproperlyConfigured,
-    ElasticsearchException,
-    SerializationError,
-    TransportError,
-    NotFoundError,
+    AuthenticationException,
+    AuthorizationException,
     ConflictError,
-    RequestError,
     ConnectionError,
-    SSLError,
     ConnectionTimeout,
-    AuthenticationException,
-    AuthorizationException,
-    ElasticsearchWarning,
     ElasticsearchDeprecationWarning,
+    ElasticsearchException,
+    ElasticsearchWarning,
+    ImproperlyConfigured,
+    NotFoundError,
+    RequestError,
+    SerializationError,
+    SSLError,
+    TransportError,
 )
+from .serializer import JSONSerializer
+from .transport import Transport
 
 # Only raise one warning per deprecation message so as not
 # to spam up the user if the same action is done multiple times.
@@ -90,9 +90,9 @@
     if sys.version_info < (3, 6):
         raise ImportError
 
+    from ._async.client import AsyncElasticsearch
     from ._async.http_aiohttp import AIOHttpConnection, AsyncConnection
     from ._async.transport import AsyncTransport
-    from ._async.client import AsyncElasticsearch
 
     __all__ += [
         "AIOHttpConnection",

elasticsearch/__init__.pyi

@@ -19,41 +19,37 @@ import sys
 from typing import Tuple
 
 from .client import Elasticsearch as Elasticsearch
-from .transport import Transport as Transport
-from .connection_pool import (
-    ConnectionPool as ConnectionPool,
-    ConnectionSelector as ConnectionSelector,
-    RoundRobinSelector as RoundRobinSelector,
-)
-from .serializer import JSONSerializer as JSONSerializer
-from .connection import (
-    Connection as Connection,
-    RequestsHttpConnection as RequestsHttpConnection,
-    Urllib3HttpConnection as Urllib3HttpConnection,
-)
+from .connection import Connection as Connection
+from .connection import RequestsHttpConnection as RequestsHttpConnection
+from .connection import Urllib3HttpConnection as Urllib3HttpConnection
+from .connection_pool import ConnectionPool as ConnectionPool
+from .connection_pool import ConnectionSelector as ConnectionSelector
+from .connection_pool import RoundRobinSelector as RoundRobinSelector
+from .exceptions import AuthenticationException as AuthenticationException
+from .exceptions import AuthorizationException as AuthorizationException
+from .exceptions import ConflictError as ConflictError
+from .exceptions import ConnectionError as ConnectionError
+from .exceptions import ConnectionTimeout as ConnectionTimeout
 from .exceptions import (
-    ImproperlyConfigured as ImproperlyConfigured,
-    ElasticsearchException as ElasticsearchException,
-    SerializationError as SerializationError,
-    TransportError as TransportError,
-    NotFoundError as NotFoundError,
-    ConflictError as ConflictError,
-    RequestError as RequestError,
-    ConnectionError as ConnectionError,
-    SSLError as SSLError,
-    ConnectionTimeout as ConnectionTimeout,
-    AuthenticationException as AuthenticationException,
-    AuthorizationException as AuthorizationException,
     ElasticsearchDeprecationWarning as ElasticsearchDeprecationWarning,
 )
+from .exceptions import ElasticsearchException as ElasticsearchException
+from .exceptions import ImproperlyConfigured as ImproperlyConfigured
+from .exceptions import NotFoundError as NotFoundError
+from .exceptions import RequestError as RequestError
+from .exceptions import SerializationError as SerializationError
+from .exceptions import SSLError as SSLError
+from .exceptions import TransportError as TransportError
+from .serializer import JSONSerializer as JSONSerializer
+from .transport import Transport as Transport
 
 try:
     if sys.version_info < (3, 6):
         raise ImportError
 
+    from ._async.client import AsyncElasticsearch as AsyncElasticsearch
     from ._async.http_aiohttp import AIOHttpConnection as AIOHttpConnection
     from ._async.transport import AsyncTransport as AsyncTransport
-    from ._async.client import AsyncElasticsearch as AsyncElasticsearch
 except (ImportError, SyntaxError):
     pass
 

elasticsearch/_async/_extra_imports.py

@@ -32,7 +32,6 @@
 import aiohttp
 import aiohttp.client_exceptions as aiohttp_exceptions
 
-
 # We do this because we don't explicitly require 'yarl'
 # within our [async] extra any more.
 # See AIOHttpConnection.request() for more information why.

elasticsearch/_async/client/__init__.py

@@ -17,45 +17,45 @@
 #  under the License.
 
 from __future__ import unicode_literals
+
 import logging
 
 from ..transport import AsyncTransport, TransportError
-from .utils import query_params, _make_path, SKIP_IN_PATH, _bulk_body, _normalize_hosts
-
 from .async_search import AsyncSearchClient
 from .autoscaling import AutoscalingClient
 from .cat import CatClient
+from .ccr import CcrClient
 from .cluster import ClusterClient
 from .dangling_indices import DanglingIndicesClient
-from .indices import IndicesClient
-from .ingest import IngestClient
-from .nodes import NodesClient
-from .remote import RemoteClient
-from .snapshot import SnapshotClient
-from .tasks import TasksClient
-
-# xpack APIs
-from .xpack import XPackClient
-from .ccr import CcrClient
 from .data_frame import Data_FrameClient
 from .deprecation import DeprecationClient
 from .enrich import EnrichClient
 from .eql import EqlClient
 from .graph import GraphClient
 from .ilm import IlmClient
+from .indices import IndicesClient
+from .ingest import IngestClient
 from .license import LicenseClient
 from .migration import MigrationClient
 from .ml import MlClient
 from .monitoring import MonitoringClient
+from .nodes import NodesClient
+from .remote import RemoteClient
 from .rollup import RollupClient
 from .searchable_snapshots import SearchableSnapshotsClient
 from .security import SecurityClient
 from .slm import SlmClient
+from .snapshot import SnapshotClient
 from .sql import SqlClient
 from .ssl import SslClient
+from .tasks import TasksClient
+from .text_structure import TextStructureClient
 from .transform import TransformClient
+from .utils import SKIP_IN_PATH, _bulk_body, _make_path, _normalize_hosts, query_params
 from .watcher import WatcherClient
 
+# xpack APIs
+from .xpack import XPackClient
 
 logger = logging.getLogger("elasticsearch")
 
@@ -233,6 +233,7 @@ class as kwargs, or a string in the format of ``host[:port]`` which will be
         self.slm = SlmClient(self)
         self.sql = SqlClient(self)
         self.ssl = SslClient(self)
+        self.text_structure = TextStructureClient(self)
         self.transform = TransformClient(self)
         self.watcher = WatcherClient(self)
 
@@ -1534,6 +1535,7 @@ async def scroll(self, body=None, scroll_id=None, params=None, headers=None):
         "ignore_unavailable",
         "lenient",
         "max_concurrent_shard_requests",
+        "min_compatible_shard_node",
         "pre_filter_shard_size",
         "preference",
         "q",
@@ -1616,6 +1618,9 @@ async def search(
             shard requests per node this search executes concurrently. This value
             should be used to limit the impact of the search on the cluster in order
             to limit the number of concurrent shard requests  Default: 5
+        :arg min_compatible_shard_node: The minimum compatible version
+            that all shards involved in search should have for this request to be
+            successful
         :arg pre_filter_shard_size: A threshold that enforces a pre-
             filter roundtrip to prefilter search shards based on query rewriting if
             the number of shards the search request expands to exceeds the

elasticsearch/_async/client/__init__.pyi

@@ -17,43 +17,44 @@
 #  under the License.
 
 from __future__ import unicode_literals
+
 import logging
-from typing import Any, MutableMapping, Optional, Type, Union, Collection
+from typing import Any, Collection, MutableMapping, Optional, Type, Union
 
 from ..transport import AsyncTransport
-
 from .async_search import AsyncSearchClient
 from .autoscaling import AutoscalingClient
 from .cat import CatClient
+from .ccr import CcrClient
 from .cluster import ClusterClient
 from .dangling_indices import DanglingIndicesClient
-from .indices import IndicesClient
-from .ingest import IngestClient
-from .nodes import NodesClient
-from .remote import RemoteClient
-from .snapshot import SnapshotClient
-from .tasks import TasksClient
-
-# xpack APIs
-from .xpack import XPackClient
-from .ccr import CcrClient
 from .enrich import EnrichClient
 from .eql import EqlClient
 from .graph import GraphClient
 from .ilm import IlmClient
+from .indices import IndicesClient
+from .ingest import IngestClient
 from .license import LicenseClient
 from .migration import MigrationClient
 from .ml import MlClient
 from .monitoring import MonitoringClient
+from .nodes import NodesClient
+from .remote import RemoteClient
 from .rollup import RollupClient
 from .searchable_snapshots import SearchableSnapshotsClient
 from .security import SecurityClient
 from .slm import SlmClient
+from .snapshot import SnapshotClient
 from .sql import SqlClient
 from .ssl import SslClient
+from .tasks import TasksClient
+from .text_structure import TextStructureClient
 from .transform import TransformClient
 from .watcher import WatcherClient
 
+# xpack APIs
+from .xpack import XPackClient
+
 logger: logging.Logger
 
 class AsyncElasticsearch(object):
@@ -88,6 +89,7 @@ class AsyncElasticsearch(object):
     sql: SqlClient
     ssl: SslClient
     transform: TransformClient
+    text_structure: TextStructureClient
     watcher: WatcherClient
     def __init__(
         self,
@@ -788,6 +790,7 @@ class AsyncElasticsearch(object):
         ignore_unavailable: Optional[Any] = ...,
         lenient: Optional[Any] = ...,
         max_concurrent_shard_requests: Optional[Any] = ...,
+        min_compatible_shard_node: Optional[Any] = ...,
         pre_filter_shard_size: Optional[Any] = ...,
         preference: Optional[Any] = ...,
         q: Optional[Any] = ...,

elasticsearch/_async/client/async_search.py

@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from .utils import NamespacedClient, SKIP_IN_PATH, query_params, _make_path
+from .utils import SKIP_IN_PATH, NamespacedClient, _make_path, query_params
 
 
 class AsyncSearchClient(NamespacedClient):

elasticsearch/_async/client/async_search.pyi

@@ -15,7 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-from typing import Any, MutableMapping, Optional, Union, Collection
+from typing import Any, Collection, MutableMapping, Optional, Union
+
 from .utils import NamespacedClient
 
 class AsyncSearchClient(NamespacedClient):