MEDfl 0.1.22__tar.gz → 0.1.24__tar.gz

{Medfl-0.1.22 → Medfl-0.1.24}/MEDfl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Medfl
-Version: 0.1.22
+Version: 0.1.24
 Summary: Python Open-source package for simulating federated learning and differential privacy
 Home-page: https://github.com/HaithemLamri/MEDfl
 Author: MEDomics consortium
@@ -57,7 +57,7 @@ cd MEDfl
 pip install -e .
 ```
 ### MySQL DB configuration
-MEDfl requires a MySQL DB connection, and this is in order to allow users to work with their own tabular datasets,  we have created a bash script to install and configure A MySQL DB with phpmyadmin monitoring system, run the following command then change your credential on the MEDfl/scripts/base.py and MEDfl/scripts/config.ini files
+MEDfl requires a MySQL DB connection, and this is in order to allow users to work with their own tabular datasets,  we have created a bash script to install and configure A MySQL DB with phpmyadmin monitoring system, run the following command then change your credential on the MEDfl/scripts/base.py and MEDfl/scripts/db_config.ini files
 ```
 sudo bash MEDfl/scripts/setup_mysql.sh
 ```

{Medfl-0.1.22 → Medfl-0.1.24}/MEDfl.egg-info/SOURCES.txt

@@ -395,8 +395,8 @@ notebooks/tutorial/newplot2.png
 notebooks/tutorial/newplot4.png
 scripts/__init__.py
 scripts/base.py
-scripts/config.ini
 scripts/create_db.py
+scripts/db_config.ini
 scripts/setup_mysql.sh
 scripts/__pycache__/__init__.cpython-38.pyc
 scripts/__pycache__/__init__.cpython-39.pyc

{Medfl-0.1.22 → Medfl-0.1.24}/Medfl/LearningManager/utils.py

@@ -40,7 +40,7 @@ with open(yaml_path) as g:
 
 
 # Default path for the config file
-DEFAULT_CONFIG_PATH = 'config.ini'
+DEFAULT_CONFIG_PATH = 'db_config.ini'
 
 
 def load_db_config():

{Medfl-0.1.22 → Medfl-0.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Medfl
-Version: 0.1.22
+Version: 0.1.24
 Summary: Python Open-source package for simulating federated learning and differential privacy
 Home-page: https://github.com/HaithemLamri/MEDfl
 Author: MEDomics consortium
@@ -57,7 +57,7 @@ cd MEDfl
 pip install -e .
 ```
 ### MySQL DB configuration
-MEDfl requires a MySQL DB connection, and this is in order to allow users to work with their own tabular datasets,  we have created a bash script to install and configure A MySQL DB with phpmyadmin monitoring system, run the following command then change your credential on the MEDfl/scripts/base.py and MEDfl/scripts/config.ini files
+MEDfl requires a MySQL DB connection, and this is in order to allow users to work with their own tabular datasets,  we have created a bash script to install and configure A MySQL DB with phpmyadmin monitoring system, run the following command then change your credential on the MEDfl/scripts/base.py and MEDfl/scripts/db_config.ini files
 ```
 sudo bash MEDfl/scripts/setup_mysql.sh
 ```

{Medfl-0.1.22 → Medfl-0.1.24}/README.md

