Skip to content

Commit b97081e

Browse files
build: bump the python-development-updates group with 7 updates (#289)
* build: bump the python-development-updates group with 7 updates Bumps the python-development-updates group with 7 updates: | Package | From | To | | --- | --- | --- | | [pytest-cov](https://github.com/pytest-dev/pytest-cov) | `4.0.0` | `7.0.0` | | [pytest](https://github.com/pytest-dev/pytest) | `7.3.1` | `8.4.2` | | [pytest-asyncio](https://github.com/pytest-dev/pytest-asyncio) | `0.21.0` | `1.2.0` | | [ruff](https://github.com/astral-sh/ruff) | `0.8.4` | `0.14.7` | | [mypy](https://github.com/python/mypy) | `1.1.1` | `1.19.0` | | [pre-commit](https://github.com/pre-commit/pre-commit) | `2.20.0` | `4.3.0` | | [types-aiofiles](https://github.com/typeshed-internal/stub_uploader) | `23.1.0.2` | `25.1.0.20251011` | Updates `pytest-cov` from 4.0.0 to 7.0.0 - [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst) - [Commits](pytest-dev/pytest-cov@v4.0.0...v7.0.0) Updates `pytest` from 7.3.1 to 8.4.2 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@7.3.1...8.4.2) Updates `pytest-asyncio` from 0.21.0 to 1.2.0 - [Release notes](https://github.com/pytest-dev/pytest-asyncio/releases) - [Commits](pytest-dev/pytest-asyncio@v0.21.0...v1.2.0) Updates `ruff` from 0.8.4 to 0.14.7 - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](astral-sh/ruff@0.8.4...0.14.7) Updates `mypy` from 1.1.1 to 1.19.0 - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](python/mypy@v1.1.1...v1.19.0) Updates `pre-commit` from 2.20.0 to 4.3.0 - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](pre-commit/pre-commit@v2.20.0...v4.3.0) Updates `types-aiofiles` from 23.1.0.2 to 25.1.0.20251011 - [Commits](https://github.com/typeshed-internal/stub_uploader/commits) --- updated-dependencies: - dependency-name: pytest-cov dependency-version: 7.0.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: python-development-updates - dependency-name: pytest dependency-version: 8.4.2 dependency-type: direct:development update-type: version-update:semver-major dependency-group: python-development-updates - dependency-name: pytest-asyncio dependency-version: 1.2.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: python-development-updates - dependency-name: ruff dependency-version: 0.14.7 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: python-development-updates - dependency-name: mypy dependency-version: 1.19.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: python-development-updates - dependency-name: pre-commit dependency-version: 4.3.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: python-development-updates - dependency-name: types-aiofiles dependency-version: 25.1.0.20251011 dependency-type: direct:development update-type: version-update:semver-major dependency-group: python-development-updates ... Signed-off-by: dependabot[bot] <support@github.com> * fix --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ArzelaAscoIi <37148029+ArzelaAscoIi@users.noreply.github.com> Co-authored-by: ArzelaAscoIi <kristof.herrmann@rwth-aachen.de>
1 parent 3b5d228 commit b97081e

7 files changed

Lines changed: 36 additions & 45 deletions

File tree

deepset_cloud_sdk/models.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,9 @@ class PipelineConfig(BaseConfig):
240240
"""
241241

242242
inputs: PipelineInputs = Field(
243-
default_factory=PipelineInputs,
244243
description=("Pipeline input configuration. Use `PipelineInputs` model to define the inputs."),
245244
)
246245
outputs: PipelineOutputs = Field(
247-
default_factory=PipelineOutputs,
248246
description=("Pipeline output configuration. Use `PipelineOutputs` model to define the outputs."),
249247
)
250248
pipeline_output_type: PipelineOutputType | None = Field(

deepset_cloud_sdk/workflows/sync_client/pipeline_client.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ def import_into_deepset(self, pipeline: PipelineProtocol, config: IndexConfig |
116116
"""
117117
try:
118118
loop = asyncio.get_event_loop()
119+
if loop.is_closed():
120+
raise RuntimeError("Event loop is closed")
119121
# do not close if event loop already exists, e.g. in Jupyter notebooks
120122
should_close = False
121123
except RuntimeError:

pyproject.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ deepset-cloud = "deepset_cloud_sdk.cli:run_packaged"
4848

4949
[dependency-groups]
5050
test = [
51-
"pytest-cov==4.0.0",
52-
"pytest==7.3.1",
53-
"pytest-asyncio==0.21.0",
51+
"pytest-cov==7.0.0",
52+
"pytest==8.4.2",
53+
"pytest-asyncio==1.2.0",
5454
"haystack-ai>=2.13.2", # only for testing
5555
"respx==0.22.0",
5656
"sniffio>=1.3.1",
5757
]
5858
code-quality = [
59-
"ruff==0.8.4",
60-
"mypy==1.1.1",
61-
"pre-commit==2.20.0",
62-
"types-aiofiles==23.1.0.2",
59+
"ruff==0.14.7",
60+
"mypy==1.19.0",
61+
"pre-commit==4.3.0",
62+
"types-aiofiles==25.1.0.20251011",
6363
"types-tabulate==0.9.0.20241207",
6464
]
6565

tests/integration/service/test_integration_files_service.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ async def test_direct_upload_path(self, integration_config: CommonConfig, worksp
4848

4949
for file in files:
5050
if file.name in names_of_uploaded_files:
51-
assert (
52-
file.meta.get("source") == "msmarco"
53-
), f"Metadata was not uploaded correctly for file '{file.name}': {file.meta}"
51+
assert file.meta.get("source") == "msmarco", (
52+
f"Metadata was not uploaded correctly for file '{file.name}': {file.meta}"
53+
)
5454

5555
async def test_direct_upload_path_multiple_file_types(
5656
self, integration_config: CommonConfig, workspace_name: str
@@ -91,9 +91,9 @@ async def test_direct_upload_path_multiple_file_types(
9191

9292
for file in uploaded_files:
9393
if file.name in local_file_names:
94-
assert (
95-
file.meta.get("source") == "multiple file types"
96-
), f"Metadata was not uploaded correctly for file '{file.name}': {file.meta}"
94+
assert file.meta.get("source") == "multiple file types", (
95+
f"Metadata was not uploaded correctly for file '{file.name}': {file.meta}"
96+
)
9797

9898
async def test_async_upload(
9999
self, integration_config: CommonConfig, workspace_name: str, monkeypatch: MonkeyPatch
@@ -135,9 +135,9 @@ async def test_async_upload(
135135

136136
for file in uploaded_files:
137137
if file.name in local_file_names:
138-
assert (
139-
file.meta.get("source") == "msmarco"
140-
), f"Metadata was not uploaded correctly for file '{file.name}': {file.meta}"
138+
assert file.meta.get("source") == "msmarco", (
139+
f"Metadata was not uploaded correctly for file '{file.name}': {file.meta}"
140+
)
141141

142142
async def test_async_upload_multiple_file_types(
143143
self, integration_config: CommonConfig, workspace_name: str, monkeypatch: MonkeyPatch
@@ -189,9 +189,9 @@ async def test_async_upload_multiple_file_types(
189189

190190
for file in uploaded_files:
191191
if file.name in local_file_names:
192-
assert (
193-
file.meta.get("source") == "multiple file types"
194-
), f"Metadata was not uploaded correctly for file '{file.name}': {file.meta}"
192+
assert file.meta.get("source") == "multiple file types", (
193+
f"Metadata was not uploaded correctly for file '{file.name}': {file.meta}"
194+
)
195195

196196
# Make sure that the metadata for File00.txt and file00.txt are mapped correctly
197197
File00_metadata = next((file.meta for file in uploaded_files if file.name == "File00.txt"), None)

tests/unit/test_cli.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from uuid import UUID
77

88
import pytest
9-
import structlog
109
from typer.testing import CliRunner
1110

1211
__version__ = version("deepset-cloud-sdk")
@@ -23,31 +22,17 @@
2322
from deepset_cloud_sdk.models import UserInfo
2423
from deepset_cloud_sdk.workflows.sync_client.files import download as sync_download
2524

26-
logger = structlog.get_logger(__name__)
2725
runner = CliRunner()
2826

2927

3028
class TestCLIMethods:
3129
@patch("deepset_cloud_sdk.workflows.sync_client.files.async_upload")
3230
def test_uploading(self, async_upload_mock: AsyncMock) -> None:
33-
# Configure logger to output to stdout and avoid interference with other tests
34-
structlog.configure(
35-
processors=[
36-
structlog.processors.UnicodeDecoder(),
37-
structlog.processors.format_exc_info,
38-
structlog.dev.ConsoleRenderer(),
39-
],
40-
wrapper_class=structlog.BoundLogger,
41-
context_class=dict,
42-
logger_factory=structlog.PrintLoggerFactory(),
43-
cache_logger_on_first_use=True,
44-
)
45-
4631
def log_upload_folder_mock(
4732
*args: Any,
4833
**kwargs: Any,
4934
) -> None:
50-
logger.info("Fake log line")
35+
print("Fake log line")
5136

5237
async_upload_mock.side_effect = log_upload_folder_mock
5338
result = runner.invoke(cli_app, ["upload", "./test/data/upload_folder/example.txt"])

tests/unit/workflows/sync_client/test_pipeline_client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ def test_import_into_deepset_with_existing_event_loop(
200200
)
201201

202202
mock_loop = Mock()
203+
mock_loop.is_closed.return_value = False
203204
mock_loop.run_until_complete.return_value = None
204205
mock_loop.close = Mock()
205206

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
from asyncio import AbstractEventLoop
1+
import asyncio
22
from typing import AsyncIterator
33

44
from deepset_cloud_sdk.workflows.sync_client.utils import iter_over_async
55

66

7-
def test_iter_over_async(event_loop: AbstractEventLoop) -> None:
8-
async def async_generator() -> AsyncIterator[int]:
9-
yield 1
10-
yield 2
11-
yield 3
7+
def test_iter_over_async() -> None:
8+
loop = asyncio.new_event_loop()
9+
try:
1210

13-
sync_generator = iter_over_async(async_generator(), event_loop)
14-
assert list(sync_generator) == [1, 2, 3]
11+
async def async_generator() -> AsyncIterator[int]:
12+
yield 1
13+
yield 2
14+
yield 3
15+
16+
sync_generator = iter_over_async(async_generator(), loop)
17+
assert list(sync_generator) == [1, 2, 3]
18+
finally:
19+
loop.close()

0 commit comments

Comments
 (0)