From a648df0faf2a772e35873f8c62dac30b6863095f Mon Sep 17 00:00:00 2001 From: Konstantin Date: Tue, 1 Oct 2024 16:32:39 +0200 Subject: [PATCH] Move `ahbicht.expressions.condition_nodes` to `ahbicht.models.condition_nodes` --- json_schemas/generate_json_schemas.py | 2 +- src/ahbicht/condition_node_builder.py | 2 +- src/ahbicht/content_evaluation/fc_evaluators.py | 2 +- .../content_evaluation/german_strom_and_gas_tag.py | 2 +- src/ahbicht/content_evaluation/rc_evaluators.py | 2 +- src/ahbicht/expressions/expression_builder.py | 4 ++-- .../format_constraint_expression_evaluation.py | 2 +- src/ahbicht/expressions/hints_provider.py | 2 +- .../requirement_constraint_expression_evaluation.py | 4 ++-- src/ahbicht/models/categorized_key_extract.py | 2 +- src/ahbicht/{expressions => models}/condition_nodes.py | 0 src/ahbicht/models/content_evaluation_result.py | 2 +- unittests/defaults.py | 2 +- unittests/test_ahb_expression_evaluation.py | 2 +- unittests/test_categorized_key_extraction.py | 2 +- unittests/test_cer_based_fc_evaluator.py | 2 +- unittests/test_cer_based_rc_evaluator.py | 2 +- unittests/test_condition_node_builder.py | 4 ++-- unittests/test_condition_nodes.py | 2 +- unittests/test_dict_based_fc_evaluator.py | 2 +- unittests/test_dict_based_rc_evaluator.py | 2 +- unittests/test_evaluator_factory.py | 2 +- unittests/test_expression_builder.py | 2 +- .../test_format_constraint_expression_evaluation.py | 2 +- unittests/test_format_constraints_context_var.py | 2 +- unittests/test_integration_mwe.py | 2 +- unittests/test_json_serialization.py | 10 +++++----- unittests/test_mixed_sync_async_rc_fc_evaluation.py | 2 +- unittests/test_requirement_constraint_evaluation.py | 4 ++-- ...est_requirement_constraint_expression_evaluation.py | 6 +++--- unittests/test_validation.py | 2 +- 31 files changed, 40 insertions(+), 40 deletions(-) rename src/ahbicht/{expressions => models}/condition_nodes.py (100%) diff --git a/json_schemas/generate_json_schemas.py b/json_schemas/generate_json_schemas.py index ab6715b6..c8220936 100644 --- a/json_schemas/generate_json_schemas.py +++ b/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]] = [ diff --git a/src/ahbicht/condition_node_builder.py b/src/ahbicht/condition_node_builder.py index ae8aa6e9..b6a5c322 100644 --- a/src/ahbicht/condition_node_builder.py +++ b/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 diff --git a/src/ahbicht/content_evaluation/fc_evaluators.py b/src/ahbicht/content_evaluation/fc_evaluators.py index f183b0e2..06d687b8 100644 --- a/src/ahbicht/content_evaluation/fc_evaluators.py +++ b/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( diff --git a/src/ahbicht/content_evaluation/german_strom_and_gas_tag.py b/src/ahbicht/content_evaluation/german_strom_and_gas_tag.py index 6e7432f9..c6da1c84 100644 --- a/src/ahbicht/content_evaluation/german_strom_and_gas_tag.py +++ b/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") diff --git a/src/ahbicht/content_evaluation/rc_evaluators.py b/src/ahbicht/content_evaluation/rc_evaluators.py index c6567388..afa64eb9 100644 --- a/src/ahbicht/content_evaluation/rc_evaluators.py +++ b/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 diff --git a/src/ahbicht/expressions/expression_builder.py b/src/ahbicht/expressions/expression_builder.py index b1dfcb5b..ef7255a3 100644 --- a/src/ahbicht/expressions/expression_builder.py +++ b/src/ahbicht/expressions/expression_builder.py @@ -6,7 +6,8 @@ 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, @@ -14,7 +15,6 @@ RequirementConstraint, UnevaluatedFormatConstraint, ) -from ahbicht.expressions.enums import LogicalOperator SupportedNodes = TypeVar("SupportedNodes") diff --git a/src/ahbicht/expressions/format_constraint_expression_evaluation.py b/src/ahbicht/expressions/format_constraint_expression_evaluation.py index e3893e48..d06a3bfe 100644 --- a/src/ahbicht/expressions/format_constraint_expression_evaluation.py +++ b/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 diff --git a/src/ahbicht/expressions/hints_provider.py b/src/ahbicht/expressions/hints_provider.py index 5fabef57..85024b9f 100644 --- a/src/ahbicht/expressions/hints_provider.py +++ b/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 diff --git a/src/ahbicht/expressions/requirement_constraint_expression_evaluation.py b/src/ahbicht/expressions/requirement_constraint_expression_evaluation.py index 2911e6f8..8b5c1093 100644 --- a/src/ahbicht/expressions/requirement_constraint_expression_evaluation.py +++ b/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 diff --git a/src/ahbicht/models/categorized_key_extract.py b/src/ahbicht/models/categorized_key_extract.py index 1c16bd89..b56e107f 100644 --- a/src/ahbicht/models/categorized_key_extract.py +++ b/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 diff --git a/src/ahbicht/expressions/condition_nodes.py b/src/ahbicht/models/condition_nodes.py similarity index 100% rename from src/ahbicht/expressions/condition_nodes.py rename to src/ahbicht/models/condition_nodes.py diff --git a/src/ahbicht/models/content_evaluation_result.py b/src/ahbicht/models/content_evaluation_result.py index 8502b47e..b4b8463a 100644 --- a/src/ahbicht/models/content_evaluation_result.py +++ b/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, diff --git a/unittests/defaults.py b/unittests/defaults.py index 45751d8b..bbc2de12 100644 --- a/unittests/defaults.py +++ b/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 diff --git a/unittests/test_ahb_expression_evaluation.py b/unittests/test_ahb_expression_evaluation.py index 93c0ad70..db2fdc44 100644 --- a/unittests/test_ahb_expression_evaluation.py +++ b/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, diff --git a/unittests/test_categorized_key_extraction.py b/unittests/test_categorized_key_extraction.py index e8990486..216a8628 100644 --- a/unittests/test_categorized_key_extraction.py +++ b/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 diff --git a/unittests/test_cer_based_fc_evaluator.py b/unittests/test_cer_based_fc_evaluator.py index cbc469f5..0f9f4fda 100644 --- a/unittests/test_cer_based_fc_evaluator.py +++ b/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 diff --git a/unittests/test_cer_based_rc_evaluator.py b/unittests/test_cer_based_rc_evaluator.py index c7b6dd4b..6700cfb8 100644 --- a/unittests/test_cer_based_rc_evaluator.py +++ b/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 diff --git a/unittests/test_condition_node_builder.py b/unittests/test_condition_node_builder.py index 53b7fe81..b16e3e02 100644 --- a/unittests/test_condition_node_builder.py +++ b/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 diff --git a/unittests/test_condition_nodes.py b/unittests/test_condition_nodes.py index 21c2f148..a014ed80 100644 --- a/unittests/test_condition_nodes.py +++ b/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, diff --git a/unittests/test_dict_based_fc_evaluator.py b/unittests/test_dict_based_fc_evaluator.py index 19d0618d..c58b5e05 100644 --- a/unittests/test_dict_based_fc_evaluator.py +++ b/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: diff --git a/unittests/test_dict_based_rc_evaluator.py b/unittests/test_dict_based_rc_evaluator.py index 51d3b0eb..941867d8 100644 --- a/unittests/test_dict_based_rc_evaluator.py +++ b/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 diff --git a/unittests/test_evaluator_factory.py b/unittests/test_evaluator_factory.py index 5c1691b5..8d88d8a9 100644 --- a/unittests/test_evaluator_factory.py +++ b/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 diff --git a/unittests/test_expression_builder.py b/unittests/test_expression_builder.py index f6d26125..275c536d 100644 --- a/unittests/test_expression_builder.py +++ b/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: diff --git a/unittests/test_format_constraint_expression_evaluation.py b/unittests/test_format_constraint_expression_evaluation.py index d08142f8..86c83df3 100644 --- a/unittests/test_format_constraint_expression_evaluation.py +++ b/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 diff --git a/unittests/test_format_constraints_context_var.py b/unittests/test_format_constraints_context_var.py index df3f6c68..ddacc98d 100644 --- a/unittests/test_format_constraints_context_var.py +++ b/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): diff --git a/unittests/test_integration_mwe.py b/unittests/test_integration_mwe.py index c0b48b29..6bb158ee 100644 --- a/unittests/test_integration_mwe.py +++ b/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, diff --git a/unittests/test_json_serialization.py b/unittests/test_json_serialization.py index 10b60d6f..fd0764a6 100644 --- a/unittests/test_json_serialization.py +++ b/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, diff --git a/unittests/test_mixed_sync_async_rc_fc_evaluation.py b/unittests/test_mixed_sync_async_rc_fc_evaluation.py index 677b7a9d..ae227ecb 100644 --- a/unittests/test_mixed_sync_async_rc_fc_evaluation.py +++ b/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, diff --git a/unittests/test_requirement_constraint_evaluation.py b/unittests/test_requirement_constraint_evaluation.py index bf6d884b..99ea7a9f 100644 --- a/unittests/test_requirement_constraint_evaluation.py +++ b/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, diff --git a/unittests/test_requirement_constraint_expression_evaluation.py b/unittests/test_requirement_constraint_expression_evaluation.py index 55adc20a..122d5bd2 100644 --- a/unittests/test_requirement_constraint_expression_evaluation.py +++ b/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: diff --git a/unittests/test_validation.py b/unittests/test_validation.py index a92bd092..c658285f 100644 --- a/unittests/test_validation.py +++ b/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,