@@ -38,7 +38,7 @@ cd MEDfl
 pip install -e .
 ```
 ### MySQL DB configuration
-MEDfl requires a MySQL DB connection, and this is in order to allow users to work with their own tabular datasets,  we have created a bash script to install and configure A MySQL DB with phpmyadmin monitoring system, run the following command then change your credential on the MEDfl/scripts/base.py and MEDfl/scripts/config.ini files
+MEDfl requires a MySQL DB connection, and this is in order to allow users to work with their own tabular datasets,  we have created a bash script to install and configure A MySQL DB with phpmyadmin monitoring system, run the following command then change your credential on the MEDfl/scripts/base.py and MEDfl/scripts/db_config.ini files
 ```
 sudo bash MEDfl/scripts/setup_mysql.sh
 ```

{Medfl-0.1.22 → Medfl-0.1.24}/docs/build/html/_sources/configuration_file.rst.txt

@@ -12,7 +12,7 @@ In the file ``MEDfl/global_params.yaml``, you need to update the base URL parame
 
 MySQL Configuration
 -------------------
-In the file ``MEDfl/scripts/config.ini``, you can specify the SQL connection parameters.
+In the file ``MEDfl/scripts/db_config.ini``, you can specify the SQL connection parameters.
 
 .. code-block:: bash
 

{Medfl-0.1.22 → Medfl-0.1.24}/docs/build/html/configuration_file.html

@@ -114,7 +114,7 @@
 </section>
 <section id="mysql-configuration">
 <h2>MySQL Configuration<a class="headerlink" href="#mysql-configuration" title="Permalink to this heading"></a></h2>
-<p>In the file <code class="docutils literal notranslate"><span class="pre">MEDfl/scripts/config.ini</span></code>, you can specify the SQL connection parameters.</p>
+<p>In the file <code class="docutils literal notranslate"><span class="pre">MEDfl/scripts/db_config.ini</span></code>, you can specify the SQL connection parameters.</p>
 <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span><span class="o">[</span>mysql<span class="o">]</span>
 <span class="w"> </span><span class="nv">host</span><span class="w"> </span><span class="o">=</span><span class="w"> </span>localhost
 <span class="w"> </span><span class="nv">port</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="m">3306</span>

{Medfl-0.1.22 → Medfl-0.1.24}/docs/source/configuration_file.rst

@@ -12,7 +12,7 @@ In the file ``MEDfl/global_params.yaml``, you need to update the base URL parame
 
 MySQL Configuration
 -------------------
-In the file ``MEDfl/scripts/config.ini``, you can specify the SQL connection parameters.
+In the file ``MEDfl/scripts/db_config.ini``, you can specify the SQL connection parameters.
 
 .. code-block:: bash
 

{Medfl-0.1.22 → Medfl-0.1.24}/notebooks/banchmarking/MEDfl_benchmarks.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -17,6 +17,22 @@
     "\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 9,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!python \"../../scripts/create_db.py\" \"../../notebooks/data/masterDataSet/Mimic_ouael.csv\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": 2,
@@ -42,7 +58,7 @@
     "from Medfl.LearningManager.utils import *\n",
     "from Medfl.NetManager.database_connector import DatabaseManager\n",
     "\n",
-    "set_db_config('../../scripts/config.ini')\n",
+    "set_db_config('../../scripts/db_config.ini')\n",
     "\n",
     "db_manager = DatabaseManager()\n",
     "db_manager.connect()\n",
@@ -51,6 +67,30 @@
     "print('getting connection')\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "{'host': 'localhost',\n",
+       " 'port': '3306',\n",
+       " 'user': 'root',\n",
+       " 'password': '',\n",
+       " 'database': 'MEDfl'}"
+      ]
+     },
+     "execution_count": 3,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "load_db_config()"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 3,
@@ -60,7 +100,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "2024-04-23 20:44:58,137\tINFO util.py:159 -- Missing packages: ['ipywidgets']. Run `pip install -U ipywidgets`, then restart the notebook server for rich notebook output.\n"
+      "2024-04-23 20:50:11,068\tINFO util.py:159 -- Missing packages: ['ipywidgets']. Run `pip install -U ipywidgets`, then restart the notebook server for rich notebook output.\n"
      ]
     }
    ],

{Medfl-0.1.22 → Medfl-0.1.24}/scripts/base.py

@@ -9,7 +9,7 @@ import os
 current_directory = os.path.dirname(os.path.abspath(__file__))
 
 # Load configuration from the config file
-config_file_path = os.path.join(current_directory, 'config.ini')
+config_file_path = os.path.join(current_directory, 'db_config.ini')
 
 config = ConfigParser()
 config.read(config_file_path)

{Medfl-0.1.22 → Medfl-0.1.24}/scripts/create_db.py

@@ -6,13 +6,17 @@ from mysql.connector import Error
 from configparser import ConfigParser
 import os
 
-from Medfl.LearningManager.utils import load_db_config
-
 def main(csv_file_path):
     try:
-        
-        mysql_config = load_db_config()
-        
+        # Get the directory of the current script
+        current_directory = os.path.dirname(os.path.abspath(__file__))
+
+        # Load configuration from the config file
+        config_file_path = os.path.join(current_directory, 'db_config.ini')
+
+        config = ConfigParser()
+        config.read(config_file_path)
+        mysql_config = config['mysql']
 
         mydb = mysql.connector.connect(host=mysql_config['host'], user=mysql_config['user'], password=mysql_config['password'])
         mycursor = mydb.cursor()

{Medfl-0.1.22 → Medfl-0.1.24}/setup.py

@@ -14,7 +14,7 @@ with open('requirements.txt') as f:
 
 setup(
     name="Medfl",
-    version="0.1.22",
+    version="0.1.24",
     author="MEDomics consortium",
     author_email="medomics.info@gmail.com",
     description="Python Open-source package for simulating federated learning and differential privacy",
@@ -39,8 +39,8 @@ setup(
     packages=find_packages(exclude=['docs', 'tests']),
     install_requires=requirements,
     package_data={
-        # Include the config.ini file from the scripts folder
-        'scripts': ['config.ini'],
+        # Include the db_config.ini file from the scripts folder
+        'scripts': ['db_config.ini'],
         # include the create db script
         'scripts': ['create_db.py'],
         # Include the params.yaml file