more changes

integrations/amazon_bedrock/pyproject.toml

@@ -79,6 +79,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/amazon_sagemaker/pyproject.toml

@@ -81,6 +81,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/anthropic/pyproject.toml

@@ -79,6 +79,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/astra/pyproject.toml

@@ -78,7 +78,9 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
-lint.select = [
+
+[tool.ruff.lint]
+select = [
   "A",
   "ARG",
   "B",
@@ -105,7 +107,7 @@ lint.select = [
   "W",
   "YTT",
 ]
-lint.ignore = [
+ignore = [
   # Allow non-abstract empty methods in abstract base classes
   "B027",
   # Allow boolean positional values in function calls, like `dict.get(... True)`
@@ -121,11 +123,11 @@ lint.ignore = [
   "PLR0913",
   "PLR0915",
 ]
-lint.unfixable = [
+unfixable = [
   # Don't touch unused imports
   "F401",
 ]
-lint.exclude = ["example"]
+exclude = ["example"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["haystack_integrations"]

integrations/chroma/pyproject.toml

@@ -85,7 +85,9 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
-lint.select = [
+
+[tool.ruff.lint]
+select = [
   "A",
   "ARG",
   "B",
@@ -112,7 +114,7 @@ lint.select = [
   "W",
   "YTT",
 ]
-lint.ignore = [
+ignore = [
   # Allow non-abstract empty methods in abstract base classes
   "B027",
   # Allow boolean positional values in function calls, like `dict.get(... True)`
@@ -130,7 +132,7 @@ lint.ignore = [
   # Ignore unused params
   "ARG002",
 ]
-lint.unfixable = [
+unfixable = [
   # Don't touch unused imports
   "F401",
 ]

integrations/cohere/examples/cohere_embedding.py

@@ -1,7 +1,6 @@
 from haystack import Document, Pipeline
 from haystack.components.retrievers.in_memory import InMemoryEmbeddingRetriever
 from haystack.document_stores.in_memory import InMemoryDocumentStore
-
 from haystack_integrations.components.embedders.cohere.document_embedder import CohereDocumentEmbedder
 from haystack_integrations.components.embedders.cohere.text_embedder import CohereTextEmbedder
 

integrations/cohere/examples/cohere_generation.py

@@ -20,7 +20,6 @@
 from haystack.components.joiners import BranchJoiner
 from haystack.components.validators import JsonSchemaValidator
 from haystack.dataclasses import ChatMessage
-
 from haystack_integrations.components.generators.cohere import CohereChatGenerator
 
 # Defines a JSON schema for validating a person's data. The schema specifies that a valid object must

integrations/cohere/examples/cohere_ranker.py

@@ -1,7 +1,6 @@
 from haystack import Document, Pipeline
 from haystack.components.retrievers.in_memory import InMemoryBM25Retriever
 from haystack.document_stores.in_memory import InMemoryDocumentStore
-
 from haystack_integrations.components.rankers.cohere import CohereRanker
 
 # Note set your API key by running the below command in your terminal

integrations/cohere/pyproject.toml

@@ -79,6 +79,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/cohere/src/haystack_integrations/components/embedders/cohere/document_embedder.py

@@ -6,9 +6,9 @@
 
 from haystack import Document, component, default_from_dict, default_to_dict
 from haystack.utils import Secret, deserialize_secrets_inplace
+from haystack_integrations.components.embedders.cohere.utils import get_async_response, get_response
 
 from cohere import AsyncClient, Client
-from haystack_integrations.components.embedders.cohere.utils import get_async_response, get_response
 
 
 @component

integrations/cohere/src/haystack_integrations/components/embedders/cohere/text_embedder.py

@@ -6,9 +6,9 @@
 
 from haystack import component, default_from_dict, default_to_dict
 from haystack.utils import Secret, deserialize_secrets_inplace
+from haystack_integrations.components.embedders.cohere.utils import get_async_response, get_response
 
 from cohere import AsyncClient, Client
-from haystack_integrations.components.embedders.cohere.utils import get_async_response, get_response
 
 
 @component

integrations/cohere/tests/test_cohere_chat_generator.py

@@ -7,6 +7,7 @@
 from haystack.components.generators.utils import print_streaming_chunk
 from haystack.dataclasses import ChatMessage, ChatRole, StreamingChunk
 from haystack.utils import Secret
+
 from haystack_integrations.components.generators.cohere import CohereChatGenerator
 
 pytestmark = pytest.mark.chat_generators

integrations/cohere/tests/test_cohere_generator.py

@@ -7,6 +7,7 @@
 from cohere.core import ApiError
 from haystack.components.generators.utils import print_streaming_chunk
 from haystack.utils import Secret
+
 from haystack_integrations.components.generators.cohere import CohereGenerator
 
 pytestmark = pytest.mark.generators

integrations/cohere/tests/test_cohere_ranker.py

@@ -4,6 +4,7 @@
 import pytest
 from haystack import Document
 from haystack.utils.auth import Secret
+
 from haystack_integrations.components.rankers.cohere import CohereRanker
 
 pytestmark = pytest.mark.ranker

integrations/cohere/tests/test_document_embedder.py

@@ -6,6 +6,7 @@
 import pytest
 from haystack import Document
 from haystack.utils import Secret
+
 from haystack_integrations.components.embedders.cohere import CohereDocumentEmbedder
 
 pytestmark = pytest.mark.embedders

integrations/cohere/tests/test_text_embedder.py

@@ -5,6 +5,7 @@
 
 import pytest
 from haystack.utils import Secret
+
 from haystack_integrations.components.embedders.cohere import CohereTextEmbedder
 
 pytestmark = pytest.mark.embedders

integrations/deepeval/pyproject.toml

@@ -71,6 +71,9 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+extend-exclude = ["tests", "example"]
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",
@@ -121,7 +124,6 @@ unfixable = [
   # Don't touch unused imports
   "F401",
 ]
-extend-exclude = ["tests", "example"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["src"]

integrations/elasticsearch/pyproject.toml

@@ -80,6 +80,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/elasticsearch/src/haystack_integrations/components/retrievers/elasticsearch/bm25_retriever.py

@@ -7,7 +7,6 @@
 from haystack.dataclasses import Document
 from haystack.document_stores.types import FilterPolicy
 from haystack.document_stores.types.filter_policy import apply_filter_policy
-
 from haystack_integrations.document_stores.elasticsearch.document_store import ElasticsearchDocumentStore
 
 

integrations/elasticsearch/src/haystack_integrations/components/retrievers/elasticsearch/embedding_retriever.py

@@ -7,7 +7,6 @@
 from haystack.dataclasses import Document
 from haystack.document_stores.types import FilterPolicy
 from haystack.document_stores.types.filter_policy import apply_filter_policy
-
 from haystack_integrations.document_stores.elasticsearch.document_store import ElasticsearchDocumentStore
 
 

integrations/fastembed/examples/example.py

@@ -1,7 +1,6 @@
 from haystack import Document, Pipeline
 from haystack.components.retrievers.in_memory import InMemoryEmbeddingRetriever
 from haystack.document_stores.in_memory import InMemoryDocumentStore
-
 from haystack_integrations.components.embedders.fastembed import FastembedDocumentEmbedder, FastembedTextEmbedder
 
 document_store = InMemoryDocumentStore(embedding_similarity_function="cosine")

integrations/fastembed/examples/sparse_example.py

@@ -4,7 +4,6 @@
 # involving indexing and retrieval of documents.
 
 from haystack import Document
-
 from haystack_integrations.components.embedders.fastembed import FastembedSparseDocumentEmbedder
 
 document_list = [

integrations/fastembed/pyproject.toml

@@ -78,6 +78,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/google_ai/pyproject.toml

@@ -75,6 +75,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/google_vertex/pyproject.toml

@@ -75,6 +75,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/instructor_embedders/pyproject.toml

@@ -105,6 +105,8 @@ exclude_lines = ["no cov", "if __name__ == .__main__.:", "if TYPE_CHECKING:"]
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/jina/pyproject.toml

@@ -74,6 +74,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/langfuse/pyproject.toml

@@ -84,7 +84,10 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
-lint.select = [
+extend-exclude = ["tests", "example"]
+
+[tool.ruff.lint]
+select = [
   "A",
   "ARG",
   "B",
@@ -110,8 +113,7 @@ lint.select = [
   "W",
   "YTT",
 ]
-
-lint.ignore = [
+ignore = [
   # Allow non-abstract empty methods in abstract base classes
   "B027",
   # Ignore checks for possible passwords
@@ -127,11 +129,10 @@ lint.ignore = [
   # Asserts
   "S101",
 ]
-lint.unfixable = [
+unfixable = [
   # Don't touch unused imports
   "F401",
 ]
-extend-exclude = ["tests", "example"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["src"]

integrations/llama_cpp/examples/rag_pipeline_example.py

@@ -6,7 +6,6 @@
 from haystack.components.retrievers import InMemoryEmbeddingRetriever
 from haystack.components.writers import DocumentWriter
 from haystack.document_stores import InMemoryDocumentStore
-
 from haystack_integrations.components.generators.llama_cpp import LlamaCppGenerator
 
 # Load first 100 rows of the Simple Wikipedia Dataset from HuggingFace

integrations/llama_cpp/pyproject.toml

@@ -88,6 +88,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
     "A",
     "ARG",

integrations/mistral/pyproject.toml

@@ -79,6 +79,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/mistral/tests/test_mistral_chat_generator.py

@@ -7,11 +7,12 @@
 from haystack.components.generators.utils import print_streaming_chunk
 from haystack.dataclasses import ChatMessage, StreamingChunk
 from haystack.utils.auth import Secret
-from haystack_integrations.components.generators.mistral.chat.chat_generator import MistralChatGenerator
 from openai import OpenAIError
 from openai.types.chat import ChatCompletion, ChatCompletionMessage
 from openai.types.chat.chat_completion import Choice
 
+from haystack_integrations.components.generators.mistral.chat.chat_generator import MistralChatGenerator
+
 
 @pytest.fixture
 def chat_messages():

integrations/mistral/tests/test_mistral_document_embedder.py

@@ -6,6 +6,7 @@
 import pytest
 from haystack import Document
 from haystack.utils import Secret
+
 from haystack_integrations.components.embedders.mistral.document_embedder import MistralDocumentEmbedder
 
 pytestmark = pytest.mark.embedders

integrations/mistral/tests/test_mistral_text_embedder.py

@@ -5,6 +5,7 @@
 
 import pytest
 from haystack.utils import Secret
+
 from haystack_integrations.components.embedders.mistral.text_embedder import MistralTextEmbedder
 
 pytestmark = pytest.mark.embedders

integrations/mongodb_atlas/pyproject.toml

@@ -78,6 +78,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",

integrations/nvidia/pyproject.toml

@@ -81,6 +81,8 @@ skip-string-normalization = true
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 select = [
   "A",
   "ARG",