From 969077fc420d1e076d3e231531b419bb994e0afd Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Mon, 25 Nov 2024 12:33:36 +0100
Subject: [PATCH 01/14] webapp/components/training/TrainingSteps: rm
 console.log

---
 webapp/src/components/training/TrainingSteps.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapp/src/components/training/TrainingSteps.vue b/webapp/src/components/training/TrainingSteps.vue
index b872ff64d..cdfa63408 100644
--- a/webapp/src/components/training/TrainingSteps.vue
+++ b/webapp/src/components/training/TrainingSteps.vue
@@ -64,8 +64,6 @@ function setupTrainingStore() {
 // Init the task once the taskStore has been loaded successfully
 // If it is not we redirect to the task list
 const task = computed<Task<DataType> | undefined>(() => {
-  console.log("training: recompute task");
-
   if (tasksStore.status == "success") {
     return tasksStore.tasks.get(props.id);
   }

From 705a2fca89c843c59308007f1bd15a6be8355fbd Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Tue, 3 Dec 2024 14:10:35 +0100
Subject: [PATCH 02/14] webapp/components/containers/testing: show image labels
 in all caps

---
 webapp/src/components/testing/PredictSteps.vue | 6 ++++--
 webapp/src/components/testing/TestSteps.vue    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/src/components/testing/PredictSteps.vue b/webapp/src/components/testing/PredictSteps.vue
index d6a2be375..87a7461f0 100644
--- a/webapp/src/components/testing/PredictSteps.vue
+++ b/webapp/src/components/testing/PredictSteps.vue
@@ -73,7 +73,9 @@
           :image="result.input.image"
         >
           <template #title>
-            <span class="font-bold">{{ result.output }}</span>
+            <span class="font-bold text-slate-600 uppercase">
+            {{ result.output }}
+          </span>
           </template>
         </ImageCard>
       </div>
@@ -305,4 +307,4 @@ function saveCsv() {
     }
   }
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/webapp/src/components/testing/TestSteps.vue b/webapp/src/components/testing/TestSteps.vue
index 3d63c8684..385f28e18 100644
--- a/webapp/src/components/testing/TestSteps.vue
+++ b/webapp/src/components/testing/TestSteps.vue
@@ -75,7 +75,7 @@
         >
           <template #title>
             <p
-              class="font-bold"
+              class="font-bold uppercase"
               :class="result.output.correct ? 'text-green-500' : 'text-red-700'"
             >
               {{ result.output.truth }}
@@ -396,4 +396,4 @@ function saveCsv(): void {
     }
   }
 }
-</script>
+</script>
\ No newline at end of file

From cc133edeb3380470edb1f542b0dff05c054a0961 Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Mon, 25 Nov 2024 12:34:59 +0100
Subject: [PATCH 03/14] webapp/components/containers/ImageCard: improve image
 hover effect

---
 webapp/src/components/containers/ImageCard.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/components/containers/ImageCard.vue b/webapp/src/components/containers/ImageCard.vue
index aeeee265f..623cb4070 100644
--- a/webapp/src/components/containers/ImageCard.vue
+++ b/webapp/src/components/containers/ImageCard.vue
@@ -1,8 +1,8 @@
 <template>
   <div
-    class="grid grid-cols-1 w-full bg-white dark:bg-slate-800 aspect-square rounded-xl drop-shadow-md hover:drop-shadow-xl transition duration-500 hover:scale-105 opacity-70 hover:opacity-100 shadow hover:shadow-lg"
+    class="grid grid-cols-1 w-full bg-white dark:bg-slate-800 aspect-square rounded-xl drop-shadow-md hover:drop-shadow-xl transition duration-500 hover:scale-125 shadow hover:shadow-lg hover:z-50"
   >
-    <div class="grid grid-cols-1 gap-1 text-center content-center p-2 h-16">
+    <div class="grid grid-cols-1 gap-1 text-center content-center pt-2 h-8">
       <slot name="title" />
       <div class="text-sm">
         <slot name="subtitle" />
@@ -35,4 +35,4 @@ function draw() {
   if (context === null) throw new Error("canvas doesn't support 2D context");
   context.putImageData(props.image, 0, 0);
 }
-</script>
+</script>
\ No newline at end of file

From 40c171360d26a7d6d898e340f7e41ed70cdf76dd Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Mon, 25 Nov 2024 12:35:31 +0100
Subject: [PATCH 04/14] webapp/components/training/TrainingInformation: display
 training charts on first row and validation charts on second row if any

---
 .../training/TrainingInformation.vue          | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/webapp/src/components/training/TrainingInformation.vue b/webapp/src/components/training/TrainingInformation.vue
index d291e0e59..f6763faa6 100644
--- a/webapp/src/components/training/TrainingInformation.vue
+++ b/webapp/src/components/training/TrainingInformation.vue
@@ -53,9 +53,8 @@
 
     <!-- Training and validation loss charts -->
     <div
