From a48ba2dd49ead1b279191f557ace5be9e87e3c1d Mon Sep 17 00:00:00 2001
From: Paul Andrey <paul.andrey@inria.fr>
Date: Tue, 4 Jun 2024 12:19:11 +0200
Subject: [PATCH] Revise default 'FairnessSetupQuery' content.
---
declearn/fairness/api/_server.py | 5 ++++-
declearn/fairness/fairbatch/_server.py | 8 --------
declearn/fairness/fairgrad/_server.py | 8 --------
3 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/declearn/fairness/api/_server.py b/declearn/fairness/api/_server.py
index 6f893f9..7c29947 100644
--- a/declearn/fairness/api/_server.py
+++ b/declearn/fairness/api/_server.py
@@ -145,7 +145,10 @@ class FairnessControllerServer(metaclass=abc.ABCMeta):
`FairnessSetupQuery` instance to be sent to clients in order
to trigger the Fairness setup protocol.
"""
- return FairnessSetupQuery(algorithm=self.algorithm)
+ return FairnessSetupQuery(
+ algorithm=self.algorithm,
+ params={"f_type": self.f_type, "f_args": self.f_args},
+ )
@staticmethod
async def _exchange_sensitive_groups_list(
diff --git a/declearn/fairness/fairbatch/_server.py b/declearn/fairness/fairbatch/_server.py
index 4e1c99a..ecf5971 100644
--- a/declearn/fairness/fairbatch/_server.py
+++ b/declearn/fairness/fairbatch/_server.py
@@ -32,7 +32,6 @@ from declearn.fairness.fairbatch._messages import (
FairbatchSamplingProbas,
)
from declearn.fairness.fairbatch._sampling import setup_fairbatch_controller
-from declearn.messaging import FairnessSetupQuery
from declearn.secagg.api import Decrypter
@@ -105,13 +104,6 @@ class FairbatchControllerServer(FairnessControllerServer):
"""
return self._setup_function is setup_fedfb_controller
- def prepare_fairness_setup_query(
- self,
- ) -> FairnessSetupQuery:
- query = super().prepare_fairness_setup_query()
- query.params.update({"f_type": self.f_type, "f_args": self.f_args})
- return query
-
async def finalize_fairness_setup(
self,
netwk: NetworkServer,
diff --git a/declearn/fairness/fairgrad/_server.py b/declearn/fairness/fairgrad/_server.py
index b04fd3b..47ba8db 100644
--- a/declearn/fairness/fairgrad/_server.py
+++ b/declearn/fairness/fairgrad/_server.py
@@ -28,7 +28,6 @@ from declearn.communication.utils import verify_client_messages_validity
from declearn.fairness.api import FairnessControllerServer
from declearn.fairness.core import instantiate_fairness_function
from declearn.fairness.fairgrad._messages import FairgradOkay, FairgradWeights
-from declearn.messaging import FairnessSetupQuery
from declearn.secagg.api import Decrypter
@@ -185,13 +184,6 @@ class FairgradControllerServer(FairnessControllerServer):
counts={}, f_type="accuracy_parity", eta=eta, eps=eps
)
- def prepare_fairness_setup_query(
- self,
- ) -> FairnessSetupQuery:
- query = super().prepare_fairness_setup_query()
- query.params.update({"f_type": self.f_type, "f_args": self.f_args})
- return query
-
async def finalize_fairness_setup(
self,
netwk: NetworkServer,
--
GitLab