From 904686be95abaeba76c1145efa6a8cd9d3219467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20L=C3=A9obal?= <olivier.leobal@owkin.com>
Date: Fri, 7 Apr 2023 18:36:46 +0200
Subject: [PATCH] chore: release 0.26.0 (#293)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Olivier Léobal <olivier.leobal@owkin.com>
Signed-off-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>
Co-authored-by: ThibaultFy <50656860+ThibaultFy@users.noreply.github.com>
---
 .gitignore                                    |   1 +
 docs/source/additional/release.rst            |  46 ++++++++---
 docs/source/additional/releases.yaml          |  38 +++++++++
 docs/source/conf.py                           |   4 +-
 .../source/documentation/get_performances.rst |   8 +-
 .../images/substra-0.26-task-duration.png     | Bin 0 -> 15676 bytes
 examples/diabetes_example/run_diabetes.py     |  76 ++++++------------
 7 files changed, 106 insertions(+), 67 deletions(-)
 create mode 100644 docs/source/static/images/substra-0.26-task-duration.png

diff --git a/.gitignore b/.gitignore
index 32c1cad7..dde3ea97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,6 +151,7 @@ docs/source/substrafl_doc/examples
 # Data folder when run locally
 **/data_iris
 **/data_mnist
+**/data
 
 # Algo files folder when run locally
 **/algo_files
diff --git a/docs/source/additional/release.rst b/docs/source/additional/release.rst
index 683a35ff..4caf52bd 100644
--- a/docs/source/additional/release.rst
+++ b/docs/source/additional/release.rst
@@ -28,8 +28,34 @@ This is an overview of the main changes, please have a look at the changelog of
 - `backend changelog <https://github.com/Substra/substra-backend/blob/main/CHANGELOG.md>`__
 - `orchestrator changelog <https://github.com/Substra/orchestrator/blob/main/CHANGELOG.md>`__
 
-Substra 0.25.0 - 2023-02-17
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Substra 0.26.0 --- 2023-04-03
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Improve backend performance when handling large amounts of compute plans and tasks. This will result in faster front-end pages.
+- Rename Algo to Function.
+- SSO Login
+- Experimental: Add a task duration breakdown for every task in the front-end. Note that this is an experimental feature and only works on the current backend you are logged into.
+
+.. figure:: ../static/images/substra-0.26-task-duration.png
+  :align: center
+  :alt: Screenshot of task duration
+
+Front-end:
+
+- Fix issue where a performance of ``0`` was displayed as ``-``.
+
+SubstraFL:
+
+- **BREAKING CHANGE**: ``algo`` are now passed as a parameter to the ``strategy`` and not to ``execute_experiement`` anymore.
+- **BREAKING CHANGE**: a ``strategy`` needs to implement a new method ``build_graph`` to build the graph of tasks to be executed in ``execute_experiment``.
+- **BREAKING CHANGE**: ``predict`` method of ``strategy`` has been renamed to ``perform_predict``.
+- **BREAKING CHANGE**: clarify ``EvaluationStrategy`` arguments: change ``rounds`` to ``eval_frequency`` and ``eval_rounds``.
+- Fix an issue where ``aggregation_lr`` could not be changed in the Scaffold strategy.
+- Add Initialization task to each strategy in SubstraFL
+
+
+Substra 0.25.0 --- 2023-02-17
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - **BREAKING CHANGE**: ``DataSampleSpec`` does not have a ``test_only`` field anymore.
 - SubstraFL: It is now possible to test on an organization where no training have been performed.
@@ -37,15 +63,15 @@ Substra 0.25.0 - 2023-02-17
 - Fix an issue where Skaffold spawned too many backends.
 - Add contributing guide & code of conduct to all repos.
 
-Substra 0.24.0 - 2023-01-13
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Substra 0.24.0 --- 2023-01-13
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - Fix issue where launching a large compute sometimes fails with: ``ERROR: could not serialize access due to read/write dependencies among transactions (SQLSTATE 40001)``
 - Documentation: add **contributing guide** and **code of conduct**
 - Update **Substra Tools** base docker image to ``substra-tools:0.20.0-nvidiacuda11.6.0-base-ubuntu20.04-python3.*``
 
-Substra 0.23.1 - 2022-11-24
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Substra 0.23.1 --- 2022-11-24
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Main changes
 
@@ -195,8 +221,8 @@ Substra Backend:
 
 - Prevent use of ``__`` in asset metadata keys
 
-Substra 0.22.0 - 2022-10-20
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Substra 0.22.0 --- 2022-10-20
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Main changes
 
@@ -350,8 +376,8 @@ could be replace with:
       tools.metrics.execute(AUC())
 
 
-Substra 0.21.0 - 2022-09-12
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Substra 0.21.0 --- 2022-09-12
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This is our first open source release since 2021! When the product was closed source it used to be named Connect. It is now renamed Substra.
 
diff --git a/docs/source/additional/releases.yaml b/docs/source/additional/releases.yaml
index f676356f..8134cb24 100644
--- a/docs/source/additional/releases.yaml
+++ b/docs/source/additional/releases.yaml
@@ -9,6 +9,44 @@ components: # for table headers
   - substra-tests
 
 releases:
+  - version: 0.26.0
+    components:
+      substrafl:
+        version: 0.35.0
+        link: https://github.com/Substra/substrafl/releases/tag/0.35.0
+      substra:
+        version: 0.43.0
+        link: https://github.com/Substra/substra/releases/tag/0.43.0
+      substra-tools:
+        version: 0.20.0
+        link: https://github.com/Substra/substra-tools/releases/tag/0.20.0
+      substra-backend:
+        version: 0.36.0
+        link: https://github.com/Substra/substra-backend/releases/tag/0.36.0
+        helm:
+          version: 22.4.2
+          link: https://artifacthub.io/packages/helm/substra/substra-backend/22.4.2
+      orchestrator:
+        version: 0.33.0
+        link: https://github.com/Substra/orchestrator/releases/tag/0.33.0
+        helm:
+          version: 7.4.12
+          link: https://artifacthub.io/packages/helm/substra/orchestrator/7.4.12
+      substra-frontend:
+        version: 0.40.0
+        link: https://github.com/Substra/substra-frontend/releases/tag/0.40.0
+        helm:
+          version: 1.0.16
+          link: https://artifacthub.io/packages/helm/substra/substra-frontend/1.0.16
+      hlf-k8s:
+        version: 0.2.3
+        link: https://github.com/Substra/hlf-k8s/releases/tag/0.2.3
+        helm:
+          version: 10.2.3
+          link: https://artifacthub.io/packages/helm/substra/hlf-k8s/10.2.3
+      substra-tests:
+        version: 0.39.0
+        link: https://github.com/Substra/substra-tests/releases/tag/0.39.0
   - version: 0.25.0
     components:
       substrafl:
diff --git a/docs/source/conf.py b/docs/source/conf.py
index c7442e94..aa709cd5 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -29,9 +29,9 @@
 TMP_FOLDER = Path(__file__).parents[2] / "tmp"
 
 if os.environ.get("READTHEDOCS_VERSION_TYPE") == "tag":
-    SUBSTRA_VERSION = "0.42.0"
+    SUBSTRA_VERSION = "0.43.0"
     TOOLS_VERSION = "0.20.0"
-    SUBSTRAFL_VERSION = "0.34.0"
+    SUBSTRAFL_VERSION = "0.35.0"
 
 else:
     SUBSTRA_VERSION = "main"
diff --git a/docs/source/documentation/get_performances.rst b/docs/source/documentation/get_performances.rst
index 7b2e28a8..9c8f43dd 100644
--- a/docs/source/documentation/get_performances.rst
+++ b/docs/source/documentation/get_performances.rst
@@ -59,11 +59,11 @@ This script will automatically end if the :code:`performance.json` file has not
         df = pd.DataFrame(dict_perf)
 
         for _, row in df.iterrows():
-            if row["testtuple_key"] in logged_rows:
+            if row["task_key"] in logged_rows:
                 continue
 
-            logged_rows.append(row["testtuple_key"])
+            logged_rows.append(row["task_key"])
 
-            step = int(row["round_idx"]) if row["round_idx"] is not None else int(row["testtuple_rank"])
+            step = int(row["round_idx"]) if row["round_idx"] is not None else int(row["task_rank"])
 
-            log_metric(f"{row['metric_name']}_{row['worker']}", row["performance"], step)
+            log_metric(f"{row['function_name']}_{row['worker']}", row["performance"], step)
diff --git a/docs/source/static/images/substra-0.26-task-duration.png b/docs/source/static/images/substra-0.26-task-duration.png
new file mode 100644
index 0000000000000000000000000000000000000000..43ebf6c1c1ed75b5c987ad30caed52e8ef25d502
GIT binary patch
literal 15676
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
I`S9ug0poOxwEzGB

literal 0
HcmV?d00001

diff --git a/examples/diabetes_example/run_diabetes.py b/examples/diabetes_example/run_diabetes.py
index 816bcfde..7a121a29 100644
--- a/examples/diabetes_example/run_diabetes.py
+++ b/examples/diabetes_example/run_diabetes.py
@@ -104,7 +104,9 @@
 # - Permissions allow you to execute a function on a certain dataset.
 #
 
-permissions = Permissions(public=False, authorized_ids=[ANALYTICS_PROVIDER_ORG_ID])
+permissions_local = Permissions(public=False, authorized_ids=DATA_PROVIDER_ORGS_ID)
+permissions_aggregation = Permissions(public=False, authorized_ids=[ANALYTICS_PROVIDER_ORG_ID])
+
 # %%
 # Next, we need to define the asset directory. You should have already downloaded the assets folder as stated above.
 #
@@ -136,15 +138,12 @@
     type="csv",
     data_opener=assets_directory / "dataset" / "diabetes_opener.py",
     description=data_path / "description.md",
-    permissions=permissions,
-    logs_permission=permissions,
+    permissions=permissions_local,
+    logs_permission=permissions_local,
 )
 
 # We register the dataset for each of the organisations
-dataset_keys = {
-    client_id: clients[client_id].add_dataset(dataset)
-    for client_id in DATA_PROVIDER_ORGS_ID
-}
+dataset_keys = {client_id: clients[client_id].add_dataset(dataset) for client_id in DATA_PROVIDER_ORGS_ID}
 
 for client_id, key in dataset_keys.items():
     print(f"Dataset key for {client_id}: {key}")
@@ -210,6 +209,7 @@
 
 # %%
 
+
 local_first_order_computation_docker_files = [
     assets_directory / "functions" / "federated_analytics_functions.py",
     assets_directory / "functions" / "local_first_order_computation" / "Dockerfile",
@@ -227,15 +227,11 @@
         optional=False,
         multiple=True,
     ),
-    FunctionInputSpec(
-        identifier="opener", kind=AssetKind.data_manager, optional=False, multiple=False
-    ),
+    FunctionInputSpec(identifier="opener", kind=AssetKind.data_manager, optional=False, multiple=False),
 ]
 
 local_first_order_function_outputs = [
-    FunctionOutputSpec(
-        identifier="local_analytics_first_moments", kind=AssetKind.model, multiple=False
-    )
+    FunctionOutputSpec(identifier="local_analytics_first_moments", kind=AssetKind.model, multiple=False)
 ]
 
 local_first_order_function = FunctionSpec(
@@ -244,13 +240,12 @@
     outputs=local_first_order_function_outputs,
     description=assets_directory / "functions" / "description.md",
     file=local_archive_first_order_computation_path,
-    permissions=permissions,
+    permissions=permissions_local,
 )
 
 
 local_first_order_function_keys = {
-    client_id: clients[client_id].add_function(local_first_order_function)
-    for client_id in DATA_PROVIDER_ORGS_ID
+    client_id: clients[client_id].add_function(local_first_order_function) for client_id in DATA_PROVIDER_ORGS_ID
 }
 
 print(f"Local function key for step 1: computing first order moments {local_first_order_function_keys}")
@@ -271,9 +266,7 @@
     assets_directory / "functions" / "aggregation" / "Dockerfile",
 ]
 
-aggregate_archive_path = (
-    assets_directory / "functions" / "aggregate_function_analytics.zip"
-)
+aggregate_archive_path = assets_directory / "functions" / "aggregate_function_analytics.zip"
 with zipfile.ZipFile(aggregate_archive_path, "w") as z:
     for filepath in aggregate_function_docker_files:
         z.write(filepath, arcname=os.path.basename(filepath))
@@ -287,9 +280,7 @@
     ),
 ]
 
-aggregate_function_outputs = [
-    FunctionOutputSpec(identifier="shared_states", kind=AssetKind.model, multiple=False)
-]
+aggregate_function_outputs = [FunctionOutputSpec(identifier="shared_states", kind=AssetKind.model, multiple=False)]
 
 aggregate_function = FunctionSpec(
     name="Aggregate Federated Analytics",
@@ -297,7 +288,7 @@
     outputs=aggregate_function_outputs,
     description=assets_directory / "functions" / "description.md",
     file=aggregate_archive_path,
-    permissions=permissions,
+    permissions=permissions_aggregation,
 )
 
 
@@ -335,12 +326,8 @@
         optional=False,
         multiple=True,
     ),
-    FunctionInputSpec(
-        identifier="opener", kind=AssetKind.data_manager, optional=False, multiple=False
-    ),
-    FunctionInputSpec(
-        identifier="shared_states", kind=AssetKind.model, optional=False, multiple=False
-    ),
+    FunctionInputSpec(identifier="opener", kind=AssetKind.data_manager, optional=False, multiple=False),
+    FunctionInputSpec(identifier="shared_states", kind=AssetKind.model, optional=False, multiple=False),
 ]
 
 local_second_order_function_outputs = [
@@ -357,13 +344,12 @@
     outputs=local_second_order_function_outputs,
     description=assets_directory / "functions" / "description.md",
     file=local_archive_second_order_computation_path,
-    permissions=permissions,
+    permissions=permissions_local,
 )
 
 
 local_second_order_function_keys = {
-    client_id: clients[client_id].add_function(local_second_order_function)
-    for client_id in DATA_PROVIDER_ORGS_ID
+    client_id: clients[client_id].add_function(local_second_order_function) for client_id in DATA_PROVIDER_ORGS_ID
 }
 
 print(f"Local function key for step 2: computing second order moments {local_second_order_function_keys}")
@@ -379,13 +365,11 @@
 #
 
 data_manager_input = {
-    client_id: [InputRef(identifier="opener", asset_key=key)]
-    for client_id, key in dataset_keys.items()
+    client_id: [InputRef(identifier="opener", asset_key=key)] for client_id, key in dataset_keys.items()
 }
 
 datasample_inputs = {
-    client_id: [InputRef(identifier="datasamples", asset_key=key)]
-    for client_id, key in datasample_keys.items()
+    client_id: [InputRef(identifier="datasamples", asset_key=key)] for client_id, key in datasample_keys.items()
 }
 
 local_task_1_keys = {
@@ -393,11 +377,7 @@
         TaskSpec(
             function_key=local_first_order_function_keys[client_id],
             inputs=data_manager_input[client_id] + datasample_inputs[client_id],
-            outputs={
-                "local_analytics_first_moments": ComputeTaskOutputSpec(
-                    permissions=permissions
-                )
-            },
+            outputs={"local_analytics_first_moments": ComputeTaskOutputSpec(permissions=permissions_aggregation)},
             worker=client_id,
         )
     )
@@ -429,7 +409,7 @@
 aggregation_task_1 = TaskSpec(
     function_key=aggregate_function_key,
     inputs=aggregation_1_inputs,
-    outputs={"shared_states": ComputeTaskOutputSpec(permissions=permissions)},
+    outputs={"shared_states": ComputeTaskOutputSpec(permissions=permissions_local)},
     worker=ANALYTICS_PROVIDER_ORG_ID,
 )
 
@@ -450,14 +430,8 @@
     client_id: clients[client_id].add_task(
         TaskSpec(
             function_key=local_second_order_function_keys[client_id],
-            inputs=data_manager_input[client_id]
-            + datasample_inputs[client_id]
-            + shared_inputs,
-            outputs={
-                "local_analytics_second_moments": ComputeTaskOutputSpec(
-                    permissions=permissions
-                )
-            },
+            inputs=data_manager_input[client_id] + datasample_inputs[client_id] + shared_inputs,
+            outputs={"local_analytics_second_moments": ComputeTaskOutputSpec(permissions=permissions_aggregation)},
             worker=client_id,
         )
     )
@@ -477,7 +451,7 @@
 aggregation_task_2 = TaskSpec(
     function_key=aggregate_function_key,
     inputs=aggregation_2_inputs,
-    outputs={"shared_states": ComputeTaskOutputSpec(permissions=permissions)},
+    outputs={"shared_states": ComputeTaskOutputSpec(permissions=permissions_local)},
     worker=ANALYTICS_PROVIDER_ORG_ID,
 )