Merge branch 'develop' of github.com:fedbiomed/fedbiomed into feature…

…/1105-fix-loading-image-name-containing-dots-bug
fedbiomed · Nov 22, 2024 · 05acd52 · 05acd52
2 parents 55a6297 + 8e6c0dc
commit 05acd52
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/docs/tutorials/medical/medical-image-segmentation-unet-library.ipynb b/docs/tutorials/medical/medical-image-segmentation-unet-library.ipynb
@@ -640,23 +640,23 @@
     "data_loaders = []\n",
     "\n",
     "datasets = [{\n",
-    "    'dataset_path' : '<febiomed-dir>/notebooks/data/Hospital-Centers/Guys/holdout/',\n",
+    "    'dataset_path' : '../../../data/Hospital-Centers/Guys/holdout/',\n",
     "    'dataset_parameters': {\n",
-    "        'tabular_file': '<febiomed-dir>/notebooks/data/Hospital-Centers/Guys/holdout/participants.csv',\n",
+    "        'tabular_file': '../../../data/Hospital-Centers/Guys/holdout/participants.csv',\n",
     "        'index_col': 14\n",
     "        }\n",
     "    },\n",
     "    {\n",
-    "    'dataset_path' : '<febiomed-dir>/notebooks/data/Hospital-Centers/HH/holdout/',\n",
+    "    'dataset_path' : '../../../data/Hospital-Centers/HH/holdout/',\n",
     "    'dataset_parameters': {\n",
-    "        'tabular_file': '<febiomed-dir>/notebooks/data/Hospital-Centers/HH/holdout/participants.csv',\n",
+    "        'tabular_file': '../../../data/Hospital-Centers/HH/holdout/participants.csv',\n",
     "        'index_col': 14\n",
     "        }\n",
     "    },\n",
     "    {\n",
-    "    'dataset_path' : '<febiomed-dir>/notebooks/data/Hospital-Centers/IOP/holdout/',\n",
+    "    'dataset_path' : '../../../data/Hospital-Centers/IOP/holdout/',\n",
     "    'dataset_parameters': {\n",
-    "        'tabular_file': '<febiomed-dir>/notebooks/data/Hospital-Centers/IOP/holdout/participants.csv',\n",
+    "        'tabular_file': '../../../data/Hospital-Centers/IOP/holdout/participants.csv',\n",
     "        'index_col': 14\n",
     "        }\n",
     "    },\n",

diff --git a/fedbiomed/node/node.py b/fedbiomed/node/node.py
@@ -19,6 +19,8 @@
     PingRequest,
     SearchReply,
     SearchRequest,
+    ListRequest,
+    ListReply,
     SecaggDeleteReply,
     SecaggDeleteRequest,
     SecaggReply,
@@ -164,6 +166,20 @@ def on_message(self, msg: dict):
                             count=len(databases),
                         )
                     )
+                case ListRequest.__name__:
+                    # Get list of all datasets
+                    databases = self.dataset_manager.list_my_data(verbose=False)
+                    databases = self.dataset_manager.obfuscate_private_information(databases)
+                    self._grpc_client.send(
+                        ListReply(
+                            success=True,
+                            request_id=message.request_id,
+                            node_id=environ['NODE_ID'],
+                            researcher_id=message.researcher_id,
+                            databases=databases,
+                            count=len(databases),
+                        )
+                    )
 
                 case PingRequest.__name__:
                     self._grpc_client.send(