dragon-ml-toolbox 19.9.0__tar.gz → 19.10.0__tar.gz

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0}/LICENSE-THIRD-PARTY.md

@@ -31,13 +31,9 @@ This project depends on the following third-party packages. Each is governed by
 - [colorlog](https://github.com/borntyping/python-colorlog/blob/main/LICENSE)
 - [evotorch](https://github.com/nnaisense/evotorch/blob/master/LICENSE)
 - [FreeSimpleGUI](https://github.com/spyoungtech/FreeSimpleGUI/blob/main/license.txt)
-- [nuitka](https://github.com/Nuitka/Nuitka/blob/main/LICENSE.txt)
 - [omegaconf](https://github.com/omry/omegaconf/blob/master/LICENSE)
-- [ordered-set](https://github.com/rspeer/ordered-set/blob/master/MIT-LICENSE)
-- [pyinstaller](https://github.com/pyinstaller/pyinstaller/blob/develop/COPYING.txt)
 - [pytorch_tabular](https://github.com/manujosephv/pytorch_tabular/blob/main/LICENSE)
 - [torchmetrics](https://github.com/Lightning-AI/torchmetrics/blob/master/LICENSE)
-- [zstandard](https://github.com/indygreg/python-zstandard/blob/main/LICENSE)
 - [captum](https://github.com/meta-pytorch/captum/blob/master/LICENSE)
 - [node](https://github.com/Qwicen/node/blob/master/LICENSE.md)
 - [pytorch-widedeep](https://github.com/jrzaurin/pytorch-widedeep?tab=readme-ov-file#license)

{dragon_ml_toolbox-19.9.0/dragon_ml_toolbox.egg-info → dragon_ml_toolbox-19.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragon-ml-toolbox
-Version: 19.9.0
+Version: 19.10.0
 Summary: Complete pipelines and helper tools for data science and machine learning projects.
 Author-email: Karl Luigi Loza Vidaurre <luigiloza@gmail.com>
 License-Expression: MIT
@@ -90,12 +90,6 @@ Provides-Extra: gui-torch
 Requires-Dist: numpy<2.0; extra == "gui-torch"
 Requires-Dist: torch; extra == "gui-torch"
 Requires-Dist: FreeSimpleGUI>=5.2; extra == "gui-torch"
-Provides-Extra: pyinstaller
-Requires-Dist: pyinstaller; extra == "pyinstaller"
-Provides-Extra: nuitka
-Requires-Dist: nuitka; extra == "nuitka"
-Requires-Dist: zstandard; extra == "nuitka"
-Requires-Dist: ordered-set; extra == "nuitka"
 Dynamic: license-file
 
 # dragon-ml-toolbox
@@ -137,7 +131,7 @@ conda install -c conda-forge dragon-ml-toolbox
 
 ## Modular Installation
 
-This toolbox is designed as a collection of mutually exclusive environments due to conflicting core dependencies, except APP bundlers (PyInstaller/Nuitka).
+This toolbox is designed as a collection of mutually exclusive environments due to conflicting core dependencies.
 
 - Rule: Create a fresh virtual environment for each module to use.
 
@@ -330,18 +324,6 @@ schema
 
 ---
 
-### ⚒️ APP bundlers
-
-Dependencies required to compile applications, inference scripts, or GUIs into standalone executables (`.exe` or binary) for distribution. Choose your preferred backend:
-
-```Bash
-pip install "dragon-ml-toolbox[pyinstaller]"
-```
-
-```Bash
-pip install "dragon-ml-toolbox[nuitka]"
-```
-
 ## Usage
 
 After installation, import modules like this:

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0}/README.md

@@ -37,7 +37,7 @@ conda install -c conda-forge dragon-ml-toolbox
 
 ## Modular Installation
 
-This toolbox is designed as a collection of mutually exclusive environments due to conflicting core dependencies, except APP bundlers (PyInstaller/Nuitka).
+This toolbox is designed as a collection of mutually exclusive environments due to conflicting core dependencies.
 
 - Rule: Create a fresh virtual environment for each module to use.
 
@@ -230,18 +230,6 @@ schema
 
 ---
 
-### ⚒️ APP bundlers
-
-Dependencies required to compile applications, inference scripts, or GUIs into standalone executables (`.exe` or binary) for distribution. Choose your preferred backend:
-
-```Bash
-pip install "dragon-ml-toolbox[pyinstaller]"
-```
-
-```Bash
-pip install "dragon-ml-toolbox[nuitka]"
-```
-
 ## Usage
 
 After installation, import modules like this:

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0/dragon_ml_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragon-ml-toolbox
-Version: 19.9.0
+Version: 19.10.0
 Summary: Complete pipelines and helper tools for data science and machine learning projects.
 Author-email: Karl Luigi Loza Vidaurre <luigiloza@gmail.com>
 License-Expression: MIT
@@ -90,12 +90,6 @@ Provides-Extra: gui-torch
 Requires-Dist: numpy<2.0; extra == "gui-torch"
 Requires-Dist: torch; extra == "gui-torch"
 Requires-Dist: FreeSimpleGUI>=5.2; extra == "gui-torch"
-Provides-Extra: pyinstaller
-Requires-Dist: pyinstaller; extra == "pyinstaller"
-Provides-Extra: nuitka
-Requires-Dist: nuitka; extra == "nuitka"
-Requires-Dist: zstandard; extra == "nuitka"
-Requires-Dist: ordered-set; extra == "nuitka"
 Dynamic: license-file
 
 # dragon-ml-toolbox
@@ -137,7 +131,7 @@ conda install -c conda-forge dragon-ml-toolbox
 
 ## Modular Installation
 
-This toolbox is designed as a collection of mutually exclusive environments due to conflicting core dependencies, except APP bundlers (PyInstaller/Nuitka).
+This toolbox is designed as a collection of mutually exclusive environments due to conflicting core dependencies.
 
 - Rule: Create a fresh virtual environment for each module to use.
 
@@ -330,18 +324,6 @@ schema
 
 ---
 
-### ⚒️ APP bundlers
-
-Dependencies required to compile applications, inference scripts, or GUIs into standalone executables (`.exe` or binary) for distribution. Choose your preferred backend:
-
-```Bash
-pip install "dragon-ml-toolbox[pyinstaller]"
-```
-
-```Bash
-pip install "dragon-ml-toolbox[nuitka]"
-```
-
 ## Usage
 
 After installation, import modules like this:

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0}/dragon_ml_toolbox.egg-info/requires.txt

@@ -80,14 +80,6 @@ shap
 colorlog
 pyarrow
 
-[nuitka]
-nuitka
-zstandard
-ordered-set
-
 [py-tab]
 omegaconf
 pytorch_tabular
-
-[pyinstaller]
-pyinstaller

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0}/ml_tools/_core/_ML_configuration.py

@@ -6,7 +6,7 @@ import numpy as np
 from ._schema import FeatureSchema
 from ._script_info import _script_info
 from ._logger import get_logger
-from ._path_manager import sanitize_filename
+from ._path_manager import sanitize_filename, make_fullpath
 from ._keys import MLTaskKeys
 
 
@@ -701,11 +701,11 @@ class DragonParetoConfig(_BaseModelParams):
     def __init__(self,
                  save_directory: Union[str, Path],
                  target_objectives: Dict[str, Literal["min", "max"]],
-                 continuous_bounds_map: Union[Dict[str, Tuple[float, float]], Dict[str, List[float]]],
+                 continuous_bounds_map: Union[Dict[str, Tuple[float, float]], Dict[str, List[float]], str, Path],
                  columns_to_round: Optional[List[str]] = None,
-                 population_size: int = 400,
+                 population_size: int = 500,
                  generations: int = 1000,
-                 solutions_filename: str = "ParetoSolutions",
+                 solutions_filename: str = "NonDominatedSolutions",
                  float_precision: int = 4,
                  log_interval: int = 10,
                  plot_size: Tuple[int, int] = (10, 7),
@@ -718,7 +718,7 @@ class DragonParetoConfig(_BaseModelParams):
             save_directory (str | Path): Directory to save artifacts.
             target_objectives (Dict[str, "min"|"max"]): Dictionary mapping target names to optimization direction.
                 Example: {"price": "max", "error": "min"}
-            continuous_bounds_map (Dict): Bounds for continuous features {name: (min, max)}.
+            continuous_bounds_map (Dict): Bounds for continuous features {name: (min, max)}. Or a path/str to a directory containing the "optimization_bounds.json" file.
             columns_to_round (List[str] | None): List of continuous column names that should be rounded to the nearest integer.
             population_size (int): Size of the genetic population.
             generations (int): Number of generations to run.
@@ -729,7 +729,13 @@ class DragonParetoConfig(_BaseModelParams):
             plot_font_size (int): Font size for plot text.
             discretize_start_at_zero (bool): Categorical encoding start index. True=0, False=1.
         """
-        self.save_directory = save_directory
+        # Validate string or Path
+        valid_save_dir = make_fullpath(save_directory, make=True, enforce="directory")
+        
+        if isinstance(continuous_bounds_map, (str, Path)):
+            continuous_bounds_map = make_fullpath(continuous_bounds_map, make=False, enforce="directory")
+        
+        self.save_directory = valid_save_dir
         self.target_objectives = target_objectives
         self.continuous_bounds_map = continuous_bounds_map
         self.columns_to_round = columns_to_round
@@ -742,7 +748,6 @@ class DragonParetoConfig(_BaseModelParams):
         self.plot_font_size = plot_font_size
         self.discretize_start_at_zero = discretize_start_at_zero
 
-
 # ----------------------------
 # Metrics Configurations
 # ----------------------------

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0}/ml_tools/_core/_ML_optimization.py

@@ -44,12 +44,10 @@ class DragonOptimizer:
     SNES and CEM algorithms do not accept bounds, the given bounds will be used as an initial starting point.
 
     Example:
-        >>> # 1. Get the final schema from data exploration
-        >>> schema = data_exploration.finalize_feature_schema(...)
-        >>> # 2. Define bounds for continuous features
+        >>> # 1. Define bounds for continuous features
         >>> cont_bounds = {'feature_A': (0, 100), 'feature_B': (-10, 10)}
         >>>
-        >>> # 3. Initialize the optimizer
+        >>> # 2. Initialize the optimizer
         >>> optimizer = DragonOptimizer(
         ...     inference_handler=my_handler,
         ...     schema=schema,
@@ -58,7 +56,7 @@ class DragonOptimizer:
         ...     task="max",
         ...     algorithm="Genetic",
         ... )
-        >>> # 4. Run the optimization
+        >>> # 3. Run the optimization
         >>> best_result = optimizer.run(
         ...     num_generations=100,
         ...     save_dir="/path/to/results",

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0}/ml_tools/_core/_ML_optimization_pareto.py

@@ -7,7 +7,7 @@ import matplotlib.cm as cm
 from matplotlib.collections import LineCollection
 import seaborn as sns
 from pathlib import Path
-from typing import Literal, Union, Tuple, List, Optional, Dict
+from typing import Literal, Union, List, Optional, Dict
 from tqdm import tqdm
 import plotly.express as px
 import plotly.graph_objects as go
@@ -21,7 +21,7 @@ from ._SQL import DragonSQL
 from ._ML_inference import DragonInferenceHandler
 from ._ML_chaining_inference import DragonChainInference
 from ._ML_configuration import DragonParetoConfig
-from ._optimization_tools import create_optimization_bounds, plot_optimal_feature_distributions_from_dataframe
+from ._optimization_tools import create_optimization_bounds, plot_optimal_feature_distributions_from_dataframe, load_continuous_bounds_template
 from ._math_utilities import discretize_categorical_values
 from ._utilities import save_dataframe_filename
 from ._IO_tools import save_json
@@ -107,6 +107,10 @@ class DragonParetoOptimizer:
                 _LOGGER.error(f"Target '{name}' not found in model targets: {available_targets}")
                 raise ValueError()
             
+            if direction not in ["min" , "max"]:
+                _LOGGER.error(f"Invalid optimization direction '{direction}' for target '{name}'. Use 'min' or 'max'.")
+                raise ValueError()
+            
             # For standard handlers, we need indices to slice the output tensor.
             # For chain handlers, we just rely on name matching, but we track index for consistency.
             idx = available_targets.index(name)
@@ -117,10 +121,20 @@ class DragonParetoOptimizer:
         _LOGGER.info(f"Pareto Optimization setup for: {self.ordered_target_names}")
 
         # --- 2. Bounds Setup ---
+        # check type
+        raw_bounds_map = config.continuous_bounds_map
+        if isinstance(raw_bounds_map, (str, Path)):
+            continuous_bounds = load_continuous_bounds_template(raw_bounds_map)
+        elif isinstance(raw_bounds_map, dict):
+            continuous_bounds = raw_bounds_map
+        else:
+            _LOGGER.error(f"Invalid type for 'continuous_bounds_map' in config. Expected dict or Path. Got {type(raw_bounds_map)}.")
+            raise ValueError()
+        
         # Uses the external tool which reads the schema to set correct bounds for both continuous and categorical
         bounds = create_optimization_bounds(
             schema=schema,
-            continuous_bounds_map=config.continuous_bounds_map,
+            continuous_bounds_map=continuous_bounds,
             start_at_zero=self.discretize_start_at_zero
         )
         self.lower_bounds = list(bounds[0])

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0}/ml_tools/optimization_tools.py

@@ -1,4 +1,6 @@
 from ._core._optimization_tools import (
+    make_continuous_bounds_template,
+    load_continuous_bounds_template,
     create_optimization_bounds,
     parse_lower_upper_bounds,
     plot_optimal_feature_distributions,
@@ -7,6 +9,8 @@ from ._core._optimization_tools import (
 )
 
 __all__ = [
+    "make_continuous_bounds_template",
+    "load_continuous_bounds_template",
     "create_optimization_bounds",
     "parse_lower_upper_bounds",
     "plot_optimal_feature_distributions",

{dragon_ml_toolbox-19.9.0 → dragon_ml_toolbox-19.10.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dragon-ml-toolbox"
-version = "19.9.0"
+version = "19.10.0"
 description = "Complete pipelines and helper tools for data science and machine learning projects."
 authors = [
     { name = "Karl Luigi Loza Vidaurre", email = "luigiloza@gmail.com" }
@@ -127,24 +127,13 @@ gui-boost = [
 ]
 
 # GUI for Pytorch 
-# Optional: Pil / Torchvision / matplotlib / seaborn
+# Optional: Pillow / Torchvision / matplotlib / seaborn
 gui-torch = [
     "numpy<2.0",
     "torch",
     "FreeSimpleGUI>=5.2",
 ]
 
-# APP Bundlers - Choose one
-pyinstaller = [ 
-    "pyinstaller"
-]
-
-nuitka = [ 
-    "nuitka", 
-    "zstandard", 
-    "ordered-set"
-]
-
 [build-system]
 requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
@@ -156,3 +145,31 @@ build-backend = "setuptools.build_meta"
 where = ["."]
 include = ["ml_tools*"]
 namespaces = false
+
+[dependency-groups]
+dev = [
+    "captum>=0.8.0",
+    "colorlog>=6.10.1",
+    "evotorch>=0.6.1",
+    "freesimplegui>=5.2",
+    "ipykernel>=7.1.0",
+    "ipython>=9.8.0",
+    "ipywidgets>=8.1.8",
+    "joblib>=1.5.2",
+    "jupyterlab>=4.5.0",
+    "matplotlib>=3.10.8",
+    "notebook>=7.5.0",
+    "numpy<2.0",
+    "openpyxl>=3.1.5",
+    "pandas>=2.3.3",
+    "pillow>=12.0.0",
+    "plotly>=6.5.0",
+    "polars>=1.0",
+    "pyarrow>=22.0.0",
+    "scikit-learn>=1.7.2",
+    "seaborn>=0.13.2",
+    "shap>=0.49.1",
+    "torch>=2.9.1",
+    "torchmetrics>=1.5.2",
+    "tqdm>=4.67.1",
+]