dragon-ml-toolbox 20.12.0__tar.gz → 20.14.0__tar.gz

{dragon_ml_toolbox-20.12.0/dragon_ml_toolbox.egg-info → dragon_ml_toolbox-20.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragon-ml-toolbox
-Version: 20.12.0
+Version: 20.14.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

{dragon_ml_toolbox-20.12.0 → dragon_ml_toolbox-20.14.0/dragon_ml_toolbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dragon-ml-toolbox
-Version: 20.12.0
+Version: 20.14.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

{dragon_ml_toolbox-20.12.0 → dragon_ml_toolbox-20.14.0}/ml_tools/ML_evaluation_captum/_ML_evaluation_captum.py

@@ -202,6 +202,13 @@ def _process_single_target(ig: 'IntegratedGradients', # type: ignore
         mean_abs_attr = mean_abs_attr[:min_len]
         feature_names = feature_names[:min_len]
     
+    # Calculate percentages (Before Min-Max scaling to preserve relative importance)
+    total_attr_sum = np.sum(mean_abs_attr)
+    if total_attr_sum > 0:
+        attr_percentages = (mean_abs_attr / total_attr_sum) * 100.0
+    else:
+        attr_percentages = np.zeros_like(mean_abs_attr)
+    
     # Min-Max Scaling
     target_min = 0.01
     target_max = 1.0
@@ -222,7 +229,8 @@ def _process_single_target(ig: 'IntegratedGradients', # type: ignore
     # --- Save Data to CSV ---
     summary_df = pd.DataFrame({
         CaptumKeys.FEATURE_COLUMN: feature_names,
-        CaptumKeys.IMPORTANCE_COLUMN: mean_abs_attr
+        CaptumKeys.IMPORTANCE_COLUMN: mean_abs_attr,
+        CaptumKeys.PERCENT_COLUMN: attr_percentages
     }).sort_values(CaptumKeys.IMPORTANCE_COLUMN, ascending=False)
     
     csv_name = f"{CaptumKeys.SAVENAME}{file_suffix}.csv"
@@ -230,11 +238,13 @@ def _process_single_target(ig: 'IntegratedGradients', # type: ignore
     summary_df.to_csv(csv_path, index=False)
 
     # --- Generate Plot ---
-    plot_df = summary_df.head(20).sort_values(CaptumKeys.IMPORTANCE_COLUMN, ascending=True)
+    plot_df = summary_df.head(20).sort_values(CaptumKeys.PERCENT_COLUMN, ascending=True)
     plt.figure(figsize=(10, 8), dpi=300)
-    plt.barh(plot_df[CaptumKeys.FEATURE_COLUMN], plot_df[CaptumKeys.IMPORTANCE_COLUMN], color='mediumpurple')
-    plt.xlim(0, 1.05) # standardized scale
-    plt.xlabel("Mean Absolute Attribution")
+    plt.barh(plot_df[CaptumKeys.FEATURE_COLUMN], plot_df[CaptumKeys.PERCENT_COLUMN], color='mediumpurple')
+    # plt.xlim(0, 1.05) # standardized scale # Removed to reflect actual percentages
+    plt.xlim(left=0) # start at 0
+    # plt.xlabel("Scaled Mean Absolute Attribution")
+    plt.xlabel("Relative Importance (%)")
     
     title = "Feature Importance"
     

{dragon_ml_toolbox-20.12.0 → dragon_ml_toolbox-20.14.0}/ml_tools/ML_scaler/_ML_scaler.py

@@ -99,7 +99,7 @@ class DragonScaler:
             std = torch.sqrt(torch.clamp(variance, min=1e-8))
         
         if verbose >= 2:
-            _LOGGER.info(f"Scaler fitted on {n_total} samples for {num_continuous_features} features (Welford's).")
+            _LOGGER.info(f"Scaler fitted on {n_total} samples for {num_continuous_features} columns (Welford's).")
         return cls(mean=mean_global, std=std, continuous_feature_indices=continuous_feature_indices)
 
     @classmethod
@@ -121,7 +121,7 @@ class DragonScaler:
         std = torch.where(std == 0, torch.tensor(1.0, device=data.device), std)
         
         if verbose >= 2:
-            _LOGGER.info(f"Scaler fitted on tensor with {data.shape[0]} samples for {num_features} features.")
+            _LOGGER.info(f"Scaler fitted on tensor with {data.shape[0]} samples for {num_features} columns.")
         
         return cls(mean=mean, std=std, continuous_feature_indices=indices)
 

{dragon_ml_toolbox-20.12.0 → dragon_ml_toolbox-20.14.0}/ml_tools/data_exploration/__init__.py

@@ -33,6 +33,7 @@ from ._features import (
     reconstruct_one_hot,
     reconstruct_binary,
     reconstruct_multibinary,
+    filter_subset,
 )
 
 from ._schema_ops import (
@@ -51,6 +52,7 @@ __all__ = [
     "drop_columns_with_missing_data",
     "drop_macro",
     "clean_column_names",
+    "filter_subset",
     "plot_value_distributions",
     "split_features_targets", 
     "split_continuous_binary", 

{dragon_ml_toolbox-20.12.0 → dragon_ml_toolbox-20.14.0}/ml_tools/data_exploration/_analysis.py

@@ -34,7 +34,7 @@ def summarize_dataframe(df: pd.DataFrame, round_digits: int = 2):
     """
     summary = pd.DataFrame({
         'Data Type': df.dtypes,
-        'Completeness %': (df.notnull().mean() * 100).round(2),
+        'Completeness %': (df.notnull().mean() * 100).round(2), # type: ignore
         'Unique Values': df.nunique(),
         # 'Missing %': (df.isnull().mean() * 100).round(2)
     })

{dragon_ml_toolbox-20.12.0 → dragon_ml_toolbox-20.14.0}/ml_tools/data_exploration/_features.py

@@ -657,3 +657,66 @@ def reconstruct_multibinary(
         _LOGGER.info(f"Reconstructed {converted_count} binary columns matching '{pattern}'.")
 
     return new_df, target_columns
+
+
+def filter_subset(
+    df: pd.DataFrame,
+    filters: Union[dict[str, Any], dict[str, list[Any]]],
+    drop_filter_cols: bool = True,
+    reset_index: bool = True,
+    verbose: int = 3
+) -> pd.DataFrame:
+    """
+    Filters the DataFrame based on a dictionary of column-value conditions.
+
+    Supports:
+    - Single value matching (e.g., {"Color": "Blue"})
+    - Multiple value matching (e.g., {"Color": ["Blue", "Red"]}) -> OR logic within column.
+    - Multiple column filtering (e.g., {"Color": "Blue", "Size": "Large"}) -> AND logic between columns.
+
+    Args:
+        df (pd.DataFrame): Input DataFrame.
+        filters (dict[str, Any] | dict[str, list[Any]]): Dictionary where keys are column names and values are the target values (scalar or list).
+        drop_filter_cols (bool): If True, drops the columns used for filtering from the result.
+        reset_index (bool): If True, resets the index of the resulting DataFrame.
+        verbose (int): Verbosity level.
+
+    Returns:
+        pd.DataFrame: The filtered DataFrame.
+    """
+    df_filtered = df.copy()
+
+    # Validate columns exist
+    missing_cols = [col for col in filters.keys() if col not in df.columns]
+    if missing_cols:
+        _LOGGER.error(f"Filter columns not found: {missing_cols}")
+        raise ValueError()
+
+    if verbose >= 2:
+        _LOGGER.info(f"Original shape: {df.shape}")
+
+    for col, value in filters.items():
+        # Handle list of values (OR logic within column)
+        if isinstance(value, list):
+            df_filtered = df_filtered[df_filtered[col].isin(value)]
+        # Handle single value
+        else:
+            # Warn if the value is a floating point due to potential precision issues
+            if isinstance(value, float) and verbose >= 1:
+                _LOGGER.warning(f"Filtering on column '{col}' with float value '{value}'.")
+            df_filtered = df_filtered[df_filtered[col] == value]
+
+    if drop_filter_cols:
+        if verbose >= 3:
+            _LOGGER.info(f"Dropping filter columns: {list(filters.keys())}")
+        df_filtered.drop(columns=list(filters.keys()), inplace=True)
+
+    if reset_index:
+        if verbose >= 3:
+            _LOGGER.info("Resetting index of the filtered DataFrame.")
+        df_filtered.reset_index(drop=True, inplace=True)
+
+    if verbose >= 2:
+        _LOGGER.info(f"Filtered shape: {df_filtered.shape}")
+
+    return df_filtered

{dragon_ml_toolbox-20.12.0 → dragon_ml_toolbox-20.14.0}/ml_tools/keys/_keys.py

@@ -99,8 +99,9 @@ class SHAPKeys:
 
 class CaptumKeys:
     """Keys for Captum functions"""
-    FEATURE_COLUMN = "feature"
-    IMPORTANCE_COLUMN = "importance"
+    FEATURE_COLUMN = "Feature"
+    IMPORTANCE_COLUMN = "Scaled Mean Attribution"
+    PERCENT_COLUMN = "Relative Importance(%)"
     SAVENAME = "captum_summary"
     PLOT_NAME = "captum_importance_plot"
 

{dragon_ml_toolbox-20.12.0 → dragon_ml_toolbox-20.14.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dragon-ml-toolbox"
-version = "20.12.0"
+version = "20.14.0"
 description = "Complete pipelines and helper tools for data science and machine learning projects."
 authors = [
     { name = "Karl Luigi Loza Vidaurre", email = "luigiloza@gmail.com" }