Skip to content

Commit 9286456

Browse files
hf-kkleinclaude
andcommitted
fix: address reviewer feedback on ahbicht v2 upgrade
- Remove unused AhbContext import - Fix unbound is_valid variable in except branch - Pass actual format/version from row data instead of hardcoding UTILMD Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent ff0b891 commit 9286456

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

src/fundamend/sqlmodels/expression_view.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424

2525
try:
26-
from ahbicht.content_evaluation.ahb_context import AhbContext
2726
from ahbicht.content_evaluation.expression_check import is_valid_expression
2827
from ahbicht.expressions.condition_expression_parser import extract_categorized_keys
2928
from lark.exceptions import VisitError
@@ -79,17 +78,24 @@ def _generate_node_texts(session: Session, expression: str, ahb_pk: uuid.UUID) -
7978

8079

8180
def _get_validity_node_texts_and_error_message_cpu_intensive(
82-
expression: str, session: Session, anwendungshandbuch_pk: uuid.UUID
81+
expression: str,
82+
session: Session,
83+
anwendungshandbuch_pk: uuid.UUID,
84+
edifact_format: EdifactFormat,
85+
edifact_format_version: EdifactFormatVersion,
8386
) -> tuple[bool, str, str | None]:
87+
is_valid = True # default: assume valid unless proven otherwise
88+
error_message: str | None = None
8489
try:
8590
is_valid, error_message = asyncio.run(
86-
is_valid_expression(expression, EdifactFormat.UTILMD, EdifactFormatVersion.FV2504)
91+
is_valid_expression(expression, edifact_format, edifact_format_version)
8792
)
8893
if is_valid: # we might actually get a meaningful node_texts even for invalid expressions, but I don't like it
8994
node_texts = _generate_node_texts(session, expression, anwendungshandbuch_pk)
9095
else:
9196
node_texts = ""
9297
except NotImplementedError: # ahbicht fault/missing feature -> act like it's valid
98+
is_valid = True
9399
node_texts = _generate_node_texts(session, expression, anwendungshandbuch_pk)
94100
error_message = None
95101
return is_valid, node_texts, error_message
@@ -155,7 +161,7 @@ def create_and_fill_ahb_expression_table(session: Session, use_cpu_intensive_val
155161
if use_cpu_intensive_validity_check:
156162
# as of 2025-04-15 I have no clue how long this actually takes for all expressions
157163
_, node_texts, error_message = _get_validity_node_texts_and_error_message_cpu_intensive(
158-
expression, session, row[3]
164+
expression, session, row[3], EdifactFormat(row[1]), row[0]
159165
)
160166
else:
161167
_, node_texts, error_message = _get_validity_node_texts_and_error_message_fast(expression, session, row[3])

0 commit comments

Comments
 (0)