-      class="flex flex-col md:grid gap-4 md:gap-8"
-      :class="hasValidationData ? 'md:grid-cols-2' : ''"
-    >
+      class="flex flex-col md:grid gap-4 md:gap-8 md:grid-cols-2"
+      >
       <!-- Training loss users chart -->
       <IconCard>
         <template #title> Training Loss of the Model </template>
@@ -76,56 +75,55 @@
         />
       </IconCard>
 
-      <!-- Validation Loss users chart -->
-      <IconCard v-if="hasValidationData">
-        <template #title> Validation Loss of the Model </template>
+      <!-- Training Accuracy users chart -->
+      <IconCard>
+        <template #title> Training Accuracy of the Model </template>
 
         <span class="text-2xl font-medium text-slate-500 dark:text-slate-300">
-          {{ (lastEpoch?.validation?.loss ?? 0).toFixed(2) }}
+          {{ percent(lastEpoch?.training.accuracy ?? 0) }}
         </span>
         <span class="text-sm font-medium text-slate-500 dark:text-slate-400">
-          validation loss
+          % of training accuracy
         </span>
 
         <ApexChart
           width="100%"
           height="200"
           type="area"
-          :options="lossChartsOptions"
-          :series="[{ name: 'Validation loss', data: lossSeries.validation }]"
+          :options="accuracyChartsOptions"
+          :series="[
+            { name: 'Training accuracy', data: accuracySeries.training },
+          ]"
         />
-      </IconCard>
+      </IconCard>      
     </div>
 
     <!-- Training and validation accuracy charts -->
     <div
-      class="flex flex-col md:grid gap-4 md:gap-8"
-      :class="hasValidationData ? 'md:grid-cols-2' : ''"
+      v-if="hasValidationData"
+      class="flex flex-col md:grid gap-4 md:gap-8 md:grid-cols-2"
     >
-      <!-- Training Accuracy users chart -->
+      <!-- Validation Loss users chart -->
       <IconCard>
-        <template #title> Training Accuracy of the Model </template>
+        <template #title> Validation Loss of the Model </template>
 
         <span class="text-2xl font-medium text-slate-500 dark:text-slate-300">
-          {{ percent(lastEpoch?.training.accuracy ?? 0) }}
+          {{ (lastEpoch?.validation?.loss ?? 0).toFixed(2) }}
         </span>
         <span class="text-sm font-medium text-slate-500 dark:text-slate-400">
-          % of training accuracy
+          validation loss
         </span>
 
         <ApexChart
           width="100%"
           height="200"
           type="area"
-          :options="accuracyChartsOptions"
-          :series="[
-            { name: 'Training accuracy', data: accuracySeries.training },
-          ]"
+          :options="lossChartsOptions"
+          :series="[{ name: 'Validation loss', data: lossSeries.validation }]"
         />
       </IconCard>
-
       <!-- Validation Accuracy users chart -->
-      <IconCard v-if="hasValidationData">
+      <IconCard>
         <template #title> Validation Accuracy of the Model </template>
 
         <span class="text-2xl font-medium text-slate-500 dark:text-slate-300">
