MEDfl 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

MEDfl/LearningManager/client.py

@@ -7,6 +7,8 @@ from .model import Model
 from .utils import params
 import torch
 
+import optuna
+
 class FlowerClient(fl.client.NumPyClient):
     """
     FlowerClient class for creating MEDfl clients.
@@ -107,6 +109,7 @@ class FlowerClient(fl.client.NumPyClient):
         Returns:
             Tuple: Parameters of the local model, number of training examples, and privacy information.
         """
+
         print('\n -------------------------------- \n  this is the config of the client')
         print(f"[Client {self.cid}] fit, config: {config}")
         # print(config['epochs'])
@@ -147,4 +150,32 @@ class FlowerClient(fl.client.NumPyClient):
         self.losses.append(loss)
         self.accuracies.append(accuracy)
         
+        print(f"[ ============== From evaluate ==== Client {self.cid}] fit, config: {config}")
+
+
+        # if('study' in config):
+        #     if 0 < config['server_round'] <= config['HPO_factor']*config['server_rounds']  and (config['server_round']  -1) %(config['HPO_RATE'] )==0:
+        #        print("==================== this is th optimisations info ===================")
+        #        print(auc) 
+        #        print(config['trail'])
+        #        print('---------') 
+        #        print(config['study'].trials[0].state) 
+        #        try:
+        #             # Call tell() method to report the result
+        #             config['study'].tell(config['trail'], auc)
+                    
+        #             # Fetch the updated trial from the study
+        #             updated_trial = config['trail']
+                    
+        #             # Check the state of the trial
+        #             if updated_trial.state == optuna.trial.TrialState.COMPLETE:
+        #                 print(f"Trial {updated_trial.number} completed successfully with value {updated_trial.value}")
+        #             else:
+        #                 print(f"Trial {updated_trial.number} is in state {updated_trial.state}")
+                
+        #        except Exception as e:
+        #             # Handle and log any errors
+        #             print(f"Error during tell(): {e}")
+
+        
         return float(loss), len(self.valloader), {"accuracy": float(accuracy)}

MEDfl/LearningManager/server.py

@@ -152,6 +152,14 @@ class FlowerServer:
         self.auc.append(auc)
         self.losses.append(loss)
         self.accuracies.append(accuracy)
+
+        if hasattr(self.strategy, 'study') and 0 < server_round <= self.strategy.HPO_factor*self.num_rounds  and (server_round  -1) %(self.strategy.hpo_rate )==0:
+            
+            print("================ Weeeee aaaaaareee hre ========================")
+
+            for trail in self.strategy.trail:
+
+                self.strategy.study.tell(trail , auc) 
         
         return loss, {"accuracy": accuracy}
 

MEDfl/LearningManager/strategy.py

@@ -35,7 +35,8 @@ class  Strategy:
         min_evaluate_clients: int = 2,
         min_available_clients: int = 2,
         initial_parameters = [],
