MEDfl 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

{Medfl-0.1.23.dist-info → MEDfl-0.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: Medfl
-Version: 0.1.23
+Name: MEDfl
+Version: 0.1.25
 Summary: Python Open-source package for simulating federated learning and differential privacy
 Home-page: https://github.com/HaithemLamri/MEDfl
 Author: MEDomics consortium
@@ -75,7 +75,7 @@ cd MEDfl
 pip install -e .
 ```
 ### MySQL DB configuration
-MEDfl requires a MySQL DB connection, and this is in order to allow users to work with their own tabular datasets,  we have created a bash script to install and configure A MySQL DB with phpmyadmin monitoring system, run the following command then change your credential on the MEDfl/scripts/base.py and MEDfl/scripts/config.ini files
+MEDfl requires a MySQL DB connection, and this is in order to allow users to work with their own tabular datasets,  we have created a bash script to install and configure A MySQL DB with phpmyadmin monitoring system, run the following command then change your credential on the MEDfl/scripts/base.py and MEDfl/scripts/db_config.ini files
 ```
 sudo bash MEDfl/scripts/setup_mysql.sh
 ```

{Medfl-0.1.23.dist-info → MEDfl-0.1.25.dist-info}/RECORD

@@ -1,3 +1,4 @@
+MEDfl-0.1.25.data/scripts/setup_mysql.sh,sha256=PXl271yvYBrXwrZ7P0tsYHnGkOubKvRaFee4MnzsSko,560
 Medfl/__init__.py,sha256=wamSaVIS4RoIHcTCLQPKQ5f8odcy87mRCKyRR7-Qpu4,57
 Medfl/LearningManager/__init__.py,sha256=DZZl9wUCY4vzA8ulmBL4EaFR8yVDYNdvur2mk4BJQnA,358
 Medfl/LearningManager/client.py,sha256=ik-0qImV6nrk1Iw70dEMKaN_r7NxvcyVl5nAWqjzmQY,6083
@@ -8,25 +9,24 @@ Medfl/LearningManager/model.py,sha256=DA7HP34Eq1Ra65OlkBmjH9d2MD7OEbsOhfxD48l4QO
 Medfl/LearningManager/params.yaml,sha256=5I-NljhnSaqzjkWVNzrOtrB8z7tnHBKiBmY-mKGhBQM,450
 Medfl/LearningManager/params_optimiser.py,sha256=Pg_I5n_sPz-7ZqOsJGmnVM9ye7c5aPp5szBPmHsWKhE,18060
 Medfl/LearningManager/plot.py,sha256=iPqMV9rVd7hquoFixDL20OzXI5bMpBW41bkVmTKIWtE,7927
-Medfl/LearningManager/server.py,sha256=iQYiWFWMh9FdyQfNoAGYZ7l67fY4lB0dwICgnDXPOlA,7205
+Medfl/LearningManager/server.py,sha256=7edxPkZ9Ju3Mep_BSHQpUNgW9HKfCui3_l996buJVlU,7258
 Medfl/LearningManager/strategy.py,sha256=n0asQajkHfGLDX3QbbV5qntQA-xuJZU8Z92XccZENsA,3517
-Medfl/LearningManager/utils.py,sha256=80yWwpjVsQbYdjpzu5q_mpi6YWpEQUdPhSUdXGK9gx0,9339
+Medfl/LearningManager/utils.py,sha256=7iJiA-v7mM4SuvvwxA9oAP8i15MvNpkMyCv6uC6lLoQ,9342
 Medfl/NetManager/__init__.py,sha256=htCEy8g7lrKKeZJ-cH9-YCTyWfIOLwKtoj_dlNasOuM,246
 Medfl/NetManager/database_connector.py,sha256=rooasWBSNtZZmqQvLPS0IimHQqWeCMyyGFRFzNM8Dlw,1538
 Medfl/NetManager/dataset.py,sha256=NpbmfSKJdtqIsShvjsb_z8W1vqlpYoFyZp8Wzsx_aEc,2869
 Medfl/NetManager/flsetup.py,sha256=IPWdZcz13PZic5OQyCiMyJ34cQPegKwkKEJSAqjjnqg,11754
-Medfl/NetManager/net_helper.py,sha256=VYJPVI65wo34X9GO9t1joNGPr3TutZdxfva-X6P3MSU,7017
+Medfl/NetManager/net_helper.py,sha256=sDGDfrYqY4MUoAE2gcNcyJFBXPRoAupdUibVSnspAn0,6860
 Medfl/NetManager/net_manager_queries.py,sha256=2dfhba0iuh40kVoC7am-vC4Hlrvr-zfJ5ESymsI1Kps,4327
-Medfl/NetManager/network.py,sha256=m6TOnzVCWOJME6fUUZ25ZpQedDeRn4O-tdE5HPVqOvw,5519
-Medfl/NetManager/node.py,sha256=Mua63zKs865bSu3QKfLJx7pxYdEXpPxDSCMRhDYNhms,6475
-Medfl-0.1.23.data/scripts/setup_mysql.sh,sha256=PXl271yvYBrXwrZ7P0tsYHnGkOubKvRaFee4MnzsSko,560
+Medfl/NetManager/network.py,sha256=X5uKHna_CnskYGYZ2DjmIDEwri7srggjHc0PUIypls0,5730
+Medfl/NetManager/node.py,sha256=foOpIC3bsrOw3E-UCVQ87sy2Kp_2syd-KFijxnbYPiY,6344
 alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alembic/env.py,sha256=a4zJAzPNLHnIrUlXCqf_8vuAlFu0pceFJJKM1PQaOI4,1649
 scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scripts/base.py,sha256=B0KKbl9Czh4HhExmO41tdbI2-g1OyiW2ArYhLYgKNEw,778
+scripts/base.py,sha256=pR7StIt3PpX30aoh53gMkpeNJMHytAPhdc7N09tCITA,781
 scripts/config.ini,sha256=tDQQlpwZbCFQuSS017yjEiLglLihp6wETbWtNrSWeAA,82
-scripts/create_db.py,sha256=vxgpb1FtF8QYbhQGhUxKJPb6cWn3mQ0PHjwfeoaH-dk,4272
-Medfl-0.1.23.dist-info/METADATA,sha256=k76WOAbqZNi05S-LN5iOtKFHzHjzyzj2Ajn_n8Liqe0,5577
-Medfl-0.1.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-Medfl-0.1.23.dist-info/top_level.txt,sha256=CmLt1TC7PJj-V55rhffMZ9LSOiuSaaEbz9FJm_zOw_E,22
-Medfl-0.1.23.dist-info/RECORD,,
+scripts/create_db.py,sha256=iWE1z33rU_KbIeqoVzdWLhDRLk00TcRf2iYuqpDzOjw,4494
+MEDfl-0.1.25.dist-info/METADATA,sha256=qijvMc_6sl1N2UaGR173E3QQryvOqsofUKebI3ZSxrU,5580
+MEDfl-0.1.25.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+MEDfl-0.1.25.dist-info/top_level.txt,sha256=CmLt1TC7PJj-V55rhffMZ9LSOiuSaaEbz9FJm_zOw_E,22
+MEDfl-0.1.25.dist-info/RECORD,,

Medfl/LearningManager/server.py

@@ -115,10 +115,11 @@ class FlowerServer:
             f"cuda:{int(cid) % 4}" if torch.cuda.is_available() else "cpu"
         )
         client_model = copy.deepcopy(self.global_model)
-        
+      
         trainloader = self.fed_dataset.trainloaders[int(cid)]
         valloader = self.fed_dataset.valloaders[int(cid)]
         # this helps in making plots
+        
         client = FlowerClient(
             cid, client_model, trainloader, valloader, self.diff_priv
         )
@@ -165,7 +166,8 @@ class FlowerServer:
         ray_init_args = {"include_dashboard": False
                          , "object_store_memory": 78643200
                         }
-
+        self.fed_dataset.eng = None
+        
         history = fl.simulation.start_simulation(
             client_fn=self.client_fn,
             num_clients=self.num_clients,

Medfl/LearningManager/utils.py

@@ -40,7 +40,7 @@ with open(yaml_path) as g:
 
 
 # Default path for the config file
-DEFAULT_CONFIG_PATH = 'config.ini'
+DEFAULT_CONFIG_PATH = 'db_config.ini'
 
 
 def load_db_config():

Medfl/NetManager/net_helper.py

@@ -133,11 +133,8 @@ def get_nodeid_from_name(name):
     db_manager.connect()
     my_eng = db_manager.get_connection()
 
-    NodeId = int(
-        pd.read_sql(
-            text(f"SELECT NodeId FROM Nodes WHERE NodeName = '{name}'"), my_eng
-        ).iloc[0, 0]
-    )
+    result_proxy = my_eng.execute(f"SELECT NodeId FROM Nodes WHERE NodeName = '{name}'")
+    NodeId = int(result_proxy.fetchone()[0])
     return NodeId
 
 
@@ -156,12 +153,8 @@ def get_netid_from_name(name):
     my_eng = db_manager.get_connection()
 
     try:
-        NetId = int(
-            pd.read_sql(
-                text(f"SELECT NetId FROM Networks WHERE NetName = '{name}'"),
-                my_eng,
-            ).iloc[0, 0]
-        )
+        result_proxy = my_eng.execute(f"SELECT NetId FROM Networks WHERE NetName = '{name}'")
+        NetId = int(result_proxy.fetchone()[0])
     except:
         NetId = None
     return NetId
@@ -182,12 +175,10 @@ def get_flsetupid_from_name(name):
     my_eng = db_manager.get_connection()
 
     try:
-        id = int(
-            pd.read_sql(
-                text(f"SELECT FLsetupId FROM FLsetup WHERE name = '{name}'"),
-                my_eng,
-            ).iloc[0, 0]
-        )
+        
+         result_proxy = my_eng.execute(f"SELECT FLsetupId FROM FLsetup WHERE name = '{name}'")
+         id = int(result_proxy.fetchone()[0])
+   
     except:
         id = None
     return id
@@ -208,12 +199,9 @@ def get_flpipeline_from_name(name):
     my_eng = db_manager.get_connection()
 
     try:
-        id = int(
-            pd.read_sql(
-                text(f"SELECT id FROM FLpipeline WHERE name = '{name}'"),
-                my_eng,
-            ).iloc[0, 0]
-        )
+
+        result_proxy = my_eng.execute(f"SELECT id FROM FLpipeline WHERE name = '{name}'")
+        id = int(result_proxy.fetchone()[0])
     except:
         id = None
     return id
@@ -234,12 +222,9 @@ def get_feddataset_id_from_name(name):
     my_eng = db_manager.get_connection()
 
     try:
-        id = int(
-            pd.read_sql(
-                text(f"SELECT FedId FROM FedDatasets WHERE name = '{name}'"),
-                my_eng,
-            ).iloc[0, 0]
-        )
+        
+        result_proxy = my_eng.execute(f"SELECT FedId FROM FedDatasets WHERE name = '{name}'")
+        id = int(result_proxy.fetchone()[0])
     except:
         id = None
     return id
@@ -256,9 +241,8 @@ def master_table_exists():
     db_manager.connect()
     my_eng = db_manager.get_connection()
 
-    return pd.read_sql(
-        text(
-            " SELECT EXISTS ( SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_NAME = 'MasterDataset' )"
-        ),
-        my_eng,
-    ).values[0][0]
+
+    sql_query = text("SELECT EXISTS (SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_NAME = 'MasterDataset')")
+    result = my_eng.execute(sql_query)
+    exists = result.scalar()
+    return exists

Medfl/NetManager/network.py

@@ -12,6 +12,8 @@ from .node import Node
 import pandas as pd
 from Medfl.LearningManager.utils import params
 
+from sqlalchemy import text
+
 
 class Network:
     """
@@ -104,9 +106,10 @@ class Network:
             DataFrame: A DataFrame containing information about all nodes in the network.
         
         """
-        return pd.read_sql(
-            text(LIST_ALL_NODES_QUERY.format(name=self.name)), self.eng
-        )
+        query = text(LIST_ALL_NODES_QUERY.format(name=self.name))
+        result_proxy = self.eng.execute(query)
+        result_df = pd.DataFrame(result_proxy.fetchall(), columns=result_proxy.keys())
+        return result_df
 
     def create_master_dataset(self, path_to_csv: str = params['path_to_master_csv']):
         """
@@ -165,4 +168,7 @@ class Network:
         db_manager.connect() ; 
         my_eng = db_manager.get_connection() ;
 
-        return pd.read_sql(text("SELECT * FROM Networks"), my_eng)
+        result_proxy = my_eng.execute("SELECT * FROM Networks")
+        result = result_proxy.fetchall()
+        return result
+

Medfl/NetManager/node.py

@@ -74,10 +74,12 @@ class Node:
             print("MasterDataset doesn't exist")
         else:
             columns = data_df.columns.tolist()
+            
             # get master_dataset columns
-            master_table_columns = pd.read_sql(
-                text(SELECT_MASTER_COLUMNS_QUERY), self.engine
-            ).columns.tolist()
+            result_proxy = self.engine.execute(SELECT_MASTER_COLUMNS_QUERY)
+            master_table_columns = result_proxy.keys()
+
+
             assert [x == y for x, y in zip(master_table_columns, columns)]
 
     def update_node(self):
@@ -94,21 +96,13 @@ class Node:
         """
         NodeId = get_nodeid_from_name(self.name)
         if column_name is not None:
-            
-            node_dataset = pd.read_sql(
-                text(
-                    SELECT_DATASET_BY_COLUMN_QUERY.format(
-                        column_name, self.name
-                    )
-                ),
-                self.engine,
-            )
-             
+            query = text(SELECT_DATASET_BY_COLUMN_QUERY.format(column_name, self.name))
         else:
-            node_dataset = pd.read_sql(
-                text(SELECT_DATASET_BY_NODE_ID_QUERY.format(NodeId)),
-                self.engine,
-            )
+            query = text(SELECT_DATASET_BY_NODE_ID_QUERY.format(NodeId))
+
+        result_proxy = self.engine.execute(query)
+        node_dataset = pd.DataFrame(result_proxy.fetchall(), columns=result_proxy.keys())
+
         return node_dataset
 
     def upload_dataset(self, dataset_name: str, path_to_csv: str = params['path_to_test_csv']):

scripts/base.py

@@ -9,7 +9,7 @@ import os
 current_directory = os.path.dirname(os.path.abspath(__file__))
 
 # Load configuration from the config file
-config_file_path = os.path.join(current_directory, 'config.ini')
+config_file_path = os.path.join(current_directory, 'db_config.ini')
 
 config = ConfigParser()
 config.read(config_file_path)

scripts/create_db.py

@@ -6,21 +6,22 @@ from mysql.connector import Error
 from configparser import ConfigParser
 import os
 
-from Medfl.LearningManager.utils import load_db_config
-
 def main(csv_file_path):
     try:
-        
-        mysql_config = load_db_config()
-        
+        # Get the directory of the current script
+        current_directory = os.path.dirname(os.path.abspath(__file__))
 
-        print('Step 1')
+        # Load configuration from the config file
+        config_file_path = os.path.join(current_directory, 'db_config.ini')
 
-        mydb = mysql.connector.connect(host=mysql_config['host'], user=mysql_config['user'], password=mysql_config['password'])
-        mycursor = mydb.cursor()
+        config = ConfigParser()
+        config.read(config_file_path)
+        mysql_config = config['mysql']
 
-        print('Step 2')
+        print('Im here !')
 
+        mydb = mysql.connector.connect(host=mysql_config['host'], user=mysql_config['user'], password=mysql_config['password'])
+        mycursor = mydb.cursor()
 
         # Create the 'MEDfl' database if it doesn't exist
         mycursor.execute("CREATE DATABASE IF NOT EXISTS MEDfl")