feat: upgrade to ahbicht v2.0.0, remove inject dependency

- Remove inject, EvaluatableDataProvider, TokenLogicProvider,
  SingletonTokenLogicProvider, create_content_evaluation_result_based_evaluators
  imports from expression_view.py
- Remove _setup_weird_ahbicht_dependency_injection() function entirely
- Update is_valid_expression call to use new format params instead of
  setter callback
- Bump ahbicht dep to >=2.0.0

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: hf-kklein

pyproject.toml

@@ -30,7 +30,7 @@ sqlmodels = [
   "sqlalchemy[mypy]>=2.0.37"
 ]
 ahbicht = [
-    "ahbicht>=1.0.0,<2"
+    "ahbicht>=2.0.0"
 ]
 coverage = [
     "coverage==7.13.5"

src/fundamend/sqlmodels/expression_view.py

@@ -5,7 +5,6 @@
 import asyncio
 import logging
 import uuid
-from contextvars import ContextVar
 from typing import Optional
 
 from efoli import EdifactFormat, EdifactFormatVersion
@@ -24,13 +23,9 @@
 
 
 try:
-    import inject
-    from ahbicht.content_evaluation.evaluationdatatypes import EvaluatableData, EvaluatableDataProvider
-    from ahbicht.content_evaluation.evaluator_factory import create_content_evaluation_result_based_evaluators
+    from ahbicht.content_evaluation.ahb_context import AhbContext
     from ahbicht.content_evaluation.expression_check import is_valid_expression
-    from ahbicht.content_evaluation.token_logic_provider import SingletonTokenLogicProvider, TokenLogicProvider
     from ahbicht.expressions.condition_expression_parser import extract_categorized_keys
-    from ahbicht.models.content_evaluation_result import ContentEvaluationResult
     from lark.exceptions import VisitError
 except ImportError as import_error:
     import_error.msg += "; Did you install fundamend[sqlmodels,ahbicht]?"
@@ -39,39 +34,6 @@
 
 _logger = logging.getLogger(__name__)
 
-_content_evaluation_result: ContextVar[Optional[ContentEvaluationResult]] = ContextVar(
-    "_content_evaluation_result", default=None
-)
-
-
-def _get_evaluatable_data() -> EvaluatableData[ContentEvaluationResult]:
-    """
-    returns the _content_evaluation_result context var value wrapped in a EvaluatableData container.
-    This is the kind of data that the ContentEvaluationResultBased RC/FC Evaluators, HintsProvider and Package Resolver
-    require.
-    :return:
-    """
-    cer = _content_evaluation_result.get()
-    assert cer is not None
-    return EvaluatableData(
-        body=cer,
-        edifact_format=EdifactFormat.UTILMD,  # not important, something has to be here
-        edifact_format_version=EdifactFormatVersion.FV2504,  # not important, something has to be here
-    )
-
-
-def _setup_weird_ahbicht_dependency_injection() -> None:
-    def configure(binder: inject.Binder) -> None:
-        binder.bind(
-            TokenLogicProvider,
-            SingletonTokenLogicProvider(
-                [*create_content_evaluation_result_based_evaluators(EdifactFormat.UTILMD, EdifactFormatVersion.FV2504)]
-            ),
-        )
-        binder.bind_to_provider(EvaluatableDataProvider, _get_evaluatable_data)
-
-    inject.configure_once(configure)
-
 
 def _generate_node_texts(session: Session, expression: str, ahb_pk: uuid.UUID) -> str:
     categorized_key_extract = asyncio.run(extract_categorized_keys(expression))
@@ -120,7 +82,9 @@ def _get_validity_node_texts_and_error_message_cpu_intensive(
     expression: str, session: Session, anwendungshandbuch_pk: uuid.UUID
 ) -> tuple[bool, str, str | None]:
     try:
-        is_valid, error_message = asyncio.run(is_valid_expression(expression, _content_evaluation_result.set))
+        is_valid, error_message = asyncio.run(
+            is_valid_expression(expression, EdifactFormat.UTILMD, EdifactFormatVersion.FV2504)
+        )
         if is_valid:  # we might actually get a meaningful node_texts even for invalid expressions, but I don't like it
             node_texts = _generate_node_texts(session, expression, anwendungshandbuch_pk)
         else:
@@ -157,7 +121,6 @@ def create_and_fill_ahb_expression_table(session: Session, use_cpu_intensive_val
     outcomes. This leads to only few additional expressions marked as invalid but is very slow.
     """
     rows: list[tuple[EdifactFormatVersion | None, str, str | None, uuid.UUID]] = []
-    _setup_weird_ahbicht_dependency_injection()
     for ahb_status_col in [
         AhbHierarchyMaterialized.segmentgroup_ahb_status,
         AhbHierarchyMaterialized.segment_ahb_status,