Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dataconnect/service/mappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def resource_to_fetched_data(table: DataTable) -> pd.DataFrame:

ipc_buffer = pa.BufferReader(table.ipc_bytes)
with pa.ipc.open_stream(ipc_buffer) as reader:
return reader.read_all().to_pandas()
return reader.read_all().to_pandas(types_mapper=pd.ArrowDtype)
Comment thread
butsyk-mdsol marked this conversation as resolved.


def resource_to_dataset(resource: ResourceInfo) -> Dataset:
Expand Down
45 changes: 0 additions & 45 deletions tests/test_get_datasets_paginated.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

import pytest

from dataconnect.exceptions import ValidationError
from dataconnect.models import Dataset, PaginatedResponse, Pagination
from dataconnect.service.default import DefaultDataConnectService
from dataconnect.transport.errors import TransportError
Expand Down Expand Up @@ -144,50 +143,6 @@ def test_builds_correct_request_body(self) -> None:
"page_size": 10,
}

def test_raises_validation_error_for_invalid_uuid(self) -> None:
transport = _FakeTransport(resources=[])
service = DefaultDataConnectService(transport)

with pytest.raises(ValidationError, match="study_environment_uuid must be a valid UUID"):
service.get_datasets(study_environment_uuid="not-a-uuid") # type: ignore[arg-type]

def test_raises_validation_error_for_zero_uuid(self) -> None:
transport = _FakeTransport(resources=[])
service = DefaultDataConnectService(transport)

with pytest.raises(ValidationError, match="study_environment_uuid must not be empty"):
service.get_datasets(study_environment_uuid=UUID(int=0))

@pytest.mark.parametrize("page", [0, -1, -100])
def test_raises_validation_error_for_invalid_page(self, page: int) -> None:
transport = _FakeTransport(resources=[])
service = DefaultDataConnectService(transport)

with pytest.raises(ValidationError, match="page must be a positive integer"):
service.get_datasets(study_environment_uuid=_STUDY_ENV_UUID, page=page)

def test_raises_validation_error_for_non_int_page(self) -> None:
transport = _FakeTransport(resources=[])
service = DefaultDataConnectService(transport)

with pytest.raises(ValidationError, match="page must be a positive integer"):
service.get_datasets(study_environment_uuid=_STUDY_ENV_UUID, page="2") # type: ignore[arg-type]

@pytest.mark.parametrize("page_size", [0, -1, -50])
def test_raises_validation_error_for_invalid_page_size(self, page_size: int) -> None:
transport = _FakeTransport(resources=[])
service = DefaultDataConnectService(transport)

with pytest.raises(ValidationError, match="page_size must be a positive integer"):
service.get_datasets(study_environment_uuid=_STUDY_ENV_UUID, page_size=page_size)

def test_raises_validation_error_for_non_int_page_size(self) -> None:
transport = _FakeTransport(resources=[])
service = DefaultDataConnectService(transport)

with pytest.raises(ValidationError, match="page_size must be a positive integer"):
service.get_datasets(study_environment_uuid=_STUDY_ENV_UUID, page_size="25") # type: ignore[arg-type]

def test_translates_transport_errors(self) -> None:
transport = _FakeTransport(error=TransportError(error_code="CONN", message="cannot connect"))
service = DefaultDataConnectService(transport)
Expand Down
Loading