Fixes in Diagnostics object, version 0.11.2 (#161)

Author: insolor

df_translation_toolkit/validation/validation_models.py

@@ -43,6 +43,9 @@ def __str__(self) -> str:
         problems_text = "\n".join(str(problem) for problem in self.problems)
         return f"Problematic tag pair: {self.original!r}, {self.translation!r}\nProblems:\n{problems_text}"
 
+    def contains_problems(self) -> bool:
+        return bool(self.problems)
+
     def contains_errors(self) -> bool:
         return ValidationProblem.contains_errors(self.problems)
 
@@ -56,8 +59,13 @@ def __init__(self) -> None:
     def add(self, problem_info: ProblemInfo) -> None:
         self.problems.append(problem_info)
 
-    def __bool__(self) -> bool:
-        return bool(self.problems)
+    def contains_problems(self) -> bool:
+        """Contains any problems (including errors)"""
+        return any(problem.contains_problems() for problem in self.problems)
 
     def contains_errors(self) -> bool:
+        """Contains any errors among problems."""
         return any(problem.contains_errors() for problem in self.problems)
+
+    def __str__(self) -> str:
+        return "\n".join(map(str, self.problems))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "df-translation-toolkit"
-version = "0.11.1"
+version = "0.11.2"
 description = "Toolset to convert text extracted from DF to translation format and aback"
 authors = [
     "insolor <[email protected]>",

tests/test_validation_models.py

@@ -1,6 +1,12 @@
 import pytest
 
-from df_translation_toolkit.validation.validation_models import ProblemSeverity, ValidationException, ValidationProblem
+from df_translation_toolkit.validation.validation_models import (
+    Diagnostics,
+    ProblemInfo,
+    ProblemSeverity,
+    ValidationException,
+    ValidationProblem,
+)
 
 
 @pytest.mark.parametrize(
@@ -48,3 +54,20 @@ def test_validation_problem_contains_errors(test_data: list[ValidationProblem],
 )
 def test_validation_exception_str(test_data: list[ValidationProblem], expected: str) -> None:
     assert str(ValidationException(test_data)) == expected
+
+
+def test_diagnostics() -> None:
+    diagnostics = Diagnostics()
+    assert bool(diagnostics)
+    assert diagnostics.contains_problems() is False
+    diagnostics.add(ProblemInfo("text", "translation", problems=[]))
+    assert diagnostics.contains_problems() is False
+    diagnostics.add(
+        ProblemInfo("text1", "translation1", problems=[ValidationProblem("Warning", ProblemSeverity.WARNING)]),
+    )
+    assert diagnostics.contains_problems() is True
+    assert diagnostics.contains_errors() is False
+    diagnostics.add(
+        ProblemInfo("text2", "translation2", problems=[ValidationProblem("Error")]),
+    )
+    assert diagnostics.contains_errors() is True