MEDfl 0.1.19__py3-none-any.whl → 0.1.20__py3-none-any.whl

Medfl/NetManager/network.py

@@ -35,7 +35,7 @@ class Network:
 
         db_manager = DatabaseManager() ; 
         db_manager.connect() ; 
-        self.eng = db_manager.get_connection() ;
+        self.eng = db_manager.get_connection()
 
     def validate(self):
         """Validate name"""

Medfl/NetManager/node.py

@@ -3,7 +3,7 @@ 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
 
 class Node:
     """
@@ -29,9 +29,10 @@ class Node:
         self.name = name
         self.train = train
         self.test_fraction = 1.0 if self.train == 0 else test_fraction
+       
 
-        db_manager = DatabaseManager()
-        db_manager.connect()
+        db_manager = DatabaseManager() ; 
+        db_manager.connect() ; 
         self.engine = db_manager.get_connection()
 
     def validate(self):
@@ -168,7 +169,7 @@ class Node:
         
         """
         return pd.read_sql(
-            text(SELECT_ALL_DATASETS_QUERY.format(self.name)), self.engine
+            text(SELECT_ALL_DATASETS_QUERY.format(self.name)), my_eng
         )
 
     @staticmethod
@@ -178,10 +179,6 @@ class Node:
             DataFrame: A DataFrame containing information about all nodes in the database.
         
         """
-        db_manager = DatabaseManager() ; 
-        db_manager.connect() ; 
-        my_eng = db_manager.get_connection() 
-        
         query = text(SELECT_ALL_NODES_QUERY)
         res = pd.read_sql(query, my_eng)
         return res

{Medfl-0.1.19.dist-info → Medfl-0.1.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Medfl
-Version: 0.1.19
+Version: 0.1.20
 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.19.dist-info → Medfl-0.1.20.dist-info}/RECORD

@@ -17,16 +17,16 @@ Medfl/NetManager/dataset.py,sha256=NpbmfSKJdtqIsShvjsb_z8W1vqlpYoFyZp8Wzsx_aEc,2
 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.19.data/scripts/setup_mysql.sh,sha256=PXl271yvYBrXwrZ7P0tsYHnGkOubKvRaFee4MnzsSko,560
+Medfl/NetManager/network.py,sha256=m6TOnzVCWOJME6fUUZ25ZpQedDeRn4O-tdE5HPVqOvw,5519
+Medfl/NetManager/node.py,sha256=Mua63zKs865bSu3QKfLJx7pxYdEXpPxDSCMRhDYNhms,6475
+Medfl-0.1.20.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.19.dist-info/METADATA,sha256=LJ6RCkIuFNzlkH8ydH1gZ2Mee6RGoR1LwlwtvhYMYu4,5577
-Medfl-0.1.19.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-Medfl-0.1.19.dist-info/top_level.txt,sha256=CmLt1TC7PJj-V55rhffMZ9LSOiuSaaEbz9FJm_zOw_E,22
-Medfl-0.1.19.dist-info/RECORD,,
+Medfl-0.1.20.dist-info/METADATA,sha256=e0jhrYrYjBRjs_cGwlnbE_gjcEkhfPUAqutdXzkKldc,5577
+Medfl-0.1.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+Medfl-0.1.20.dist-info/top_level.txt,sha256=CmLt1TC7PJj-V55rhffMZ9LSOiuSaaEbz9FJm_zOw_E,22
+Medfl-0.1.20.dist-info/RECORD,,