MEDfl 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

Medfl/LearningManager/utils.py

@@ -6,6 +6,9 @@ import yaml
 from sklearn.metrics import *
 from yaml.loader import SafeLoader
 
+
+from Medfl.NetManager.database_connector import DatabaseManager
+
 # from scripts.base import *
 import json
 
@@ -21,8 +24,6 @@ import ast
 
 from sqlalchemy import text
 
-from Medfl.NetManager.database_connector import DatabaseManager
-
 
 # Get the directory of the current script
 current_directory = os.path.dirname(os.path.abspath(__file__))
@@ -42,11 +43,11 @@ with open(yaml_path) as g:
 DEFAULT_CONFIG_PATH = 'config.ini'
 
 
-def load_config():
+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")
 
@@ -61,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():
@@ -176,7 +173,7 @@ def empty_db():
     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'}"))
     my_eng.execute(text(f"DELETE FROM {'FedDatasets'}"))
@@ -303,7 +300,7 @@ def get_pipeline_result(pipeline_id):
     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/NetManager/database_connector.py

@@ -4,12 +4,11 @@ from configparser import ConfigParser
 
 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:
@@ -18,8 +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']}"
@@ -30,21 +28,21 @@ class DatabaseManager:
         if not self.engine:
             self.connect()
         return self.engine.connect()
-
-    def create_MEDfl_db(self, path_to_csv):
+    
+    def create_MEDfl_db(self , path_to_csv):
         # Get the directory of the current script
         current_directory = os.path.dirname(__file__)
 
         # Define the path to the create_db.py script
-        create_db_script_path = os.path.join(
-            current_directory, '..', '..', 'scripts', 'create_db.py')
+        create_db_script_path = os.path.join(current_directory, '..', 'scripts', 'create_db.py')
 
         # Execute the create_db.py script
-        subprocess.run(
-            ['python', create_db_script_path, path_to_csv], check=True)
+        subprocess.run(['python', create_db_script_path, path_to_csv], check=True)
 
         return
 
     def close(self):
         if self.engine:
             self.engine.dispose()
+
+

{Medfl-0.1.16.dist-info → Medfl-0.1.18.dist-info}/METADATA

@@ -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.dist-info → Medfl-0.1.18.dist-info}/RECORD

@@ -10,23 +10,23 @@ Medfl/LearningManager/params_optimiser.py,sha256=Pg_I5n_sPz-7ZqOsJGmnVM9ye7c5aPp
 Medfl/LearningManager/plot.py,sha256=iPqMV9rVd7hquoFixDL20OzXI5bMpBW41bkVmTKIWtE,7927
 Medfl/LearningManager/server.py,sha256=iQYiWFWMh9FdyQfNoAGYZ7l67fY4lB0dwICgnDXPOlA,7205
 Medfl/LearningManager/strategy.py,sha256=n0asQajkHfGLDX3QbbV5qntQA-xuJZU8Z92XccZENsA,3517
-Medfl/LearningManager/utils.py,sha256=-lchRC7cmPV529nlEg-i-O4fp0-sncyMa2vpr4TBdVc,9480
+Medfl/LearningManager/utils.py,sha256=80yWwpjVsQbYdjpzu5q_mpi6YWpEQUdPhSUdXGK9gx0,9339
 Medfl/NetManager/__init__.py,sha256=htCEy8g7lrKKeZJ-cH9-YCTyWfIOLwKtoj_dlNasOuM,246
-Medfl/NetManager/database_connector.py,sha256=UZYeAKOA0BqwDd-KBlNFyTKFT-Du2QtWq1l6e6uIcVA,1574
+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_manager_queries.py,sha256=2dfhba0iuh40kVoC7am-vC4Hlrvr-zfJ5ESymsI1Kps,4327
 Medfl/NetManager/network.py,sha256=dzSyEv0IFcoAFeXnI4Favhe9aHuw18YZHB9zwm0VwZE,5521
 Medfl/NetManager/node.py,sha256=c1vxcpzZFRV0KeG7KLBtP_sA_VmTdjG93PWUpGNIsKM,6535
-Medfl-0.1.16.data/scripts/setup_mysql.sh,sha256=PXl271yvYBrXwrZ7P0tsYHnGkOubKvRaFee4MnzsSko,560
+Medfl-0.1.18.data/scripts/setup_mysql.sh,sha256=PXl271yvYBrXwrZ7P0tsYHnGkOubKvRaFee4MnzsSko,560
 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/config.ini,sha256=tDQQlpwZbCFQuSS017yjEiLglLihp6wETbWtNrSWeAA,82
 scripts/create_db.py,sha256=ZoQeXIPRBxpcMX6wgQSUKCHzxg3kixzBz0ysTGpAejs,4461
-Medfl-0.1.16.dist-info/METADATA,sha256=8_6PdJEj203_ljWHWcoa6mMsPiZHWX1XlRHRLQQE8Xw,5577
-Medfl-0.1.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-Medfl-0.1.16.dist-info/top_level.txt,sha256=CmLt1TC7PJj-V55rhffMZ9LSOiuSaaEbz9FJm_zOw_E,22
-Medfl-0.1.16.dist-info/RECORD,,
+Medfl-0.1.18.dist-info/METADATA,sha256=NOuAr_ydSJOE2Wo44aXGMg-_5yN6Uyn41nUdR1zCNtM,5577
+Medfl-0.1.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+Medfl-0.1.18.dist-info/top_level.txt,sha256=CmLt1TC7PJj-V55rhffMZ9LSOiuSaaEbz9FJm_zOw_E,22
+Medfl-0.1.18.dist-info/RECORD,,