Move ahbicht.expressions.condition_nodes to ahbicht.models.condition_nodes

json_schemas/generate_json_schemas.py

@@ -15,10 +15,10 @@
     FormatConstraintEvaluationResultSchema,
     RequirementConstraintEvaluationResultSchema,
 )
-from ahbicht.expressions.condition_nodes import EvaluatedFormatConstraintSchema
 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
 
 schema_types: List[Type[Schema]] = [

src/ahbicht/condition_node_builder.py

@@ -11,7 +11,7 @@
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableData, EvaluatableDataProvider
 from ahbicht.content_evaluation.token_logic_provider import TokenLogicProvider
 from ahbicht.expressions.condition_expression_parser import extract_categorized_keys_from_tree
-from ahbicht.expressions.condition_nodes import Hint, RequirementConstraint, UnevaluatedFormatConstraint
+from ahbicht.models.condition_nodes import Hint, RequirementConstraint, UnevaluatedFormatConstraint
 
 # TRCTransformerArgument is a union of nodes that are already evaluated from a Requirement Constraint (RC) perspective.
 # The Format Constraints (FC) might still be unevaluated. That's why the return type used in the

src/ahbicht/content_evaluation/fc_evaluators.py

@@ -20,7 +20,7 @@
 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.expressions.condition_nodes import EvaluatedFormatConstraint
+from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
 
 text_to_be_evaluated_by_format_constraint: ContextVar[Optional[str]] = ContextVar(

src/ahbicht/content_evaluation/german_strom_and_gas_tag.py

@@ -10,7 +10,7 @@
 # and it's PITA to manually define timezones. So we're using pytz as a datasource for timezone information.
 from pytz import timezone, utc
 
-from ahbicht.expressions.condition_nodes import EvaluatedFormatConstraint
+from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
 
 berlin = timezone("Europe/Berlin")
 

src/ahbicht/content_evaluation/rc_evaluators.py

@@ -12,7 +12,7 @@
 
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableData, EvaluationContext
 from ahbicht.content_evaluation.evaluators import Evaluator
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue
+from ahbicht.models.condition_nodes import ConditionFulfilledValue
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
 
 

src/ahbicht/expressions/expression_builder.py

@@ -6,15 +6,15 @@
 from abc import ABC, abstractmethod
 from typing import Generic, Optional, Protocol, Type, TypeVar, Union
 
-from ahbicht.expressions.condition_nodes import (
+from ahbicht.expressions.enums import LogicalOperator
+from ahbicht.models.condition_nodes import (
     ConditionNode,
     EvaluatedComposition,
     EvaluatedFormatConstraint,
     Hint,
     RequirementConstraint,
     UnevaluatedFormatConstraint,
 )
-from ahbicht.expressions.enums import LogicalOperator
 
 SupportedNodes = TypeVar("SupportedNodes")
 

src/ahbicht/expressions/format_constraint_expression_evaluation.py

@@ -18,8 +18,8 @@
 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.condition_nodes import EvaluatedFormatConstraint
 from ahbicht.expressions.expression_builder import FormatErrorMessageExpressionBuilder
+from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
 
 
 @v_args(inline=True)  # Children are provided as *args instead of a list argument

src/ahbicht/expressions/hints_provider.py

@@ -17,7 +17,7 @@
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableData, EvaluatableDataProvider
 
 # pylint: disable = too-few-public-methods
-from ahbicht.expressions.condition_nodes import Hint
+from ahbicht.models.condition_nodes import Hint
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
 
 

src/ahbicht/expressions/requirement_constraint_expression_evaluation.py

@@ -16,7 +16,8 @@
 from ahbicht.expressions import InvalidExpressionError
 from ahbicht.expressions.base_transformer import BaseTransformer
 from ahbicht.expressions.condition_expression_parser import parse_condition_expression_to_tree
-from ahbicht.expressions.condition_nodes import (
+from ahbicht.expressions.expression_builder import FormatConstraintExpressionBuilder, HintExpressionBuilder
+from ahbicht.models.condition_nodes import (
     ConditionFulfilledValue,
     ConditionNode,
     EvaluatedComposition,
@@ -25,7 +26,6 @@
     RequirementConstraint,
     UnevaluatedFormatConstraint,
 )
-from ahbicht.expressions.expression_builder import FormatConstraintExpressionBuilder, HintExpressionBuilder
 
 
 @v_args(inline=True)  # Children are provided as *args instead of a list argument

src/ahbicht/models/categorized_key_extract.py

@@ -8,7 +8,7 @@
 import attrs
 from marshmallow import Schema, fields, post_load
 
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
+from ahbicht.models.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult
 
 

src/ahbicht/models/content_evaluation_result.py

@@ -8,7 +8,7 @@
 import attrs
 from marshmallow import Schema, fields, post_load
 
-from ahbicht.expressions.condition_nodes import (
+from ahbicht.models.condition_nodes import (
     ConditionFulfilledValue,
     EvaluatedFormatConstraint,
     EvaluatedFormatConstraintSchema,

unittests/defaults.py

@@ -13,9 +13,9 @@
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableData
 from ahbicht.content_evaluation.fc_evaluators import FcEvaluator
 from ahbicht.content_evaluation.rc_evaluators import RcEvaluator
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue
 from ahbicht.expressions.hints_provider import DictBasedHintsProvider
 from ahbicht.expressions.package_expansion import DictBasedPackageResolver
+from ahbicht.models.condition_nodes import ConditionFulfilledValue
 
 default_test_format: EdifactFormat = EdifactFormat.UTILMD
 #: the default edifact format version used in the unit tests

unittests/test_ahb_expression_evaluation.py

@@ -18,9 +18,9 @@
 )
 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.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.expressions.enums import ModalMark, PrefixOperator, RequirementIndicator
 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 unittests.defaults import (
     default_test_format,

unittests/test_categorized_key_extraction.py

@@ -7,8 +7,8 @@
 import pytest
 
 from ahbicht.expressions.condition_expression_parser import extract_categorized_keys
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.models.categorized_key_extract import CategorizedKeyExtract, CategorizedKeyExtractSchema
+from ahbicht.models.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
 
 

unittests/test_cer_based_fc_evaluator.py

@@ -6,7 +6,7 @@
 import pytest
 
 from ahbicht.content_evaluation.token_logic_provider import TokenLogicProvider
-from ahbicht.expressions.condition_nodes import EvaluatedFormatConstraint
+from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult
 from unittests.defaults import default_test_format, default_test_version
 

unittests/test_cer_based_rc_evaluator.py

@@ -5,7 +5,7 @@
 import pytest
 
 from ahbicht.content_evaluation.rc_evaluators import ContentEvaluationResultBasedRcEvaluator, RcEvaluator
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue
+from ahbicht.models.condition_nodes import ConditionFulfilledValue
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult
 from unittests.conftest import store_content_evaluation_result_in_evaluatable_data
 

unittests/test_condition_node_builder.py

@@ -10,13 +10,13 @@
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableDataProvider, EvaluationContext
 from ahbicht.content_evaluation.rc_evaluators import RcEvaluator
 from ahbicht.content_evaluation.token_logic_provider import SingletonTokenLogicProvider, TokenLogicProvider
-from ahbicht.expressions.condition_nodes import (
+from ahbicht.expressions.hints_provider import JsonFileHintsProvider
+from ahbicht.models.condition_nodes import (
     ConditionFulfilledValue,
     Hint,
     RequirementConstraint,
     UnevaluatedFormatConstraint,
 )
-from ahbicht.expressions.hints_provider import JsonFileHintsProvider
 from unittests.defaults import default_test_format, default_test_version, return_empty_dummy_evaluatable_data
 
 

unittests/test_condition_nodes.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from ahbicht.expressions.condition_nodes import (
+from ahbicht.models.condition_nodes import (
     ConditionFulfilledValue,
     ConditionNode,
     EvaluatedComposition,

unittests/test_dict_based_fc_evaluator.py

@@ -7,7 +7,7 @@
 
 from ahbicht.content_evaluation import fc_evaluators
 from ahbicht.content_evaluation.fc_evaluators import DictBasedFcEvaluator, FcEvaluator
-from ahbicht.expressions.condition_nodes import EvaluatedFormatConstraint
+from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
 
 
 class TestDictBasedFcEvaluator:

unittests/test_dict_based_rc_evaluator.py

@@ -5,7 +5,7 @@
 import pytest
 
 from ahbicht.content_evaluation.rc_evaluators import DictBasedRcEvaluator
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue
+from ahbicht.models.condition_nodes import ConditionFulfilledValue
 from unittests.defaults import empty_default_test_data
 
 

unittests/test_evaluator_factory.py

@@ -9,9 +9,9 @@
 
 from ahbicht.content_evaluation.evaluator_factory import create_and_inject_hardcoded_evaluators
 from ahbicht.expressions.ahb_expression_evaluation import evaluate_ahb_expression_tree
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.expressions.enums import ModalMark, RequirementIndicator
 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 unittests.defaults import default_test_format, default_test_version, return_empty_dummy_evaluatable_data
 

unittests/test_expression_builder.py

@@ -4,8 +4,8 @@
 
 import pytest
 
-from ahbicht.expressions.condition_nodes import Hint, UnevaluatedFormatConstraint
 from ahbicht.expressions.expression_builder import FormatConstraintExpressionBuilder, HintExpressionBuilder
+from ahbicht.models.condition_nodes import Hint, UnevaluatedFormatConstraint
 
 
 class TestFormatConstraintExpressionBuilder:

unittests/test_format_constraint_expression_evaluation.py

@@ -12,11 +12,11 @@
 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.condition_nodes import EvaluatedFormatConstraint
 from ahbicht.expressions.format_constraint_expression_evaluation import (
     _build_evaluated_format_constraint_nodes,
     format_constraint_evaluation,
 )
+from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
 from unittests.defaults import default_test_format, default_test_version, return_empty_dummy_evaluatable_data
 
 

unittests/test_format_constraints_context_var.py

@@ -3,7 +3,7 @@
 
 from ahbicht.content_evaluation import fc_evaluators
 from ahbicht.content_evaluation.fc_evaluators import FcEvaluator
-from ahbicht.expressions.condition_nodes import EvaluatedFormatConstraint
+from ahbicht.models.condition_nodes import EvaluatedFormatConstraint
 
 
 class _MyFcEvaluator(FcEvaluator):

unittests/test_integration_mwe.py

@@ -17,7 +17,7 @@
 
 from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableData, EvaluatableDataProvider
 from ahbicht.content_evaluation.token_logic_provider import SingletonTokenLogicProvider, TokenLogicProvider
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
+from ahbicht.models.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.validation.validation import validate_deep_anwendungshandbuch
 from unittests.defaults import (
     DefaultHintsProvider,

unittests/test_json_serialization.py

@@ -17,11 +17,6 @@
     FormatConstraintEvaluationResult,
     RequirementConstraintEvaluationResult,
 )
-from ahbicht.expressions.condition_nodes import (
-    ConditionFulfilledValue,
-    EvaluatedFormatConstraint,
-    EvaluatedFormatConstraintSchema,
-)
 from ahbicht.expressions.enums import ModalMark
 from ahbicht.mapping_results import (
     ConditionKeyConditionTextMapping,
@@ -30,6 +25,11 @@
     PackageKeyConditionExpressionMappingSchema,
 )
 from ahbicht.models.categorized_key_extract import CategorizedKeyExtract, CategorizedKeyExtractSchema
+from ahbicht.models.condition_nodes import (
+    ConditionFulfilledValue,
+    EvaluatedFormatConstraint,
+    EvaluatedFormatConstraintSchema,
+)
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
 from ahbicht.validation.validation_results import (
     DataElementValidationResult,

unittests/test_mixed_sync_async_rc_fc_evaluation.py

@@ -10,8 +10,8 @@
 from ahbicht.content_evaluation.rc_evaluators import RcEvaluator
 from ahbicht.content_evaluation.token_logic_provider import SingletonTokenLogicProvider, TokenLogicProvider
 from ahbicht.expressions.ahb_expression_evaluation import evaluate_ahb_expression_tree
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.expressions.expression_resolver import parse_expression_including_unresolved_subexpressions
+from ahbicht.models.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from unittests.defaults import (
     default_test_format,
     default_test_version,

unittests/test_requirement_constraint_evaluation.py

@@ -7,14 +7,14 @@
 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.condition_nodes import (
+from ahbicht.expressions.requirement_constraint_expression_evaluation import requirement_constraint_evaluation
+from ahbicht.models.condition_nodes import (
     ConditionFulfilledValue,
     EvaluatedComposition,
     Hint,
     RequirementConstraint,
     UnevaluatedFormatConstraint,
 )
-from ahbicht.expressions.requirement_constraint_expression_evaluation import requirement_constraint_evaluation
 from unittests.defaults import (
     empty_default_hints_provider,
     empty_default_rc_evaluator,

unittests/test_requirement_constraint_expression_evaluation.py

@@ -6,15 +6,15 @@
 
 from ahbicht.expressions import InvalidExpressionError
 from ahbicht.expressions.condition_expression_parser import parse_condition_expression_to_tree
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue as cfv
-from ahbicht.expressions.condition_nodes import (
+from ahbicht.expressions.requirement_constraint_expression_evaluation import evaluate_requirement_constraint_tree
+from ahbicht.models.condition_nodes import ConditionFulfilledValue as cfv
+from ahbicht.models.condition_nodes import (
     ConditionNode,
     EvaluatedComposition,
     Hint,
     RequirementConstraint,
     UnevaluatedFormatConstraint,
 )
-from ahbicht.expressions.requirement_constraint_expression_evaluation import evaluate_requirement_constraint_tree
 
 
 class TestRequirementConstraintEvaluation:

unittests/test_validation.py

@@ -15,8 +15,8 @@
 )
 
 from ahbicht.content_evaluation.evaluator_factory import create_and_inject_hardcoded_evaluators
-from ahbicht.expressions.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.expressions.enums import ModalMark, PrefixOperator, RequirementIndicator
+from ahbicht.models.condition_nodes import ConditionFulfilledValue, EvaluatedFormatConstraint
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult
 from ahbicht.validation.validation import (
     combine_requirements_of_different_levels,