MEDfl 0.1.30__tar.gz → 0.1.31__tar.gz

{MEDfl-0.1.30 → MEDfl-0.1.31}/MEDfl/LearningManager/utils.py

@@ -24,6 +24,8 @@ import ast
 
 from sqlalchemy import text
 
+from dotenv import load_dotenv, set_key
+
 
 # Get the directory of the current script
 current_directory = os.path.dirname(os.path.abspath(__file__))
@@ -43,27 +45,50 @@ with open(yaml_path) as g:
 DEFAULT_CONFIG_PATH = 'db_config.ini'
 
 
+# def load_db_config():
+#     config = os.environ.get('MEDfl_DB_CONFIG')
+
+#     if config:
+#         return ast.literal_eval(config)
+#     else:
+#         raise ValueError(f"MEDfl db config not found")
+
 def load_db_config():
-    config = os.environ.get('MEDfl_DB_CONFIG')
+    # Load environment variables from .env file
+    load_dotenv()
+
+    config = os.getenv('MEDfl_DB_CONFIG')
 
     if config:
         return ast.literal_eval(config)
     else:
         raise ValueError(f"MEDfl db config not found")
 
+
 # Function to allow users to set config path programmatically
 
 
+# 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']))
+#     else:
+#         raise ValueError(f"mysql key not found in file '{config_path}'")
+
 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']))
+    if 'mysql' in config:
+        env_path = '.env'
+        load_dotenv(dotenv_path=env_path)
+        for key, value in config['mysql'].items():
+            set_key(env_path, key, value)
+            os.environ[key] = value
     else:
         raise ValueError(f"mysql key not found in file '{config_path}'")
 
 
-
 # Create databas
 
 

{MEDfl-0.1.30 → MEDfl-0.1.31}/MEDfl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MEDfl
-Version: 0.1.30
+Version: 0.1.31
 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.30/medfl.egg-info → MEDfl-0.1.31/MEDfl.egg-info}/requires.txt

@@ -16,3 +16,4 @@ plotly==5.19.0
 optuna==3.5.0
 mysql
 mysql-connector-python
+python-dotenv==1.0.1

{MEDfl-0.1.30 → MEDfl-0.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MEDfl
-Version: 0.1.30
+Version: 0.1.31
 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.30 → MEDfl-0.1.31}/requirements.txt

@@ -16,3 +16,4 @@ plotly==5.19.0
 optuna==3.5.0
 mysql
 mysql-connector-python
+python-dotenv==1.0.1

{MEDfl-0.1.30 → MEDfl-0.1.31}/setup.py

@@ -14,7 +14,7 @@ with open('requirements.txt') as f:
 
 setup(
     name="MEDfl",
-    version="0.1.30",
+    version="0.1.31",
     author="MEDomics consortium",
     author_email="medomics.info@gmail.com",
     description="Python Open-source package for simulating federated learning and differential privacy",