fkml logs object bugfix

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [3.0.1] - 2023-12-07
+- **Bugfix**
+  - Fix pipeline logs to actually return learners objects in \_\_fkml__.learners dicts.
+
 ## [3.0.0] - 2023-11-08
 - **Enhancement**
   - Remove support for python 3.6 and 3.7.

src/fklearn/resources/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

src/fklearn/training/pipeline.py

@@ -82,8 +82,8 @@ def pipeline(data: pd.DataFrame) -> LearnerReturnType:
             current_data = new_data
 
             model_objects = {}
-            if learner_log.get("obj"):
-                model_objects["obj"] = learner_log.pop("obj")
+            if learner_log.get("object"):
+                model_objects["object"] = learner_log.pop("object")
 
             serialisation[learner_name].append({"fn": learner_fn, "log": learner_log, **model_objects})
             logs.append(learner_log)

src/fklearn/validation/validator.py

@@ -210,7 +210,7 @@ def get_perturbed_columns(perturbator: PerturbFnType) -> List[str]:
 
     train_logs, validator_logs = zip(*map(_join_split_log, zipped_logs))
     if return_all_train_logs:
-        train_logs = {"train_log": [log["train_log"] for log in train_logs]}
+        train_logs = {"train_log": [log["train_log"] for log in train_logs]}  # type: ignore
     else:
         train_logs = first(train_logs)
 

tests/training/test_pipeline.py

@@ -152,7 +152,7 @@ def dummy_learner_2(df, fn, call):
 
     @fp.curry
     def dummy_learner_3(df, fn, call):
-        return fn, df, {f"dummy_learner_{call}": {}, "obj": "a"}
+        return fn, df, {f"dummy_learner_{call}": {}, "object": "a"}
 
     train_fn = build_pipeline(
         dummy_learner(fn=fn, call=1),
@@ -166,10 +166,10 @@ def dummy_learner_3(df, fn, call):
             "features": ['id', 'x1', 'y'],
             "learners": {"dummy_learner": {"fn": fn, "log": {"dummy_learner_1": {}}},
                          "dummy_learner_2": {"fn": fn, "log": {"dummy_learner_2": {}}},
-                         "dummy_learner_3": {"fn": fn, "log": {"dummy_learner_3": {}}, "obj": "a"}}}
+                         "dummy_learner_3": {"fn": fn, "log": {"dummy_learner_3": {}}, "object": "a"}}}
 
     assert log["__fkml__"] == fkml
-    assert "obj" not in log.keys()
+    assert "object" not in log.keys()
 
 
 @pytest.mark.parametrize("has_repeated_learners", [False, True])
@@ -247,4 +247,4 @@ def dummy_learner_2(df, fn, call):
                 "dummy_learner_2": [{"fn": fn, "log": {"dummy_learner_2": {}}}]}}
 
     assert log["__fkml__"] == fkml
-    assert "obj" not in log.keys()
+    assert "object" not in log.keys()