MEDfl 0.1.16__tar.gz → 0.1.18__tar.gz

{Medfl-0.1.16 → Medfl-0.1.18}/MEDfl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Medfl
-Version: 0.1.16
+Version: 0.1.18
 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.16 → Medfl-0.1.18}/Medfl/LearningManager/utils.py

@@ -22,7 +22,7 @@ import configparser
 import subprocess
 import ast
 
-from sqlalchemy import  text
+from sqlalchemy import text
 
 
 # Get the directory of the current script
@@ -47,7 +47,7 @@ def load_db_config():
     config = os.environ.get('MEDFL_DB_CONFIG')
 
     if config:
-        return ast.literal_eval( config )
+        return ast.literal_eval(config)
     else:
         raise ValueError(f"MEDfl db config not found")
 
@@ -62,13 +62,9 @@ def set_db_config(config_path):
     else:
         raise ValueError(f"mysql key not found in file '{config_path}'")
 
-# set the master dataset path
 
 
-def set_masterDataset_path(dataset_path):
-    os.environ['MEDFL_MASTERDATASET_PATH'] = dataset_path
-
-# Create database
+# Create databas
 
 
 def create_MEDfl_db():
@@ -174,9 +170,9 @@ def empty_db():
     Returns:
         None
     """
-    db_manager = DatabaseManager() ; 
-    db_manager.connect() ; 
-    my_eng = db_manager.get_connection() ; 
+    db_manager = DatabaseManager()
+    db_manager.connect()
+    my_eng = db_manager.get_connection()
 
     # my_eng.execute(text(f"DELETE FROM  {'DataSets'}"))
     my_eng.execute(text(f"DELETE FROM {'Nodes'}"))
@@ -205,9 +201,9 @@ def get_pipeline_from_name(name):
     Returns:
         int: ID of the pipeline.
     """
-    db_manager = DatabaseManager() ; 
-    db_manager.connect() ; 
-    my_eng = db_manager.get_connection() 
+    db_manager = DatabaseManager()
+    db_manager.connect()
+    my_eng = db_manager.get_connection()
 
     NodeId = int(
         pd.read_sql(
@@ -227,9 +223,9 @@ def get_pipeline_confusion_matrix(pipeline_id):
     Returns:
         dict: A dictionary representing the global confusion matrix.
     """
-    db_manager = DatabaseManager() ; 
-    db_manager.connect() ; 
-    my_eng = db_manager.get_connection() 
+    db_manager = DatabaseManager()
+    db_manager.connect()
+    my_eng = db_manager.get_connection()
 
     data = pd.read_sql(
         text(
@@ -273,9 +269,9 @@ def get_node_confusion_matrix(pipeline_id, node_name):
     Returns:
         dict: A dictionary representing the confusion matrix for the specified node.
     """
-    db_manager = DatabaseManager() ; 
-    db_manager.connect() ; 
-    my_eng = db_manager.get_connection() 
+    db_manager = DatabaseManager()
+    db_manager.connect()
+    my_eng = db_manager.get_connection()
 
     data = pd.read_sql(
         text(
@@ -301,10 +297,10 @@ def get_pipeline_result(pipeline_id):
     Returns:
         pandas.DataFrame: DataFrame containing test results for the specified pipeline.
     """
-    db_manager = DatabaseManager() ; 
-    db_manager.connect() ; 
+    db_manager = DatabaseManager()
+    db_manager.connect()
     my_eng = db_manager.get_connection()
-    
+
     data = pd.read_sql(
         text(
             f"SELECT * FROM testResults WHERE pipelineid = '{pipeline_id}'"), my_eng

{Medfl-0.1.16 → Medfl-0.1.18}/Medfl/NetManager/database_connector.py

@@ -7,8 +7,8 @@ import subprocess
 class DatabaseManager:
     def __init__(self):
 
-        from Medfl.LearningManager.utils import load_config
-        db_config = load_config()
+        from Medfl.LearningManager.utils import load_db_config
+        db_config = load_db_config()
         if db_config:
             self.config = db_config
         else:
@@ -17,7 +17,7 @@ class DatabaseManager:
 
     def connect(self):
         if not self.config:
-            raise ValueError("Database configuration not loaded. Use load_config() or set_config_path() first.")
+            raise ValueError("Database configuration not loaded. Use load_db_config() or set_config_path() first.")
         connection_string = (
             f"mysql+mysqlconnector://{self.config['user']}:{self.config['password']}@"
             f"{self.config['host']}:{self.config['port']}/{self.config['database']}"

{Medfl-0.1.16 → Medfl-0.1.18}/PKG-INFO

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