MEDfl 0.1.24__tar.gz → 0.1.25__tar.gz

{Medfl-0.1.24 → MEDfl-0.1.25}/MEDfl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: Medfl
-Version: 0.1.24
+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

{Medfl-0.1.24 → MEDfl-0.1.25}/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-0.1.24 → MEDfl-0.1.25}/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-0.1.24 → MEDfl-0.1.25}/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-0.1.24 → MEDfl-0.1.25}/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']):

{Medfl-0.1.24 → MEDfl-0.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: Medfl
-Version: 0.1.24
+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

{Medfl-0.1.24 → MEDfl-0.1.25}/notebooks/banchmarking/MEDfl_benchmarks.ipynb

@@ -19,9 +19,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 10,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Im here !\n"
+     ]
+    }
+   ],
    "source": [
     "!python \"../../scripts/create_db.py\" \"../../notebooks/data/masterDataSet/Mimic_ouael.csv\""
    ]
@@ -223,82 +231,82 @@
     "    # * 1 . Differential Privacy\n",
     "    # *******************************************\n",
     "    \"diff_privacy\": [\n",
-    "        # {\n",
-    "        #     # DP config\n",
-    "        #     \"dp_activate\": False,\n",
-    "\n",
-    "        #     # The rest of the config\n",
-    "        #     \"n_clients\": 10,\n",
-    "        #     \"train_test\": True,\n",
-    "        #     \"train_portion\": 0.5,\n",
-    "        #     \"aggreg_algo\": \"FedAvg\",\n",
-    "        #     \"Tl\": True,\n",
-    "        # },\n",
-    "        # {\n",
-    "        #     # DP config\n",
-    "        #     \"dp_activate\": True,\n",
-    "        #     \"DELTA\": 1e-5,\n",
-    "        #     \"EPSILON\": 5.0,\n",
-    "\n",
-    "        #     # The rest of the config\n",
-    "        #     \"n_clients\": 10,\n",
-    "        #     \"train_test\": True,\n",
-    "        #     \"train_portion\": 0.5,\n",
-    "        #     \"aggreg_algo\": \"FedAvg\",\n",
-    "        #     \"Tl\": True,\n",
-    "        # },\n",
-    "        # {\n",
-    "        #     # DP config\n",
-    "        #     \"dp_activate\": True,\n",
-    "        #     \"DELTA\": 1e-5,\n",
-    "        #     \"EPSILON\": 10.0,\n",
-    "\n",
-    "        #     # The rest of the config\n",
-    "        #     \"n_clients\": 10,\n",
-    "        #     \"train_test\": True,\n",
-    "        #     \"train_portion\": 0.5,\n",
-    "        #     \"aggreg_algo\": \"FedAvg\",\n",
-    "        #     \"Tl\": True,\n",
-    "        # },\n",
-    "        # {\n",
-    "        #     # DP config\n",
-    "        #     \"dp_activate\": True,\n",
-    "        #     \"DELTA\": 1e-5,\n",
-    "        #     \"EPSILON\": 0.5,\n",
-    "\n",
-    "        #     # The rest of the config\n",
-    "        #     \"n_clients\": 10,\n",
-    "        #     \"train_test\": True,\n",
-    "        #     \"train_portion\": 0.5,\n",
-    "        #     \"aggreg_algo\": \"FedAvg\",\n",
-    "        #     \"Tl\": True,\n",
-    "        # },\n",
-    "        # {\n",
-    "        #     # DP config\n",
-    "        #     \"dp_activate\": True,\n",
-    "        #     \"DELTA\": 0,\n",
-    "        #     \"EPSILON\": 0.5,\n",
-    "\n",
-    "        #     # The rest of the config\n",
-    "        #     \"n_clients\": 10,\n",
-    "        #     \"train_test\": True,\n",
-    "        #     \"train_portion\": 0.5,\n",
-    "        #     \"aggreg_algo\": \"FedAvg\",\n",
-    "        #     \"Tl\": True,\n",
-    "        # },\n",
-    "        #       {\n",
-    "        #     # DP config\n",
-    "        #     \"dp_activate\": True,\n",
-    "        #     \"DELTA\": 0,\n",
-    "        #     \"EPSILON\": 5.0,\n",
-    "\n",
-    "        #     # The rest of the config\n",
-    "        #     \"n_clients\": 10,\n",
-    "        #     \"train_test\": True,\n",
-    "        #     \"train_portion\": 0.5,\n",
-    "        #     \"aggreg_algo\": \"FedAvg\",\n",
-    "        #     \"Tl\": True,\n",
-    "        # }\n",
+    "        {\n",
+    "            # DP config\n",
+    "            \"dp_activate\": False,\n",
+    "\n",
+    "            # The rest of the config\n",
+    "            \"n_clients\": 10,\n",
+    "            \"train_test\": True,\n",
+    "            \"train_portion\": 0.5,\n",
+    "            \"aggreg_algo\": \"FedAvg\",\n",
+    "            \"Tl\": True,\n",
+    "        },\n",
+    "        {\n",
+    "            # DP config\n",
+    "            \"dp_activate\": True,\n",
+    "            \"DELTA\": 1e-5,\n",
+    "            \"EPSILON\": 5.0,\n",
+    "\n",
+    "            # The rest of the config\n",
+    "            \"n_clients\": 10,\n",
+    "            \"train_test\": True,\n",
+    "            \"train_portion\": 0.5,\n",
+    "            \"aggreg_algo\": \"FedAvg\",\n",
+    "            \"Tl\": True,\n",
+    "        },\n",
+    "        {\n",
+    "            # DP config\n",
+    "            \"dp_activate\": True,\n",
+    "            \"DELTA\": 1e-5,\n",
+    "            \"EPSILON\": 10.0,\n",
+    "\n",
+    "            # The rest of the config\n",
+    "            \"n_clients\": 10,\n",
+    "            \"train_test\": True,\n",
+    "            \"train_portion\": 0.5,\n",
+    "            \"aggreg_algo\": \"FedAvg\",\n",
+    "            \"Tl\": True,\n",
+    "        },\n",
+    "        {\n",
+    "            # DP config\n",
+    "            \"dp_activate\": True,\n",
+    "            \"DELTA\": 1e-5,\n",
+    "            \"EPSILON\": 0.5,\n",
+    "\n",
+    "            # The rest of the config\n",
+    "            \"n_clients\": 10,\n",
+    "            \"train_test\": True,\n",
+    "            \"train_portion\": 0.5,\n",
+    "            \"aggreg_algo\": \"FedAvg\",\n",
+    "            \"Tl\": True,\n",
+    "        },\n",
+    "        {\n",
+    "            # DP config\n",
+    "            \"dp_activate\": True,\n",
+    "            \"DELTA\": 0,\n",
+    "            \"EPSILON\": 0.5,\n",
+    "\n",
+    "            # The rest of the config\n",
+    "            \"n_clients\": 10,\n",
+    "            \"train_test\": True,\n",
+    "            \"train_portion\": 0.5,\n",
+    "            \"aggreg_algo\": \"FedAvg\",\n",
+    "            \"Tl\": True,\n",
+    "        },\n",
+    "              {\n",
+    "            # DP config\n",
+    "            \"dp_activate\": True,\n",
+    "            \"DELTA\": 0,\n",
+    "            \"EPSILON\": 5.0,\n",
+    "\n",
+    "            # The rest of the config\n",
+    "            \"n_clients\": 10,\n",
+    "            \"train_test\": True,\n",
+    "            \"train_portion\": 0.5,\n",
+    "            \"aggreg_algo\": \"FedAvg\",\n",
+    "            \"Tl\": True,\n",
+    "        }\n",
     "    ],\n",
     "    # * 2 . Nodes Config\n",
     "    # *******************************************\n",
