From bbb53c179f1688a701e3ac35715758fa1c64ec0c Mon Sep 17 00:00:00 2001 From: Elodie MORIN Date: Thu, 1 Oct 2026 16:11:20 +0200 Subject: [PATCH 1/3] fix(storage): cannot list dataset content if an analysis with the same name exists --- backend/storage/resolvers/_osekit.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/storage/resolvers/_osekit.py b/backend/storage/resolvers/_osekit.py index 1d31c3892..e7ff9273f 100644 --- a/backend/storage/resolvers/_osekit.py +++ b/backend/storage/resolvers/_osekit.py @@ -70,7 +70,7 @@ def _get_all_analysis_for_dataset( dataset=dataset, relative_path=make_path_relative( PureWindowsPath(info["dataset"]).parent.as_posix(), - to=dataset.path, + to=osekit_project.folder, ), detailed=detailed, ) @@ -93,7 +93,7 @@ def _get_analysis( continue path = make_path_relative( PureWindowsPath(info["dataset"]).parent.as_posix(), - to=dataset.path, + to=osekit_dataset.folder, ) if path == relative_path: if not detailed: From b57ec4fff071b313c933c78d4764b395ee7d5ebc Mon Sep 17 00:00:00 2001 From: Elodie MORIN Date: Thu, 1 Oct 2026 16:28:42 +0200 Subject: [PATCH 2/3] fix(storage): cannot list dataset content if an analysis with the same name exists --- backend/storage/resolvers/_osekit.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/storage/resolvers/_osekit.py b/backend/storage/resolvers/_osekit.py index e7ff9273f..e95931239 100644 --- a/backend/storage/resolvers/_osekit.py +++ b/backend/storage/resolvers/_osekit.py @@ -1,6 +1,7 @@ """OSEkit resolver""" from pathlib import PureWindowsPath, Path +from django.conf import settings from metadatax.data.models import FileFormat from osekit.core.spectro_dataset import SpectroDataset from osekit.public.project import Project @@ -70,7 +71,7 @@ def _get_all_analysis_for_dataset( dataset=dataset, relative_path=make_path_relative( PureWindowsPath(info["dataset"]).parent.as_posix(), - to=osekit_project.folder, + to=join(settings.DATASET_EXPORT_PATH,make_path_relative(osekit_project.folder)), ), detailed=detailed, ) @@ -93,7 +94,7 @@ def _get_analysis( continue path = make_path_relative( PureWindowsPath(info["dataset"]).parent.as_posix(), - to=osekit_dataset.folder, + to=join(settings.DATASET_EXPORT_PATH,make_path_relative(osekit_dataset.folder)), ) if path == relative_path: if not detailed: From 8ae3189a1648fdc4a8a703b2dd7e120320e01ab3 Mon Sep 17 00:00:00 2001 From: Elodie MORIN Date: Thu, 1 Oct 2026 16:33:00 +0200 Subject: [PATCH 3/3] black --- backend/storage/resolvers/_osekit.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/storage/resolvers/_osekit.py b/backend/storage/resolvers/_osekit.py index e95931239..6d355f58a 100644 --- a/backend/storage/resolvers/_osekit.py +++ b/backend/storage/resolvers/_osekit.py @@ -71,7 +71,10 @@ def _get_all_analysis_for_dataset( dataset=dataset, relative_path=make_path_relative( PureWindowsPath(info["dataset"]).parent.as_posix(), - to=join(settings.DATASET_EXPORT_PATH,make_path_relative(osekit_project.folder)), + to=join( + settings.DATASET_EXPORT_PATH, + make_path_relative(osekit_project.folder), + ), ), detailed=detailed, ) @@ -94,7 +97,10 @@ def _get_analysis( continue path = make_path_relative( PureWindowsPath(info["dataset"]).parent.as_posix(), - to=join(settings.DATASET_EXPORT_PATH,make_path_relative(osekit_dataset.folder)), + to=join( + settings.DATASET_EXPORT_PATH, + make_path_relative(osekit_dataset.folder), + ), ) if path == relative_path: if not detailed: