Skip to content

Commit 534fb11

Browse files
🐛 fix searchfile bug and filter tests for old clients (#218)
1 parent d05c0cd commit 534fb11

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

clients/python/src/osparc/_api_files_api.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,15 @@ def _search_files(
251251
sha256_checksum: Optional[str] = None,
252252
timeout_seconds: int = DEFAULT_TIMEOUT_SECONDS,
253253
) -> PaginationGenerator:
254+
kwargs = {
255+
"file_id": file_id,
256+
"sha256_checksum": sha256_checksum,
257+
"_request_timeout": timeout_seconds,
258+
}
259+
254260
def _pagination_method():
255261
return super(FilesApi, self).search_files_page(
256-
file_id=file_id,
257-
sha256_checksum=sha256_checksum,
258-
_request_timeout=timeout_seconds,
262+
**{k: v for k, v in kwargs.items() if v is not None}
259263
)
260264

261265
return PaginationGenerator(

clients/python/test/e2e/test_files_api.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@ def max_diff(data: List[int]) -> int:
8585
assert _hash_file(Path(downloaded_file)) == _hash_file(large_server_file.local_file)
8686

8787

88-
@skip_if_osparc_version(at_least=Version("0.8.0"))
89-
@pytest.mark.parametrize("use_checksum", [True, False])
90-
@pytest.mark.parametrize("use_id", [True, False])
88+
@skip_if_osparc_version(at_least=Version("0.8.3.post0.dev20"))
89+
@pytest.mark.parametrize(
90+
"use_checksum,use_id", [(True, True), (False, True), (True, False)]
91+
)
9192
def test_search_files(
9293
large_server_file: Callable[[ByteSize], Path],
9394
files_api: osparc.FilesApi,

0 commit comments

Comments
 (0)