MEDfl 2.0.3__py3-none-any.whl → 2.0.4__py3-none-any.whl

MEDfl/rw/server.py

@@ -1,14 +1,20 @@
-
 import flwr as fl
 from flwr.server.strategy import FedAvg
 from flwr.server.server import ServerConfig
-from typing import  Optional, Any
+from typing import Optional, Any, List, Tuple, Dict, Callable
 from MEDfl.rw.strategy import Strategy
+from MEDfl.rw.verbose_server import VerboseServer
+import time
+from flwr.server.client_manager import ClientManager
+from flwr.server.client_proxy import ClientProxy
+from flwr.common import GetPropertiesIns
+import asyncio
 
 class FederatedServer:
     """
     Wrapper for launching a Flower federated-learning server,
     using a Strategy instance as its strategy attribute.
+    Now with client connection tracking.
     """
     def __init__(
         self,
@@ -28,15 +34,49 @@ class FederatedServer:
             raise ValueError("Strategy object not initialized. Call create_strategy() first.")
         self.strategy = self.strategy_wrapper.strategy_object
         self.certificates = certificates
+        self.connected_clients = []
 
     def start(self) -> None:
         """
         Start the Flower server with the configured strategy.
+        Now tracks and logs client connections before starting.
         """
+        print(f"Using strategy: {self.strategy_wrapper.name}")
         print(f"Starting Flower server on {self.server_address} with strategy {self.strategy_wrapper.name}")
+        
+        # Create a custom client manager to track connections
+        client_manager = TrackingClientManager(self)
+        
         fl.server.start_server(
             server_address=self.server_address,
             config=self.server_config,
             strategy=self.strategy,
             certificates=self.certificates,
-        )
+            client_manager=client_manager,
+        )
+
+class TrackingClientManager(fl.server.client_manager.SimpleClientManager):
+    """
+    Custom client manager that tracks and logs client connections.
+    """
+    def __init__(self, server: FederatedServer):
+        super().__init__()
+        self.server = server
+        self.client_properties = {}  # Store client properties
+
+    def register(self, client: ClientProxy) -> bool:
+        success = super().register(client)
+        if success and client.cid not in self.server.connected_clients:
+            # Run the async fetch synchronously
+            asyncio.run(self._fetch_and_log_hostname(client))
+        return success
+
+    async def _fetch_and_log_hostname(self, client: ClientProxy):
+        # try:
+        #     ins = GetPropertiesIns(config={})
+        #     props = await client.get_properties(ins=ins, timeout=10.0, group_id=0)
+        #     hostname = props.properties.get("hostname", "unknown")
+        # except Exception as e:
+        #     hostname = f"Error: {e}"
+        print(f"✅ Client connected - CID: {client.cid}")
+        self.server.connected_clients.append(client.cid)

MEDfl/rw/strategy.py

@@ -105,18 +105,36 @@ class Strategy:
         # 2) Wrap aggregate_fit to log
         original_agg_fit = strat.aggregate_fit
         def logged_aggregate_fit(rnd, results, failures):
+            # Print individual client fit metrics
+            print(f"\n[Server] 🔄 Round {rnd} - Client Training Metrics:")
+            for i, (client_id, fit_res) in enumerate(results):
+                print(f"  Client {client_id.cid}: {fit_res.metrics}")
+
+            # Call original aggregation function
             aggregated_params, metrics = original_agg_fit(rnd, results, failures)
-            print(f"[Server] ✔ Round {rnd} fit complete → Metrics: {metrics}")
+
+            # Print aggregated metrics
+            print(f"[Server] ✅ Round {rnd} - Aggregated Training Metrics: {metrics}\n")
             return aggregated_params, metrics
+
         strat.aggregate_fit = logged_aggregate_fit  # type: ignore
 
         # 3) Wrap aggregate_evaluate to log
         original_agg_eval = strat.aggregate_evaluate
         def logged_aggregate_evaluate(rnd, results, failures):
+            # Print individual client evaluation metrics
+            print(f"\n[Server] 📊 Round {rnd} - Client Evaluation Metrics:")
+            for i, (client_id, eval_res) in enumerate(results):
+                print(f"  Client {client_id.cid}: {eval_res.metrics}")
+
+            # Call original aggregation function
             loss, metrics = original_agg_eval(rnd, results, failures)
-            print(results)
-            print(f"[Server] ✔ Round {rnd} eval complete → Loss: {loss}, Metrics: {metrics}")
+
+            # Print aggregated metrics
+            print(f"[Server] ✅ Round {rnd} - Aggregated Evaluation Metrics:")
+            print(f"  Loss: {loss}, Metrics: {metrics}\n")
             return loss, metrics
+
         strat.aggregate_evaluate = logged_aggregate_evaluate  # type: ignore
 
         self.strategy_object = strat

