Skip to content

Commit

Permalink
fix(Printing): Handling debug and repr printing properly. (#232)
Browse files Browse the repository at this point in the history
  • Loading branch information
szemyd authored Aug 10, 2023
1 parent 2f9ba86 commit 526fa08
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
5 changes: 1 addition & 4 deletions src/krisi/evaluate/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,4 @@ def evaluate_over_time(
)

def __str__(self) -> str:
return "\n".join([metric.__str__() for metric in self.metrics])

def __repr__(self) -> str:
return "\n".join([metric.__repr__() for metric in self.metrics])
return " - ".join([metric.key for metric in self.metrics])
9 changes: 4 additions & 5 deletions src/krisi/evaluate/metric.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
TargetsDS,
WeightsDS,
)
from krisi.report.console import print_metric
from krisi.report.console import get_metric_string
from krisi.report.type import InteractiveFigure, PlotDefinition, plotly_interactive
from krisi.utils.iterable_helpers import (
check_iterable_with_number,
Expand Down Expand Up @@ -112,12 +112,11 @@ def __setitem__(self, key: str, item: Any) -> None:
def __getitem__(self, key: str) -> Any:
return getattr(self, key, "Unknown Field")

def __str__(self) -> str:
return print_metric(self)
def __str__(self, repr: bool = False) -> str:
return get_metric_string(self, repr=repr)

def __repr__(self) -> str:
print(print_metric(self, repr=True))
return super().__repr__()
return super().__repr__()[:-1] + f" - {self.__str__(True)}>"

def _evaluation(self, *args, **kwargs) -> Metric:
if self.calculation == Calculation.rolling:
Expand Down
7 changes: 7 additions & 0 deletions src/krisi/evaluate/scorecard.py
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,13 @@ def generate_report(
)
report.generate_launch()

def __repr__(self):
md = self.__dict__["metadata"]
return (
super().__repr__()[:-1]
+ f"\n{md.model_name:>40s} | {md.dataset_name} \n{md.project_name:>40s} | {self.dataset_type.value}\n\n{get_minimal_summary(self, dataframe=False)}>"
)


def get_rolling_diagrams(obj: "ScoreCard") -> List[List[InteractiveFigure]]:
return [
Expand Down
2 changes: 1 addition & 1 deletion src/krisi/report/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from krisi.utils.printing import bold


def print_metric(obj: "Metric", repr: bool = False) -> str:
def get_metric_string(obj: "Metric", repr: bool = False) -> str:
if repr:
return f"{obj.result} | {obj.name}"
hyperparams = ""
Expand Down

0 comments on commit 526fa08

Please sign in to comment.