MEDfl 0.1.24__tar.gz → 0.1.26__tar.gz

MEDfl-0.1.26/.gitignore

@@ -0,0 +1,2 @@
+__pycache__/
+MEDfl.egg-info/

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/LearningManager/__init__.py

@@ -1,4 +1,4 @@
-# # Medfl/LearningManager/__init__.py
+# # MEDfl/LearningManager/__init__.py
 
 # # Import modules from this package
 # from .client import *

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/LearningManager/client.py

@@ -72,7 +72,7 @@ class FlowerClient(fl.client.NumPyClient):
             raise TypeError("cid argument must be a string")
 
         if not isinstance(self.local_model, Model):
-            raise TypeError("local_model argument must be a Medfl.LearningManager.model.Model")
+            raise TypeError("local_model argument must be a MEDfl.LearningManager.model.Model")
 
         if not isinstance(self.trainloader, DataLoader):
             raise TypeError("trainloader argument must be a torch.utils.data.dataloader")

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/LearningManager/federated_dataset.py

@@ -1,6 +1,6 @@
-from Medfl.NetManager.net_helper import *
-from Medfl.NetManager.net_manager_queries import *
-from Medfl.NetManager.database_connector import DatabaseManager
+from MEDfl.NetManager.net_helper import *
+from MEDfl.NetManager.net_manager_queries import *
+from MEDfl.NetManager.database_connector import DatabaseManager
 
 class FederatedDataset:
     def __init__(

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/LearningManager/flpipeline.py

@@ -9,12 +9,12 @@ from sqlalchemy import text
 from torch.utils.data import DataLoader, TensorDataset
 import torch 
 
-from Medfl.LearningManager.server import FlowerServer
-from Medfl.LearningManager.utils import params, test
-from Medfl.NetManager.net_helper import get_flpipeline_from_name
-from Medfl.NetManager.net_manager_queries import (CREATE_FLPIPELINE_QUERY,
+from MEDfl.LearningManager.server import FlowerServer
+from MEDfl.LearningManager.utils import params, test
+from MEDfl.NetManager.net_helper import get_flpipeline_from_name
+from MEDfl.NetManager.net_manager_queries import (CREATE_FLPIPELINE_QUERY,
                                                   DELETE_FLPIPELINE_QUERY , CREATE_TEST_RESULTS_QUERY)
-from Medfl.NetManager.database_connector import DatabaseManager
+from MEDfl.NetManager.database_connector import DatabaseManager
 
 def create_query(name, description, creation_date, result):
     query = text(

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/LearningManager/params_optimiser.py

@@ -12,10 +12,10 @@ from sklearn.base import BaseEstimator
 from sklearn.metrics import make_scorer, precision_score, recall_score, accuracy_score, f1_score,roc_auc_score, balanced_accuracy_score
 import optuna
 
-from Medfl.LearningManager.model import Model
-from Medfl.LearningManager.strategy import Strategy
-from Medfl.LearningManager.server import FlowerServer
-from Medfl.LearningManager.flpipeline import FLpipeline
+from MEDfl.LearningManager.model import Model
+from MEDfl.LearningManager.strategy import Strategy
+from MEDfl.LearningManager.server import FlowerServer
+from MEDfl.LearningManager.flpipeline import FLpipeline
 
 class BinaryClassifier(nn.Module):
     def __init__(self, input_size, num_layers, layer_size):

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/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 → MEDfl-0.1.26/MEDfl}/LearningManager/utils.py

@@ -7,7 +7,7 @@ from sklearn.metrics import *
 from yaml.loader import SafeLoader
 
 
-from Medfl.NetManager.database_connector import DatabaseManager
+from MEDfl.NetManager.database_connector import DatabaseManager
 
 # from scripts.base import *
 import json
@@ -44,7 +44,7 @@ DEFAULT_CONFIG_PATH = 'db_config.ini'
 
 
 def load_db_config():
-    config = os.environ.get('MEDFL_DB_CONFIG')
+    config = os.environ.get('MEDfl_DB_CONFIG')
 
     if config:
         return ast.literal_eval(config)
@@ -58,7 +58,7 @@ def set_db_config(config_path):
     config = configparser.ConfigParser()
     config.read(config_path)
     if (config['mysql']):
-        os.environ['MEDFL_DB_CONFIG'] = str(dict(config['mysql']))
+        os.environ['MEDfl_DB_CONFIG'] = str(dict(config['mysql']))
     else:
         raise ValueError(f"mysql key not found in file '{config_path}'")
 

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/NetManager/__init__.py

@@ -1,4 +1,4 @@
-# # Medfl/NetworkManager/__init__.py
+# # MEDfl/NetworkManager/__init__.py
 
 # # Import modules from this package
 # from .dataset import *

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/NetManager/database_connector.py

@@ -7,7 +7,7 @@ import subprocess
 class DatabaseManager:
     def __init__(self):
 
-        from Medfl.LearningManager.utils import load_db_config
+        from MEDfl.LearningManager.utils import load_db_config
         db_config = load_db_config()
         if db_config:
             self.config = db_config

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/NetManager/dataset.py

@@ -4,7 +4,7 @@ from sqlalchemy import text
 from .net_helper import *
 from .net_manager_queries import (DELETE_DATASET, INSERT_DATASET,
                                   SELECT_ALL_DATASET_NAMES)
-from Medfl.NetManager.database_connector import DatabaseManager
+from MEDfl.NetManager.database_connector import DatabaseManager
 
 class DataSet:
     def __init__(self, name: str, path: str, engine=None):

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/NetManager/flsetup.py

@@ -3,14 +3,14 @@ from datetime import datetime
 
 from torch.utils.data import random_split, DataLoader, Dataset
 
-from Medfl.LearningManager.federated_dataset import FederatedDataset
+from MEDfl.LearningManager.federated_dataset import FederatedDataset
 from .net_helper import *
 from .net_manager_queries import *  # Import the sql_queries module
 from .network import Network
 
 from .node import Node
 
-from Medfl.NetManager.database_connector import DatabaseManager
+from MEDfl.NetManager.database_connector import DatabaseManager
 
 
 class FLsetup:
@@ -46,7 +46,7 @@ class FLsetup:
 
         if not isinstance(self.network, Network):
             raise TypeError(
-                "network argument must be a Medfl.NetManager.Network "
+                "network argument must be a MEDfl.NetManager.Network "
             )
 
     def create(self):

{Medfl-0.1.24/Medfl → MEDfl-0.1.26/MEDfl}/NetManager/net_helper.py

@@ -8,7 +8,7 @@ import pandas as pd
 from torch.utils.data import TensorDataset
 import numpy as np
 
-from Medfl.NetManager.database_connector import DatabaseManager
+from MEDfl.NetManager.database_connector import DatabaseManager
 
 
 def is_str(data_df, row, x):
@@ -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 → MEDfl-0.1.26/MEDfl}/NetManager/network.py

@@ -1,6 +1,6 @@
-# src/Medfl/NetManager/network.py
+# src/MEDfl/NetManager/network.py
 
-from Medfl.LearningManager.utils import *
+from MEDfl.LearningManager.utils import *
 
 from .net_helper import *
 from .net_manager_queries import (CREATE_MASTER_DATASET_TABLE_QUERY,
@@ -10,7 +10,9 @@ from .net_manager_queries import (CREATE_MASTER_DATASET_TABLE_QUERY,
                                   UPDATE_NETWORK_QUERY, GET_NETWORK_QUERY)
 from .node import Node
 import pandas as pd
-from Medfl.LearningManager.utils import params
+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 → MEDfl-0.1.26/MEDfl}/NetManager/node.py

@@ -2,8 +2,8 @@ import pandas as pd
 
 from .net_helper import *
 from .net_manager_queries import *
-from Medfl.LearningManager.utils import params
-from Medfl.NetManager.database_connector import DatabaseManager
+from MEDfl.LearningManager.utils import params
+from MEDfl.NetManager.database_connector import DatabaseManager
 
 class Node:
     """
@@ -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.26}/MEDfl.egg-info/PKG-INFO

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