From 99e025fc74a13875522794d73ca6e16143c6be16 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Tue, 1 Oct 2024 16:35:01 +0200 Subject: [PATCH] Move `ahbicht.expressions.enums` to `ahbicht.models.enums` --- src/ahbicht/evaluation_results.py | 2 +- src/ahbicht/expressions/ahb_expression_evaluation.py | 2 +- src/ahbicht/expressions/expression_builder.py | 2 +- src/ahbicht/{expressions => models}/enums.py | 0 src/ahbicht/validation/validation.py | 2 +- unittests/test_ahb_expression_evaluation.py | 2 +- unittests/test_evaluator_factory.py | 2 +- unittests/test_json_serialization.py | 2 +- unittests/test_validation.py | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename src/ahbicht/{expressions => models}/enums.py (100%) diff --git a/src/ahbicht/evaluation_results.py b/src/ahbicht/evaluation_results.py index e94106a6..0cfac8c3 100644 --- a/src/ahbicht/evaluation_results.py +++ b/src/ahbicht/evaluation_results.py @@ -9,7 +9,7 @@ import attrs from marshmallow import Schema, fields, post_load -from ahbicht.expressions.enums import RequirementIndicator, RequirementIndicatorSchema +from ahbicht.models.enums import RequirementIndicator, RequirementIndicatorSchema @attrs.define(auto_attribs=True, kw_only=True) diff --git a/src/ahbicht/expressions/ahb_expression_evaluation.py b/src/ahbicht/expressions/ahb_expression_evaluation.py index 5579ab46..a53c941b 100644 --- a/src/ahbicht/expressions/ahb_expression_evaluation.py +++ b/src/ahbicht/expressions/ahb_expression_evaluation.py @@ -15,9 +15,9 @@ FormatConstraintEvaluationResult, RequirementConstraintEvaluationResult, ) -from ahbicht.expressions.enums import ModalMark, PrefixOperator, RequirementIndicator 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] = { diff --git a/src/ahbicht/expressions/expression_builder.py b/src/ahbicht/expressions/expression_builder.py index ef7255a3..4bf3cd0c 100644 --- a/src/ahbicht/expressions/expression_builder.py +++ b/src/ahbicht/expressions/expression_builder.py @@ -6,7 +6,6 @@ from abc import ABC, abstractmethod from typing import Generic, Optional, Protocol, Type, TypeVar, Union -from ahbicht.expressions.enums import LogicalOperator from ahbicht.models.condition_nodes import ( ConditionNode, EvaluatedComposition, @@ -15,6 +14,7 @@ RequirementConstraint, UnevaluatedFormatConstraint, ) +from ahbicht.models.enums import LogicalOperator SupportedNodes = TypeVar("SupportedNodes") diff --git a/src/ahbicht/expressions/enums.py b/src/ahbicht/models/enums.py similarity index 100% rename from src/ahbicht/expressions/enums.py rename to src/ahbicht/models/enums.py diff --git a/src/ahbicht/validation/validation.py b/src/ahbicht/validation/validation.py index 94dc6792..0c3109ab 100644 --- a/src/ahbicht/validation/validation.py +++ b/src/ahbicht/validation/validation.py @@ -24,8 +24,8 @@ ) from ahbicht.expressions import InvalidExpressionError from ahbicht.expressions.ahb_expression_evaluation import evaluate_ahb_expression_tree -from ahbicht.expressions.enums import ModalMark, PrefixOperator, RequirementIndicator from ahbicht.expressions.expression_resolver import parse_expression_including_unresolved_subexpressions +from ahbicht.models.enums import ModalMark, PrefixOperator, RequirementIndicator from ahbicht.validation import validation_logger from ahbicht.validation.validation_results import ( DataElementValidationResult, diff --git a/unittests/test_ahb_expression_evaluation.py b/unittests/test_ahb_expression_evaluation.py index db2fdc44..b961be8d 100644 --- a/unittests/test_ahb_expression_evaluation.py +++ b/unittests/test_ahb_expression_evaluation.py @@ -18,10 +18,10 @@ ) 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.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 ahbicht.models.enums import ModalMark, PrefixOperator, RequirementIndicator from unittests.defaults import ( default_test_format, default_test_version, diff --git a/unittests/test_evaluator_factory.py b/unittests/test_evaluator_factory.py index 8d88d8a9..82bc33d5 100644 --- a/unittests/test_evaluator_factory.py +++ b/unittests/test_evaluator_factory.py @@ -9,10 +9,10 @@ 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.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 ahbicht.models.enums import ModalMark, RequirementIndicator from unittests.defaults import default_test_format, default_test_version, return_empty_dummy_evaluatable_data diff --git a/unittests/test_json_serialization.py b/unittests/test_json_serialization.py index fd0764a6..72e5c43a 100644 --- a/unittests/test_json_serialization.py +++ b/unittests/test_json_serialization.py @@ -17,7 +17,6 @@ FormatConstraintEvaluationResult, RequirementConstraintEvaluationResult, ) -from ahbicht.expressions.enums import ModalMark from ahbicht.mapping_results import ( ConditionKeyConditionTextMapping, ConditionKeyConditionTextMappingSchema, @@ -31,6 +30,7 @@ EvaluatedFormatConstraintSchema, ) from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema +from ahbicht.models.enums import ModalMark from ahbicht.validation.validation_results import ( DataElementValidationResult, DataElementValidationResultSchema, diff --git a/unittests/test_validation.py b/unittests/test_validation.py index c658285f..a6d7583d 100644 --- a/unittests/test_validation.py +++ b/unittests/test_validation.py @@ -15,9 +15,9 @@ ) from ahbicht.content_evaluation.evaluator_factory import create_and_inject_hardcoded_evaluators -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.models.enums import ModalMark, PrefixOperator, RequirementIndicator from ahbicht.validation.validation import ( combine_requirements_of_different_levels, map_requirement_validation_values,