wavetrainer 0.0.26__tar.gz → 0.0.27__tar.gz

{wavetrainer-0.0.26/wavetrainer.egg-info → wavetrainer-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavetrainer
-Version: 0.0.26
+Version: 0.0.27
 Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
 Home-page: https://github.com/8W9aG/wavetrainer
 Author: Will Sackfield

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/setup.py

@@ -23,7 +23,7 @@ def install_requires() -> typing.List[str]:
 
 setup(
     name='wavetrainer',
-    version='0.0.26',
+    version='0.0.27',
     description='A library for automatically finding the optimal model within feature and hyperparameter space.',
     long_description=long_description,
     long_description_content_type='text/markdown',

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/__init__.py

@@ -2,5 +2,5 @@
 
 from .create import create
 
-__VERSION__ = "0.0.26"
+__VERSION__ = "0.0.27"
 __all__ = ("create",)

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/calibrator/calibrator_router.py

@@ -48,11 +48,11 @@ class CalibratorRouter(Calibrator):
         calibrator.load(folder)
         self._calibrator = calibrator
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         calibrator = self._calibrator
         if calibrator is None:
             raise ValueError("calibrator is null.")
-        calibrator.save(folder)
+        calibrator.save(folder, trial)
         with open(
             os.path.join(folder, _CALIBRATOR_ROUTER_FILE), "w", encoding="utf8"
         ) as handle:

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/calibrator/mapie_calibrator.py

@@ -35,7 +35,7 @@ class MAPIECalibrator(Calibrator):
     def load(self, folder: str) -> None:
         self._mapie = joblib.load(os.path.join(folder, _CALIBRATOR_FILENAME))
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         joblib.dump(self._mapie, os.path.join(folder, _CALIBRATOR_FILENAME))
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/calibrator/vennabers_calibrator.py

@@ -33,7 +33,7 @@ class VennabersCalibrator(Calibrator):
     def load(self, folder: str) -> None:
         self._vennabers = joblib.load(os.path.join(folder, _CALIBRATOR_FILENAME))
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         joblib.dump(self._vennabers, os.path.join(folder, _CALIBRATOR_FILENAME))
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/model/catboost_model.py

@@ -26,6 +26,7 @@ _L2_LEAF_REG_KEY = "l2_leaf_reg"
 _BOOSTING_TYPE_KEY = "boosting_type"
 _MODEL_TYPE_KEY = "model_type"
 _EARLY_STOPPING_ROUNDS = "early_stopping_rounds"
+_BEST_ITERATION_KEY = "best_iteration"
 
 
 class CatboostModel(Model):
@@ -41,6 +42,7 @@ class CatboostModel(Model):
     _boosting_type: None | str
     _model_type: None | ModelType
     _early_stopping_rounds: None | int
+    _best_iteration: None | int
 
     @classmethod
     def name(cls) -> str:
@@ -56,6 +58,7 @@ class CatboostModel(Model):
         self._boosting_type = None
         self._model_type = None
         self._early_stopping_rounds = None
+        self._best_iteration = None
 
     @property
     def estimator(self) -> Any:
@@ -92,6 +95,7 @@ class CatboostModel(Model):
             _BOOSTING_TYPE_KEY, ["Ordered", "Plain"]
         )
         self._early_stopping_rounds = trial.suggest_int(_EARLY_STOPPING_ROUNDS, 10, 500)
+        self._best_iteration = trial.user_attrs.get(_BEST_ITERATION_KEY)
 
     def load(self, folder: str) -> None:
         with open(
@@ -105,10 +109,11 @@ class CatboostModel(Model):
             self._boosting_type = params[_BOOSTING_TYPE_KEY]
             self._model_type = ModelType(params[_MODEL_TYPE_KEY])
             self._early_stopping_rounds = params[_EARLY_STOPPING_ROUNDS]
+            self._best_iteration = params.get(_BEST_ITERATION_KEY)
         catboost = self._provide_catboost()
         catboost.load_model(os.path.join(folder, _MODEL_FILENAME))
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         with open(
             os.path.join(folder, _MODEL_PARAMS_FILENAME), "w", encoding="utf8"
         ) as handle:
@@ -121,11 +126,13 @@ class CatboostModel(Model):
                     _BOOSTING_TYPE_KEY: self._boosting_type,
                     _MODEL_TYPE_KEY: str(self._model_type),
                     _EARLY_STOPPING_ROUNDS: self._early_stopping_rounds,
+                    _BEST_ITERATION_KEY: self._best_iteration,
                 },
                 handle,
             )
         catboost = self._provide_catboost()
         catboost.save_model(os.path.join(folder, _MODEL_FILENAME))
