A01: Separate API readiness from import health diagnostics
- Infrastructure (DB/MinIO) blocks readiness; imports are diagnostic only - Per-source community scheduler health with backoff detection - Stale/failed imports never block /ready — scheduler can recover them - Add 'blocking: false' to all import components - 4 new tests: per-source health, backoff detection, stale/failed non-blocking - 108 Python tests pass
This commit is contained in:
@@ -6,7 +6,7 @@ from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.database import Base
|
||||
from app.models import ImportStatus, CommunityImportRun, OfficialRecordImport
|
||||
from app.models import CommunityImportRun, DataSource, ImportStatus, OfficialRecordImport
|
||||
from app.readiness import readiness_report
|
||||
|
||||
|
||||
@@ -35,7 +35,8 @@ def test_optional_import_does_not_block_dependencies() -> None:
|
||||
assert "community_scheduler" in components
|
||||
|
||||
|
||||
def test_required_import_must_be_recent_and_successful() -> None:
|
||||
def test_required_import_success_shows_ready_status() -> None:
|
||||
"""A01: Successful import is diagnostic, not blocking."""
|
||||
engine = create_engine("sqlite://")
|
||||
Base.metadata.create_all(engine)
|
||||
now = datetime.now(timezone.utc)
|
||||
@@ -52,9 +53,11 @@ def test_required_import_must_be_recent_and_successful() -> None:
|
||||
)
|
||||
assert ready is True
|
||||
assert components["official_import"]["status"] == "ready"
|
||||
assert components["official_import"]["blocking"] is False
|
||||
|
||||
|
||||
def test_unavailable_storage_and_stale_import_fail_readiness() -> None:
|
||||
def test_unavailable_storage_blocks_readiness_but_stale_import_does_not() -> None:
|
||||
"""A01: Infrastructure failures block, stale imports are diagnostic only."""
|
||||
engine = create_engine("sqlite://")
|
||||
Base.metadata.create_all(engine)
|
||||
now = datetime.now(timezone.utc)
|
||||
@@ -72,13 +75,16 @@ def test_unavailable_storage_and_stale_import_fail_readiness() -> None:
|
||||
assert ready is False
|
||||
assert components["minio"]["status"] == "unavailable"
|
||||
assert components["official_import"]["status"] == "stale"
|
||||
assert components["official_import"]["blocking"] is False
|
||||
|
||||
|
||||
def test_community_scheduler_success_does_not_block_readiness() -> None:
|
||||
def test_community_scheduler_success_shows_ready_status() -> None:
|
||||
"""A01: Successful scheduler is diagnostic, not blocking."""
|
||||
engine = create_engine("sqlite://")
|
||||
Base.metadata.create_all(engine)
|
||||
now = datetime.now(timezone.utc)
|
||||
with Session(engine) as session:
|
||||
session.add(DataSource(key="rf4db", name="RF4DB", base_url="https://rf4db.com", default_confidence=70, enabled=True))
|
||||
session.add(CommunityImportRun(
|
||||
source_system="rf4db",
|
||||
started_at=now - timedelta(minutes=30),
|
||||
@@ -93,14 +99,17 @@ def test_community_scheduler_success_does_not_block_readiness() -> None:
|
||||
)
|
||||
assert ready is True
|
||||
assert components["community_scheduler"]["status"] == "ready"
|
||||
assert "rf4db" in components["community_scheduler"]["sources"]
|
||||
assert components["community_scheduler"]["sources"]["rf4db"]["blocking"] is False
|
||||
|
||||
|
||||
def test_community_scheduler_stale_or_failed_blocks_readiness() -> None:
|
||||
def test_community_scheduler_stale_does_not_block_readiness() -> None:
|
||||
"""A01: Stale scheduler is diagnostic, never blocks readiness."""
|
||||
engine = create_engine("sqlite://")
|
||||
Base.metadata.create_all(engine)
|
||||
now = datetime.now(timezone.utc)
|
||||
with Session(engine) as session:
|
||||
# Stale run
|
||||
session.add(DataSource(key="rf4db", name="RF4DB", base_url="https://rf4db.com", default_confidence=70, enabled=True))
|
||||
session.add(CommunityImportRun(
|
||||
source_system="rf4db",
|
||||
started_at=now - timedelta(hours=2),
|
||||
@@ -113,15 +122,19 @@ def test_community_scheduler_stale_or_failed_blocks_readiness() -> None:
|
||||
session, AvailableStorage(), import_required=False,
|
||||
import_interval_seconds=3600, community_import_interval_seconds=1800, now=now,
|
||||
)
|
||||
assert ready is False
|
||||
assert components["community_scheduler"]["status"] == "stale"
|
||||
assert ready is True # A01: stale does NOT block
|
||||
assert components["community_scheduler"]["status"] == "ready"
|
||||
assert components["community_scheduler"]["sources"]["rf4db"]["status"] == "stale"
|
||||
assert components["community_scheduler"]["sources"]["rf4db"]["blocking"] is False
|
||||
|
||||
|
||||
def test_community_scheduler_failed_status_blocks_readiness() -> None:
|
||||
def test_community_scheduler_failed_does_not_block_readiness() -> None:
|
||||
"""A01: Failed scheduler is diagnostic, never blocks readiness."""
|
||||
engine = create_engine("sqlite://")
|
||||
Base.metadata.create_all(engine)
|
||||
now = datetime.now(timezone.utc)
|
||||
with Session(engine) as session:
|
||||
session.add(DataSource(key="rf4db", name="RF4DB", base_url="https://rf4db.com", default_confidence=70, enabled=True))
|
||||
session.add(CommunityImportRun(
|
||||
source_system="rf4db",
|
||||
started_at=now - timedelta(minutes=30),
|
||||
@@ -135,5 +148,48 @@ def test_community_scheduler_failed_status_blocks_readiness() -> None:
|
||||
session, AvailableStorage(), import_required=False,
|
||||
import_interval_seconds=3600, community_import_interval_seconds=1800, now=now,
|
||||
)
|
||||
assert ready is False
|
||||
assert components["community_scheduler"]["status"] == "failed"
|
||||
assert ready is True # A01: failed does NOT block
|
||||
assert components["community_scheduler"]["status"] == "ready"
|
||||
assert components["community_scheduler"]["sources"]["rf4db"]["status"] == "failed"
|
||||
assert components["community_scheduler"]["sources"]["rf4db"]["blocking"] is False
|
||||
|
||||
|
||||
def test_community_scheduler_tracked_per_source_with_backoff() -> None:
|
||||
"""A01: Per-source health tracking with backoff detection."""
|
||||
engine = create_engine("sqlite://")
|
||||
Base.metadata.create_all(engine)
|
||||
now = datetime.now(timezone.utc)
|
||||
with Session(engine) as session:
|
||||
session.add(DataSource(key="rf4db", name="RF4DB", base_url="https://rf4db.com", default_confidence=70, enabled=True))
|
||||
session.add(DataSource(key="rf4stat-fishing", name="RF4-STAT", base_url="https://rf4-stat.ru", default_confidence=65, enabled=True))
|
||||
# rf4db: healthy
|
||||
session.add(CommunityImportRun(
|
||||
source_system="rf4db",
|
||||
started_at=now - timedelta(minutes=30),
|
||||
status="success",
|
||||
source_url="fixture://rf4db",
|
||||
rows_seen=5, rows_created=5, rows_updated=0, error_summary=None,
|
||||
))
|
||||
# rf4stat-fishing: multiple recent failures → backoff recommended
|
||||
for i in range(6):
|
||||
session.add(CommunityImportRun(
|
||||
source_system="rf4stat-fishing",
|
||||
started_at=now - timedelta(hours=i),
|
||||
status="failed",
|
||||
source_url="fixture://rf4stat",
|
||||
rows_seen=0, rows_created=0, rows_updated=0,
|
||||
error_summary="TimeoutError",
|
||||
))
|
||||
session.commit()
|
||||
ready, components = readiness_report(
|
||||
session, AvailableStorage(), import_required=False,
|
||||
import_interval_seconds=3600, community_import_interval_seconds=1800, now=now,
|
||||
)
|
||||
assert ready is True
|
||||
sources = components["community_scheduler"]["sources"]
|
||||
assert sources["rf4db"]["status"] == "ready"
|
||||
assert sources["rf4db"]["recent_failures_24h"] == 0
|
||||
assert sources["rf4db"]["backoff_recommended"] is False
|
||||
assert sources["rf4stat-fishing"]["status"] == "failed"
|
||||
assert sources["rf4stat-fishing"]["recent_failures_24h"] == 6
|
||||
assert sources["rf4stat-fishing"]["backoff_recommended"] is True
|
||||
|
||||
Reference in New Issue
Block a user