lecrapaud 0.19.1__py3-none-any.whl → 0.19.3__py3-none-any.whl

lecrapaud/api.py

@@ -475,6 +475,9 @@ class ExperimentEngine:
             # For lightgbm models
             importances = model.feature_importance(importance_type="split")
             importance_type = "Split"
+        elif hasattr(model, "get_feature_importance"):
+            importances = model.get_feature_importance()
+            importance_type = "Feature importance"
         elif hasattr(model, "coef_"):
             # For linear models
             importances = np.abs(model.coef_.flatten())

lecrapaud/experiment.py

@@ -35,7 +35,7 @@ def create_experiment(
     groups = {}
     if group_column:
         groups["number_of_groups"] = data[group_column].nunique()
-        groups["list_of_groups"] = data[group_column].unique().tolist().sort()
+        groups["list_of_groups"] = sorted(data[group_column].unique().tolist())
 
     with get_db() as db:
         all_targets = Target.get_all(db=db)

lecrapaud/feature_engineering.py

@@ -629,6 +629,7 @@ class PreprocessFeature:
         """
 
         pcas_dict = {}
+        index_saved = df.index
 
         for pca_cross_sectional in self.pca_cross_sectional:
             name, index_col, columns_col, value_col = (
@@ -659,6 +660,7 @@ class PreprocessFeature:
             scores_df = pd.DataFrame(scores, index=pivot.index, columns=cols)
 
             df = df.merge(scores_df.reset_index(), on=index_col, how="left")
+            df.index = index_saved
             pcas_dict.update({name: pipe})
 
         return df, pcas_dict

lecrapaud/model_selection.py

@@ -110,6 +110,63 @@ def test_hardware():
 warnings.filterwarnings("ignore", category=UserWarning, module="pydantic")
 
 
+class CatBoostWrapper:
+    """
+    Transparent proxy for a CatBoost model that accepts arbitrary keyword arguments
+    as direct attributes, while forwarding all method calls and properties.
+    """
+
+    __slots__ = ("_model", "_extra_attrs")
+
+    def __init__(self, model, **kwargs):
+        object.__setattr__(self, "_model", model)
+        object.__setattr__(self, "_extra_attrs", {})
+        # Register kwargs as direct attributes
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+    # ---- Transparent access ----
+    def __getattr__(self, name):
+        """Forward attribute access to the underlying model if not found."""
+        model = object.__getattribute__(self, "_model")
+        if hasattr(model, name):
+            return getattr(model, name)
+        extra_attrs = object.__getattribute__(self, "_extra_attrs")
+        if name in extra_attrs:
+            return extra_attrs[name]
+        raise AttributeError(f"{type(self).__name__!r} has no attribute {name!r}")
+
+    def __setattr__(self, name, value):
+        """Set to wrapper or forward to model when appropriate."""
+        if name in CatBoostWrapper.__slots__:
+            object.__setattr__(self, name, value)
+            return
+
+        model = object.__getattribute__(self, "_model")
+        if hasattr(model, name):
+            setattr(model, name, value)
+        else:
+            extra_attrs = object.__getattribute__(self, "_extra_attrs")
+            extra_attrs[name] = value
+
+    def __dir__(self):
+        """Merge dir() from wrapper, model, and custom attributes."""
+        base = set(super().__dir__())
+        model_attrs = set(dir(object.__getattribute__(self, "_model")))
+        extra_attrs = set(object.__getattribute__(self, "_extra_attrs").keys())
+        return sorted(base | model_attrs | extra_attrs)
+
+    def __repr__(self):
+        model = object.__getattribute__(self, "_model")
+        extras = object.__getattribute__(self, "_extra_attrs")
+        return f"CatBoostWrapper(model={model.__class__.__name__}, extras={extras})"
+
+    @property
+    def model(self):
+        """Access the raw CatBoost model."""
+        return object.__getattribute__(self, "_model")
+
+
 class ModelEngine:
 
     def __init__(
@@ -296,12 +353,15 @@ class ModelEngine:
             )
 
         # Attach metadata for consistency with sklearn path
-        model.model_name = self.model_name
-        model.target_type = self.target_type
-        logger.info(f"Successfully created a {model.model_name} at {datetime.now()}")
+        model_wrapped = CatBoostWrapper(
+            model, model_name=self.model_name, target_type=self.target_type
+        )
+        logger.info(
+            f"Successfully created a {model_wrapped.model_name} at {datetime.now()}"
+        )
 
-        self._model = model
-        return model
+        self._model = model_wrapped
+        return model_wrapped
 
     def fit_boosting(self, x_train, y_train, x_val, y_val, params):
         """

{lecrapaud-0.19.1.dist-info → lecrapaud-0.19.3.dist-info}/METADATA

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: lecrapaud
-Version: 0.19.1
+Version: 0.19.3
 Summary: Framework for machine and deep learning, with regression, classification and time series analysis
 License: Apache License
+License-File: LICENSE
 Author: Pierre H. Gallet
 Requires-Python: ==3.12.*
 Classifier: License :: Other/Proprietary License

{lecrapaud-0.19.1.dist-info → lecrapaud-0.19.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 lecrapaud/__init__.py,sha256=oCxbtw_nk8rlOXbXbWo0RRMlsh6w-hTiZ6e5PRG_wp0,28
-lecrapaud/api.py,sha256=GsylHdScug-D8ePbPKo5r7Wa0myj9Ol0OqNwlNsbgs8,22518
+lecrapaud/api.py,sha256=xPa8GG5o9ngjJaGgBWhojzGzRq1tbFL5nsCv5U1Ehjw,22681
 lecrapaud/config.py,sha256=itiqC31HB8i2Xo-kn2viCQrg_9tnA07-TJuZ-xdnx44,1126
 lecrapaud/db/__init__.py,sha256=82o9fMfaqKXPh2_rt44EzNRVZV1R4LScEnQYvj_TjK0,34
 lecrapaud/db/alembic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
@@ -27,8 +27,8 @@ lecrapaud/db/models/target.py,sha256=DKnfeaLU8eT8J_oh_vuFo5-o1CaoXR13xBbswme6Bgk
 lecrapaud/db/models/utils.py,sha256=-a-nWWmpJ2XzidIxo2COVUTrGZIPYCfBzjhcszJj_bM,1109
 lecrapaud/db/session.py,sha256=87W5AkGRYu8b2rF5FNQ0MFC6wtGc-gGagNJQN_0vnDQ,3667
 lecrapaud/directories.py,sha256=0LrANuDgbuneSLker60c6q2hmGnQ3mKHIztTGzTx6Gw,826
-lecrapaud/experiment.py,sha256=1xLWjOrqAxJh9CdXOx9ppQuRFRRj0GH-xYZqg-ty9hI,2463
-lecrapaud/feature_engineering.py,sha256=ib1afBrwqePiXUaw0Cpe6hY3VNl5afg8YVntb88SCT4,39199
+lecrapaud/experiment.py,sha256=xj2DAzjWM-FiRcNS8PBE0VotUskKuN8ydMk6THhjGiA,2464
+lecrapaud/feature_engineering.py,sha256=aeK58ahZXFY8AoLiNM2HVBflF9V-E4dUT6XhzHpk2Cs,39265
 lecrapaud/feature_selection.py,sha256=6ry-oVPQHbipm1XSE5YsH7AY0lQFt4CFbWiHiRs1nxg,43593
 lecrapaud/integrations/openai_integration.py,sha256=hHLF3fk5Bps8KNbNrEL3NUFa945jwClE6LrLpuMZOd4,7459
 lecrapaud/jobs/__init__.py,sha256=ZkrsyTOR21c_wN7RY8jPhm8jCrL1oCEtTsf3VFIlQiE,292
@@ -39,10 +39,10 @@ lecrapaud/misc/tabpfn_tests.ipynb,sha256=VkgsCUJ30d8jaL2VaWtQAgb8ngHPNtPgnXLs7QQ
 lecrapaud/misc/test-gpu-bilstm.ipynb,sha256=4nLuZRJVe2kn6kEmauhRiz5wkWT9AVrYhI9CEk_dYUY,9608
 lecrapaud/misc/test-gpu-resnet.ipynb,sha256=27Vu7nYwujYeh3fOxBNCnKJn3MXNPKZU-U8oDDUbymg,4944
 lecrapaud/misc/test-gpu-transformers.ipynb,sha256=k6MBSs_Um1h4PykvE-LTBcdpbWLbIFST_xl_AFW2jgI,8444
-lecrapaud/model_selection.py,sha256=z6sMU6ZGaymZOWdJehPw4yaWdzcYTABWweyH5LvCJwk,76980
+lecrapaud/model_selection.py,sha256=tspBjam6FopIwe-7oYaAahr9MTEBz_OJhT6c6dQhmo0,79259
 lecrapaud/search_space.py,sha256=FCIEHZBK1pUQ4CphJuxwXY2N_BdrCelRzHsCXnNLlVI,36334
 lecrapaud/utils.py,sha256=ATKu9pbXjYFRa2YzBYjqyLHJrzfnZ7SJrOD_qAnEBYE,8242
-lecrapaud-0.19.1.dist-info/LICENSE,sha256=MImCryu0AnqhJE_uAZD-PIDKXDKb8sT7v0i1NOYeHTM,11350
-lecrapaud-0.19.1.dist-info/METADATA,sha256=9wZednrJcXhbqdRGBLxo7pZnm78d8M2Z8lI34wJtR3o,11115
-lecrapaud-0.19.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lecrapaud-0.19.1.dist-info/RECORD,,
+lecrapaud-0.19.3.dist-info/METADATA,sha256=Tm3AmZ3FyxgGxEA9zsa-6CjTHI2V4xYM_pw8fRKczko,11137
+lecrapaud-0.19.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+lecrapaud-0.19.3.dist-info/licenses/LICENSE,sha256=MImCryu0AnqhJE_uAZD-PIDKXDKb8sT7v0i1NOYeHTM,11350
+lecrapaud-0.19.3.dist-info/RECORD,,

{lecrapaud-0.19.1.dist-info → lecrapaud-0.19.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any