Move CategorizedKeyExtract from ahbicht.content_evaluation to `ah…

…bicht.models`
Hochfrequenz · Oct 1, 2024 · e5960fc · e5960fc
1 parent 33a624a
commit e5960fc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/json_schemas/generate_json_schemas.py b/json_schemas/generate_json_schemas.py
@@ -10,7 +10,6 @@
 from marshmallow import Schema, fields
 from marshmallow_jsonschema import JSONSchema  # type:ignore[import]
 
-from ahbicht.content_evaluation.categorized_key_extract import CategorizedKeyExtractSchema
 from ahbicht.evaluation_results import (
     AhbExpressionEvaluationResultSchema,
     FormatConstraintEvaluationResultSchema,
@@ -19,6 +18,7 @@
 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.content_evaluation_result import ContentEvaluationResultSchema
 
 schema_types: List[Type[Schema]] = [

diff --git a/src/ahbicht/expressions/condition_expression_parser.py b/src/ahbicht/expressions/condition_expression_parser.py
@@ -13,8 +13,8 @@
 from lark.exceptions import UnexpectedCharacters, UnexpectedEOF
 
 from ahbicht.condition_node_distinction import ConditionNodeType, derive_condition_node_type
-from ahbicht.content_evaluation.categorized_key_extract import CategorizedKeyExtract
 from ahbicht.expressions import parsing_logger
+from ahbicht.models.categorized_key_extract import CategorizedKeyExtract
 from ahbicht.utility_functions import tree_copy
 
 GRAMMAR = r"""

diff --git a/...ent_evaluation/categorized_key_extract.py → ...ahbicht/models/categorized_key_extract.py b/...ent_evaluation/categorized_key_extract.py → ...ahbicht/models/categorized_key_extract.py
diff --git a/unittests/test_categorized_key_extraction.py b/unittests/test_categorized_key_extraction.py
@@ -6,9 +6,9 @@
 
 import pytest
 
-from ahbicht.content_evaluation.categorized_key_extract import CategorizedKeyExtract, CategorizedKeyExtractSchema
 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.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
 
 

diff --git a/unittests/test_json_serialization.py b/unittests/test_json_serialization.py
@@ -11,7 +11,6 @@
 from marshmallow import Schema, ValidationError
 from maus.models.edifact_components import DataElementDataType
 
-from ahbicht.content_evaluation.categorized_key_extract import CategorizedKeyExtract, CategorizedKeyExtractSchema
 from ahbicht.evaluation_results import (
     AhbExpressionEvaluationResult,
     AhbExpressionEvaluationResultSchema,
@@ -30,6 +29,7 @@
     PackageKeyConditionExpressionMapping,
     PackageKeyConditionExpressionMappingSchema,
 )
+from ahbicht.models.categorized_key_extract import CategorizedKeyExtract, CategorizedKeyExtractSchema
 from ahbicht.models.content_evaluation_result import ContentEvaluationResult, ContentEvaluationResultSchema
 from ahbicht.validation.validation_results import (
     DataElementValidationResult,