Skip to content

Commit f0aac56

Browse files
Merge branch 'main' into fix/2939-sparse-vector-storage
2 parents 8f85f8d + b3f17e0 commit f0aac56

File tree

83 files changed

+789
-751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+789
-751
lines changed

.github/workflows/CI_docusaurus_sync.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,4 @@ jobs:
117117
add-paths: |
118118
docs-website
119119
body: |
120-
This PR syncs the Core Integrations API reference (${{ env.INTEGRATION_NAME }}) on Docusaurus. Just approve and merge it.
121-
reviewers: "${{ github.actor }}"
120+
This PR syncs the Core Integrations API reference (${{ env.INTEGRATION_NAME }}) on Docusaurus. Just approve and merge it.

integrations/aimlapi/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ line-length = 120
8080
[tool.ruff.lint]
8181
select = [
8282
"A",
83+
"ANN",
8384
"ARG",
8485
"B",
8586
"C",
@@ -130,7 +131,7 @@ ban-relative-imports = "parents"
130131

131132
[tool.ruff.lint.per-file-ignores]
132133
# Tests can use magic values, assertions, and relative imports
133-
"tests/**/*" = ["PLR2004", "S101", "TID252"]
134+
"tests/**/*" = ["PLR2004", "S101", "TID252", "ANN"]
134135

135136
[tool.coverage.run]
136137
source = ["haystack_integrations"]

integrations/aimlapi/src/haystack_integrations/components/generators/aimlapi/chat/chat_generator.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def __init__(
7171
extra_headers: dict[str, Any] | None = None,
7272
max_retries: int | None = None,
7373
http_client_kwargs: dict[str, Any] | None = None,
74-
):
74+
) -> None:
7575
"""
7676
Creates an instance of AIMLAPIChatGenerator. Unless specified otherwise,
7777
the default model is `openai/gpt-5-chat-latest`.
@@ -192,8 +192,6 @@ def _prepare_api_call(
192192
raise ValueError(msg)
193193
response_format = generation_kwargs.pop("response_format", None)
194194

195-
response_format = generation_kwargs.pop("response_format", None)
196-
197195
base_args = {
198196
"model": self.model,
199197
"messages": aimlapi_formatted_messages,

integrations/amazon_bedrock/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ line-length = 120
9696
[tool.ruff.lint]
9797
select = [
9898
"A",
99+
"ANN",
99100
"ARG",
100101
"B",
101102
"C",
@@ -123,6 +124,8 @@ select = [
123124
ignore = [
124125
# Allow non-abstract empty methods in abstract base classes
125126
"B027",
127+
# Allow `Any` - used legitimately for **kwargs passed to AWS/boto3 APIs
128+
"ANN401",
126129
# Ignore checks for possible passwords
127130
"S105",
128131
"S106",
@@ -147,7 +150,7 @@ ban-relative-imports = "parents"
147150

148151
[tool.ruff.lint.per-file-ignores]
149152
# Tests can use magic values, assertions, and relative imports
150-
"tests/**/*" = ["PLR2004", "S101", "TID252"]
153+
"tests/**/*" = ["PLR2004", "S101", "TID252", "ANN"]
151154

152155
[tool.coverage.run]
153156
source = ["haystack_integrations"]

integrations/amazon_bedrock/src/haystack_integrations/components/rankers/amazon_bedrock/ranker.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ def __init__(
7272
meta_fields_to_embed: list[str] | None = None,
7373
meta_data_separator: str = "\n",
7474
) -> None:
75-
if not model:
76-
msg = "'model' cannot be None or empty string"
77-
raise ValueError(msg)
7875
"""
7976
Creates an instance of the 'AmazonBedrockRanker'.
8077
@@ -93,6 +90,9 @@ def __init__(
9390
:param meta_data_separator: Separator used to concatenate the meta fields
9491
to the Document content.
9592
"""
93+
if not model:
94+
msg = "'model' cannot be None or empty string"
95+
raise ValueError(msg)
9696
self.model_name = model
9797
self.aws_access_key_id = aws_access_key_id
9898
self.aws_secret_access_key = aws_secret_access_key

integrations/amazon_sagemaker/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ line-length = 120
8787
[tool.ruff.lint]
8888
select = [
8989
"A",
90+
"ANN",
9091
"ARG",
9192
"B",
9293
"C",
@@ -139,7 +140,7 @@ ban-relative-imports = "parents"
139140

140141
[tool.ruff.lint.per-file-ignores]
141142
# Tests can use magic values, assertions, and relative imports
142-
"tests/**/*" = ["PLR2004", "S101", "TID252"]
143+
"tests/**/*" = ["PLR2004", "S101", "TID252", "ANN"]
143144

144145
[tool.coverage.run]
145146
source = ["haystack_integrations"]

integrations/amazon_sagemaker/src/haystack_integrations/components/generators/amazon_sagemaker/sagemaker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(
5858
aws_profile_name: Secret | None = Secret.from_env_var(["AWS_PROFILE"], strict=False), # noqa: B008
5959
aws_custom_attributes: dict[str, Any] | None = None,
6060
generation_kwargs: dict[str, Any] | None = None,
61-
):
61+
) -> None:
6262
"""
6363
Instantiates the session with SageMaker.
6464

integrations/anthropic/pyproject.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ line-length = 120
8282
[tool.ruff.lint]
8383
select = [
8484
"A",
85+
"ANN",
8586
"ARG",
8687
"B",
8788
"C",
@@ -110,6 +111,8 @@ ignore = [
110111
"T201", # print statements
111112
# Allow non-abstract empty methods in abstract base classes
112113
"B027",
114+
# Allow `Any` - used for Anthropic SDK response objects which are dynamically typed
115+
"ANN401",
113116
# Ignore checks for possible passwords
114117
"S105",
115118
"S106",
@@ -134,7 +137,8 @@ ban-relative-imports = "parents"
134137

135138
[tool.ruff.lint.per-file-ignores]
136139
# Tests can use magic values, assertions, and relative imports
137-
"tests/**/*" = ["PLR2004", "S101", "TID252"]
140+
"tests/**/*" = ["PLR2004", "S101", "TID252", "ANN"]
141+
"example/**/*" = ["ANN"]
138142

139143
[tool.coverage.run]
140144
source = ["haystack_integrations"]

integrations/anthropic/src/haystack_integrations/components/generators/anthropic/chat/chat_generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def __init__(
135135
*,
136136
timeout: float | None = None,
137137
max_retries: int | None = None,
138-
):
138+
) -> None:
139139
"""
140140
Creates an instance of AnthropicChatGenerator.
141141

integrations/anthropic/src/haystack_integrations/components/generators/anthropic/chat/vertex_chat_generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def __init__(
9292
*,
9393
timeout: float | None = None,
9494
max_retries: int | None = None,
95-
):
95+
) -> None:
9696
"""
9797
Creates an instance of AnthropicVertexChatGenerator.
9898

0 commit comments

Comments
 (0)