julearn 0.3.5.dev74__tar.gz → 0.3.5.dev80__tar.gz

{julearn-0.3.5.dev74 → julearn-0.3.5.dev80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: julearn
-Version: 0.3.5.dev74
+Version: 0.3.5.dev80
 Summary: Juelich Machine Learning Library
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Sami Hamdan <s.hamdan@fz-juelich.de>
 Maintainer-email: Sami Hamdan <s.hamdan@fz-juelich.de>

julearn-0.3.5.dev80/docs/changes/newsfragments/286.bugfix

@@ -0,0 +1 @@
+Fix a bug in which the :class:`.PipelineInspector` will fail for pipelines with hyperparameter tuning by `Fede Raimondo`_

{julearn-0.3.5.dev74 → julearn-0.3.5.dev80}/julearn/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.3.5.dev74'
-__version_tuple__ = version_tuple = (0, 3, 5, 'dev74')
+__version__ = version = '0.3.5.dev80'
+__version_tuple__ = version_tuple = (0, 3, 5, 'dev80')
 
-__commit_id__ = commit_id = 'gd35b078e8'
+__commit_id__ = commit_id = 'g835fe2f52'

{julearn-0.3.5.dev74 → julearn-0.3.5.dev80}/julearn/inspect/_pipeline.py

@@ -34,7 +34,10 @@ class PipelineInspector:
             The names of the steps in the pipeline.
 
         """
-        return list(self._model.named_steps.keys())
+        model = self._model
+        if hasattr(model, "best_estimator_"):
+            model = model.best_estimator_
+        return list(model.named_steps.keys())
 
     def get_step(self, name, as_estimator=False):
         """Get a step from the pipeline.
@@ -52,7 +55,10 @@ class PipelineInspector:
             The requested step.
 
         """
-        step = self._model.named_steps[name]
+        model = self._model
+        if hasattr(model, "best_estimator_"):
+            model = model.best_estimator_
+        step = model.named_steps[name]
         if not as_estimator:
             step = _EstimatorInspector(step)
         return step
@@ -66,8 +72,7 @@ class PipelineInspector:
             The parameters of the pipeline.
 
         """
-        if hasattr(self._model, "best_estimator_"):
-            self._model.best_estimator_.get_params()
+
         return self._model.get_params()
 
     def get_fitted_params(self):
@@ -83,11 +88,9 @@ class PipelineInspector:
 
         """
         fitted_params = {}
-        model = (
-            self._model.best_estimator_
-            if hasattr(self._model, "best_estimator_")
-            else self._model
-        )
+        model = self._model
+        if hasattr(model, "best_estimator_"):
+            model = model.best_estimator_
         for name, step in model.steps:
             params = _EstimatorInspector(step).get_fitted_params()
             fitted_params = {

{julearn-0.3.5.dev74 → julearn-0.3.5.dev80}/julearn/inspect/tests/test_pipeline.py

@@ -274,3 +274,27 @@ def test_get_estimator(df_iris: "pd.DataFrame") -> None:
     svc = inspector.get_step("svc").estimator
     assert isinstance(svc, SVC)
     assert pipe.get_params() == inspector.get_params()
+
+
+def test_estimator_gridsearch(df_iris: "pd.DataFrame") -> None:
+    """Test estimator fetch from inspector.
+
+    Parameters
+    ----------
+    df_iris : pd.DataFrame
+        The iris dataset.
+
+    """
+    pipe = (
+        PipelineCreator(problem_type="classification")
+        .add("zscore")
+        .add("svm", C=[1, 10], kernel=["linear", "rbf"])
+        .to_pipeline()
+    )
+    pipe.fit(df_iris.iloc[:, :-1], df_iris.species)
+    inspector = PipelineInspector(pipe)
+    svc = inspector.get_step("svm").estimator
+    assert isinstance(svc, SVC)
+    assert pipe.get_params() == inspector.get_params()
+    assert isinstance(inspector.get_step_names(), list)
+    assert len(inspector.get_step_names()) == 3

{julearn-0.3.5.dev74 → julearn-0.3.5.dev80}/julearn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: julearn
-Version: 0.3.5.dev74
+Version: 0.3.5.dev80
 Summary: Juelich Machine Learning Library
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Sami Hamdan <s.hamdan@fz-juelich.de>
 Maintainer-email: Sami Hamdan <s.hamdan@fz-juelich.de>

{julearn-0.3.5.dev74 → julearn-0.3.5.dev80}/julearn.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ docs/changes/newsfragments/282.doc
 docs/changes/newsfragments/283.doc
 docs/changes/newsfragments/284.misc
 docs/changes/newsfragments/285.bugfix
+docs/changes/newsfragments/286.bugfix
 docs/images/corrected_ttest.png
 docs/images/final_estimator.png
 docs/images/iris_X.png