cleanup repr/str

ensemble/ensemble.py

@@ -51,9 +51,12 @@ def __repr__(self) -> str:
     )
 
   def __str__(self, level: int = 0) -> str:
+    return self._str()[:-1]
+
+  def _str(self, level: int = 0) -> str:
     ret = '\t' * level + repr(self) + "\n"
     for child in self.children.values():
-      ret += child.__str__(level+1)
+      ret += child._str(level+1)
     return ret
 
   def _init_to_graph(self, children: List[Callable], weights: Optional[List[np.ndarray]]):

ensemble/model.py

@@ -34,7 +34,10 @@ def __repr__(self) -> str:
       f"Model(name='{self.name}', func={self.name}({', '.join(self.arg_names)}))"
     )
 
-  def __str__(self, level: int = 0) -> str:
+  def __str__(self):
+    return self._str()
+
+  def _str(self, level: int = 0) -> str:
     return '\t' * level + repr(self) + "\n"
 
   def get_name(self) -> str:

ensemble/node.py

@@ -21,13 +21,21 @@ def __call__(self, *args, **kwargs):
   def __repr__(self, *args, **kwargs):
     pass
 
+  @abstractmethod
+  def __str__(self, *args, **kwargs):
+    pass
+
   @abstractmethod
   def get_name(self):
     pass
 
   def get_arg_names(self):
     return set(inspect.getfullargspec(self)[0])
 
+  @abstractmethod
+  def _str(self):
+    pass
+
 """
   @abstractmethod
   def set_name(self, name):

examples/evaluate_models.py

@@ -32,6 +32,7 @@ def wrapper(dataset):
   e = Ensemble('ensemble', children=[model1, model2], mode='all')
   results = Ensemble('results', children=[model1, model2, e])
   results.decorate_children(evaluate)
+  print(results)
   pprint(
     results(dataset=get_dataset())
   )