MEDfl/rw/verbose_server.py

@@ -0,0 +1,21 @@
+from flwr.server import Server
+from flwr.server.client_manager import SimpleClientManager
+from flwr.server.client_proxy import ClientProxy
+from flwr.common.logger import log
+from logging import INFO
+
+class VerboseServer(Server):
+    def __init__(self, strategy):
+        super().__init__(client_manager=SimpleClientManager(), strategy=strategy)
+
+    def client_manager_fn(self):
+        return self.client_manager
+
+    def on_client_connect(self, client: ClientProxy):
+        super().on_client_connect(client)
+        log(INFO, f"[Server] ➕ Client connected: {client.cid}")
+        log(INFO, f"[Server] Currently connected: {len(self.client_manager.all().values())} clients")
+
+    def on_client_disconnect(self, client: ClientProxy):
+        super().on_client_disconnect(client)
+        log(INFO, f"[Server] ❌ Client disconnected: {client.cid}")

{medfl-2.0.3.dist-info → medfl-2.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MEDfl
-Version: 2.0.3
+Version: 2.0.4
 Summary: Python Open-source package for simulating federated learning and differential privacy
 Home-page: https://github.com/MEDomics-UdeS/MEDfl
 Author: MEDomics consortium

{medfl-2.0.3.dist-info → medfl-2.0.4.dist-info}/RECORD

@@ -23,8 +23,9 @@ MEDfl/rw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 MEDfl/rw/client.py,sha256=k8y8Wxh2KNe2oy5gRD-KXpTEGCYzp7X2oF5-Z6Rk1_E,1329
 MEDfl/rw/model.py,sha256=a3mrACDqg4K1V4Qyhh0PBEmWL5SpUYsiEarWHwsVcGk,2704
 MEDfl/rw/rwConfig.py,sha256=nK3Inv7v7Dm9gZnUnK5EqA4DmQ7TqiH4UoCZ8MlgFjA,823
-MEDfl/rw/server.py,sha256=JTexQ5KVOrXWmGOMoLstiVrwUNDHaEhWYnImvAF1Fiw,1557
-MEDfl/rw/strategy.py,sha256=NvpDpuU5_4Xv9vYyfvGLeaHaYd9h7V-b330G-PgPFCE,5469
+MEDfl/rw/server.py,sha256=PiCrUTlnx7rVcO9DcT-vnJF5WkOCe4eEzWXeRSUBh10,3286
+MEDfl/rw/strategy.py,sha256=DbgitZzW9Hu7rUnkHdRCq8sKkOGLjMMHPsHRIEVZXwM,6203
+MEDfl/rw/verbose_server.py,sha256=B_abnpCy43e3YrjotLFOm7cLiuiB5PSTeXD5sMP0CxA,851
 MEDfl/scripts/__init__.py,sha256=Pq1weevsPaU7MRMHfBYeyT0EOFeWLeVM6Y1DVz6jw1A,48
 MEDfl/scripts/base.py,sha256=QrmG7gkiPYkAy-5tXxJgJmOSLGAKeIVH6i0jq7G9xnA,752
 MEDfl/scripts/create_db.py,sha256=MnFtZkTueRZ-3qXPNX4JsXjOKj-4mlkxoRhSFdRcvJw,3817
@@ -54,8 +55,8 @@ Medfl/scripts/base.py,sha256=QrmG7gkiPYkAy-5tXxJgJmOSLGAKeIVH6i0jq7G9xnA,752
 Medfl/scripts/create_db.py,sha256=MnFtZkTueRZ-3qXPNX4JsXjOKj-4mlkxoRhSFdRcvJw,3817
 alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alembic/env.py,sha256=-aSZ6SlJeK1ZeqHgM-54hOi9LhJRFP0SZGjut-JnY-4,1588
-medfl-2.0.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-medfl-2.0.3.dist-info/METADATA,sha256=U9hqDT2qdSxEyYvtVFKQmjjuHx51XJ-RaKmg8ruzu_M,4579
-medfl-2.0.3.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-medfl-2.0.3.dist-info/top_level.txt,sha256=dIL9X8HOFuaVSzpg40DVveDPrymWRoShHtspH7kkjdI,14
-medfl-2.0.3.dist-info/RECORD,,
+medfl-2.0.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+medfl-2.0.4.dist-info/METADATA,sha256=hFoRqPRyKiqNCbBw3RcrYEh9fSRlAZChdEGaoNrLIGQ,4579
+medfl-2.0.4.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+medfl-2.0.4.dist-info/top_level.txt,sha256=dIL9X8HOFuaVSzpg40DVveDPrymWRoShHtspH7kkjdI,14
+medfl-2.0.4.dist-info/RECORD,,