chore: rebase legacy

Signed-off-by: ThibaultFy <[email protected]>

substrafl/evaluation_strategy.py

@@ -84,7 +84,7 @@ def __init__(
             raise ValueError("test_data_nodes lists cannot be empty")
 
         if not all(isinstance(node, TestDataNodeProtocol) for node in test_data_nodes):
-            raise TypeError("test_data_nodes must respect the TestDataNodeProtocol")
+            raise TypeError("test_data_nodes must implement the TestDataNodeProtocol")
 
         if eval_frequency is None and eval_rounds is None:
             raise ValueError("At least one of eval_frequency or eval_rounds must be defined")

substrafl/strategies/scaffold.py

@@ -158,11 +158,7 @@ def perform_evaluation(
 
             test_data_node.update_states(
                 operation=self.evaluate(
-<<<<<<< HEAD
                     data_samples=test_data_node.data_sample_keys,
-=======
-                    data_samples=test_data_node.test_data_sample_keys,
->>>>>>> a79ee49 (rebase)
                     _algo_name=f"Evaluating with {self.__class__.__name__}",
                 ),
                 traintask_id=local_state.key,

substrafl/strategies/strategy.py

@@ -15,17 +15,10 @@
 from substrafl.algorithms.algo import Algo
 from substrafl.compute_plan_builder import ComputePlanBuilder
 from substrafl.evaluation_strategy import EvaluationStrategy
-<<<<<<< HEAD
 from substrafl.nodes import AggregationNodeProtocol
 from substrafl.nodes import TestDataNodeProtocol
 from substrafl.nodes import TrainDataNodeProtocol
 from substrafl.nodes.schemas import OutputIdentifiers
-=======
-from substrafl.nodes.aggregation_node import AggregationNode
-from substrafl.nodes.node import OutputIdentifiers
-from substrafl.nodes.test_data_node import TestDataNode
-from substrafl.nodes.train_data_node import TrainDataNode
->>>>>>> a79ee49 (rebase)
 from substrafl.remote.decorators import remote_data
 from substrafl.strategies.schemas import StrategyName