@@ -361,4 +359,4 @@ const lossChartsOptions = computed(() => {
 function percent(n: number): string {
   return (n * 100).toFixed(2);
 }
-</script>
+</script>
\ No newline at end of file

From d4ccfb3a0617b2d7023cce7a7fbc5df0bcdca3b9 Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Mon, 25 Nov 2024 12:36:09 +0100
Subject: [PATCH 05/14] discojs/src/training/disco: handle validation split
 ratio equals zero

---
 discojs/src/training/disco.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/discojs/src/training/disco.ts b/discojs/src/training/disco.ts
index 2ef90728e..07d37c68c 100644
--- a/discojs/src/training/disco.ts
+++ b/discojs/src/training/disco.ts
@@ -205,18 +205,21 @@ export class Disco<D extends DataType> extends EventEmitter<{
   ): Promise<
     [
       Dataset<Batched<DataFormat.ModelEncoded[D]>>,
-      Dataset<Batched<DataFormat.ModelEncoded[D]>>,
+      Dataset<Batched<DataFormat.ModelEncoded[D]>> | undefined,
     ]
   > {
     const { batchSize, validationSplit } = this.#task.trainingInformation;
 
-    const preprocessed = await processing.preprocess(this.#task, dataset);
+    let preprocessed = await processing.preprocess(this.#task, dataset);
 
-    const [training, validation] = (
+    preprocessed = (
       this.#preprocessOnce
         ? new Dataset(await arrayFromAsync(preprocessed))
         : preprocessed
-    ).split(validationSplit);
+    )
+    if (validationSplit === 0) return [preprocessed.batch(batchSize).cached(), undefined];
+    
+    const [training, validation] = preprocessed.split(validationSplit);
 
     return [
       training.batch(batchSize).cached(),
@@ -230,4 +233,4 @@ async function arrayFromAsync<T>(iter: AsyncIterable<T>): Promise<T[]> {
   const ret: T[] = [];
   for await (const e of iter) ret.push(e);
   return ret;
-}
+}
\ No newline at end of file

From 87cc09c1e886d832b20ca4304cfb36b9b0121f7c Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Mon, 25 Nov 2024 12:36:31 +0100
Subject: [PATCH 06/14] discojs/client/federated/federated_client: wait
 indefinitely for server answer

---
 discojs/src/client/federated/federated_client.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/discojs/src/client/federated/federated_client.ts b/discojs/src/client/federated/federated_client.ts
index e6c89cc79..fc172d7b8 100644
--- a/discojs/src/client/federated/federated_client.ts
+++ b/discojs/src/client/federated/federated_client.ts
@@ -6,7 +6,6 @@ import { Client, shortenId } from "../client.js";
 import { type, type ClientConnected } from "../messages.js";
 import {
   waitMessage,
-  waitMessageWithTimeout,
   WebSocketServer,
 } from "../event_connection.js";
 import * as messages from "./messages.js";
@@ -75,7 +74,7 @@ export class FederatedClient extends Client {
     const {
       id, waitForMoreParticipants, payload,
       round, nbOfParticipants
-    } = await waitMessageWithTimeout(this.server, type.NewFederatedNodeInfo);
+    } = await waitMessage(this.server, type.NewFederatedNodeInfo);
     
     // This should come right after receiving the message to make sure
     // we don't miss a subsequent message from the server

From bf2a8915f74b0fbfb970cb543f48fba47429fd72 Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Mon, 25 Nov 2024 12:37:47 +0100
Subject: [PATCH 07/14] disco/default_tasks: implement GDHF tinder dog task

---
 discojs/src/default_tasks/index.ts      |  1 +
 discojs/src/default_tasks/tinder_dog.ts | 84 +++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 discojs/src/default_tasks/tinder_dog.ts

diff --git a/discojs/src/default_tasks/index.ts b/discojs/src/default_tasks/index.ts
index 7ee583f1f..43adf0d3c 100644
--- a/discojs/src/default_tasks/index.ts
+++ b/discojs/src/default_tasks/index.ts
@@ -4,3 +4,4 @@ export { mnist } from './mnist.js'
 export { simpleFace } from './simple_face.js'
 export { titanic } from './titanic.js'
 export { wikitext } from './wikitext.js'
+export { tinderDog } from './tinder_dog.js'
\ No newline at end of file
diff --git a/discojs/src/default_tasks/tinder_dog.ts b/discojs/src/default_tasks/tinder_dog.ts
new file mode 100644
index 000000000..5a7e92cf2
--- /dev/null
+++ b/discojs/src/default_tasks/tinder_dog.ts
@@ -0,0 +1,84 @@
+import * as tf from '@tensorflow/tfjs'
+
+import type { Model, Task, TaskProvider } from '../index.js'
+import { models } from '../index.js'
+
+export const tinderDog: TaskProvider<'image'> = {
+  getTask (): Task<'image'> {
+    return {
+      id: 'tinder_dog',
+      displayInformation: {
+        taskTitle: 'GDHF 2024 | TinderDog',
+        summary: {
+          preview: 'Which dog is the cutest....or not?',
+          overview: "Binary classification model for dog cuteness."
+        },
+        // model: 'The model is a pretrained <a  class="underline text-blue-400" target="_blank" href="https://github.com/tensorflow/tfjs-models/tree/master/mobilenet">MobileNetV1 model</a> trained in Tensorflow.js. The last output layer is replaced with a fully connected layer with softmax activation and one output neuron per CIFAR10 category. The data preprocessing reshapes images into 224x224 pixels and normalizes values between 0 and 1. The neural network is optimized via Stochastic Gradient Descent and a categorical Cross Entropy loss.',
+        dataFormatInformation: 'Images should be of .png format.',
+       /*  dataExampleText: 'Below you can find 10 random examples from each of the 10 classes in the dataset.',
+        dataExampleImage: 'https://storage.googleapis.com/deai-313515.appspot.com/example_training_data/cifar10-example.png',
+        sampleDatasetLink: 'https://storage.googleapis.com/deai-313515.appspot.com/example_training_data.tar.gz',
+        sampleDatasetInstructions: 'Opening the link should start downloading a zip file which you can unzip. To connect the data, use the CSV option below and select the file named "cifar10-labels.csv". You can now connect the images located in the "CIFAR10" folder. Note that there are only 24 images in this sample dataset which is far too few to successfully train a machine learning model.' */
+      },
+      trainingInformation: {
+        epochs: 10,
+        roundDuration: 2,
+        validationSplit: 0, // nicer plot for GDHF demo
+        batchSize: 10,
+        dataType: 'image',
+        IMAGE_H: 64,
+        IMAGE_W: 64,
+        LABEL_LIST: ['Cute dogs', 'Less cute dogs'],
+        scheme: 'federated',
+        aggregationStrategy: 'mean',
+        minNbOfParticipants: 3,
+        tensorBackend: 'tfjs'
+      }
+    }
+  },
+
+
+  async getModel(): Promise<Model<'image'>> {
+    const seed = 42 // set a seed to ensure reproducibility during GDHF demo
+    const imageHeight = this.getTask().trainingInformation.IMAGE_H
+    const imageWidth = this.getTask().trainingInformation.IMAGE_W
+    const imageChannels = 3
+
+    const model = tf.sequential()
+
+    model.add(
+      tf.layers.conv2d({
+        inputShape: [imageHeight, imageWidth, imageChannels],
+        kernelSize: 5,
+        filters: 8,
+        activation: 'relu',
+        kernelInitializer: tf.initializers.heNormal({ seed })
+      })
+    )
+    model.add(tf.layers.conv2d({
+      kernelSize: 5, filters: 16, activation: 'relu',
+      kernelInitializer: tf.initializers.heNormal({ seed })
+    }))
+    model.add(tf.layers.maxPooling2d({ poolSize: 2, strides: 2 }))
+    model.add(tf.layers.dropout({ rate: 0.25, seed }))
+
+    model.add(tf.layers.flatten())
+    model.add(tf.layers.dense({
+      units: 32, activation: 'relu',
+      kernelInitializer: tf.initializers.heNormal({ seed })
+     }))
+    model.add(tf.layers.dropout({rate:0.25, seed}))
+    model.add(tf.layers.dense({
+      units: 2, activation: 'softmax',
+      kernelInitializer: tf.initializers.heNormal({ seed })
+     }))
+
+    model.compile({
+      optimizer: tf.train.adam(0.0005),
+      loss: 'categoricalCrossentropy',
+      metrics: ['accuracy']
+    })
+
+    return Promise.resolve(new models.TFJS('image', model))
+  }
+}
\ No newline at end of file

From 6d329335bce012c3ca22430e2d9a7ad9da76dad8 Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Tue, 3 Dec 2024 15:31:54 +0100
Subject: [PATCH 08/14] datasets/populate: download tinder_dog dataset

---
 datasets/.gitignore | 3 +++
 datasets/populate   | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/datasets/.gitignore b/datasets/.gitignore
index d1d80c705..f73eda468 100644
--- a/datasets/.gitignore
+++ b/datasets/.gitignore
@@ -17,3 +17,6 @@
 
 # LUS Covid
 /lus_covid/
+
+# GDHF demo
+/tinder_dog/
diff --git a/datasets/populate b/datasets/populate
index 3f86a82fa..105ea0710 100755
--- a/datasets/populate
+++ b/datasets/populate
@@ -19,3 +19,8 @@ rm archive.zip DeAI-testimages
 mkdir -p wikitext
 curl 'https://dax-cdn.cdn.appdomain.cloud/dax-wikitext-103/1.0.1/wikitext-103.tar.gz' |
 	tar --extract --gzip --strip-components=1 -C wikitext
+
+# tinder_dog
+curl 'https://storage.googleapis.com/deai-313515.appspot.com/tinder_dog.zip' > tinder_dog.zip
+unzip -u tinder_dog.zip
+rm tinder_dog.zip
\ No newline at end of file

From 0a73a2f5e47ecfae3aed13981e1813e62013f534 Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Tue, 3 Dec 2024 15:44:38 +0100
Subject: [PATCH 09/14] cli: setup tinder dog CLI support

---
 cli/src/args.ts |  7 ++++---
 cli/src/cli.ts  | 18 ++++++------------
 cli/src/data.ts | 39 ++++++++++++++++++++++++++++++++-------
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/cli/src/args.ts b/cli/src/args.ts
index 74c4ed5c7..aad21a9f1 100644
--- a/cli/src/args.ts
+++ b/cli/src/args.ts
@@ -22,8 +22,8 @@ const argExample = 'e.g. npm start -- -u 2 -e 3 # runs 2 users for 3 epochs'
 
 const unsafeArgs = parse<BenchmarkUnsafeArguments>(
   {
-    task: { type: String, alias: 't', description: 'Task: titanic, simple_face, cifar10 or lus_covid', defaultValue: 'simple_face' },
-    numberOfUsers: { type: Number, alias: 'u', description: 'Number of users', defaultValue: 1 },
+    task: { type: String, alias: 't', description: 'Task: tinder_dog, titanic, simple_face, cifar10 or lus_covid', defaultValue: 'tinder_dog' },
+    numberOfUsers: { type: Number, alias: 'u', description: 'Number of users', defaultValue: 2 },
     epochs: { type: Number, alias: 'e', description: 'Number of epochs', defaultValue: 10 },
     roundDuration: { type: Number, alias: 'r', description: 'Round duration (in epochs)', defaultValue: 2 },
     batchSize: { type: Number, alias: 'b', description: 'Training batch size', defaultValue: 10 },
@@ -42,6 +42,7 @@ const supportedTasks = Map(
     defaultTasks.lusCovid,
     defaultTasks.simpleFace,
     defaultTasks.titanic,
+    defaultTasks.tinderDog,
   ).map((t) => [t.getTask().id, t]),
 );
 
@@ -69,4 +70,4 @@ export const args: BenchmarkArguments = {
     },
     getModel: () => provider.getModel(),
   },
-};
+};
\ No newline at end of file
diff --git a/cli/src/cli.ts b/cli/src/cli.ts
index 54ff0c3ef..f204236a0 100644
--- a/cli/src/cli.ts
+++ b/cli/src/cli.ts
@@ -13,7 +13,6 @@ import type {
   TaskProvider,
 } from "@epfml/discojs";
 import { Disco, aggregator as aggregators, client as clients } from '@epfml/discojs'
-import { Server } from 'server'
 
 import { getTaskData } from './data.js'
 import { args } from './args.js'
@@ -49,23 +48,18 @@ async function main<D extends DataType>(
   console.log(`Started ${task.trainingInformation.scheme} training of ${task.id}`)
   console.log({ args })
 
-  const [server, url] = await new Server().serve(undefined, provider)
-
-  const data = await getTaskData(task)
-
+  const url = new URL('http://localhost:8080')
+  const dataSplits = await Promise.all(
+    Range(0, numberOfUsers).map(async i => getTaskData(task.id, i))
+  )
   const logs = await Promise.all(
-    Range(0, numberOfUsers).map(async (_) => await runUser(task, url, data)).toArray()
+    dataSplits.map(async data => await runUser(task, url, data as Dataset<DataFormat.Raw[D]>))
   )
 
   if (args.save) {
     const fileName = `${task.id}_${numberOfUsers}users.csv`;
     await fs.writeFile(fileName, JSON.stringify(logs, null, 2));
   }
-  console.log('Shutting down the server...')
-  await new Promise((resolve, reject) => {
-    server.once('close', resolve)
-    server.close(reject)
-  })
 }
 
-main(args.provider, args.numberOfUsers).catch(console.error)
+main(args.provider, args.numberOfUsers).catch(console.error)
\ No newline at end of file
diff --git a/cli/src/data.ts b/cli/src/data.ts
index 895a35bf7..c3077c11b 100644
--- a/cli/src/data.ts
+++ b/cli/src/data.ts
@@ -1,13 +1,12 @@
 import path from "node:path";
-
+import { Dataset, processing } from "@epfml/discojs";
 import type {
-  Dataset,
   DataFormat,
   DataType,
   Image,
   Task,
 } from "@epfml/discojs";
-import { loadCSV, loadImagesInDir } from "@epfml/discojs-node";
+import { loadCSV, loadImage, loadImagesInDir } from "@epfml/discojs-node";
 import { Repeat } from "immutable";
 
 async function loadSimpleFaceData(): Promise<Dataset<DataFormat.Raw["image"]>> {
@@ -36,10 +35,34 @@ async function loadLusCovidData(): Promise<Dataset<DataFormat.Raw["image"]>> {
   return positive.chain(negative);
 }
 
+function loadTinderDogData(split: number): Dataset<DataFormat.Raw["image"]> {
+  const folder = path.join("..", "datasets", "tinder_dog", `${split + 1}`);
+  return loadCSV(path.join(folder, "labels.csv"))
+    .map(
+      (row) =>
+        [
+          processing.extractColumn(row, "filename"),
+          processing.extractColumn(row, "label"),
+        ] as const,
+    )
+    .map(async ([filename, label]) => {
+      try {
+        const image = await Promise.any(
+          ["png", "jpg", "jpeg"].map((ext) =>
+            loadImage(path.join(folder, `${filename}.${ext}`)),
+          ),
+        );
+        return [image, label];
+      } catch {
+        throw Error(`${filename} not found in ${folder}`);
+      }
+    });
+}
+
 export async function getTaskData<D extends DataType>(
-  task: Task<D>,
+  taskID: Task<D>['id'], userIdx: number
 ): Promise<Dataset<DataFormat.Raw[D]>> {
-  switch (task.id) {
+  switch (taskID) {
     case "simple_face":
       return (await loadSimpleFaceData()) as Dataset<DataFormat.Raw[D]>;
     case "titanic":
@@ -52,7 +75,9 @@ export async function getTaskData<D extends DataType>(
       ).zip(Repeat("cat")) as Dataset<DataFormat.Raw[D]>;
     case "lus_covid":
       return (await loadLusCovidData()) as Dataset<DataFormat.Raw[D]>;
+    case "tinder_dog":
+      return loadTinderDogData(userIdx) as Dataset<DataFormat.Raw[D]>;
     default:
-      throw new Error(`Data loader for ${task.id} not implemented.`);
+      throw new Error(`Data loader for ${taskID} not implemented.`);
   }
-}
+}
\ No newline at end of file

From b34809ce2f3794f86ac51049c74f3a64794ab26e Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Tue, 26 Nov 2024 13:32:47 +0100
Subject: [PATCH 10/14] server/controllers/federated_controller: reset state
 when training session finished

---
 server/src/controllers/federated_controller.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/server/src/controllers/federated_controller.ts b/server/src/controllers/federated_controller.ts
index c58a05328..0e5f92d71 100644
--- a/server/src/controllers/federated_controller.ts
+++ b/server/src/controllers/federated_controller.ts
@@ -32,9 +32,9 @@ export class FederatedController<
    */
   #latestGlobalWeights: serialization.Encoded;
 
-  constructor(task: Task<D>, initialWeights: serialization.Encoded) {
+  constructor(task: Task<D>, private readonly initialWeights: serialization.Encoded) {
     super(task)
-    this.#latestGlobalWeights = initialWeights
+    this.#latestGlobalWeights = this.initialWeights
 
     // Save the latest weight updates to be able to send it to new or outdated clients
     this.#aggregator.on('aggregation', async (weightUpdate) => {
@@ -145,6 +145,13 @@ export class FederatedController<
       this.#aggregator.removeNode(clientId)
       debug("client [%s] left", shortId)
 
+      // Reset the training session when all participants left
+      if (this.connections.size === 0) {
+        debug("All participants left. Resetting the training session")
+        this.#aggregator = new aggregators.MeanAggregator(undefined, 1, 'relative')
+        this.#latestGlobalWeights = this.initialWeights
+      }
+
       // Check if we dropped below the minimum number of participant required
       // or if we are already waiting for new participants to join
       if (this.connections.size >= minNbOfParticipants ||

From bed76702d4515bf6260ded1e417ec69496221e2b Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Wed, 27 Nov 2024 14:28:20 +0100
Subject: [PATCH 11/14] 
 webapp/components/dataset_input/LabeledImageDatasetInput/ByGroup: shuffle
 files connected by labels

---
 .../dataset_input/LabeledImageDatasetInput/ByGroup.vue   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/webapp/src/components/dataset_input/LabeledImageDatasetInput/ByGroup.vue b/webapp/src/components/dataset_input/LabeledImageDatasetInput/ByGroup.vue
index f556367fb..867f65c9c 100644
--- a/webapp/src/components/dataset_input/LabeledImageDatasetInput/ByGroup.vue
+++ b/webapp/src/components/dataset_input/LabeledImageDatasetInput/ByGroup.vue
@@ -67,7 +67,14 @@ function refreshWatcher() {
         ([label, files]) =>
           files.value?.map((f) => [label, f] as const)?.toArray() ?? [],
       );
-
+      // TODO: rm once dataset supports shuffling
+      // shuffle the filenames o.w. they are ordered by labels
+      for (let i = 0; i < expanded.length; i++) {
+        const j = Math.floor(Math.random() * i)
+        const swap = expanded[i]
+        expanded[i] = expanded[j]
+        expanded[j] = swap
+      }
       dataset.value = new Dataset(expanded).map(async ([label, file]) => ({
         filename: file.name,
         image: await loadImage(file),

From 15f9c04ec3881230c7ad8fdf77d00296f310b6ee Mon Sep 17 00:00:00 2001
From: Julien Vignoud <julien.vignoud@epfl.ch>
Date: Wed, 27 Nov 2024 17:35:32 +0100
Subject: [PATCH 12/14] discojs/default_tasks/tinder_dog: improve textual
 description and link sample dataset

---
 discojs/src/default_tasks/tinder_dog.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/discojs/src/default_tasks/tinder_dog.ts b/discojs/src/default_tasks/tinder_dog.ts
index 5a7e92cf2..a19bf5f8b 100644
--- a/discojs/src/default_tasks/tinder_dog.ts
+++ b/discojs/src/default_tasks/tinder_dog.ts
@@ -13,12 +13,12 @@ export const tinderDog: TaskProvider<'image'> = {
           preview: 'Which dog is the cutest....or not?',
           overview: "Binary classification model for dog cuteness."
         },
-        // model: 'The model is a pretrained <a  class="underline text-blue-400" target="_blank" href="https://github.com/tensorflow/tfjs-models/tree/master/mobilenet">MobileNetV1 model</a> trained in Tensorflow.js. The last output layer is replaced with a fully connected layer with softmax activation and one output neuron per CIFAR10 category. The data preprocessing reshapes images into 224x224 pixels and normalizes values between 0 and 1. The neural network is optimized via Stochastic Gradient Descent and a categorical Cross Entropy loss.',
-        dataFormatInformation: 'Images should be of .png format.',
-       /*  dataExampleText: 'Below you can find 10 random examples from each of the 10 classes in the dataset.',
-        dataExampleImage: 'https://storage.googleapis.com/deai-313515.appspot.com/example_training_data/cifar10-example.png',
-        sampleDatasetLink: 'https://storage.googleapis.com/deai-313515.appspot.com/example_training_data.tar.gz',
-        sampleDatasetInstructions: 'Opening the link should start downloading a zip file which you can unzip. To connect the data, use the CSV option below and select the file named "cifar10-labels.csv". You can now connect the images located in the "CIFAR10" folder. Note that there are only 24 images in this sample dataset which is far too few to successfully train a machine learning model.' */
+        model: 'The model is a simple Convolutional Neural Network composed of two convolutional layers with ReLU activations and max pooling layers, followed by a fully connected output layer. The data preprocessing reshapes images into 64x64 pixels and normalizes values between 0 and 1',
+        dataFormatInformation: 'Accepted image formats are .png .jpg and .jpeg.',
+        dataExampleText: '',
+        dataExampleImage: 'https://storage.googleapis.com/deai-313515.appspot.com/tinder_dog_preview.png',
+        sampleDatasetLink: 'https://storage.googleapis.com/deai-313515.appspot.com/tinder_dog.zip',
+        sampleDatasetInstructions: 'Opening the link should start downloading a zip file which you can unzip. To connect the data, pick one of the data splits (the folder 0 for example) and use the CSV option below to select the file named "labels.csv". You can now connect the images located in the same folder.'
       },
       trainingInformation: {
         epochs: 10,

From 0be927e11c32b7e8c7ea3d50fbd1fa17bbad617f Mon Sep 17 00:00:00 2001
From: tharvik <tharvik@users.noreply.github.com>
Date: Mon, 2 Dec 2024 12:43:07 +0100
Subject: [PATCH 13/14] cli: add host option

---
 cli/src/args.ts | 8 ++++++++
 cli/src/cli.ts  | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cli/src/args.ts b/cli/src/args.ts
index aad21a9f1..ab5e0d92c 100644
--- a/cli/src/args.ts
+++ b/cli/src/args.ts
@@ -11,6 +11,7 @@ interface BenchmarkArguments {
   roundDuration: number
   batchSize: number
   save: boolean
+  host: URL
 }
 
 type BenchmarkUnsafeArguments = Omit<BenchmarkArguments, 'provider'> & {
@@ -28,6 +29,13 @@ const unsafeArgs = parse<BenchmarkUnsafeArguments>(
     roundDuration: { type: Number, alias: 'r', description: 'Round duration (in epochs)', defaultValue: 2 },
     batchSize: { type: Number, alias: 'b', description: 'Training batch size', defaultValue: 10 },
     save: { type: Boolean, alias: 's', description: 'Save logs of benchmark', defaultValue: false },
+    host: {
+      type: (raw: string) => new URL(raw),
+      typeLabel: "URL",
+      description: "Host to connect to",
+      defaultValue: new URL("http://localhost:8080"),
+    },
+
     help: { type: Boolean, optional: true, alias: 'h', description: 'Prints this usage guide' }
   },
   {
diff --git a/cli/src/cli.ts b/cli/src/cli.ts
index f204236a0..c56c9280b 100644
--- a/cli/src/cli.ts
+++ b/cli/src/cli.ts
@@ -48,12 +48,11 @@ async function main<D extends DataType>(
   console.log(`Started ${task.trainingInformation.scheme} training of ${task.id}`)
   console.log({ args })
 
-  const url = new URL('http://localhost:8080')
   const dataSplits = await Promise.all(
     Range(0, numberOfUsers).map(async i => getTaskData(task.id, i))
   )
   const logs = await Promise.all(
-    dataSplits.map(async data => await runUser(task, url, data as Dataset<DataFormat.Raw[D]>))
+    dataSplits.map(async data => await runUser(task, args.host, data as Dataset<DataFormat.Raw[D]>))
   )
 
   if (args.save) {

From 75a67ec3fd23d186fddabb332fc176a9f4e56641 Mon Sep 17 00:00:00 2001
From: tharvik <tharvik@users.noreply.github.com>
Date: Mon, 2 Dec 2024 13:18:00 +0100
Subject: [PATCH 14/14] discojs: fail on fetch error

---
 discojs/src/client/client.ts                  |  2 ++
 discojs/src/task/task_handler.ts              |  4 ++-
 .../testing/__tests__/Testing.spec.ts         |  2 +-
 .../training/__tests__/Trainer.spec.ts        | 34 +++----------------
 4 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/discojs/src/client/client.ts b/discojs/src/client/client.ts
index 9f05febc7..795f9346e 100644
--- a/discojs/src/client/client.ts
+++ b/discojs/src/client/client.ts
@@ -178,6 +178,8 @@ export abstract class Client extends EventEmitter<{'status': RoundStatus}>{
     url.pathname += `tasks/${this.task.id}/model.json`
 
     const response = await fetch(url);
+    if (!response.ok) throw new Error(`fetch: HTTP status ${response.status}`);
+
     const encoded = new Uint8Array(await response.arrayBuffer())
     return await serialization.model.decode(encoded)
   }
diff --git a/discojs/src/task/task_handler.ts b/discojs/src/task/task_handler.ts
index 7b38a6928..d2b692bb4 100644
--- a/discojs/src/task/task_handler.ts
+++ b/discojs/src/task/task_handler.ts
@@ -20,7 +20,7 @@ export async function pushTask<D extends DataType>(
   task: Task<D>,
   model: Model<D>,
 ): Promise<void> {
-  await fetch(urlToTasks(base), {
+  const response = await fetch(urlToTasks(base), {
     method: "POST",
     body: JSON.stringify({
       task,
@@ -28,12 +28,14 @@ export async function pushTask<D extends DataType>(
       weights: await serialization.weights.encode(model.weights),
     }),
   });
+  if (!response.ok) throw new Error(`fetch: HTTP status ${response.status}`);
 }
 
 export async function fetchTasks(
   base: URL,
 ): Promise<Map<TaskID, Task<DataType>>> {
   const response = await fetch(urlToTasks(base));
+  if (!response.ok) throw new Error(`fetch: HTTP status ${response.status}`);
   const tasks: unknown = await response.json();
 
   if (!Array.isArray(tasks)) {
diff --git a/webapp/src/components/testing/__tests__/Testing.spec.ts b/webapp/src/components/testing/__tests__/Testing.spec.ts
index 7cd5d62dd..341cfc129 100644
--- a/webapp/src/components/testing/__tests__/Testing.spec.ts
+++ b/webapp/src/components/testing/__tests__/Testing.spec.ts
@@ -60,7 +60,7 @@ it("shows stored models", async () => {
 it("allows to download server's models", async () => {
   vi.stubGlobal("fetch", async (url: string | URL) => {
     if (url.toString() === "http://localhost:8080/tasks")
-      return { json: () => Promise.resolve([TASK]) };
+      return new Response(JSON.stringify([TASK]));
     throw new Error(`unhandled get: ${url}`);
   });
   afterEach(() => {
diff --git a/webapp/src/components/training/__tests__/Trainer.spec.ts b/webapp/src/components/training/__tests__/Trainer.spec.ts
index b77d27493..5dfd74762 100644
--- a/webapp/src/components/training/__tests__/Trainer.spec.ts
+++ b/webapp/src/components/training/__tests__/Trainer.spec.ts
@@ -10,39 +10,15 @@ import { loadCSV } from "@epfml/discojs-web";
 import Trainer from "../Trainer.vue";
 import TrainingInformation from "../TrainingInformation.vue";
 
-vi.mock("axios", async () => {
-  async function get(url: string) {
-    if (url === "http://localhost:8080/tasks/titanic/model.json") {
-      return {
-        data: await serialization.model.encode(
-          await defaultTasks.titanic.getModel(),
-        ),
-      };
-    }
-    throw new Error("unhandled get");
-  }
-
-  const axios = await vi.importActual<typeof import("axios")>("axios");
-  return {
-    ...axios,
-    default: {
-      ...axios.default,
-      get,
-    },
-  };
-});
-
 async function setupForTask() {
   const provider = defaultTasks.titanic;
 
   vi.stubGlobal("fetch", async (url: string | URL) => {
-    if (url.toString() === "http://localhost:8080/tasks/titanic/model.json")
-      return {
-        arrayBuffer: async () => {
-          const model = await provider.getModel();
-          return await serialization.model.encode(model);
-        },
-      };
+    if (url.toString() === "http://localhost:8080/tasks/titanic/model.json") {
+      const model = await provider.getModel();
+      const encoded = await serialization.model.encode(model);
+      return new Response(encoded);
+    }
     throw new Error(`unhandled get: ${url}`);
   });
   afterEach(() => {