-        evaluation_methode = "centralized"
+        evaluation_methode = "centralized" , 
+        config = None
     ) -> None:
         """
         Initialize a Strategy object with the specified parameters.
@@ -57,12 +58,62 @@ class  Strategy:
         self.min_available_clients = min_available_clients
         self.initial_parameters = initial_parameters
         self.evaluate_fn = None
-        self.name = name
-    
-    def optuna_fed_optimization(self, direction:str , hpo_rate:int , params_config):
-        self.study = optuna.create_study(direction=direction)
+        self.name = name 
+        self.config = config
+        self.server_round = 0
+
+    def get_trial(self, trial_number):
+        # Retrieve the trial from the study
+        trial = next((t for t in self.study.trials if t.number == trial_number), None)
+        if trial:
+            return trial
+        else:
+            return "Trial not found"
+        
+    def fit_config(self , server_round: int):
+        """Return training configuration dict for each round.
+
+        Perform two rounds of training with one local epoch, increase to two local
+        epochs afterwards.
+        """
+        config  = self.config 
+        
+        if hasattr(self, 'study'):
+            if 0 < server_round <= 0.7*10  and (server_round - 1 ) % self.hpo_rate == 0 : 
+                if(self.server_round < server_round):
+                    self.server_round = server_round
+                    self.trail = []
+                    
+                
+
+                print('================= this is the server trails')
+                print(self.trail)
+
+                trail = self.study.ask()
+                self.trail.append(trail)
+                learning_rate = trail.suggest_float('learning_rate', 1e-5, 1e-1)
+                print(self.study.trials)
+                print(trail.number)
+                config = {
+                    "trail" : trail ,
+                    "server_rounds":  5 , 
+                    "server_round" : server_round , 
+                    "HPO_factor" : 0.5 , 
+                    "study" : self.study , 
+                    "HPO_RATE" : self.hpo_rate , 
+                    "params" : {
+                    "learning_rate" : learning_rate
+                  }
+                  }
+                
+        return config
+
+    def optuna_fed_optimization(self, direction:str , hpo_rate:int , hpo_factor ,  params_config , sampler="TPESampler" , metric='AUC'):
+        self.study = optuna.create_study(direction=direction , sampler=self.get_sampler_by_name(sampler)())
         self.hpo_rate = hpo_rate
-        self.params_config = params_config
+        self.HPO_factor = hpo_factor
+        self.config = params_config
+        self.opt_metric = metric
     
  
     def create_strategy(self):
@@ -73,10 +124,15 @@ class  Strategy:
             min_evaluate_clients=self.min_evaluate_clients,
             min_available_clients=self.min_available_clients,
             initial_parameters=fl.common.ndarrays_to_parameters(self.initial_parameters),
-            evaluate_fn=self.evaluate_fn
+            evaluate_fn=self.evaluate_fn , 
+            on_fit_config_fn = self.fit_config ,
+            on_evaluate_config_fn = self.fit_config
         )
     def get_strategy_by_name(self):
         return eval(f"fl.server.strategy.{self.name}")
     
+    def get_sampler_by_name(self , name) : 
+        return eval(f"optuna.samplers.{name}")
+    
     
 

MEDfl/NetManager/database_connector.py

@@ -34,7 +34,7 @@ class DatabaseManager:
         create_db_script_path = os.path.join(current_directory, '..', 'scripts', 'create_db.py')
 
         # Execute the create_db.py script
-        subprocess.run(['python3', create_db_script_path, path_to_csv], check=True)
+        subprocess.run(['python', create_db_script_path, path_to_csv], check=True)
 
         return
 

{MEDfl-0.2.0.dist-info → MEDfl-0.2.1.dist-info}/METADATA

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

{MEDfl-0.2.0.dist-info → MEDfl-0.2.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 MEDfl/__init__.py,sha256=pMyTkws4slDkLQgPpPdKoWdQf1rZGHXAlNxfPFFZM-I,81
 MEDfl/LearningManager/__init__.py,sha256=L66e9oq7hTWIo8KpRrG6Yxx1UHmEIOoOfbaBcX9BeOk,354
-MEDfl/LearningManager/client.py,sha256=9WyLYCsI9JuHjneLbbzDf7HtzjYINuLfqwkbxOsrBrE,6083
+MEDfl/LearningManager/client.py,sha256=rFAVDJ3KGB61A8ztvYgE0rjY16fo7XpxcbTiSkDPIlo,7540
 MEDfl/LearningManager/dynamicModal.py,sha256=0mTvDJlss0uSJ3_EXOuL_d-zRmFyXaKB4W4ql-uEX8Y,10821
 MEDfl/LearningManager/federated_dataset.py,sha256=fQqIbhO6LSk16Ob9z6RohaZ8X71Ff-yueynjulrl4M0,2141
 MEDfl/LearningManager/flpipeline.py,sha256=M4-OL4nlogv08J_YsyDsGHXR6xe8BWx4HIsuL1QyUvY,7303
@@ -8,11 +8,11 @@ MEDfl/LearningManager/model.py,sha256=DA7HP34Eq1Ra65OlkBmjH9d2MD7OEbsOhfxD48l4QO
 MEDfl/LearningManager/params.yaml,sha256=6UcmIgYcufbCn_H6vxerlinVlQE8fF6fI6CrRaTSVWE,450
 MEDfl/LearningManager/params_optimiser.py,sha256=pjhDskhSPuca-jnarYoJcFVBvRkdD9tD3992q_eMPSE,18060
 MEDfl/LearningManager/plot.py,sha256=iPqMV9rVd7hquoFixDL20OzXI5bMpBW41bkVmTKIWtE,7927
-MEDfl/LearningManager/server.py,sha256=7edxPkZ9Ju3Mep_BSHQpUNgW9HKfCui3_l996buJVlU,7258
-MEDfl/LearningManager/strategy.py,sha256=n0asQajkHfGLDX3QbbV5qntQA-xuJZU8Z92XccZENsA,3517
+MEDfl/LearningManager/server.py,sha256=scnjiWC6vMIPzAwEvaeQfKfCBqYtKdqZLhOwvcwRo7w,7631
+MEDfl/LearningManager/strategy.py,sha256=ouCdAJA8CdxMmXBVVZ0BapmZIBZfACOxVPQLEXPmHIs,5673
 MEDfl/LearningManager/utils.py,sha256=vEhkpyC7iLsn4wp1wDh7GzAn5MCJ7T69jkS9lfmKA1Y,9936
 MEDfl/NetManager/__init__.py,sha256=UaHMFtzo90k7rQW45ZUX7aW0-EG1d3OXDkqc8cVgp6U,283
-MEDfl/NetManager/database_connector.py,sha256=vOhbvCbzKVN3vk5HxfcJP7iher7rsGpLtCXB0-4wwRw,1517
+MEDfl/NetManager/database_connector.py,sha256=JKfFLom7I4zuykb8m7aY4cUYZy4j0-i9w3R_jkPzjXY,1516
 MEDfl/NetManager/dataset.py,sha256=eEuVzCp5dGD4tvDVKq6jlSReecge7T20ByG4d7_cnXU,2869
 MEDfl/NetManager/flsetup.py,sha256=CS7531I08eLm6txMIDWFMCIrPP-dNpOLBTaR2BR6X0c,11754
 MEDfl/NetManager/net_helper.py,sha256=T5Y-03SVskK8oXXIpiXzASyEDPQJbcuGVpIS9FnmzI8,7066
@@ -24,8 +24,8 @@ MEDfl/scripts/base.py,sha256=pR7StIt3PpX30aoh53gMkpeNJMHytAPhdc7N09tCITA,781
 MEDfl/scripts/create_db.py,sha256=PgA6N68iTSfnrt6zy7FDZX2lLjQQ7Ual1Y0efve8gf4,3943
 alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alembic/env.py,sha256=a4zJAzPNLHnIrUlXCqf_8vuAlFu0pceFJJKM1PQaOI4,1649
-MEDfl-0.2.0.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-MEDfl-0.2.0.dist-info/METADATA,sha256=TdK27hGked7Mdy6WVnyhoG3uX_ohfh9UDI7-DAHZY7k,4428
-MEDfl-0.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-MEDfl-0.2.0.dist-info/top_level.txt,sha256=dIL9X8HOFuaVSzpg40DVveDPrymWRoShHtspH7kkjdI,14
-MEDfl-0.2.0.dist-info/RECORD,,
+MEDfl-0.2.1.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+MEDfl-0.2.1.dist-info/METADATA,sha256=RIvrAIdTlpIdHPQfGeopzdSKXhaDuhlldOc8sjqF4Uk,4428
+MEDfl-0.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+MEDfl-0.2.1.dist-info/top_level.txt,sha256=dIL9X8HOFuaVSzpg40DVveDPrymWRoShHtspH7kkjdI,14
+MEDfl-0.2.1.dist-info/RECORD,,