Anfragen werden absichtlich nicht in die URL geschrieben.
-
-
-
-
Ergebnisse
- {result_section if result_section else '
Gib einen Namen ein und klicke auf „Screenen".
'}
-
-
-
- {json_section if json_section else '
JSON erscheint hier nach der Suche.
'}
-
+
+
+ Ergebnisse
+ {result_section if result_section else 'Gib einen Namen ein und klicke auf „Screenen".
'}
+
+
+ {json_section if json_section else 'JSON erscheint hier nach der Suche.
'}
+
-
"""
- return HTMLResponse(content=page_html)
+
+@app.get("/search", response_class=HTMLResponse)
+async def search_ui():
+ """Render the blank search page without writing sensitive queries into URLs."""
+ return HTMLResponse(content=_build_search_page())
+
+
+@app.post("/search", response_class=HTMLResponse)
+async def search_ui_submit(
+ q: Annotated[str, Form()] = "",
+ threshold: Annotated[float, Form(ge=0.0, le=1.0)] = 0.7,
+):
+ matches: list[dict] = []
+ error = None
+ raw_json = ""
+ normalized_query = q.strip()
+
+ if q and not normalized_query:
+ error = "Bitte einen Namen eingeben."
+ elif normalized_query:
+ try:
+ results = await _query_yente(normalized_query, threshold)
+ matches = [
+ {
+ "id": result.get("id", ""),
+ "name": result.get("caption", result.get("name", "")),
+ "score": result.get("score", 0.0),
+ "datasets": result.get("datasets", []),
+ "properties": result.get("properties", {}),
+ }
+ for result in results
+ ]
+ raw_json = json.dumps(
+ {
+ "query": normalized_query,
+ "total": len(matches),
+ "matches": matches,
+ },
+ indent=2,
+ ensure_ascii=False,
+ )
+ except httpx.ConnectError:
+ logger.warning("Search UI could not reach yente.")
+ error = "Screening-Service aktuell nicht erreichbar."
+ except Exception:
+ logger.exception("Unexpected error while rendering search results.")
+ error = "Suche aktuell nicht verfuegbar."
+
+ return HTMLResponse(
+ content=_build_search_page(
+ q=normalized_query,
+ threshold=threshold,
+ matches=matches,
+ error=error,
+ raw_json=raw_json,
+ )
+ )
@app.post("/api/screen", response_model=ScreenResponse)
@@ -298,19 +737,23 @@ async def screen(req: ScreenRequest):
try:
results = await _query_yente(req.name, req.threshold)
except httpx.ConnectError as e:
+ logger.warning("yente connectivity failure during screening request.")
raise HTTPException(
status_code=503,
- detail=f"yente service not reachable at {YENTE_URL}.",
+ detail="screening backend unavailable",
) from e
except httpx.TimeoutException as e:
+ logger.warning("yente timeout during screening request.")
raise HTTPException(
status_code=504,
- detail=f"yente request timed out at {YENTE_URL}.",
+ detail="screening backend timed out",
) from e
except httpx.RequestError as e:
- raise HTTPException(status_code=503, detail=f"yente request failed: {e}") from e
+ logger.warning("yente request error during screening request.")
+ raise HTTPException(status_code=503, detail="screening backend unavailable") from e
except httpx.HTTPStatusError as e:
- raise HTTPException(status_code=502, detail=f"yente error: {e}") from e
+ logger.warning("yente returned an invalid response to screening request.")
+ raise HTTPException(status_code=502, detail="screening backend error") from e
matches = [
ScreenMatch(
@@ -334,15 +777,18 @@ async def status():
try:
async with httpx.AsyncClient(timeout=5.0) as client:
r = await client.get(f"{YENTE_URL}/healthz")
- services["yente"] = "ok" if r.status_code == 200 else f"HTTP {r.status_code}"
- except Exception as e:
- services["yente"] = f"error: {e}"
+ services["yente"] = "ok" if r.status_code == 200 else "degraded"
+ except Exception:
+ logger.warning("Status check for yente failed.", exc_info=True)
+ services["yente"] = "degraded"
try:
from shared.neo4j.connector import Neo4jConnector
with Neo4jConnector() as conn:
services["neo4j"] = "ok" if conn.verify_connectivity() else "unreachable"
- except Exception as e:
- services["neo4j"] = f"error: {e}"
+ except Exception:
+ logger.warning("Status check for neo4j failed.", exc_info=True)
+ services["neo4j"] = "degraded"
- return {"services": services}
+ overall_status = "ok" if all(state == "ok" for state in services.values()) else "degraded"
+ return {"status": overall_status, "services": services}
diff --git a/sanctions/tests/test_main.py b/sanctions/tests/test_main.py
index 73ae440..56107bd 100644
--- a/sanctions/tests/test_main.py
+++ b/sanctions/tests/test_main.py
@@ -3,7 +3,9 @@
Sprint 1: Grundlegende Unit-Tests ohne externe Services.
"""
+import base64
import html
+import os
from unittest.mock import AsyncMock, Mock, patch
import httpx
@@ -12,9 +14,17 @@
from sanctions.src.main import APP_VERSION, _query_yente, app
+os.environ["BEYOND_AI_BASIC_AUTH_USER"] = "tester"
+os.environ["BEYOND_AI_BASIC_AUTH_PASSWORD"] = "topsecret"
+
client = TestClient(app)
+def auth_headers() -> dict[str, str]:
+ token = base64.b64encode(b"tester:topsecret").decode("ascii")
+ return {"Authorization": f"Basic {token}"}
+
+
def test_health():
response = client.get("/health")
assert response.status_code == 200
@@ -27,18 +37,20 @@ def test_health():
def test_search_ui_empty():
"""Leere Suche liefert HTML mit Suchfeld."""
- response = client.get("/search")
+ response = client.get("/search", headers=auth_headers())
assert response.status_code == 200
assert "text/html" in response.headers["content-type"]
assert "Beyond AI" in response.text
assert "Sanctions" in response.text
+ assert response.headers["cache-control"].startswith("no-store")
-def test_search_ui_with_query():
- """Suche mit Query — yente nicht erreichbar → Fehlermeldung in HTML."""
- response = client.get("/search?q=TestPerson")
+def test_search_ui_get_does_not_process_query_string():
+ """GET rendert nur die Seite und verarbeitet keine sensiblen Query-Strings."""
+ response = client.get("/search?q=TestPerson", headers=auth_headers())
assert response.status_code == 200
assert "text/html" in response.headers["content-type"]
+ assert "TestPerson" not in response.text
def test_search_ui_escapes_query_and_result_fields():
@@ -55,7 +67,7 @@ def test_search_ui_escapes_query_and_result_fields():
]
with patch("sanctions.src.main._query_yente", new=AsyncMock(return_value=mock_results)):
- response = client.get("/search", params={"q": payload})
+ response = client.post("/search", data={"q": payload}, headers=auth_headers())
assert response.status_code == 200
assert payload not in response.text
@@ -69,7 +81,7 @@ def test_search_ui_escapes_query_and_result_fields():
def test_search_ui_whitespace_query_shows_validation_error():
"""Whitespace-only Queries duerfen nicht als cleanes Screening erscheinen."""
with patch("sanctions.src.main._query_yente", new=AsyncMock()) as query_mock:
- response = client.get("/search", params={"q": " "})
+ response = client.post("/search", data={"q": " "}, headers=auth_headers())
assert response.status_code == 200
query_mock.assert_not_called()
@@ -77,6 +89,12 @@ def test_search_ui_whitespace_query_shows_validation_error():
assert "Keine Treffer" not in response.text
+def test_search_requires_authentication():
+ response = client.get("/search")
+ assert response.status_code == 401
+ assert response.json() == {"detail": "authentication required"}
+
+
@pytest.mark.asyncio
async def test_query_yente_screens_persons_and_organizations():
"""Organisationen werden neben Personen gegen yente abgefragt."""
@@ -125,6 +143,7 @@ async def test_screen_endpoint_mocked():
response = client.post(
"/api/screen",
json={"name": "Wladimir Putin"},
+ headers=auth_headers(),
)
assert response.status_code == 200
@@ -142,6 +161,7 @@ async def test_screen_no_matches():
response = client.post(
"/api/screen",
json={"name": "Max Mustermann"},
+ headers=auth_headers(),
)
assert response.status_code == 200
@@ -159,21 +179,37 @@ def test_screen_timeout_returns_gateway_timeout():
response = client.post(
"/api/screen",
json={"name": "Max Mustermann"},
+ headers=auth_headers(),
)
assert response.status_code == 504
- assert response.json() == {
- "detail": "yente request timed out at http://localhost:8100."
- }
+ assert response.json() == {"detail": "screening backend timed out"}
def test_screen_blank_name_rejected():
"""Leere oder whitespace-only Namen sind ungueltig."""
- response = client.post("/api/screen", json={"name": " "})
+ response = client.post("/api/screen", json={"name": " "}, headers=auth_headers())
assert response.status_code == 422
def test_screen_missing_body():
"""Fehlender Body → 422 Validation Error."""
- response = client.post("/api/screen", json={})
+ response = client.post("/api/screen", json={}, headers=auth_headers())
+ assert response.status_code == 422
+
+
+def test_screen_threshold_bounds_enforced():
+ response = client.post(
+ "/api/screen",
+ json={"name": "Max Mustermann", "threshold": 1.5},
+ headers=auth_headers(),
+ )
assert response.status_code == 422
+
+
+def test_status_endpoint_sanitizes_errors():
+ response = client.get("/api/status", headers=auth_headers())
+ assert response.status_code == 200
+ payload = response.json()
+ assert payload["status"] in {"ok", "degraded"}
+ assert "error:" not in response.text
diff --git a/shared/llm/gateway.py b/shared/llm/gateway.py
index 34da9d2..a764847 100644
--- a/shared/llm/gateway.py
+++ b/shared/llm/gateway.py
@@ -5,11 +5,14 @@
Follows FinRegAgents confidence-aware pattern.
"""
+import logging
import os
from dataclasses import dataclass
import httpx
+logger = logging.getLogger(__name__)
+
@dataclass
class LLMResponse:
@@ -31,6 +34,7 @@ def __init__(
claude_api_key: str | None = None,
claude_model: str = "claude-sonnet-4-20250514",
timeout: float = 60.0,
+ allow_external_fallback: bool | None = None,
):
self.ollama_url = ollama_url or os.getenv(
"OLLAMA_URL", "http://localhost:11434"
@@ -41,6 +45,11 @@ def __init__(
self.claude_api_key = claude_api_key or os.getenv("ANTHROPIC_API_KEY")
self.claude_model = claude_model
self.timeout = timeout
+ if allow_external_fallback is None:
+ allow_external_fallback = os.getenv(
+ "BEYOND_AI_ALLOW_EXTERNAL_LLM_FALLBACK", ""
+ ).strip().lower() in {"1", "true", "yes", "on"}
+ self.allow_external_fallback = allow_external_fallback
self._client = httpx.Client(timeout=timeout)
async def complete(
@@ -56,10 +65,16 @@ async def complete(
prompt, system, temperature, max_tokens
)
except Exception:
- if self.claude_api_key:
+ if self.allow_external_fallback and self.claude_api_key:
+ logger.warning(
+ "Falling back to external Claude provider after Ollama failure."
+ )
return await self._claude_complete(
prompt, system, temperature, max_tokens
)
+ logger.warning(
+ "Ollama request failed and external fallback is disabled or unconfigured."
+ )
raise
async def _ollama_complete(