Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move CategorizedKeyExtract from ahbicht.content_evaluation to ahbicht.models #489

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Move CategorizedKeyExtract from ahbicht.content_evaluation to ahbicht.models #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion json_schemas/generate_json_schemas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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]] = [
Expand Down
2 changes: 1 addition & 1 deletion src/ahbicht/expressions/condition_expression_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
Expand Down
0 ...ent_evaluation/categorized_key_extract.py → ...ahbicht/models/categorized_key_extract.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion unittests/test_categorized_key_extraction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion unittests/test_json_serialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down