Skip to content

feat: Support <Uebertragungsdatei> in AhbReader (adds flag is_on_uebertragungsdatei_level to AHB Segment model) #132

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.

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

Merged
merged 4 commits into from
Apr 24, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
7 changes: 7 additions & 0 deletions src/fundamend/models/anwendungshandbuch.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@ class Segment(FundamendBaseModel):
number: str #: e.g. '00002'
ahb_status: str | None #: e.g. 'Muss'
data_elements: tuple[DataElement | DataElementGroup, ...]
is_on_uebertragungsdatei_level: bool = False
"""
true for e.g. S_UNA, S_UNB or S_UNZ which occur outside the regular AHB <M_FORMAT> structure.
We decided against introducing another (mostly useless) layer around the actual body of the Anwendungsfall.
This is only relevant (true) for MSCONS AHBs as of 2025-04-23 although the MIGs read like this _might_ also be true
for REMADV and INVOIC. We all know, how (self-)consistent BDEW documents are, even if you pay for them.
"""


class SegmentGroup(FundamendBaseModel):
Expand Down
16 changes: 11 additions & 5 deletions src/fundamend/reader/ahbreader.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def _to_data_element_group(element: ET.Element) -> DataElementGroup:
)


def _to_segment(element: ET.Element) -> Segment:
def _to_segment(element: ET.Element, is_uebertragungsdatei_level: bool = False) -> Segment:
assert _is_segment(element)
data_elements: list[DataElement | DataElementGroup] = []
for child in element:
Expand All @@ -138,6 +138,7 @@ def _to_segment(element: ET.Element) -> Segment:
number=element.attrib["Number"],
ahb_status=ahb_status,
data_elements=tuple(data_elements),
is_on_uebertragungsdatei_level=is_uebertragungsdatei_level,
)


Expand Down Expand Up @@ -231,17 +232,22 @@ def get_anwendungsfaelle(self) -> list[Anwendungsfall]:
result.append(self._read_anwendungsfall(element))
return result

def _iter_segments_and_segment_groups(self, element: ET.Element) -> list[SegmentGroup | Segment]:
def _iter_segments_and_segment_groups(
self, element: ET.Element, is_uebertragungsdatei_level: bool = False
) -> list[SegmentGroup | Segment]:
"""recursive function that builds a list of all segments and segment groups"""
result: list[Segment | SegmentGroup] = []
should_go_deeper = _is_anwendungsfall(element) or _is_format(element) or _is_uebertragungsdatei(element)
should_go_deeper = _is_anwendungsfall(element) or _is_format(element)
if should_go_deeper:
for sub_element in element:
result.extend(self._iter_segments_and_segment_groups(sub_element))
if _is_segment_group(element):
if _is_uebertragungsdatei(element):
for sub_element in element:
result.extend(self._iter_segments_and_segment_groups(sub_element, is_uebertragungsdatei_level=True))
elif _is_segment_group(element):
result.append(_to_segment_group(element))
elif _is_segment(element):
result.append(_to_segment(element))
result.append(_to_segment(element, is_uebertragungsdatei_level=is_uebertragungsdatei_level))
return result

def _read_anwendungsfall(self, original_element: ET.Element) -> Anwendungsfall:
Expand Down
3 changes: 3 additions & 0 deletions src/fundamend/sqlmodels/anwendungshandbuch.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ class Segment(SQLModel, table=True):
name: str = Field(index=True) #: e.g. 'Beginn der Nachricht'
number: str = Field(index=True) #: e.g. '00002'
ahb_status: str | None #: e.g. 'Muss'
is_on_uebertragungsdatei_level: bool
Copy link
Preview

Copilot AI Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider providing a default value (e.g., False) for is_on_uebertragungsdatei_level to prevent potential issues when new Segment records are created without explicitly setting this field.

Suggested change
is_on_uebertragungsdatei_level: bool
is_on_uebertragungsdatei_level: bool = Field(default=False)

Copilot uses AI. Check for mistakes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, not here.

data_elements: list[DataElement] = Relationship(back_populates="segment")
data_element_groups: list[DataElementGroup] = Relationship(back_populates="segment")
position: Optional[int] = Field(default=None, index=True)
Expand All @@ -202,6 +203,7 @@ def from_model(cls, model: PydanticSegment, position: Optional[int] = None) -> "
number=model.number,
ahb_status=model.ahb_status,
position=position,
is_on_uebertragungsdatei_level=model.is_on_uebertragungsdatei_level,
)
for _position, element in enumerate(model.data_elements):
if isinstance(element, PydanticDataElement):
Expand All @@ -225,6 +227,7 @@ def to_model(self) -> PydanticSegment:
key=lambda y: y.position or 0,
)
),
is_on_uebertragungsdatei_level=self.is_on_uebertragungsdatei_level,
)


Expand Down
6 changes: 3 additions & 3 deletions unittests/__snapshots__/test_ahbreader.ambr

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions unittests/test_ahb_serialisierung.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import pytest

from fundamend.models.anwendungshandbuch import Segment as AhbSegment
from fundamend.reader import AhbReader, MigReader

from .conftest import is_private_submodule_checked_out
Expand Down Expand Up @@ -58,3 +59,18 @@ def test_deserializing_all_migs() -> None:
for mig_file_path in data_path.rglob("**/*MIG*.xml"):
reader = MigReader(mig_file_path)
_ = reader.read() # must not crash


def test_uebertragungsdatei_level_flag_is_set() -> None:
if not is_private_submodule_checked_out():
pytest.skip("Skipping test because of missing private submodule")
reader = AhbReader(data_path / "FV2504" / "MSCONS_AHB_3_1f_Fehlerkorrektur_20250320.xml")
ahb13012 = [awf for awf in reader.read().anwendungsfaelle if awf.pruefidentifikator == "13012"][0]
unb_segment = ahb13012.elements[0]
assert isinstance(unb_segment, AhbSegment) and unb_segment.id == "UNB"
unz_segment = ahb13012.elements[-1]
assert isinstance(unz_segment, AhbSegment) and unz_segment.id == "UNZ"
unh_segment = [s for s in ahb13012.elements if isinstance(s, AhbSegment) and s.id == "UNH"][0]
assert unb_segment.is_on_uebertragungsdatei_level
assert unz_segment.is_on_uebertragungsdatei_level
assert not unh_segment.is_on_uebertragungsdatei_level