diff --git a/pyproject.toml b/pyproject.toml index b032612b4713d5dd21784acbe94b0ae69b8af3f3..67c8cd6ea38d1c4eb6319270a538b5ba35b5eacf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "MaggotUBA-adapter" -version = "0.15.0" +version = "0.16" description = "Interface between MaggotUBA and the Nyx tagging UI" authors = ["François Laurent"] license = "MIT" @@ -14,7 +14,7 @@ maggotuba-core = {git = "https://gitlab.pasteur.fr/nyx/MaggotUBA-core", tag = "v torch = "^1.11.0" numpy = "^1.19.3" protobuf = "3.9.2" -taggingbackends = {git = "https://gitlab.pasteur.fr/nyx/TaggingBackends", tag = "v0.14"} +taggingbackends = {git = "https://gitlab.pasteur.fr/nyx/TaggingBackends", tag = "v0.14.1"} [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/src/maggotuba/data/make_dataset.py b/src/maggotuba/data/make_dataset.py index 4687ff713c4543e648ec3bd6cc2f45fbee212161..8595288f58dbe4a2619f5922237632488b902978 100644 --- a/src/maggotuba/data/make_dataset.py +++ b/src/maggotuba/data/make_dataset.py @@ -52,6 +52,8 @@ def make_dataset(backend, labels_expected=False, trxmat_only=False, # note kwargs['labels'] may be defined, but we dismiss # the input argument, because we need to preserve the # order of the labels (the class indices) + if isinstance(labels, dict): + labels = labels['names'] kwargs['labels'] = labels break @@ -59,6 +61,7 @@ def make_dataset(backend, labels_expected=False, trxmat_only=False, # generate a larva_dataset_*.hdf5 file in data/interim/{instance}/ balance = isinstance(balancing_strategy, str) and balancing_strategy.lower() == 'maggotuba' out = backend.generate_dataset(backend.raw_data_dir(), + past_future_extensions=False, balance=balance, **kwargs) print(f"larva_dataset file generated: {out}")