Skip to content

Commit

Permalink
feat(api): re-add api datasets commands using new database backend (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Panaetius committed Sep 2, 2021
1 parent ad622bc commit d4e26e9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
11 changes: 8 additions & 3 deletions renku/api/models/dataset.py
Expand Up @@ -42,7 +42,8 @@
from operator import attrgetter

from renku.api.models.project import ensure_project_context
from renku.core.management.dataset.datasets_provenance import DatasetsProvenance
from renku.core.management.command_builder.database_dispatcher import DatabaseDispatcher
from renku.core.metadata.gateway.dataset_gateway import DatasetGateway
from renku.core.models import dataset as core_dataset


Expand Down Expand Up @@ -85,8 +86,12 @@ def list(project):
client = project.client
if not client or not client.has_graph_files():
return []
datasets_provenance = DatasetsProvenance()
return [Dataset._from_dataset(d) for d in datasets_provenance.datasets]
database_dispatcher = DatabaseDispatcher()
database_dispatcher.push_database_to_stack(client.database_path)
dataset_gateway = DatasetGateway()
dataset_gateway.database_dispatcher = database_dispatcher

return [Dataset._from_dataset(d) for d in dataset_gateway.get_all_datasets()]

def __getattribute__(self, name):
dataset = object.__getattribute__(self, "_dataset")
Expand Down
3 changes: 0 additions & 3 deletions tests/api/test_dataset.py
Expand Up @@ -24,7 +24,6 @@
from renku.api import Dataset, Project


@pytest.mark.skip(reason="not implemented with new metadata yet, reenable later")
def test_list_datasets(client_with_datasets):
"""Test listing datasets within a project context."""
with Project():
Expand All @@ -33,7 +32,6 @@ def test_list_datasets(client_with_datasets):
assert {"dataset-1", "dataset-2"} == {d.name for d in datasets}


@pytest.mark.skip(reason="not implemented with new metadata yet, reenable later")
def test_list_datasets_outside_a_context(client_with_datasets):
"""Test listing datasets outside a project context."""
datasets = Dataset.list()
Expand All @@ -48,7 +46,6 @@ def test_list_datasets_outside_a_renku_project(directory_tree):
assert [] == Dataset.list()


@pytest.mark.skip(reason="not implemented with new metadata yet, reenable later")
@pytest.mark.parametrize(
"dataset, files_paths",
[
Expand Down

0 comments on commit d4e26e9

Please sign in to comment.