MEDfl 0.1.25__py3-none-any.whl → 0.1.26__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. {MEDfl-0.1.25.dist-info → MEDfl-0.1.26.dist-info}/METADATA +1 -1
  2. MEDfl-0.1.26.dist-info/RECORD +32 -0
  3. {MEDfl-0.1.25.dist-info → MEDfl-0.1.26.dist-info}/top_level.txt +1 -1
  4. Medfl/LearningManager/__init__.py +1 -1
  5. Medfl/LearningManager/client.py +1 -1
  6. Medfl/LearningManager/federated_dataset.py +3 -3
  7. Medfl/LearningManager/flpipeline.py +5 -5
  8. Medfl/LearningManager/params_optimiser.py +4 -4
  9. Medfl/LearningManager/utils.py +3 -3
  10. Medfl/NetManager/__init__.py +1 -1
  11. Medfl/NetManager/database_connector.py +1 -1
  12. Medfl/NetManager/dataset.py +1 -1
  13. Medfl/NetManager/flsetup.py +3 -3
  14. Medfl/NetManager/net_helper.py +1 -1
  15. Medfl/NetManager/network.py +3 -3
  16. Medfl/NetManager/node.py +2 -2
  17. MEDfl-0.1.25.dist-info/RECORD +0 -32
  18. {MEDfl-0.1.25.data → MEDfl-0.1.26.data}/scripts/setup_mysql.sh +0 -0
  19. {MEDfl-0.1.25.dist-info → MEDfl-0.1.26.dist-info}/WHEEL +0 -0
{MEDfl-0.1.25.dist-info → MEDfl-0.1.26.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: MEDfl
3
- Version: 0.1.25
3
+ Version: 0.1.26
4
4
  Summary: Python Open-source package for simulating federated learning and differential privacy
5
5
  Home-page: https://github.com/HaithemLamri/MEDfl
6
6
  Author: MEDomics consortium
MEDfl-0.1.26.dist-info/RECORD ADDED
@@ -0,0 +1,32 @@
1
+ MEDfl-0.1.26.data/scripts/setup_mysql.sh,sha256=PXl271yvYBrXwrZ7P0tsYHnGkOubKvRaFee4MnzsSko,560
2
+ Medfl/__init__.py,sha256=wamSaVIS4RoIHcTCLQPKQ5f8odcy87mRCKyRR7-Qpu4,57
3
+ Medfl/LearningManager/__init__.py,sha256=mvlAmHEHljXGaB6Ij0EPN0Txw21qX25ELK3X7QkoVwA,358
4
+ Medfl/LearningManager/client.py,sha256=9WyLYCsI9JuHjneLbbzDf7HtzjYINuLfqwkbxOsrBrE,6083
5
+ Medfl/LearningManager/dynamicModal.py,sha256=0mTvDJlss0uSJ3_EXOuL_d-zRmFyXaKB4W4ql-uEX8Y,10821
6
+ Medfl/LearningManager/federated_dataset.py,sha256=fQqIbhO6LSk16Ob9z6RohaZ8X71Ff-yueynjulrl4M0,2141
7
+ Medfl/LearningManager/flpipeline.py,sha256=M4-OL4nlogv08J_YsyDsGHXR6xe8BWx4HIsuL1QyUvY,7303
8
+ Medfl/LearningManager/model.py,sha256=DA7HP34Eq1Ra65OlkBmjH9d2MD7OEbsOhfxD48l4QOk,7679
9
+ Medfl/LearningManager/params.yaml,sha256=5I-NljhnSaqzjkWVNzrOtrB8z7tnHBKiBmY-mKGhBQM,450
10
+ Medfl/LearningManager/params_optimiser.py,sha256=pjhDskhSPuca-jnarYoJcFVBvRkdD9tD3992q_eMPSE,18060
11
+ Medfl/LearningManager/plot.py,sha256=iPqMV9rVd7hquoFixDL20OzXI5bMpBW41bkVmTKIWtE,7927
12
+ Medfl/LearningManager/server.py,sha256=7edxPkZ9Ju3Mep_BSHQpUNgW9HKfCui3_l996buJVlU,7258
13
+ Medfl/LearningManager/strategy.py,sha256=n0asQajkHfGLDX3QbbV5qntQA-xuJZU8Z92XccZENsA,3517
14
+ Medfl/LearningManager/utils.py,sha256=gAFkA4cUimMaUh40lvveL8b7NvB8zPjWonwZKVk8HpE,9342
15
+ Medfl/NetManager/__init__.py,sha256=RhO9Ya6wXOdM6qO58wjTD-lNL7-q8KvPDvSccYP9wUY,246
16
+ Medfl/NetManager/database_connector.py,sha256=zZYOYD1ZGpdOxiH_HuMFnofjJimOcnoZ02fdD0Rkh9E,1538
17
+ Medfl/NetManager/dataset.py,sha256=eEuVzCp5dGD4tvDVKq6jlSReecge7T20ByG4d7_cnXU,2869
18
+ Medfl/NetManager/flsetup.py,sha256=CS7531I08eLm6txMIDWFMCIrPP-dNpOLBTaR2BR6X0c,11754
19
+ Medfl/NetManager/net_helper.py,sha256=leXwpkDewj-_bXZUO3S_DscELnyZogb6jmz6Bjrsmag,6860
20
+ Medfl/NetManager/net_manager_queries.py,sha256=2dfhba0iuh40kVoC7am-vC4Hlrvr-zfJ5ESymsI1Kps,4327
21
+ Medfl/NetManager/network.py,sha256=NPHaSSLLA9FIBkqg3Il8g7VDQ1Ds8rH4d91srT6wUNI,5730
22
+ Medfl/NetManager/node.py,sha256=HQPKy-RHs5SkVxPo5EdjD-W9XK--TaFXa49ooua5_kU,6344
23
+ alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
24
+ alembic/env.py,sha256=a4zJAzPNLHnIrUlXCqf_8vuAlFu0pceFJJKM1PQaOI4,1649
25
+ scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
26
+ scripts/base.py,sha256=pR7StIt3PpX30aoh53gMkpeNJMHytAPhdc7N09tCITA,781
27
+ scripts/config.ini,sha256=tDQQlpwZbCFQuSS017yjEiLglLihp6wETbWtNrSWeAA,82
28
+ scripts/create_db.py,sha256=iWE1z33rU_KbIeqoVzdWLhDRLk00TcRf2iYuqpDzOjw,4494
29
+ MEDfl-0.1.26.dist-info/METADATA,sha256=cX617jlzpKbpwieidkfDyDT4Vi4sK1NMj87BFCc1qZ8,5580
30
+ MEDfl-0.1.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
31
+ MEDfl-0.1.26.dist-info/top_level.txt,sha256=hMAmSbfVxxQBmDx0uaQeXYlSrdC42iD58FyzJGl2lAs,22
32
+ MEDfl-0.1.26.dist-info/RECORD,,
{MEDfl-0.1.25.dist-info → MEDfl-0.1.26.dist-info}/top_level.txt RENAMED
@@ -1,3 +1,3 @@
1
- Medfl
1
+ MEDfl
2
2
  alembic
3
3
  scripts
Medfl/LearningManager/__init__.py CHANGED
@@ -1,4 +1,4 @@
1
- # # Medfl/LearningManager/__init__.py
1
+ # # MEDfl/LearningManager/__init__.py
2
2
 
3
3
  # # Import modules from this package
4
4
  # from .client import *
Medfl/LearningManager/client.py CHANGED
@@ -72,7 +72,7 @@ class FlowerClient(fl.client.NumPyClient):
72
72
  raise TypeError("cid argument must be a string")
73
73
 
74
74
  if not isinstance(self.local_model, Model):
75
- raise TypeError("local_model argument must be a Medfl.LearningManager.model.Model")
75
+ raise TypeError("local_model argument must be a MEDfl.LearningManager.model.Model")
76
76
 
77
77
  if not isinstance(self.trainloader, DataLoader):
78
78
  raise TypeError("trainloader argument must be a torch.utils.data.dataloader")
Medfl/LearningManager/federated_dataset.py CHANGED
@@ -1,6 +1,6 @@
1
- from Medfl.NetManager.net_helper import *
2
- from Medfl.NetManager.net_manager_queries import *
3
- from Medfl.NetManager.database_connector import DatabaseManager
1
+ from MEDfl.NetManager.net_helper import *
2
+ from MEDfl.NetManager.net_manager_queries import *
3
+ from MEDfl.NetManager.database_connector import DatabaseManager
4
4
 
5
5
  class FederatedDataset:
6
6
  def __init__(
Medfl/LearningManager/flpipeline.py CHANGED
@@ -9,12 +9,12 @@ from sqlalchemy import text
9
9
  from torch.utils.data import DataLoader, TensorDataset
10
10
  import torch
11
11
 
12
- from Medfl.LearningManager.server import FlowerServer
13
- from Medfl.LearningManager.utils import params, test
14
- from Medfl.NetManager.net_helper import get_flpipeline_from_name
15
- from Medfl.NetManager.net_manager_queries import (CREATE_FLPIPELINE_QUERY,
12
+ from MEDfl.LearningManager.server import FlowerServer
13
+ from MEDfl.LearningManager.utils import params, test
14
+ from MEDfl.NetManager.net_helper import get_flpipeline_from_name
15
+ from MEDfl.NetManager.net_manager_queries import (CREATE_FLPIPELINE_QUERY,
16
16
  DELETE_FLPIPELINE_QUERY , CREATE_TEST_RESULTS_QUERY)
17
- from Medfl.NetManager.database_connector import DatabaseManager
17
+ from MEDfl.NetManager.database_connector import DatabaseManager
18
18
 
19
19
  def create_query(name, description, creation_date, result):
20
20
  query = text(
Medfl/LearningManager/params_optimiser.py CHANGED
@@ -12,10 +12,10 @@ from sklearn.base import BaseEstimator
12
12
  from sklearn.metrics import make_scorer, precision_score, recall_score, accuracy_score, f1_score,roc_auc_score, balanced_accuracy_score
13
13
  import optuna
14
14
 
15
- from Medfl.LearningManager.model import Model
16
- from Medfl.LearningManager.strategy import Strategy
17
- from Medfl.LearningManager.server import FlowerServer
18
- from Medfl.LearningManager.flpipeline import FLpipeline
15
+ from MEDfl.LearningManager.model import Model
16
+ from MEDfl.LearningManager.strategy import Strategy
17
+ from MEDfl.LearningManager.server import FlowerServer
18
+ from MEDfl.LearningManager.flpipeline import FLpipeline
19
19
 
20
20
  class BinaryClassifier(nn.Module):
21
21
  def __init__(self, input_size, num_layers, layer_size):
Medfl/LearningManager/utils.py CHANGED
@@ -7,7 +7,7 @@ from sklearn.metrics import *
7
7
  from yaml.loader import SafeLoader
8
8
 
9
9
 
10
- from Medfl.NetManager.database_connector import DatabaseManager
10
+ from MEDfl.NetManager.database_connector import DatabaseManager
11
11
 
12
12
  # from scripts.base import *
13
13
  import json
@@ -44,7 +44,7 @@ DEFAULT_CONFIG_PATH = 'db_config.ini'
44
44
 
45
45
 
46
46
  def load_db_config():
47
- config = os.environ.get('MEDFL_DB_CONFIG')
47
+ config = os.environ.get('MEDfl_DB_CONFIG')
48
48
 
49
49
  if config:
50
50
  return ast.literal_eval(config)
@@ -58,7 +58,7 @@ def set_db_config(config_path):
58
58
  config = configparser.ConfigParser()
59
59
  config.read(config_path)
60
60
  if (config['mysql']):
61
- os.environ['MEDFL_DB_CONFIG'] = str(dict(config['mysql']))
61
+ os.environ['MEDfl_DB_CONFIG'] = str(dict(config['mysql']))
62
62
  else:
63
63
  raise ValueError(f"mysql key not found in file '{config_path}'")
64
64
 
Medfl/NetManager/__init__.py CHANGED
@@ -1,4 +1,4 @@
1
- # # Medfl/NetworkManager/__init__.py
1
+ # # MEDfl/NetworkManager/__init__.py
2
2
 
3
3
  # # Import modules from this package
4
4
  # from .dataset import *
Medfl/NetManager/database_connector.py CHANGED
@@ -7,7 +7,7 @@ import subprocess
7
7
  class DatabaseManager:
8
8
  def __init__(self):
9
9
 
10
- from Medfl.LearningManager.utils import load_db_config
10
+ from MEDfl.LearningManager.utils import load_db_config
11
11
  db_config = load_db_config()
12
12
  if db_config:
13
13
  self.config = db_config
Medfl/NetManager/dataset.py CHANGED
@@ -4,7 +4,7 @@ from sqlalchemy import text
4
4
  from .net_helper import *
5
5
  from .net_manager_queries import (DELETE_DATASET, INSERT_DATASET,
6
6
  SELECT_ALL_DATASET_NAMES)
7
- from Medfl.NetManager.database_connector import DatabaseManager
7
+ from MEDfl.NetManager.database_connector import DatabaseManager
8
8
 
9
9
  class DataSet:
10
10
  def __init__(self, name: str, path: str, engine=None):
Medfl/NetManager/flsetup.py CHANGED
@@ -3,14 +3,14 @@ from datetime import datetime
3
3
 
4
4
  from torch.utils.data import random_split, DataLoader, Dataset
5
5
 
6
- from Medfl.LearningManager.federated_dataset import FederatedDataset
6
+ from MEDfl.LearningManager.federated_dataset import FederatedDataset
7
7
  from .net_helper import *
8
8
  from .net_manager_queries import * # Import the sql_queries module
9
9
  from .network import Network
10
10
 
11
11
  from .node import Node
12
12
 
13
- from Medfl.NetManager.database_connector import DatabaseManager
13
+ from MEDfl.NetManager.database_connector import DatabaseManager
14
14
 
15
15
 
16
16
  class FLsetup:
@@ -46,7 +46,7 @@ class FLsetup:
46
46
 
47
47
  if not isinstance(self.network, Network):
48
48
  raise TypeError(
49
- "network argument must be a Medfl.NetManager.Network "
49
+ "network argument must be a MEDfl.NetManager.Network "
50
50
  )
51
51
 
52
52
  def create(self):
Medfl/NetManager/net_helper.py CHANGED
@@ -8,7 +8,7 @@ import pandas as pd
8
8
  from torch.utils.data import TensorDataset
9
9
  import numpy as np
10
10
 
11
- from Medfl.NetManager.database_connector import DatabaseManager
11
+ from MEDfl.NetManager.database_connector import DatabaseManager
12
12
 
13
13
 
14
14
  def is_str(data_df, row, x):
Medfl/NetManager/network.py CHANGED
@@ -1,6 +1,6 @@
1
- # src/Medfl/NetManager/network.py
1
+ # src/MEDfl/NetManager/network.py
2
2
 
3
- from Medfl.LearningManager.utils import *
3
+ from MEDfl.LearningManager.utils import *
4
4
 
5
5
  from .net_helper import *
6
6
  from .net_manager_queries import (CREATE_MASTER_DATASET_TABLE_QUERY,
@@ -10,7 +10,7 @@ from .net_manager_queries import (CREATE_MASTER_DATASET_TABLE_QUERY,
10
10
  UPDATE_NETWORK_QUERY, GET_NETWORK_QUERY)
11
11
  from .node import Node
12
12
  import pandas as pd
13
- from Medfl.LearningManager.utils import params
13
+ from MEDfl.LearningManager.utils import params
14
14
 
15
15
  from sqlalchemy import text
16
16
 
Medfl/NetManager/node.py CHANGED
@@ -2,8 +2,8 @@ import pandas as pd
2
2
 
3
3
  from .net_helper import *
4
4
  from .net_manager_queries import *
5
- from Medfl.LearningManager.utils import params
6
- from Medfl.NetManager.database_connector import DatabaseManager
5
+ from MEDfl.LearningManager.utils import params
6
+ from MEDfl.NetManager.database_connector import DatabaseManager
7
7
 
8
8
  class Node:
9
9
  """
MEDfl-0.1.25.dist-info/RECORD DELETED
@@ -1,32 +0,0 @@
1
- MEDfl-0.1.25.data/scripts/setup_mysql.sh,sha256=PXl271yvYBrXwrZ7P0tsYHnGkOubKvRaFee4MnzsSko,560
2
- Medfl/__init__.py,sha256=wamSaVIS4RoIHcTCLQPKQ5f8odcy87mRCKyRR7-Qpu4,57
3
- Medfl/LearningManager/__init__.py,sha256=DZZl9wUCY4vzA8ulmBL4EaFR8yVDYNdvur2mk4BJQnA,358
4
- Medfl/LearningManager/client.py,sha256=ik-0qImV6nrk1Iw70dEMKaN_r7NxvcyVl5nAWqjzmQY,6083
5
- Medfl/LearningManager/dynamicModal.py,sha256=0mTvDJlss0uSJ3_EXOuL_d-zRmFyXaKB4W4ql-uEX8Y,10821
6
- Medfl/LearningManager/federated_dataset.py,sha256=2zAl6lW058pqqTsTDv5ixRiIe5XaNKPPBK8rTva-LPY,2141
7
- Medfl/LearningManager/flpipeline.py,sha256=A0CtTtOoh2PfSuwH-bxOOndoflLjfTyWwR-DvydN-RA,7303
8
- Medfl/LearningManager/model.py,sha256=DA7HP34Eq1Ra65OlkBmjH9d2MD7OEbsOhfxD48l4QOk,7679
9
- Medfl/LearningManager/params.yaml,sha256=5I-NljhnSaqzjkWVNzrOtrB8z7tnHBKiBmY-mKGhBQM,450
10
- Medfl/LearningManager/params_optimiser.py,sha256=Pg_I5n_sPz-7ZqOsJGmnVM9ye7c5aPp5szBPmHsWKhE,18060
11
- Medfl/LearningManager/plot.py,sha256=iPqMV9rVd7hquoFixDL20OzXI5bMpBW41bkVmTKIWtE,7927
12
- Medfl/LearningManager/server.py,sha256=7edxPkZ9Ju3Mep_BSHQpUNgW9HKfCui3_l996buJVlU,7258
13
- Medfl/LearningManager/strategy.py,sha256=n0asQajkHfGLDX3QbbV5qntQA-xuJZU8Z92XccZENsA,3517
14
- Medfl/LearningManager/utils.py,sha256=7iJiA-v7mM4SuvvwxA9oAP8i15MvNpkMyCv6uC6lLoQ,9342
15
- Medfl/NetManager/__init__.py,sha256=htCEy8g7lrKKeZJ-cH9-YCTyWfIOLwKtoj_dlNasOuM,246
16
- Medfl/NetManager/database_connector.py,sha256=rooasWBSNtZZmqQvLPS0IimHQqWeCMyyGFRFzNM8Dlw,1538
17
- Medfl/NetManager/dataset.py,sha256=NpbmfSKJdtqIsShvjsb_z8W1vqlpYoFyZp8Wzsx_aEc,2869
18
- Medfl/NetManager/flsetup.py,sha256=IPWdZcz13PZic5OQyCiMyJ34cQPegKwkKEJSAqjjnqg,11754
19
- Medfl/NetManager/net_helper.py,sha256=sDGDfrYqY4MUoAE2gcNcyJFBXPRoAupdUibVSnspAn0,6860
20
- Medfl/NetManager/net_manager_queries.py,sha256=2dfhba0iuh40kVoC7am-vC4Hlrvr-zfJ5ESymsI1Kps,4327
21
- Medfl/NetManager/network.py,sha256=X5uKHna_CnskYGYZ2DjmIDEwri7srggjHc0PUIypls0,5730
22
- Medfl/NetManager/node.py,sha256=foOpIC3bsrOw3E-UCVQ87sy2Kp_2syd-KFijxnbYPiY,6344
23
- alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
24
- alembic/env.py,sha256=a4zJAzPNLHnIrUlXCqf_8vuAlFu0pceFJJKM1PQaOI4,1649
25
- scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
26
- scripts/base.py,sha256=pR7StIt3PpX30aoh53gMkpeNJMHytAPhdc7N09tCITA,781
27
- scripts/config.ini,sha256=tDQQlpwZbCFQuSS017yjEiLglLihp6wETbWtNrSWeAA,82
28
- scripts/create_db.py,sha256=iWE1z33rU_KbIeqoVzdWLhDRLk00TcRf2iYuqpDzOjw,4494
29
- MEDfl-0.1.25.dist-info/METADATA,sha256=qijvMc_6sl1N2UaGR173E3QQryvOqsofUKebI3ZSxrU,5580
30
- MEDfl-0.1.25.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
31
- MEDfl-0.1.25.dist-info/top_level.txt,sha256=CmLt1TC7PJj-V55rhffMZ9LSOiuSaaEbz9FJm_zOw_E,22
32
- MEDfl-0.1.25.dist-info/RECORD,,
{MEDfl-0.1.25.dist-info → MEDfl-0.1.26.dist-info}/WHEEL RENAMED
File without changes