Merge branch 'main' into feature/eja-eli-579-adding-derivation-for-previous-dose-calculations

eddalmond1 · web-flow · commit d47a14cd9742 · 2026-01-06T16:52:12.000Z
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -19,5 +19,10 @@ updates:
 
   - package-ecosystem: "pip"
     directory: "/"
+    cooldown:
+      default-days: 5
+      semver-major-days: 7
+      semver-minor-days: 7
+      semver-patch-days: 3
     schedule:
       interval: "daily"
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="UTF-8"/>
+  <meta charset="UTF-8" />
   <title>Campaign Config Validator - NHS Digital</title>
   <script src="https://cdn.jsdelivr.net/pyodide/v0.26.4/full/pyodide.js"></script>
   <style>
@@ -216,18 +216,22 @@ <h3>Visualiser Output</h3>
   const jsonInput = document.getElementById("jsonfile");
   const runBtn = document.getElementById("run");
 
-  function log(text) {
-    let cleanText = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-    // Handle ANSI Colors for Pydantic output
-    cleanText = cleanText
-      .replace(/\x1b\[92m/g, '<span class="ansi-green">')
-      .replace(/\x1b\[93m/g, '<span class="ansi-yellow">')
-      .replace(/\x1b\[91m/g, '<span class="ansi-red">')
-      .replace(/\x1b\[0m/g, '</span>');
-
-    output.innerHTML += cleanText + "\n";
-    output.scrollTop = output.scrollHeight;
+function log(text) {
+  let cleanText = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  // ANSI color replacements
+  cleanText = cleanText
+    .replace(/\x1b\[92m/g, '<span class="ansi-grey">')   // validator/method green
+    .replace(/\x1b\[93m/g, '<span class="ansi-yellow">')  // general yellow
+    .replace(/\x1b\[34m/g, '<span style="color:#005eb8;font-weight:bold">') // blue
+    .replace(/\x1b\[33m/g, '<span class="ansi-yellow">')  // colon yellow
+    .replace(/\x1b\[0m/g, '</span>');                     // reset
+
+  if (cleanText.includes("Valid Config")) {
+    cleanText = cleanText.replace(/Valid Config/g, '<span style="font-size:2em;font-weight:bold;color:#007f3b">Valid Config</span>');
   }
+  output.innerHTML += cleanText + "\n";
+  output.scrollTop = output.scrollHeight;
+}
 
   function clearLog() {
     output.innerHTML = "";
@@ -248,6 +252,8 @@ <h3>Visualiser Output</h3>
     "src/eligibility_signposting_api/model/campaign_config.py",
     "src/eligibility_signposting_api/config/__init__.py",
     "src/eligibility_signposting_api/config/constants.py",
+    "src/rules_validation_api/decorators/__init__.py",
+    "src/rules_validation_api/decorators/tracker.py",
     "src/rules_validation_api/__init__.py",
     "src/rules_validation_api/validators/__init__.py",
     "src/rules_validation_api/validators/rules_validator.py",
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,27 +26,27 @@ httpx = "^0.28.1"
 yarl = "^1.18.3"
 pydantic = "^2.12.5"
 asgiref = "^3.11.0"
-eval-type-backport = "^0.2.2"
+eval-type-backport = "^0.3.1"
 mangum = "^0.19.0"
-wireup = "^2.1.0"
-python-json-logger = "^3.3.0"
+wireup = "^2.2.2"
+python-json-logger = "^4.0.0"
 python-dateutil = "^2.9.0"
 pyhamcrest = "^2.1.0"
 boto3 = "^1.40.57"
-botocore = "^1.40.57"
+botocore = "^1.40.76"
 aws-xray-sdk = "2.15.0"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.11.13"
+ruff = "^0.14.10"
 docopt = "^0.6.2"
 jsonpath-rw = "^1.4.0"
 semver = "^3.0.4"
 gitpython = "^3.1.45"
 pytest = "^8.4.2"
-pytest-asyncio = "^1.2.0"
+pytest-asyncio = "^1.3.0"
 pytest-cov = "^7.0.0"
 pytest-nhsd-apim = "^5.0.14"
-aiohttp = "^3.12.15"
+aiohttp = "^3.13.2"
 awscli = "^1.37.24"
 awscli-local = "^0.22.2"
 polyfactory = "^3.2.0"
@@ -56,13 +56,13 @@ localstack = "^4.12.0"
 pytest-docker = "^3.2.3"
 stamina = "^25.2.0"
 pytest-freezer = "^0.4.9"
-moto = "^5.1.13"
+moto = "^5.1.19"
 requests = "^2.32.5"
 jsonschema = "^4.25.1"
 behave = "^1.3.3"
 python-dotenv = "^1.2.1"
 openapi-spec-validator = "^0.7.2"
-pip-licenses = "^5.0.0"
+pip-licenses = "^5.5.0"
 
 
 [tool.poetry-plugin-lambda-build]
diff --git a/scripts/config/pre-commit.yaml b/scripts/config/pre-commit.yaml
@@ -51,7 +51,7 @@ repos:
         language: script
         pass_filenames: false
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.7
+    rev: v0.14.10
     hooks:
       - id: ruff
         args: [--fix]
diff --git a/src/eligibility_signposting_api/logging/logs_manager.py b/src/eligibility_signposting_api/logging/logs_manager.py
@@ -30,9 +30,14 @@ def wrapper(event: LambdaEvent, context: LambdaContext) -> dict[str, Any] | None
 
 
 class EnrichedJsonFormatter(JsonFormatter):
-    def add_fields(self, log_record: dict[str, Any], record: logging.LogRecord, message_dict: dict[str, Any]) -> None:
-        log_record["request_id"] = request_id_context_var.get() or "-"
-        super().add_fields(log_record, record, message_dict)
+    def add_fields(
+        self,
+        log_data: dict[str, Any],
+        record: logging.LogRecord,
+        message_dict: dict[str, Any],
+    ) -> None:
+        log_data["request_id"] = request_id_context_var.get() or "-"
+        super().add_fields(log_data, record, message_dict)
 
 
 def init_logging(quieten: Sequence[str] = ("asyncio", "botocore", "boto3", "mangum", "urllib3")) -> None:
diff --git a/src/eligibility_signposting_api/model/campaign_config.py b/src/eligibility_signposting_api/model/campaign_config.py
@@ -158,7 +158,7 @@ class IterationRule(BaseModel):
     model_config = {"populate_by_name": True, "extra": "ignore"}
 
     @field_validator("rule_stop", mode="before")
-    def parse_yn_to_bool(cls, v: str | bool) -> bool:  # noqa: N805
+    def parse_yn_to_bool(cls, v: str | bool) -> bool:  # noqa: N805, FBT001
         if isinstance(v, str):
             return v.upper() == "Y"
         return v
@@ -238,7 +238,7 @@ class StatusText(BaseModel):
     not_actionable: str | None = Field(None, alias="NotActionable")
     actionable: str | None = Field(None, alias="Actionable")
 
-    model_config = {"populate_by_name": True}
+    model_config = {"populate_by_name": True, "extra": "ignore"}
 
 
 class RuleEntry(BaseModel):
@@ -277,6 +277,12 @@ class Iteration(BaseModel):
 
     model_config = {"populate_by_name": True, "arbitrary_types_allowed": True, "extra": "ignore"}
 
+    def __init__(self, **data: dict[str, typing.Any]) -> None:
+        super().__init__(**data)
+        # Ensure each rule knows its parent iteration
+        for rule in self.iteration_rules:
+            rule.set_parent(self)
+
     @field_validator("iteration_date", mode="before")
     @classmethod
     def parse_dates(cls, v: str | date) -> date:
@@ -300,12 +306,6 @@ def parse_dates(cls, v: str | date) -> date:
     def serialize_dates(v: date, _info: SerializationInfo) -> str:
         return v.strftime("%Y%m%d")
 
-    @model_validator(mode="after")
-    def attach_rule_parents(self) -> Iteration:
-        for rule in self.iteration_rules:
-            rule.set_parent(self)
-        return self
-
     def __str__(self) -> str:
         return json.dumps(self.model_dump(by_alias=True), indent=2)
 
diff --git a/src/eligibility_signposting_api/services/calculators/eligibility_calculator.py b/src/eligibility_signposting_api/services/calculators/eligibility_calculator.py
@@ -129,7 +129,7 @@ def get_best_iteration_result(self, campaign_group: list[CampaignConfig]) -> Bes
         if not iteration_results:
             return None
 
-        (best_iteration_name, best_iteration_result) = max(
+        (_best_iteration_name, best_iteration_result) = max(
             iteration_results.items(),
             key=lambda item: next(iter(item[1].cohort_results.values())).status.value
             # Below handles the case where there are no cohort results
diff --git a/src/rules_validation_api/app.py b/src/rules_validation_api/app.py
@@ -2,10 +2,12 @@
 import json
 import logging
 import sys
+from collections import defaultdict
 from pathlib import Path
 
 from pydantic import ValidationError
 
+from rules_validation_api.decorators.tracker import VALIDATORS_CALLED
 from rules_validation_api.validators.rules_validator import RulesValidation
 
 logging.basicConfig(
@@ -18,11 +20,12 @@
 RESET = "\033[0m"
 YELLOW = "\033[93m"
 RED = "\033[91m"
+BLUE = "\033[34m"
 
 
 def refine_error(e: ValidationError) -> str:
     """Return a very short, single-line error message."""
-    lines = [f"Validation Error: {len(e.errors())} validation error(s)"]
+    lines = [f"❌Validation Error: {len(e.errors())} validation error(s)"]
 
     for err in e.errors():
         loc = ".".join(str(x) for x in err["loc"])
@@ -34,21 +37,43 @@ def refine_error(e: ValidationError) -> str:
     return "\n".join(lines)
 
 
-def main() -> None:
+def main() -> None:  # pragma: no cover
     parser = argparse.ArgumentParser(description="Validate campaign configuration.")
     parser.add_argument("--config_path", required=True, help="Path to the campaign config JSON file")
     args = parser.parse_args()
 
     try:
         with Path(args.config_path).open() as file:
             json_data = json.load(file)
-            RulesValidation(**json_data)
+            result = RulesValidation(**json_data)
             sys.stdout.write(f"{GREEN}Valid Config{RESET}\n")
+            sys.stdout.write(
+                f"{YELLOW}Current Iteration Number is {RESET}{GREEN}"
+                f"{result.campaign_config.current_iteration.iteration_number}{RESET}\n"
+            )
+
+            # Group by class
+            grouped = defaultdict(list)
+            for v in VALIDATORS_CALLED:
+                cls, method = v.split(":", 1)
+                grouped[cls].append(method.strip())
+
+            # Print grouped
+            for cls_name in sorted(grouped.keys(), reverse=True):
+                methods = sorted(grouped[cls_name])
+                # First method prints class name
+                first = methods[0]
+                colored = f"{BLUE}{cls_name}{RESET}{YELLOW}:{RESET}{GREEN}{first}{RESET}\n"
+                sys.stdout.write(colored)
+                # Rest methods indented
+                for method_name in methods[1:]:
+                    colored = f"{' ' * len(cls_name)}{YELLOW}:{RESET}{GREEN}{method_name}{RESET}\n"
+                    sys.stdout.write(colored)
 
     except ValidationError as e:
         clean = refine_error(e)
         sys.stderr.write(f"{YELLOW}{clean}{RESET}\n")
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     main()
diff --git a/src/rules_validation_api/decorators/__init__.py b/src/rules_validation_api/decorators/__init__.py
diff --git a/src/rules_validation_api/decorators/tracker.py b/src/rules_validation_api/decorators/tracker.py
@@ -0,0 +1,28 @@
+from typing import Self
+
+from pydantic import model_validator
+
+VALIDATORS_CALLED: list[str] = []
+
+
+# --- Mixin and decorator to track validators ---
+class TrackValidatorsMixin:
+    """
+    Mixin to track all validator names in a Pydantic model.
+    """
+
+    @model_validator(mode="after")
+    def _track_validators(self) -> Self:
+        for name in dir(self):
+            if name.startswith(("validate_", "check_")) and callable(getattr(self, name)):
+                full_name = f"{self.__class__.__name__}:{name}"
+                if full_name not in VALIDATORS_CALLED:
+                    VALIDATORS_CALLED.append(full_name)
+        return self
+
+
+def track_validators(cls) -> type:  # noqa:ANN001
+    """
+    Decorator to add the tracking mixin to a Pydantic model.
+    """
+    return type(cls.__name__, (TrackValidatorsMixin, cls), {})
diff --git a/src/rules_validation_api/validators/actions_mapper_validator.py b/src/rules_validation_api/validators/actions_mapper_validator.py
@@ -1,9 +1,11 @@
 from pydantic import ValidationError, model_validator
 
 from eligibility_signposting_api.model.campaign_config import ActionsMapper
+from rules_validation_api.decorators.tracker import track_validators
 from rules_validation_api.validators.available_action_validator import AvailableActionValidation
 
 
+@track_validators
 class ActionsMapperValidation(ActionsMapper):
     @model_validator(mode="after")
     def validate_keys(self) -> "ActionsMapperValidation":
diff --git a/src/rules_validation_api/validators/available_action_validator.py b/src/rules_validation_api/validators/available_action_validator.py
@@ -3,8 +3,10 @@
 from pydantic import field_validator
 
 from eligibility_signposting_api.model.campaign_config import AvailableAction
+from rules_validation_api.decorators.tracker import track_validators
 
 
+@track_validators
 class AvailableActionValidation(AvailableAction):
     @field_validator("action_description")
     @classmethod
diff --git a/src/rules_validation_api/validators/campaign_config_validator.py b/src/rules_validation_api/validators/campaign_config_validator.py
@@ -5,9 +5,11 @@
 from pydantic import field_validator, model_validator
 
 from eligibility_signposting_api.model.campaign_config import CampaignConfig, Iteration
+from rules_validation_api.decorators.tracker import track_validators
 from rules_validation_api.validators.iteration_validator import IterationValidation
 
 
+@track_validators
 class CampaignConfigValidation(CampaignConfig):
     @field_validator("iterations")
     @classmethod
diff --git a/src/rules_validation_api/validators/iteration_cohort_validator.py b/src/rules_validation_api/validators/iteration_cohort_validator.py
@@ -1,5 +1,7 @@
 from eligibility_signposting_api.model.campaign_config import IterationCohort
+from rules_validation_api.decorators.tracker import track_validators
 
 
+@track_validators
 class IterationCohortValidation(IterationCohort):
     pass
diff --git a/src/rules_validation_api/validators/iteration_rules_validator.py b/src/rules_validation_api/validators/iteration_rules_validator.py
@@ -9,8 +9,10 @@
     RuleAttributeName,
     RuleType,
 )
+from rules_validation_api.decorators.tracker import track_validators
 
 
+@track_validators
 class IterationRuleValidation(IterationRule):
     @field_validator("attribute_target")
     @classmethod
diff --git a/src/rules_validation_api/validators/iteration_validator.py b/src/rules_validation_api/validators/iteration_validator.py
@@ -11,12 +11,14 @@
     IterationRule,
     RuleType,
 )
+from rules_validation_api.decorators.tracker import track_validators
 from rules_validation_api.validators.actions_mapper_validator import ActionsMapperValidation
 from rules_validation_api.validators.available_action_validator import AvailableActionValidation
 from rules_validation_api.validators.iteration_cohort_validator import IterationCohortValidation
 from rules_validation_api.validators.iteration_rules_validator import IterationRuleValidation
 
 
+@track_validators
 class IterationValidation(Iteration):
     @field_validator("iteration_rules")
     @classmethod
diff --git a/src/rules_validation_api/validators/rules_validator.py b/src/rules_validation_api/validators/rules_validator.py
@@ -1,9 +1,11 @@
 from pydantic import field_validator
 
 from eligibility_signposting_api.model.campaign_config import CampaignConfig, Rules
+from rules_validation_api.decorators.tracker import track_validators
 from rules_validation_api.validators.campaign_config_validator import CampaignConfigValidation
 
 
+@track_validators
 class RulesValidation(Rules):
     @field_validator("campaign_config")
     @classmethod
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -228,7 +228,7 @@ def iam_role(iam_client: BaseClient) -> Generator[str]:
 
 @pytest.fixture(scope="session")
 def lambda_zip() -> Path:
-    build_result = subprocess.run(["make", "build"], capture_output=True, text=True, check=False)  # Noqa: S603, S607
+    build_result = subprocess.run(["make", "build"], capture_output=True, text=True, check=False)  # noqa: S607
     assert build_result.returncode == 0, f"'make build' failed: {build_result.stderr}"
     return Path("dist/lambda.zip")
 
diff --git a/tests/unit/logging/test_logs_helper.py b/tests/unit/logging/test_logs_helper.py
diff --git a/tests/unit/middleware/test_security_headers.py b/tests/unit/middleware/test_security_headers.py
diff --git a/tests/unit/services/processors/test_token_parser.py b/tests/unit/services/processors/test_token_parser.py
diff --git a/tests/unit/services/processors/test_token_processor.py b/tests/unit/services/processors/test_token_processor.py
diff --git a/tests/unit/validation/test_app.py b/tests/unit/validation/test_app.py
