From 4a7dd93a15331311603e3ebceb36a1c8cd31cc14 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Fri, 7 Feb 2025 16:26:07 +0400 Subject: [PATCH 1/2] Switch to Black 2025 code style --- elasticsearch/dsl/_sync/search.py | 10 +--------- elasticsearch/dsl/search_base.py | 6 +++--- elasticsearch/helpers/vectorstore/_sync/vectorstore.py | 5 +---- examples/dsl/search_as_you_type.py | 7 +------ noxfile.py | 4 ++-- test_elasticsearch/test_dsl/_sync/test_index.py | 9 +-------- test_elasticsearch/test_dsl/_sync/test_search.py | 10 +--------- .../test_dsl/test_integration/_sync/test_search.py | 10 +--------- test_elasticsearch/test_dsl/test_result.py | 4 ++-- 9 files changed, 13 insertions(+), 52 deletions(-) diff --git a/elasticsearch/dsl/_sync/search.py b/elasticsearch/dsl/_sync/search.py index ae826a12f..f46364a67 100644 --- a/elasticsearch/dsl/_sync/search.py +++ b/elasticsearch/dsl/_sync/search.py @@ -16,15 +16,7 @@ # under the License. import contextlib -from typing import ( - TYPE_CHECKING, - Any, - Dict, - Iterator, - List, - Optional, - cast, -) +from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional, cast from typing_extensions import Self diff --git a/elasticsearch/dsl/search_base.py b/elasticsearch/dsl/search_base.py index ad4a56059..c513fc78d 100644 --- a/elasticsearch/dsl/search_base.py +++ b/elasticsearch/dsl/search_base.py @@ -698,12 +698,12 @@ def ensure_strings(fields: "InstrumentedField") -> str: ... @overload def ensure_strings( - fields: List[Union[str, "InstrumentedField"]] + fields: List[Union[str, "InstrumentedField"]], ) -> List[str]: ... @overload def ensure_strings( - fields: Dict[str, List[Union[str, "InstrumentedField"]]] + fields: Dict[str, List[Union[str, "InstrumentedField"]]], ) -> Dict[str, List[str]]: ... def ensure_strings( @@ -712,7 +712,7 @@ def ensure_strings( "InstrumentedField", List[Union[str, "InstrumentedField"]], Dict[str, List[Union[str, "InstrumentedField"]]], - ] + ], ) -> Union[str, List[str], Dict[str, List[str]]]: if isinstance(fields, dict): return {k: ensure_strings(v) for k, v in fields.items()} diff --git a/elasticsearch/helpers/vectorstore/_sync/vectorstore.py b/elasticsearch/helpers/vectorstore/_sync/vectorstore.py index 6a6a5ee2a..3c4a0d51a 100644 --- a/elasticsearch/helpers/vectorstore/_sync/vectorstore.py +++ b/elasticsearch/helpers/vectorstore/_sync/vectorstore.py @@ -22,10 +22,7 @@ from elasticsearch import Elasticsearch from elasticsearch._version import __versionstr__ as lib_version from elasticsearch.helpers import BulkIndexError, bulk -from elasticsearch.helpers.vectorstore import ( - EmbeddingService, - RetrievalStrategy, -) +from elasticsearch.helpers.vectorstore import EmbeddingService, RetrievalStrategy from elasticsearch.helpers.vectorstore._utils import maximal_marginal_relevance logger = logging.getLogger(__name__) diff --git a/examples/dsl/search_as_you_type.py b/examples/dsl/search_as_you_type.py index a70de8ccb..c1ebc99a4 100644 --- a/examples/dsl/search_as_you_type.py +++ b/examples/dsl/search_as_you_type.py @@ -28,12 +28,7 @@ import os from typing import TYPE_CHECKING, Optional -from elasticsearch.dsl import ( - Document, - SearchAsYouType, - connections, - mapped_field, -) +from elasticsearch.dsl import Document, SearchAsYouType, connections, mapped_field from elasticsearch.dsl.query import MultiMatch diff --git a/noxfile.py b/noxfile.py index 90172d49e..c0bbf661b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -66,7 +66,7 @@ def test_otel(session): @nox.session() def format(session): - session.install(".", "black~=24.0", "isort", "flynt", "unasync>=0.6.0", "jinja2") + session.install(".", "black~=25.0", "isort", "flynt", "unasync>=0.6.0", "jinja2") session.run("python", "utils/run-unasync.py") session.run("python", "utils/run-unasync-dsl.py") @@ -88,7 +88,7 @@ def lint(session): session.install( "flake8", - "black~=24.0", + "black~=25.0", "mypy", "isort", "types-requests", diff --git a/test_elasticsearch/test_dsl/_sync/test_index.py b/test_elasticsearch/test_dsl/_sync/test_index.py index 327efa047..c6d1b7904 100644 --- a/test_elasticsearch/test_dsl/_sync/test_index.py +++ b/test_elasticsearch/test_dsl/_sync/test_index.py @@ -22,14 +22,7 @@ import pytest from pytest import raises -from elasticsearch.dsl import ( - Date, - Document, - Index, - IndexTemplate, - Text, - analyzer, -) +from elasticsearch.dsl import Date, Document, Index, IndexTemplate, Text, analyzer class Post(Document): diff --git a/test_elasticsearch/test_dsl/_sync/test_search.py b/test_elasticsearch/test_dsl/_sync/test_search.py index 1fa7da1c7..04b0ad53e 100644 --- a/test_elasticsearch/test_dsl/_sync/test_search.py +++ b/test_elasticsearch/test_dsl/_sync/test_search.py @@ -21,15 +21,7 @@ import pytest from pytest import raises -from elasticsearch.dsl import ( - Document, - EmptySearch, - Q, - Search, - query, - types, - wrappers, -) +from elasticsearch.dsl import Document, EmptySearch, Q, Search, query, types, wrappers from elasticsearch.dsl.exceptions import IllegalOperation diff --git a/test_elasticsearch/test_dsl/test_integration/_sync/test_search.py b/test_elasticsearch/test_dsl/test_integration/_sync/test_search.py index 41dd720a3..54060d311 100644 --- a/test_elasticsearch/test_dsl/test_integration/_sync/test_search.py +++ b/test_elasticsearch/test_dsl/test_integration/_sync/test_search.py @@ -20,15 +20,7 @@ from pytest import raises from elasticsearch import ApiError, Elasticsearch -from elasticsearch.dsl import ( - Date, - Document, - Keyword, - MultiSearch, - Q, - Search, - Text, -) +from elasticsearch.dsl import Date, Document, Keyword, MultiSearch, Q, Search, Text from elasticsearch.dsl.response import aggs from ..test_data import FLAT_DATA diff --git a/test_elasticsearch/test_dsl/test_result.py b/test_elasticsearch/test_dsl/test_result.py index 46707c715..2acd810d5 100644 --- a/test_elasticsearch/test_dsl/test_result.py +++ b/test_elasticsearch/test_dsl/test_result.py @@ -130,7 +130,7 @@ def test_iterating_over_response_gives_you_hits(dummy_response: Dict[str, Any]) def test_hits_get_wrapped_to_contain_additional_attrs( - dummy_response: Dict[str, Any] + dummy_response: Dict[str, Any], ) -> None: res = response.Response(Search(), dummy_response) hits = res.hits @@ -140,7 +140,7 @@ def test_hits_get_wrapped_to_contain_additional_attrs( def test_hits_provide_dot_and_bracket_access_to_attrs( - dummy_response: Dict[str, Any] + dummy_response: Dict[str, Any], ) -> None: res = response.Response(Search(), dummy_response) h = res.hits[0] From 893c30468d3c82d908b967465ecaa0d40b834303 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Tue, 11 Feb 2025 16:26:14 +0400 Subject: [PATCH 2/2] Run format with isort 6 --- elasticsearch/dsl/_sync/search.py | 10 +++++++++- elasticsearch/helpers/vectorstore/_sync/vectorstore.py | 5 ++++- examples/dsl/search_as_you_type.py | 7 ++++++- noxfile.py | 6 ++++-- test_elasticsearch/test_dsl/_sync/test_index.py | 9 ++++++++- test_elasticsearch/test_dsl/_sync/test_search.py | 10 +++++++++- .../test_dsl/test_integration/_sync/test_search.py | 10 +++++++++- 7 files changed, 49 insertions(+), 8 deletions(-) diff --git a/elasticsearch/dsl/_sync/search.py b/elasticsearch/dsl/_sync/search.py index f46364a67..ae826a12f 100644 --- a/elasticsearch/dsl/_sync/search.py +++ b/elasticsearch/dsl/_sync/search.py @@ -16,7 +16,15 @@ # under the License. import contextlib -from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional, cast +from typing import ( + TYPE_CHECKING, + Any, + Dict, + Iterator, + List, + Optional, + cast, +) from typing_extensions import Self diff --git a/elasticsearch/helpers/vectorstore/_sync/vectorstore.py b/elasticsearch/helpers/vectorstore/_sync/vectorstore.py index 3c4a0d51a..6a6a5ee2a 100644 --- a/elasticsearch/helpers/vectorstore/_sync/vectorstore.py +++ b/elasticsearch/helpers/vectorstore/_sync/vectorstore.py @@ -22,7 +22,10 @@ from elasticsearch import Elasticsearch from elasticsearch._version import __versionstr__ as lib_version from elasticsearch.helpers import BulkIndexError, bulk -from elasticsearch.helpers.vectorstore import EmbeddingService, RetrievalStrategy +from elasticsearch.helpers.vectorstore import ( + EmbeddingService, + RetrievalStrategy, +) from elasticsearch.helpers.vectorstore._utils import maximal_marginal_relevance logger = logging.getLogger(__name__) diff --git a/examples/dsl/search_as_you_type.py b/examples/dsl/search_as_you_type.py index c1ebc99a4..a70de8ccb 100644 --- a/examples/dsl/search_as_you_type.py +++ b/examples/dsl/search_as_you_type.py @@ -28,7 +28,12 @@ import os from typing import TYPE_CHECKING, Optional -from elasticsearch.dsl import Document, SearchAsYouType, connections, mapped_field +from elasticsearch.dsl import ( + Document, + SearchAsYouType, + connections, + mapped_field, +) from elasticsearch.dsl.query import MultiMatch diff --git a/noxfile.py b/noxfile.py index c0bbf661b..c9e961900 100644 --- a/noxfile.py +++ b/noxfile.py @@ -66,7 +66,9 @@ def test_otel(session): @nox.session() def format(session): - session.install(".", "black~=25.0", "isort", "flynt", "unasync>=0.6.0", "jinja2") + session.install( + ".", "black~=25.0", "isort~=6.0", "flynt", "unasync>=0.6.0", "jinja2" + ) session.run("python", "utils/run-unasync.py") session.run("python", "utils/run-unasync-dsl.py") @@ -90,7 +92,7 @@ def lint(session): "flake8", "black~=25.0", "mypy", - "isort", + "isort~=6.0", "types-requests", "types-python-dateutil", "unasync>=0.6.0", diff --git a/test_elasticsearch/test_dsl/_sync/test_index.py b/test_elasticsearch/test_dsl/_sync/test_index.py index c6d1b7904..327efa047 100644 --- a/test_elasticsearch/test_dsl/_sync/test_index.py +++ b/test_elasticsearch/test_dsl/_sync/test_index.py @@ -22,7 +22,14 @@ import pytest from pytest import raises -from elasticsearch.dsl import Date, Document, Index, IndexTemplate, Text, analyzer +from elasticsearch.dsl import ( + Date, + Document, + Index, + IndexTemplate, + Text, + analyzer, +) class Post(Document): diff --git a/test_elasticsearch/test_dsl/_sync/test_search.py b/test_elasticsearch/test_dsl/_sync/test_search.py index 04b0ad53e..1fa7da1c7 100644 --- a/test_elasticsearch/test_dsl/_sync/test_search.py +++ b/test_elasticsearch/test_dsl/_sync/test_search.py @@ -21,7 +21,15 @@ import pytest from pytest import raises -from elasticsearch.dsl import Document, EmptySearch, Q, Search, query, types, wrappers +from elasticsearch.dsl import ( + Document, + EmptySearch, + Q, + Search, + query, + types, + wrappers, +) from elasticsearch.dsl.exceptions import IllegalOperation diff --git a/test_elasticsearch/test_dsl/test_integration/_sync/test_search.py b/test_elasticsearch/test_dsl/test_integration/_sync/test_search.py index 54060d311..41dd720a3 100644 --- a/test_elasticsearch/test_dsl/test_integration/_sync/test_search.py +++ b/test_elasticsearch/test_dsl/test_integration/_sync/test_search.py @@ -20,7 +20,15 @@ from pytest import raises from elasticsearch import ApiError, Elasticsearch -from elasticsearch.dsl import Date, Document, Keyword, MultiSearch, Q, Search, Text +from elasticsearch.dsl import ( + Date, + Document, + Keyword, + MultiSearch, + Q, + Search, + Text, +) from elasticsearch.dsl.response import aggs from ..test_data import FLAT_DATA