Move ahbicht.evaluation_results to ahbicht.models.evaluation_results

json_schemas/generate_json_schemas.py

@@ -10,16 +10,16 @@
 from marshmallow import Schema, fields
 from marshmallow_jsonschema import JSONSchema  # type:ignore[import]
 
-from ahbicht.evaluation_results import (
-    AhbExpressionEvaluationResultSchema,
-    FormatConstraintEvaluationResultSchema,
-    RequirementConstraintEvaluationResultSchema,
-)
 from ahbicht.json_serialization.tree_schema import TokenSchema  # , TreeSchema
 from ahbicht.mapping_results import ConditionKeyConditionTextMappingSchema, PackageKeyConditionExpressionMappingSchema
 from ahbicht.models.categorized_key_extract import CategorizedKeyExtractSchema
 from ahbicht.models.condition_nodes import EvaluatedFormatConstraintSchema
 from ahbicht.models.content_evaluation_result import ContentEvaluationResultSchema
+from ahbicht.models.evaluation_results import (
+    AhbExpressionEvaluationResultSchema,
+    FormatConstraintEvaluationResultSchema,
+    RequirementConstraintEvaluationResultSchema,
+)
 
 schema_types: List[Type[Schema]] = [
     RequirementConstraintEvaluationResultSchema,

src/ahbicht/content_evaluation/fc_evaluators.py

@@ -19,9 +19,9 @@
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableData, EvaluatableDataProvider
 from ahbicht.content_evaluation.evaluators import Evaluator
 from ahbicht.content_evaluation.german_strom_and_gas_tag import has_no_utc_offset, is_xtag_limit
-from ahbicht.evaluation_results import FormatConstraintEvaluationResult
 from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
+from ahbicht.models.evaluation_results import FormatConstraintEvaluationResult
 
 text_to_be_evaluated_by_format_constraint: ContextVar[Optional[str]] = ContextVar(
     "text_to_be_evaluated_by_format_constraint", default=None

src/ahbicht/expressions/ahb_expression_evaluation.py

@@ -10,14 +10,14 @@
 from lark import Token, Transformer, Tree, v_args
 from lark.exceptions import VisitError
 
-from ahbicht.evaluation_results import (
+from ahbicht.expressions.format_constraint_expression_evaluation import format_constraint_evaluation
+from ahbicht.expressions.requirement_constraint_expression_evaluation import requirement_constraint_evaluation
+from ahbicht.models.enums import ModalMark, PrefixOperator, RequirementIndicator
+from ahbicht.models.evaluation_results import (
     AhbExpressionEvaluationResult,
     FormatConstraintEvaluationResult,
     RequirementConstraintEvaluationResult,
 )
-from ahbicht.expressions.format_constraint_expression_evaluation import format_constraint_evaluation
-from ahbicht.expressions.requirement_constraint_expression_evaluation import requirement_constraint_evaluation
-from ahbicht.models.enums import ModalMark, PrefixOperator, RequirementIndicator
 from ahbicht.utility_functions import gather_if_necessary
 
 _str_to_modal_mark_mapping: Dict[str, ModalMark] = {

src/ahbicht/expressions/format_constraint_expression_evaluation.py

@@ -15,11 +15,11 @@
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableData, EvaluatableDataProvider
 from ahbicht.content_evaluation.fc_evaluators import FcEvaluator
 from ahbicht.content_evaluation.token_logic_provider import TokenLogicProvider
-from ahbicht.evaluation_results import FormatConstraintEvaluationResult
 from ahbicht.expressions.base_transformer import BaseTransformer
 from ahbicht.expressions.condition_expression_parser import parse_condition_expression_to_tree
 from ahbicht.expressions.expression_builder import FormatErrorMessageExpressionBuilder
 from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
+from ahbicht.models.evaluation_results import FormatConstraintEvaluationResult
 
 
 @v_args(inline=True)  # Children are provided as *args instead of a list argument

src/ahbicht/expressions/requirement_constraint_expression_evaluation.py

@@ -12,7 +12,6 @@
 from lark.exceptions import VisitError
 
 from ahbicht.condition_node_builder import ConditionNodeBuilder, TRCTransformerArgument
-from ahbicht.evaluation_results import RequirementConstraintEvaluationResult
 from ahbicht.expressions import InvalidExpressionError
 from ahbicht.expressions.base_transformer import BaseTransformer
 from ahbicht.expressions.condition_expression_parser import parse_condition_expression_to_tree
@@ -26,6 +25,7 @@
     RequirementConstraint,
     UnevaluatedFormatConstraint,
 )
+from ahbicht.models.evaluation_results import RequirementConstraintEvaluationResult
 
 
 @v_args(inline=True)  # Children are provided as *args instead of a list argument

src/ahbicht/validation/validation.py

@@ -17,15 +17,15 @@
 )
 
 from ahbicht.content_evaluation import fc_evaluators
-from ahbicht.evaluation_results import (
-    AhbExpressionEvaluationResult,
-    FormatConstraintEvaluationResult,
-    RequirementConstraintEvaluationResult,
-)
 from ahbicht.expressions import InvalidExpressionError
 from ahbicht.expressions.ahb_expression_evaluation import evaluate_ahb_expression_tree
 from ahbicht.expressions.expression_resolver import parse_expression_including_unresolved_subexpressions
 from ahbicht.models.enums import ModalMark, PrefixOperator, RequirementIndicator
+from ahbicht.models.evaluation_results import (
+    AhbExpressionEvaluationResult,
+    FormatConstraintEvaluationResult,
+    RequirementConstraintEvaluationResult,
+)
 from ahbicht.models.validation_results import (
     DataElementValidationResult,
     SegmentLevelValidationResult,

unittests/test_ahb_expression_evaluation.py

@@ -11,17 +11,17 @@
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableDataProvider
 from ahbicht.content_evaluation.evaluator_factory import create_and_inject_hardcoded_evaluators
 from ahbicht.content_evaluation.token_logic_provider import SingletonTokenLogicProvider, TokenLogicProvider
-from ahbicht.evaluation_results import (
-    AhbExpressionEvaluationResult,
-    FormatConstraintEvaluationResult,
-    RequirementConstraintEvaluationResult,
-)
 from ahbicht.expressions.ahb_expression_evaluation import evaluate_ahb_expression_tree
 from ahbicht.expressions.ahb_expression_parser import parse_ahb_expression_to_single_requirement_indicator_expressions
 from ahbicht.expressions.expression_resolver import parse_expression_including_unresolved_subexpressions
 from ahbicht.models.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult
 from ahbicht.models.enums import ModalMark, PrefixOperator, RequirementIndicator
+from ahbicht.models.evaluation_results import (
+    AhbExpressionEvaluationResult,
+    FormatConstraintEvaluationResult,
+    RequirementConstraintEvaluationResult,
+)
 from unittests.defaults import (
     default_test_format,
     default_test_version,

unittests/test_format_constraint_expression_evaluation.py

@@ -11,12 +11,12 @@
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableDataProvider
 from ahbicht.content_evaluation.fc_evaluators import FcEvaluator
 from ahbicht.content_evaluation.token_logic_provider import SingletonTokenLogicProvider, TokenLogicProvider
-from ahbicht.evaluation_results import FormatConstraintEvaluationResult
 from ahbicht.expressions.format_constraint_expression_evaluation import (
     _build_evaluated_format_constraint_nodes,
     format_constraint_evaluation,
 )
 from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
+from ahbicht.models.evaluation_results import FormatConstraintEvaluationResult
 from unittests.defaults import default_test_format, default_test_version, return_empty_dummy_evaluatable_data
 
 

unittests/test_json_serialization.py

@@ -11,12 +11,6 @@
 from marshmallow import Schema, ValidationError
 from maus.models.edifact_components import DataElementDataType
 
-from ahbicht.evaluation_results import (
-    AhbExpressionEvaluationResult,
-    AhbExpressionEvaluationResultSchema,
-    FormatConstraintEvaluationResult,
-    RequirementConstraintEvaluationResult,
-)
 from ahbicht.mapping_results import (
     ConditionKeyConditionTextMapping,
     ConditionKeyConditionTextMappingSchema,
@@ -31,6 +25,12 @@
 )
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
 from ahbicht.models.enums import ModalMark
+from ahbicht.models.evaluation_results import (
+    AhbExpressionEvaluationResult,
+    AhbExpressionEvaluationResultSchema,
+    FormatConstraintEvaluationResult,
+    RequirementConstraintEvaluationResult,
+)
 from ahbicht.models.validation_results import (
     DataElementValidationResult,
     DataElementValidationResultSchema,

unittests/test_requirement_constraint_evaluation.py

@@ -6,7 +6,6 @@
 
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableDataProvider
 from ahbicht.content_evaluation.token_logic_provider import SingletonTokenLogicProvider, TokenLogicProvider
-from ahbicht.evaluation_results import RequirementConstraintEvaluationResult
 from ahbicht.expressions.requirement_constraint_expression_evaluation import requirement_constraint_evaluation
 from ahbicht.models.condition_nodes import (
     ConditionFulfilledValue,
@@ -15,6 +14,7 @@
     RequirementConstraint,
     UnevaluatedFormatConstraint,
 )
+from ahbicht.models.evaluation_results import RequirementConstraintEvaluationResult
 from unittests.defaults import (
     empty_default_hints_provider,
     empty_default_rc_evaluator,