fix formatting

Author: maxjakob

elasticsearch/vectorstore/_async/strategies.py

@@ -3,7 +3,6 @@
 from typing import Any, Dict, List, Literal, Optional, Union, cast
 
 from elasticsearch import AsyncElasticsearch
-
 from elasticsearch.vectorstore._async._utils import model_must_be_deployed
 from elasticsearch.vectorstore._async.embedding_service import AsyncEmbeddingService
 

elasticsearch/vectorstore/_async/vectorestore.py

@@ -4,12 +4,9 @@
 
 from elasticsearch import AsyncElasticsearch
 from elasticsearch.helpers import BulkIndexError, async_bulk
-
-from elasticsearch.vectorstore._utils import (
-    maximal_marginal_relevance,
-)
 from elasticsearch.vectorstore._async.embedding_service import AsyncEmbeddingService
 from elasticsearch.vectorstore._async.strategies import RetrievalStrategy
+from elasticsearch.vectorstore._utils import maximal_marginal_relevance
 
 logger = logging.getLogger(__name__)
 

examples/bulk-ingest/bulk-ingest.py

@@ -6,13 +6,14 @@
 """Script that downloads a public dataset and streams it to an Elasticsearch cluster"""
 
 import csv
-from os.path import abspath, join, dirname, exists
+from os.path import abspath, dirname, exists, join
+
 import tqdm
 import urllib3
+
 from elasticsearch import Elasticsearch
 from elasticsearch.helpers import streaming_bulk
 
-
 NYC_RESTAURANTS = (
     "https://data.cityofnewyork.us/api/views/43nn-pn8j/rows.csv?accessType=DOWNLOAD"
 )
@@ -99,7 +100,9 @@ def main():
     progress = tqdm.tqdm(unit="docs", total=number_of_docs)
     successes = 0
     for ok, action in streaming_bulk(
-        client=client, index="nyc-restaurants", actions=generate_actions(),
+        client=client,
+        index="nyc-restaurants",
+        actions=generate_actions(),
     ):
         progress.update(1)
         successes += ok

examples/fastapi-apm/app.py

@@ -2,15 +2,16 @@
 # Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 # See the LICENSE file in the project root for more information
 
-import aiohttp
 import datetime
 import os
+
+import aiohttp
+from elasticapm.contrib.starlette import ElasticAPM, make_apm_client
 from fastapi import FastAPI
 from fastapi.encoders import jsonable_encoder
+
 from elasticsearch import AsyncElasticsearch, NotFoundError
 from elasticsearch.helpers import async_streaming_bulk
-from elasticapm.contrib.starlette import ElasticAPM, make_apm_client
-
 
 apm = make_apm_client(
     {"SERVICE_NAME": "fastapi-app", "SERVER_URL": "http://apm-server:8200"}
@@ -60,7 +61,9 @@ async def search(query):
 
 @app.get("/delete")
 async def delete():
-    return await client.delete_by_query(index="games", body={"query": {"match_all": {}}})
+    return await client.delete_by_query(
+        index="games", body={"query": {"match_all": {}}}
+    )
 
 
 @app.get("/delete/{id}")

examples/fastapi-apm/ping.py

@@ -3,9 +3,9 @@
 # See the LICENSE file in the project root for more information
 
 import random
-import urllib3
 import time
 
+import urllib3
 
 endpoints = [
     "http://app:9292/",

test_elasticsearch/test_server/test_vectorstore/_async/_test_utils.py

@@ -1,9 +1,9 @@
 import os
-from typing import Any, Dict, List, Optional, AsyncIterator
+from typing import Any, AsyncIterator, Dict, List, Optional
 
 from elastic_transport import AsyncTransport
-from elasticsearch import AsyncElasticsearch
 
+from elasticsearch import AsyncElasticsearch
 from elasticsearch.vectorstore._async.embedding_service import AsyncEmbeddingService
 
 

test_elasticsearch/test_server/test_vectorstore/_async/test_embedding_service.py

@@ -1,22 +1,17 @@
 import os
+from typing import AsyncIterator
 
 import pytest
-
 import pytest_asyncio
-from elasticsearch import AsyncElasticsearch
-
-from typing import AsyncIterator
 
+from elasticsearch import AsyncElasticsearch
 from elasticsearch.vectorstore._async._utils import model_is_deployed
-
-from ._test_utils import (
-    es_client_fixture,
-)
-
 from elasticsearch.vectorstore._async.embedding_service import (
     AsyncElasticsearchEmbeddings,
 )
 
+from ._test_utils import es_client_fixture
+
 # deployed with
 # https://www.elastic.co/guide/en/machine-learning/current/ml-nlp-text-emb-vector-search-example.html
 MODEL_ID = os.getenv("MODEL_ID", "sentence-transformers__msmarco-minilm-l-12-v3")

test_elasticsearch/test_server/test_vectorstore/_async/test_vectorestore.py

@@ -1,16 +1,13 @@
 import logging
 import uuid
-from typing import AsyncIterator
-from typing import Any, List, Optional, Union, cast
 from functools import partial
+from typing import Any, AsyncIterator, List, Optional, Union, cast
 
 import pytest
 import pytest_asyncio
-from elasticsearch import AsyncElasticsearch
 
-from elasticsearch import NotFoundError
+from elasticsearch import AsyncElasticsearch, NotFoundError
 from elasticsearch.helpers import BulkIndexError
-
 from elasticsearch.vectorstore._async import AsyncVectorStore
 from elasticsearch.vectorstore._async._utils import model_is_deployed
 from elasticsearch.vectorstore._async.strategies import (
@@ -22,11 +19,11 @@
 )
 
 from ._test_utils import (
-    create_requests_saving_client,
-    es_client_fixture,
     AsyncConsistentFakeEmbeddings,
     AsyncFakeEmbeddings,
     AsyncRequestSavingTransport,
+    create_requests_saving_client,
+    es_client_fixture,
 )
 
 logging.basicConfig(level=logging.DEBUG)
@@ -44,7 +41,7 @@
 - sentence-transformers__all-minilm-l6-v2 (can be deployed through the API,
   loaded via eland)
 
-These tests that require the models to be deployed are skipped by default. 
+These tests that require the models to be deployed are skipped by default.
 Enable them by adding the model name to the modelsDeployed list below.
 """
 

utils/run-unasync.py

@@ -17,8 +17,8 @@
 
 import os
 import subprocess
-from pathlib import Path
 from glob import glob
+from pathlib import Path
 
 import unasync
 
@@ -55,7 +55,6 @@ def run(rule: unasync.Rule, cleanup_patterns: list[str] = []):
 
 
 def main():
-
     run(
         rule=unasync.Rule(
             fromdir="/elasticsearch/_async/client/",
@@ -98,7 +97,6 @@ def main():
             fromdir="test_elasticsearch/test_server/test_vectorstore/_async/",
             todir="test_elasticsearch/test_server/test_vectorstore/_sync/",
             additional_replacements={
-                # Main
                 "_async": "_sync",
                 "async_bulk": "bulk",
                 "AsyncElasticsearch": "Elasticsearch",