+        trial.user_attrs[_BEST_ITERATION_KEY] = self._best_iteration
 
     def fit(
         self,
@@ -137,8 +144,6 @@ class CatboostModel(Model):
     ) -> Self:
         if y is None:
             raise ValueError("y is null.")
-        if eval_x is None:
-            raise ValueError("eval_x is null.")
         self._model_type = determine_model_type(y)
         catboost = self._provide_catboost()
 
@@ -148,10 +153,14 @@ class CatboostModel(Model):
             weight=w,
             cat_features=df.select_dtypes(include="category").columns.tolist(),
         )
-        eval_pool = Pool(
-            eval_x,
-            label=eval_y,
-            cat_features=eval_x.select_dtypes(include="category").columns.tolist(),
+        eval_pool = (
+            Pool(
+                eval_x,
+                label=eval_y,
+                cat_features=eval_x.select_dtypes(include="category").columns.tolist(),
+            )
+            if eval_x is not None
+            else None
         )
         catboost.fit(
             train_pool,
@@ -162,6 +171,7 @@ class CatboostModel(Model):
         )
         importances = catboost.get_feature_importance(prettified=True)
         logging.info("Importances:\n%s", importances)
+        self._best_iteration = catboost.get_best_iteration()
         return self
 
     def transform(self, df: pd.DataFrame) -> pd.DataFrame:
@@ -186,10 +196,14 @@ class CatboostModel(Model):
     def _provide_catboost(self) -> CatBoost:
         catboost = self._catboost
         if catboost is None:
+            best_iteration = self._best_iteration
+            iterations = (
+                best_iteration if best_iteration is not None else self._iterations
+            )
             match self._model_type:
                 case ModelType.BINARY:
                     catboost = CatBoostClassifierWrapper(
-                        iterations=self._iterations,
+                        iterations=iterations,
                         learning_rate=self._learning_rate,
                         depth=self._depth,
                         l2_leaf_reg=self._l2_leaf_reg,
@@ -201,7 +215,7 @@ class CatboostModel(Model):
                     )
                 case ModelType.REGRESSION:
                     catboost = CatBoostRegressorWrapper(
-                        iterations=self._iterations,
+                        iterations=iterations,
                         learning_rate=self._learning_rate,
                         depth=self._depth,
                         l2_leaf_reg=self._l2_leaf_reg,
@@ -213,7 +227,7 @@ class CatboostModel(Model):
                     )
                 case ModelType.BINNED_BINARY:
                     catboost = CatBoostClassifierWrapper(
-                        iterations=self._iterations,
+                        iterations=iterations,
                         learning_rate=self._learning_rate,
                         depth=self._depth,
                         l2_leaf_reg=self._l2_leaf_reg,
@@ -225,7 +239,7 @@ class CatboostModel(Model):
                     )
                 case ModelType.MULTI_CLASSIFICATION:
                     catboost = CatBoostClassifierWrapper(
-                        iterations=self._iterations,
+                        iterations=iterations,
                         learning_rate=self._learning_rate,
                         depth=self._depth,
                         l2_leaf_reg=self._l2_leaf_reg,

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/model/model_router.py

@@ -73,11 +73,11 @@ class ModelRouter(Model):
         model.load(folder)
         self._model = model
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         model = self._model
         if model is None:
             raise ValueError("model is null")
-        model.save(folder)
+        model.save(folder, trial)
         with open(
             os.path.join(folder, _MODEL_ROUTER_FILE), "w", encoding="utf8"
         ) as handle:

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/model/tabpfn_model.py

@@ -69,7 +69,7 @@ class TabPFNModel(Model):
             params = json.load(handle)
             self._model_type = ModelType(params[_MODEL_TYPE_KEY])
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         with open(os.path.join(folder, _MODEL_FILENAME), "wb") as f:
             pickle.dump(self._tabpfn, f)
         with open(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/params.py

@@ -14,6 +14,6 @@ class Params:
         """Loads the objects from a folder."""
         raise NotImplementedError("load not implemented in parent class.")
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         """Saves the objects into a folder."""
         raise NotImplementedError("save not implemented in parent class.")

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/reducer/base_selector_reducer.py

@@ -39,7 +39,7 @@ class BaseSelectorReducer(Reducer):
         file_path = os.path.join(folder, self._file_name)
         self._base_selector = joblib.load(file_path)
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         file_path = os.path.join(folder, self._file_name)
         joblib.dump(self._base_selector, file_path)
 

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/reducer/combined_reducer.py

@@ -67,7 +67,7 @@ class CombinedReducer(Reducer):
         for reducer in self._reducers:
             reducer.load(folder)
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         with open(
             os.path.join(folder, _COMBINED_REDUCER_FILE), "w", encoding="utf8"
         ) as handle:
@@ -78,7 +78,7 @@ class CombinedReducer(Reducer):
                 handle,
             )
         for reducer in self._reducers:
-            reducer.save(folder)
+            reducer.save(folder, trial)
 
     def fit(
         self,

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/reducer/nonnumeric_reducer.py

@@ -23,7 +23,7 @@ class NonNumericReducer(Reducer):
     def load(self, folder: str) -> None:
         pass
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         pass
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/reducer/pca_reducer.py

@@ -45,7 +45,7 @@ class PCAReducer(Reducer):
         if os.path.exists(pca_file):
             self._pca = joblib.load(pca_file)
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         if self._scaler is not None:
             joblib.dump(self._scaler, os.path.join(folder, _PCA_SCALER_FILE))
         if self._pca is not None:

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/reducer/unseen_reducer.py

@@ -34,7 +34,7 @@ class UnseenReducer(Reducer):
         ) as handle:
             self._seen_features = json.load(handle)
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         with open(
             os.path.join(folder, _UNSEEN_REDUCER_FILE), "w", encoding="utf8"
         ) as handle:

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/selector/selector.py

@@ -38,7 +38,7 @@ class Selector(Params, Fit):
     def load(self, folder: str) -> None:
         self._selector = joblib.load(os.path.join(folder, _SELECTOR_FILE))
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         joblib.dump(self._selector, os.path.join(folder, _SELECTOR_FILE))
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/trainer.py

@@ -258,12 +258,12 @@ class Trainer(Fit):
                         )
                         if not os.path.exists(folder):
                             os.mkdir(folder)
-                        windower.save(folder)
-                        reducer.save(folder)
-                        weights.save(folder)
-                        model.save(folder)
-                        selector.save(folder)
-                        calibrator.save(folder)
+                        windower.save(folder, trial)
+                        reducer.save(folder, trial)
+                        weights.save(folder, trial)
+                        model.save(folder, trial)
+                        selector.save(folder, trial)
+                        calibrator.save(folder, trial)
 
                     y_pred = model.transform(x_test)
                     y_pred = calibrator.transform(y_pred)
@@ -380,6 +380,7 @@ class Trainer(Fit):
 
     def transform(self, df: pd.DataFrame) -> pd.DataFrame:
         """Predict the expected values of the data."""
+        tqdm.tqdm.pandas(desc="Inferring...")
         input_df = df.copy()
         df = df.reindex(sorted(df.columns), axis=1)
         feature_columns = df.columns.values

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/weights/class_weights.py

@@ -33,7 +33,7 @@ class ClassWeights(Weights):
     def load(self, folder: str) -> None:
         pass
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         pass
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/weights/combined_weights.py

@@ -31,9 +31,9 @@ class CombinedWeights(Weights):
         for weights in self._weights:
             weights.load(folder)
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         for weights in self._weights:
-            weights.save(folder)
+            weights.save(folder, trial)
 
     def fit(
         self,

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/weights/exponential_weights.py

@@ -25,7 +25,7 @@ class ExponentialWeights(Weights):
     def load(self, folder: str) -> None:
         pass
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         pass
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/weights/linear_weights.py

@@ -25,7 +25,7 @@ class LinearWeights(Weights):
     def load(self, folder: str) -> None:
         pass
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         pass
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/weights/noop_weights.py

@@ -25,7 +25,7 @@ class NoopWeights(Weights):
     def load(self, folder: str) -> None:
         pass
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         pass
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/weights/sigmoid_weights.py

@@ -26,7 +26,7 @@ class SigmoidWeights(Weights):
     def load(self, folder: str) -> None:
         pass
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         pass
 
     def fit(

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/weights/weights_router.py

@@ -54,10 +54,11 @@ class WeightsRouter(Weights):
             weights = _WEIGHTS[params[_WEIGHTS_KEY]]()
         self._weights = weights
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         weights = self._weights
         if weights is None:
             raise ValueError("weights is null")
+        weights.save(folder, trial)
         with open(
             os.path.join(folder, _WEIGHTS_ROUTER_FILE), "w", encoding="utf8"
         ) as handle:

{wavetrainer-0.0.26 → wavetrainer-0.0.27}/wavetrainer/windower/windower.py

@@ -36,7 +36,7 @@ class Windower(Params, Fit):
             params = json.load(handle)
             self._lookback = params[_LOOKBACK_KEY]
 
-    def save(self, folder: str) -> None:
+    def save(self, folder: str, trial: optuna.Trial | optuna.trial.FrozenTrial) -> None:
         with open(os.path.join(folder, _WINDOWER_FILE), "w", encoding="utf8") as handle:
             json.dump(
                 {

{wavetrainer-0.0.26 → wavetrainer-0.0.27/wavetrainer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavetrainer
-Version: 0.0.26
+Version: 0.0.27
 Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
 Home-page: https://github.com/8W9aG/wavetrainer
 Author: Will Sackfield