@@ -440,44 +448,6 @@
     "}"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 10,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "benchmarks_config = {\n",
-    "    \n",
-    "    \"TL\": [\n",
-    "        {\n",
-    "            # Activate TL\n",
-    "            \"Tl\": True,\n",
-    "\n",
-    "            # The rest of the config\n",
-    "            \"train_test\": True,\n",
-    "            \"train_portion\": 0.5,\n",
-    "            \"aggreg_algo\": \"FedAvg\",\n",
-    "            \"dp_activate\": False,\n",
-    "            \"n_clients\": 10,\n",
-    "            \n",
-    "        },\n",
-    "        #    {\n",
-    "        #     # Activate TL\n",
-    "        #     \"Tl\": False,\n",
-    "\n",
-    "        #     # The rest of the config\n",
-    "        #     \"train_test\": True,\n",
-    "        #     \"train_portion\": 0.5,\n",
-    "        #     \"aggreg_algo\": \"FedAvg\",\n",
-    "        #     \"dp_activate\": False,\n",
-    "        #     \"n_clients\": 10,\n",
-    "            \n",
-    "        # },\n",
-    "       \n",
-    "    ],\n",
-    "}"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": 11,
@@ -627,32 +597,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Executing the: TL configurations\n",
-      "Executing th confuguration\n",
-      "{'Tl': True, 'train_test': True, 'train_portion': 0.5, 'aggreg_algo': 'FedAvg', 'dp_activate': False, 'n_clients': 10}\n"
-     ]
-    },
-    {
-     "ename": "CalledProcessError",
-     "evalue": "Command '['python', 'C:\\\\Users\\\\HP User\\\\AppData\\\\Roaming\\\\Python\\\\Python39\\\\site-packages\\\\Medfl\\\\NetManager\\\\..\\\\scripts\\\\create_db.py', '../data/masterDataSet/Mimic_ouael.csv']' returned non-zero exit status 2.",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[1;31mCalledProcessError\u001b[0m                        Traceback (most recent call last)",
-      "Cell \u001b[1;32mIn[17], line 14\u001b[0m\n\u001b[0;32m      9\u001b[0m     \u001b[39mbreak\u001b[39;00m\n\u001b[0;32m     10\u001b[0m \u001b[39m# Create the MEDfl pipeline for each config\u001b[39;00m\n\u001b[1;32m---> 14\u001b[0m db_manager\u001b[39m.\u001b[39;49mcreate_MEDfl_db(path_to_csv\u001b[39m=\u001b[39;49m\u001b[39m\"\u001b[39;49m\u001b[39m../data/masterDataSet/Mimic_ouael.csv\u001b[39;49m\u001b[39m\"\u001b[39;49m)\n\u001b[0;32m     16\u001b[0m \u001b[39m# if the differential privac is activated change the epsilon and delta on the params file \u001b[39;00m\n\u001b[0;32m     17\u001b[0m \u001b[39mif\u001b[39;00m(config[\u001b[39m\"\u001b[39m\u001b[39mdp_activate\u001b[39m\u001b[39m\"\u001b[39m]):\n",
-      "File \u001b[1;32m~\\AppData\\Roaming\\Python\\Python39\\site-packages\\Medfl\\NetManager\\database_connector.py:40\u001b[0m, in \u001b[0;36mDatabaseManager.create_MEDfl_db\u001b[1;34m(self, path_to_csv)\u001b[0m\n\u001b[0;32m     37\u001b[0m create_db_script_path \u001b[39m=\u001b[39m os\u001b[39m.\u001b[39mpath\u001b[39m.\u001b[39mjoin(current_directory, \u001b[39m'\u001b[39m\u001b[39m..\u001b[39m\u001b[39m'\u001b[39m, \u001b[39m'\u001b[39m\u001b[39mscripts\u001b[39m\u001b[39m'\u001b[39m, \u001b[39m'\u001b[39m\u001b[39mcreate_db.py\u001b[39m\u001b[39m'\u001b[39m)\n\u001b[0;32m     39\u001b[0m \u001b[39m# Execute the create_db.py script\u001b[39;00m\n\u001b[1;32m---> 40\u001b[0m subprocess\u001b[39m.\u001b[39;49mrun([\u001b[39m'\u001b[39;49m\u001b[39mpython\u001b[39;49m\u001b[39m'\u001b[39;49m, create_db_script_path, path_to_csv], check\u001b[39m=\u001b[39;49m\u001b[39mTrue\u001b[39;49;00m)\n\u001b[0;32m     42\u001b[0m \u001b[39mreturn\u001b[39;00m\n",
-      "File \u001b[1;32mc:\\Python39\\lib\\subprocess.py:528\u001b[0m, in \u001b[0;36mrun\u001b[1;34m(input, capture_output, timeout, check, *popenargs, **kwargs)\u001b[0m\n\u001b[0;32m    526\u001b[0m     retcode \u001b[39m=\u001b[39m process\u001b[39m.\u001b[39mpoll()\n\u001b[0;32m    527\u001b[0m     \u001b[39mif\u001b[39;00m check \u001b[39mand\u001b[39;00m retcode:\n\u001b[1;32m--> 528\u001b[0m         \u001b[39mraise\u001b[39;00m CalledProcessError(retcode, process\u001b[39m.\u001b[39margs,\n\u001b[0;32m    529\u001b[0m                                  output\u001b[39m=\u001b[39mstdout, stderr\u001b[39m=\u001b[39mstderr)\n\u001b[0;32m    530\u001b[0m \u001b[39mreturn\u001b[39;00m CompletedProcess(process\u001b[39m.\u001b[39margs, retcode, stdout, stderr)\n",
-      "\u001b[1;31mCalledProcessError\u001b[0m: Command '['python', 'C:\\\\Users\\\\HP User\\\\AppData\\\\Roaming\\\\Python\\\\Python39\\\\site-packages\\\\Medfl\\\\NetManager\\\\..\\\\scripts\\\\create_db.py', '../data/masterDataSet/Mimic_ouael.csv']' returned non-zero exit status 2."
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "\n",
     "# Loop Over the benchmark configs\n",
@@ -814,25 +761,6 @@
     "            })\n"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 18,
-   "metadata": {},
-   "outputs": [
-    {
-     "ename": "AttributeError",
-     "evalue": "'DatabaseManager' object has no attribute 'load_db_config'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[1;31mAttributeError\u001b[0m                            Traceback (most recent call last)",
-      "Cell \u001b[1;32mIn[18], line 1\u001b[0m\n\u001b[1;32m----> 1\u001b[0m db_manager\u001b[39m.\u001b[39;49mload_db_config()\n",
-      "\u001b[1;31mAttributeError\u001b[0m: 'DatabaseManager' object has no attribute 'load_db_config'"
-     ]
-    }
-   ],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": null,

{Medfl-0.1.24 → MEDfl-0.1.25}/scripts/create_db.py

@@ -18,6 +18,8 @@ def main(csv_file_path):
         config.read(config_file_path)
         mysql_config = config['mysql']
 
+        print('Im here !')
+
         mydb = mysql.connector.connect(host=mysql_config['host'], user=mysql_config['user'], password=mysql_config['password'])
         mycursor = mydb.cursor()
 

{Medfl-0.1.24 → MEDfl-0.1.25}/setup.py

@@ -13,8 +13,8 @@ with open('requirements.txt') as f:
     requirements = f.readlines()
 
 setup(
-    name="Medfl",
-    version="0.1.24",
+    name="MEDfl",
+    version="0.1.25",
     author="MEDomics consortium",
     author_email="medomics.info@gmail.com",
     description="Python Open-source package for simulating federated learning and differential privacy",