AP2.4: Steuerungselement-Registry und Methoden-Vertrag.
Deploy Development / deploy (push) Successful in 46s
Test Suite / pytest-backend (push) Failing after 3m17s
Test Suite / k6 /api/health Baseline (push) Has been skipped
Test Suite / playwright-smoke (push) Has been skipped
Test Suite / lint-backend (push) Successful in 2s
Test Suite / compose-smoke (push) Has been skipped
Deploy Development / deploy (push) Successful in 46s
Test Suite / pytest-backend (push) Failing after 3m17s
Test Suite / k6 /api/health Baseline (push) Has been skipped
Test Suite / playwright-smoke (push) Has been skipped
Test Suite / lint-backend (push) Successful in 2s
Test Suite / compose-smoke (push) Has been skipped
MethodDefinition traegt steering_elements/ui_features/graph_profile; operating-context und FE-Registry ohne Archetyp-Ifs. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
ac475ab92c
commit
d3bf3c36e0
25 files changed
+837
-118
No files matched your search
@@ -1,4 +1,4 @@
|
||||
"""Operating Context read model — AP2.3a."""
|
||||
"""Operating Context read model — AP2.3a / AP2.4."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
@@ -7,10 +7,20 @@ from typing import Any, Optional
|
||||
from psycopg2.extras import RealDictCursor
|
||||
|
||||
from db import get_connection
|
||||
from entity_archetypes.registry import get_ui_profile_json, resolve_ui_profile
|
||||
from entity_archetypes.registry import (
|
||||
get_ui_profile_json,
|
||||
resolve_default_method_key,
|
||||
resolve_ui_profile,
|
||||
)
|
||||
from services.initiatives import get_initiative
|
||||
from services.steering_context import ensure_steering_context, get_steering_context
|
||||
from steering.methods.registry import get_method
|
||||
from steering.graph.profiles import LIGHT, graph_profile_as_dict
|
||||
from steering.methods.registry import (
|
||||
get_method,
|
||||
list_compatible_methods,
|
||||
method_to_dict,
|
||||
ui_features_as_dict,
|
||||
)
|
||||
|
||||
|
||||
def _load_ui_profile_from_db(archetype_key: str) -> Optional[dict[str, Any]]:
|
||||
@@ -32,8 +42,6 @@ def _load_ui_profile_from_db(archetype_key: str) -> Optional[dict[str, Any]]:
|
||||
if isinstance(profile, dict) and profile:
|
||||
return dict(profile)
|
||||
return None
|
||||
except Exception:
|
||||
return None
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
@@ -48,18 +56,22 @@ def _resolve_ui_profile(archetype_key: str) -> dict[str, Any]:
|
||||
return resolve_ui_profile(archetype_key)
|
||||
|
||||
|
||||
def _resolve_om_capabilities(ui_profile: dict[str, Any]) -> frozenset[str]:
|
||||
caps = ui_profile.get("omCapabilities") or ui_profile.get("dataSlices") or []
|
||||
return frozenset(caps)
|
||||
|
||||
|
||||
def _resolve_data_slices(
|
||||
*,
|
||||
ui_profile: dict[str, Any],
|
||||
om_capabilities: frozenset[str],
|
||||
method_key: str,
|
||||
) -> list[str]:
|
||||
"""Schnittmenge Archetyp-Default ∩ Method-Slices (Phase E erweitert)."""
|
||||
archetype_slices = ui_profile.get("dataSlices") or []
|
||||
"""Schnittmenge Archetyp-OM ∩ Method-Slices."""
|
||||
method = get_method(method_key)
|
||||
if method and getattr(method, "data_slices", None):
|
||||
if method and method.data_slices:
|
||||
method_slices = set(method.data_slices)
|
||||
return [s for s in archetype_slices if s in method_slices]
|
||||
return list(archetype_slices)
|
||||
return [s for s in om_capabilities if s in method_slices]
|
||||
return list(om_capabilities)
|
||||
|
||||
|
||||
def _method_capabilities(method_key: str) -> dict[str, Any]:
|
||||
@@ -75,6 +87,41 @@ def _method_capabilities(method_key: str) -> dict[str, Any]:
|
||||
}
|
||||
|
||||
|
||||
def _resolve_method_contract(method_key: str) -> dict[str, Any]:
|
||||
method = get_method(method_key)
|
||||
if not method:
|
||||
return {
|
||||
"steering_elements": [],
|
||||
"ui_features": {},
|
||||
"graph_profile": graph_profile_as_dict(LIGHT),
|
||||
}
|
||||
return {
|
||||
"steering_elements": sorted(method.steering_elements),
|
||||
"ui_features": ui_features_as_dict(method.ui_features),
|
||||
"graph_profile": graph_profile_as_dict(method.graph_profile),
|
||||
}
|
||||
|
||||
|
||||
def _compatible_methods_payload(
|
||||
archetype_key: str,
|
||||
*,
|
||||
om_capabilities: frozenset[str],
|
||||
active_method_key: str,
|
||||
) -> list[dict[str, Any]]:
|
||||
default_key = resolve_default_method_key(archetype_key)
|
||||
methods = list_compatible_methods(
|
||||
archetype_key, om_capabilities=om_capabilities
|
||||
)
|
||||
return [
|
||||
{
|
||||
**method_to_dict(m, include_compatibility=False),
|
||||
"is_default": m.key == default_key,
|
||||
"is_active": m.key == active_method_key,
|
||||
}
|
||||
for m in methods
|
||||
]
|
||||
|
||||
|
||||
def get_operating_context(
|
||||
*, tenant_id: str, initiative_id: str
|
||||
) -> Optional[dict[str, Any]]:
|
||||
@@ -90,12 +137,17 @@ def get_operating_context(
|
||||
|
||||
archetype_key = initiative["archetype_key"]
|
||||
ui_profile = _resolve_ui_profile(archetype_key)
|
||||
om_capabilities = _resolve_om_capabilities(ui_profile)
|
||||
method_key = steering["method_key"]
|
||||
metadata = steering.get("lifecycle_metadata") or {}
|
||||
if isinstance(metadata, str):
|
||||
metadata = {}
|
||||
method_profile_key = metadata.get("method_profile_key")
|
||||
data_slices = _resolve_data_slices(ui_profile=ui_profile, method_key=method_key)
|
||||
data_slices = _resolve_data_slices(
|
||||
om_capabilities=om_capabilities,
|
||||
method_key=method_key,
|
||||
)
|
||||
method_contract = _resolve_method_contract(method_key)
|
||||
|
||||
return {
|
||||
"initiative_id": initiative_id,
|
||||
@@ -103,6 +155,15 @@ def get_operating_context(
|
||||
"method_key": method_key,
|
||||
"method_profile_key": method_profile_key,
|
||||
"ui_profile": ui_profile,
|
||||
"om_capabilities": sorted(om_capabilities),
|
||||
"data_slices": data_slices,
|
||||
"method_capabilities": _method_capabilities(method_key),
|
||||
"steering_elements": method_contract["steering_elements"],
|
||||
"ui_features": method_contract["ui_features"],
|
||||
"graph_profile": method_contract["graph_profile"],
|
||||
"compatible_methods": _compatible_methods_payload(
|
||||
archetype_key,
|
||||
om_capabilities=om_capabilities,
|
||||
active_method_key=method_key,
|
||||
),
|
||||
}
|
||||
@@ -16,6 +16,14 @@ DEFAULT_METHOD_KEY = "generic_operating"
|
||||
DEFAULT_METHOD_VERSION = "0.1.0"
|
||||
|
||||
|
||||
def _resolve_om_capabilities_for_initiative(initiative: dict[str, Any]) -> frozenset[str]:
|
||||
from entity_archetypes.registry import resolve_ui_profile
|
||||
|
||||
profile = resolve_ui_profile(initiative["archetype_key"])
|
||||
caps = profile.get("omCapabilities") or profile.get("dataSlices") or []
|
||||
return frozenset(caps)
|
||||
|
||||
|
||||
def _serialize_row(row: dict[str, Any]) -> dict[str, Any]:
|
||||
result = dict(row)
|
||||
for key in ("id", "tenant_id", "initiative_id"):
|
||||
@@ -229,7 +237,11 @@ def update_method_key(
|
||||
initiative = get_initiative(tenant_id=tenant_id, initiative_id=initiative_id)
|
||||
if not initiative:
|
||||
raise ValueError("Vorhaben nicht gefunden")
|
||||
if not method_compatible_with_archetype(method, initiative["archetype_key"]):
|
||||
if not method_compatible_with_archetype(
|
||||
method,
|
||||
initiative["archetype_key"],
|
||||
om_capabilities=_resolve_om_capabilities_for_initiative(initiative),
|
||||
):
|
||||
raise ValueError(
|
||||
f"Methode {method_key} ist nicht kompatibel mit Archetyp "
|
||||
f"{initiative['archetype_key']}"
|
||||
|
||||
Reference in new issue
Block a user