Closes maalbilde §5 gap #1 (the one missing "feedback-into-prompt" dataflow) for the OKF-bundle path. Before, ExpeL was computed AFTER generation into a discarded SessionContext, so a prior verdict could not influence any hypothesis (context_providers=0). - New okf.py: framework-neutral OKF bundle navigation (index + frontmatter + cross-links), pure stdlib, no agent_framework/mcp (D7-portable), enforced by test_okf_is_maf_free. - verdicts.py: seed_store_from_bundle + bundle_candidate_features build the ExpeL substrate + the pre-hypothesis query key from a bundle. - run_project(bundle_dir=...): folds the candidate's prior verdicts into the generation context BEFORE generate_via_llm; the road path is unchanged. Load-bearing (maalbilde §7): test_step1_expel_loadbearing proves a prior verdict reaches the hypothesis prompt and goes RED when the fold is detached (shown via TDD red->green). The marker is the minted verdict id (content hash) because docs_dir==bundle_dir lets keyword chunk-stuffing leak the realization rate; clean layer separation is Fase 2b. Suite 121->133 passed; mypy + ruff check clean. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MHR8iKxJRxDiDfNw8HZmWE
221 lines
8 KiB
Python
221 lines
8 KiB
Python
"""Shared e2e fixtures (Step 13): a scripted chat client that emits a SYNTHETIC UsageDetails
|
|
(so token accounting is real-shaped without an LLM), plus store + docs-dir fixtures.
|
|
|
|
The synthetic ``UsageDetails`` is what lets the budget meter / provenance ``token_usage`` be a
|
|
positive, UsageDetails-sourced number in CI — the REAL-provider populated-usage assertion is
|
|
the gated live arm (Step 14).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from collections.abc import Callable, Sequence
|
|
from typing import Any
|
|
|
|
import pytest
|
|
from agent_framework import (
|
|
BaseChatClient,
|
|
ChatResponse,
|
|
ChatResponseUpdate,
|
|
Message,
|
|
UsageDetails,
|
|
)
|
|
from agent_framework_openai import OpenAIChatCompletionClient
|
|
|
|
from portfolio_optimiser.verdicts import VerdictStore, seed_store
|
|
|
|
|
|
class SyntheticUsageChatClient(OpenAIChatCompletionClient):
|
|
"""Network-free chat client returning scripted/default replies WITH a synthetic
|
|
``UsageDetails`` (``total_token_count``), so strict usage accounting does not hard-fail.
|
|
|
|
Subclasses the LAYERED ``OpenAIChatCompletionClient`` (not the minimal ``BaseChatClient``)
|
|
so it inherits the ``ChatMiddlewareLayer`` — a ``ChatMiddleware`` attached to an agent
|
|
backed by the minimal base would silently no-op (verified). Construction is offline
|
|
(loopback ``base_url``, dummy key); the ``_inner_get_response`` override intercepts the
|
|
raw call before any HTTP, so no network is touched."""
|
|
|
|
OTEL_PROVIDER_NAME = "synthetic"
|
|
|
|
def __init__(
|
|
self,
|
|
scripted: Sequence[str] | None = None,
|
|
*,
|
|
default_reply: str = "ok",
|
|
tokens_per_reply: int = 8,
|
|
) -> None:
|
|
super().__init__(model="synthetic", api_key="synthetic", base_url="http://127.0.0.1:9/v1")
|
|
self._scripted = list(scripted or [])
|
|
self._idx = 0
|
|
self._default = default_reply
|
|
self._tokens = tokens_per_reply
|
|
self.call_count = 0
|
|
|
|
def _next_reply(self) -> str:
|
|
reply = self._scripted[self._idx] if self._idx < len(self._scripted) else self._default
|
|
self._idx += 1
|
|
self.call_count += 1
|
|
return reply
|
|
|
|
def _inner_get_response(
|
|
self, *, messages: Sequence[Message], stream: bool, options: Any, **kwargs: Any
|
|
) -> Any:
|
|
reply = self._next_reply()
|
|
usage = UsageDetails(total_token_count=self._tokens)
|
|
if stream:
|
|
|
|
async def _agen() -> Any:
|
|
yield ChatResponseUpdate(
|
|
role="assistant", contents=[{"type": "text", "text": reply}]
|
|
)
|
|
|
|
return self._build_response_stream(_agen())
|
|
|
|
async def _coro() -> ChatResponse:
|
|
return ChatResponse(
|
|
messages=[Message(role="assistant", contents=[reply])],
|
|
response_id="synthetic",
|
|
usage_details=usage,
|
|
)
|
|
|
|
return _coro()
|
|
|
|
|
|
@pytest.fixture()
|
|
def make_client_factory() -> Callable[..., Callable[[str], BaseChatClient]]:
|
|
"""Return a maker that builds a per-role client factory emitting synthetic usage."""
|
|
|
|
def _make(default_reply: str, *, tokens: int = 8) -> Callable[[str], BaseChatClient]:
|
|
def factory(role: str) -> BaseChatClient:
|
|
return SyntheticUsageChatClient(default_reply=default_reply, tokens_per_reply=tokens)
|
|
|
|
return factory
|
|
|
|
return _make
|
|
|
|
|
|
# A generic VALID SavingsProposal reply for any project not present in a portfolio reply map:
|
|
# affected total = 1 x 100_000 = 100_000, P90 = 0.30 x 100_000 = 30_000, claimed 20_000 <= both
|
|
# (Pydantic affected-total invariant and the validator P90 gate) -> always validates.
|
|
_PORTFOLIO_DEFAULT_REPLY = (
|
|
'{"measure":"Reduce scope","affected_items":'
|
|
'[{"code":"01.1","quantity":1,"unit_cost":100000}],"claimed_saving_nok":20000}'
|
|
)
|
|
|
|
|
|
class _ProjectAwareUsageChatClient(SyntheticUsageChatClient):
|
|
"""A ``SyntheticUsageChatClient`` that selects its reply by scanning the incoming prompt for
|
|
a known ``project_id`` substring (the prompt embeds ``project.id`` at run.py:162 and
|
|
generate.py:48), falling back to a default valid proposal. This keeps ``run_portfolio``'s
|
|
single ``client_factory`` production-shaped while letting tests vary the proposal per
|
|
project."""
|
|
|
|
def __init__(
|
|
self, replies: dict[str, str], *, default_reply: str, tokens_per_reply: int = 8
|
|
) -> None:
|
|
super().__init__(default_reply=default_reply, tokens_per_reply=tokens_per_reply)
|
|
self._replies = dict(replies)
|
|
|
|
def _inner_get_response(
|
|
self, *, messages: Sequence[Message], stream: bool, options: Any, **kwargs: Any
|
|
) -> Any:
|
|
blob = " ".join(getattr(m, "text", "") or "" for m in messages)
|
|
reply = next((r for pid, r in self._replies.items() if pid in blob), self._default)
|
|
self.call_count += 1
|
|
usage = UsageDetails(total_token_count=self._tokens)
|
|
if stream:
|
|
|
|
async def _agen() -> Any:
|
|
yield ChatResponseUpdate(
|
|
role="assistant", contents=[{"type": "text", "text": reply}]
|
|
)
|
|
|
|
return self._build_response_stream(_agen())
|
|
|
|
async def _coro() -> ChatResponse:
|
|
return ChatResponse(
|
|
messages=[Message(role="assistant", contents=[reply])],
|
|
response_id="synthetic",
|
|
usage_details=usage,
|
|
)
|
|
|
|
return _coro()
|
|
|
|
|
|
@pytest.fixture()
|
|
def make_portfolio_client_factory() -> Callable[..., Callable[[str], BaseChatClient]]:
|
|
"""Return a maker that builds a single project-aware client factory: every client it
|
|
produces picks its reply from ``replies`` by scanning the prompt for the project id, so one
|
|
factory serves the whole portfolio (matching ``run_portfolio``'s single-factory seam)."""
|
|
|
|
def _make(
|
|
replies: dict[str, str],
|
|
*,
|
|
default_reply: str = _PORTFOLIO_DEFAULT_REPLY,
|
|
tokens: int = 8,
|
|
) -> Callable[[str], BaseChatClient]:
|
|
def factory(role: str) -> BaseChatClient:
|
|
return _ProjectAwareUsageChatClient(
|
|
replies, default_reply=default_reply, tokens_per_reply=tokens
|
|
)
|
|
|
|
return factory
|
|
|
|
return _make
|
|
|
|
|
|
class _RecordingChatClient(SyntheticUsageChatClient):
|
|
"""Records the incoming prompt blob per call into a SHARED sink, then returns a fixed valid
|
|
reply. Lets a test assert exactly what text reached the prompt — the probe the Step-1 ExpeL
|
|
wiring is made load-bearing against (does a prior verdict reach the hypothesis prompt?)."""
|
|
|
|
def __init__(self, sink: list[str], reply: str, *, tokens_per_reply: int = 8) -> None:
|
|
super().__init__(default_reply=reply, tokens_per_reply=tokens_per_reply)
|
|
self._sink = sink
|
|
|
|
def _inner_get_response(
|
|
self, *, messages: Sequence[Message], stream: bool, options: Any, **kwargs: Any
|
|
) -> Any:
|
|
self._sink.append(" ".join(getattr(m, "text", "") or "" for m in messages))
|
|
return super()._inner_get_response(
|
|
messages=messages, stream=stream, options=options, **kwargs
|
|
)
|
|
|
|
|
|
@pytest.fixture()
|
|
def make_recording_client_factory() -> Callable[
|
|
[str], tuple[Callable[[str], BaseChatClient], list[str]]
|
|
]:
|
|
"""Return a maker that builds a per-role client factory recording every prompt blob into a
|
|
shared list. Returns ``(factory, recorded_prompts)`` so the test inspects what reached the
|
|
prompt across the whole run (debate rounds + generation)."""
|
|
|
|
def _make(reply: str) -> tuple[Callable[[str], BaseChatClient], list[str]]:
|
|
sink: list[str] = []
|
|
|
|
def factory(role: str) -> BaseChatClient:
|
|
return _RecordingChatClient(sink, reply)
|
|
|
|
return factory, sink
|
|
|
|
return _make
|
|
|
|
|
|
@pytest.fixture()
|
|
def fresh_store() -> VerdictStore:
|
|
return VerdictStore(verdicts=[])
|
|
|
|
|
|
@pytest.fixture()
|
|
def seeded_store() -> VerdictStore:
|
|
return seed_store()
|
|
|
|
|
|
@pytest.fixture()
|
|
def docs_dir(tmp_path) -> str:
|
|
d = tmp_path / "docs"
|
|
d.mkdir()
|
|
(d / "cost.txt").write_text(
|
|
"Asphalt Ab11 unit rate renegotiation reduced the paving cost on the school stretch.",
|
|
encoding="utf-8",
|
|
)
|
|
return str(d)
|