Merge pull request #65 from necolab-ugr/sklearn-check

Scikit-learn version management for specific example scripts

Author: pablomc88

README.md

@@ -70,7 +70,7 @@ got 88 from PyObject*—you can resolve it by force-reinstalling both packages:
 
 ```bash
 pip uninstall scikit-learn numpy -y
-pip install scikit-learn==1.3.2 numpy
+pip install scikit-learn==1.5.0 numpy
 ```
 
 # Folder Structure

examples/EEG_AD/EEG_AD.py

@@ -103,6 +103,10 @@ def create_POCTEP_dataframe(data_path):
     return df
 
 if __name__ == "__main__":
+    # Check scikit-learn version
+    if not tools.ensure_module('scikit-learn', 'scikit-learn==1.3.2'):
+        print("Failed to install required scikit-learn version 1.3.2. Please install it manually.")
+
     # Download simulation data and ML models
     if zenodo_dw_sim:
         print('\n--- Downloading simulation data and ML models from Zenodo.')

examples/LFP_developing_brain/LFP_developing_brain.py

@@ -208,6 +208,10 @@ def save_data(emp_data, method):
 
 
 if __name__ == "__main__":
+    # Check scikit-learn version
+    if not tools.ensure_module('scikit-learn', 'scikit-learn==1.3.2'):
+        print("Failed to install required scikit-learn version 1.3.2. Please install it manually.")
+
     # Download simulation data and ML models
     if zenodo_dw_sim:
         print('\n--- Downloading simulation data and ML models from Zenodo.')

ncpi/tools.py

@@ -28,10 +28,31 @@ def ensure_module(module_name, package_name=None):
             # Check again after installation
             if importlib.util.find_spec(module_name) is None:
                 raise ImportError(f"Installation failed: '{module_name}' not found after installation.")
-
-        return True  # Module is available
-    except subprocess.CalledProcessError:
-        print(f"Error: Failed to install '{module_name}'. Please install it manually.")
+        
+        # Check if installed version matches required version from package_name
+        if package_name and '==' in package_name:
+            required_version = package_name.split('==')[1]
+            module = importlib.import_module(module_name)
+            installed_version = getattr(module, '__version__', None)
+            
+            if installed_version != required_version:
+                print(f"Module '{module_name}' version {installed_version} found, but {required_version} required. Reinstalling...")
+                # Uninstall current version
+                subprocess.check_call([sys.executable, "-m", "pip", "uninstall", "-y", module_name])
+                # Install required version
+                subprocess.check_call([sys.executable, "-m", "pip", "install", package_name])
+                
+                # Clear cached modules
+                for mod_name in list(sys.modules.keys()):
+                    if mod_name == module_name or mod_name.startswith(f"{module_name}."):
+                        del sys.modules[mod_name]
+                
+                print(f"Module '{module_name}' reinstalled successfully with version {required_version}.")
+
+        return True
+
+    except subprocess.CalledProcessError as e:
+        print(f"Error: {e} Failed to install '{module_name}'. Please install it manually.")
     except ImportError as e:
         print(f"Error: {e}")
     except Exception as e:
@@ -147,7 +168,6 @@ def download_zenodo_record(api_url, download_dir="zenodo_files", extract_tar=Tru
         print("If you want to re-download, please delete the directory.")
 
 
-
 def timer(description=None):
     """
     Decorator that measures and prints execution time of a function.

pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
 requires-python = ">=3.10"
 
 dependencies = [
-    "scikit-learn==1.3.2",
+    "scikit-learn==1.5.0",
     "sbi==0.24.0",
     "torch",
     "pycatch22",
@@ -77,4 +77,4 @@ documentation = "https://necolab-ugr.github.io/ncpi"
 [tool.setuptools.packages.find]
 where = ["."]  # list of folders that contain the packages (["."] by default)
 include = ["*"]  # list of packages to include (["*"] by default)
-exclude = ["tests", "tests.*"]  # list of packages to exclude (["tests"] by default)
+exclude = ["tests", "tests.*"]  # list of packages to exclude (["tests"] by default)