From bec79630d6d1e97df82a9daf01c018d872145cfa Mon Sep 17 00:00:00 2001
From: karthikeyannhs <174426205+Karthikeyannhs@users.noreply.github.com>
Date: Tue, 23 Dec 2025 11:21:08 +0000
Subject: [PATCH 1/3] wip

---
 index.html                                    | 11 +++-
 .../model/campaign_config.py                  | 14 ++---
 src/rules_validation_api/app.py               | 59 +++++++++++++------
 .../decorators/tracker.py                     | 28 +++++++++
 .../validators/actions_mapper_validator.py    |  2 +
 .../validators/available_action_validator.py  |  2 +
 .../validators/campaign_config_validator.py   |  2 +
 .../validators/iteration_cohort_validator.py  |  2 +
 .../validators/iteration_rules_validator.py   |  2 +
 .../validators/iteration_validator.py         |  2 +
 .../validators/rules_validator.py             |  2 +
 11 files changed, 97 insertions(+), 29 deletions(-)
 create mode 100644 src/rules_validation_api/decorators/tracker.py
diff --git a/index.html b/index.html
index ae474d1d2..1a216c989 100644
--- 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>
@@ -225,9 +225,12 @@ <h3>Visualiser Output</h3>
       .replace(/\x1b\[91m/g, '<span class="ansi-red">')
       .replace(/\x1b\[0m/g, '</span>');
 
-    output.innerHTML += cleanText + "\n";
-    output.scrollTop = output.scrollHeight;
+  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 +251,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/src/eligibility_signposting_api/model/campaign_config.py b/src/eligibility_signposting_api/model/campaign_config.py
index 8c6e8c7c6..dec7d80c7 100644
--- a/src/eligibility_signposting_api/model/campaign_config.py
+++ b/src/eligibility_signposting_api/model/campaign_config.py
@@ -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/rules_validation_api/app.py b/src/rules_validation_api/app.py
index 4c50449a9..5bd349066 100644
--- a/src/rules_validation_api/app.py
+++ b/src/rules_validation_api/app.py
@@ -2,10 +2,10 @@
 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(
@@ -19,20 +19,19 @@
 YELLOW = "\033[93m"
 RED = "\033[91m"
 
-
-def refine_error(e: ValidationError) -> str:
-    """Return a very short, single-line error message."""
-    lines = [f"Validation Error: {len(e.errors())} validation error(s)"]
-
-    for err in e.errors():
-        loc = ".".join(str(x) for x in err["loc"])
-        msg = err["msg"]
-        type_ = err["type"]
-
-        lines.append(f"{loc} : {msg} [type={type_}]")
-
-    return "\n".join(lines)
-
+# ANSI color codes
+LEFT_COLOR = "\033[34m"  # Blue for class name
+COLON_COLOR = "\033[33m"  # Yellow for colon
+RIGHT_COLOR = "\033[92m"  # Milk green for validator
+CLASS_COLORS = [
+    "\033[34m",  # blue
+    "\033[35m",  # magenta
+    "\033[36m",  # cyan
+    "\033[94m",  # light blue
+    "\033[95m",  # light magenta
+    "\033[96m",  # light cyan
+    "\033[37m",  # white/light grey
+]
 
 def main() -> None:
     parser = argparse.ArgumentParser(description="Validate campaign configuration.")
@@ -45,9 +44,31 @@ def main() -> None:
             RulesValidation(**json_data)
             sys.stdout.write(f"{GREEN}Valid Config{RESET}\n")
 
-    except ValidationError as e:
-        clean = refine_error(e)
-        sys.stderr.write(f"{YELLOW}{clean}{RESET}\n")
+            # Group by class
+            grouped = defaultdict(list)
+            for v in VALIDATORS_CALLED:
+                cls, method = v.split(":", 1)
+                grouped[cls].append(method.strip())
+
+            # Assign colors to classes
+            cls_color_map = {}
+            for i, cls_name in enumerate(sorted(grouped.keys(), reverse=True)):
+                cls_color_map[cls_name] = CLASS_COLORS[i % len(CLASS_COLORS)]
+
+            # 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"{cls_color_map[cls_name]}{cls_name}{RESET}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{first}{RESET}"
+                print(colored)
+                # Rest methods indented
+                for method_name in methods[1:]:
+                    colored = f"{' ' * len(cls_name)}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{method_name}{RESET}"
+                    print(colored)
+
+    except ValueError as e:
+        sys.stderr.write(f"{YELLOW}Validation Error:{RESET} {RED}{e}{RESET}\n")
 
 
 if __name__ == "__main__":
diff --git a/src/rules_validation_api/decorators/tracker.py b/src/rules_validation_api/decorators/tracker.py
new file mode 100644
index 000000000..9db3cd298
--- /dev/null
+++ 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
index 7efdd2452..7007d9f30 100644
--- 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
index 07e80c315..74d17e1df 100644
--- 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
index d2a6bcc9b..b30e77a34 100644
--- 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
index 32e1a4b3a..c0d8911d4 100644
--- 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
index cd082db54..e9f4e954e 100644
--- 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
index 61dc2376a..d4934fd25 100644
--- 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
index cacb143d0..32f574871 100644
--- 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

From 366bcfbe9f608900855d43bec2fbe186d0cd17c2 Mon Sep 17 00:00:00 2001
From: karthikeyannhs <174426205+Karthikeyannhs@users.noreply.github.com>
Date: Tue, 23 Dec 2025 11:50:36 +0000
Subject: [PATCH 2/3] Tech dent: validation with better messages

---
 index.html                                    | 17 ++++----
 src/rules_validation_api/app.py               | 42 ++++++++++---------
 .../decorators/__init__.py                    |  0
 3 files changed, 32 insertions(+), 27 deletions(-)
 create mode 100644 src/rules_validation_api/decorators/__init__.py

diff --git a/index.html b/index.html
index 1a216c989..8fbab9c67 100644
--- a/index.html
+++ b/index.html
@@ -216,14 +216,15 @@ <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>');
+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>');
diff --git a/src/rules_validation_api/app.py b/src/rules_validation_api/app.py
index 5bd349066..ce38e6e68 100644
--- a/src/rules_validation_api/app.py
+++ b/src/rules_validation_api/app.py
@@ -5,6 +5,8 @@
 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
 
@@ -23,15 +25,21 @@
 LEFT_COLOR = "\033[34m"  # Blue for class name
 COLON_COLOR = "\033[33m"  # Yellow for colon
 RIGHT_COLOR = "\033[92m"  # Milk green for validator
-CLASS_COLORS = [
-    "\033[34m",  # blue
-    "\033[35m",  # magenta
-    "\033[36m",  # cyan
-    "\033[94m",  # light blue
-    "\033[95m",  # light magenta
-    "\033[96m",  # light cyan
-    "\033[37m",  # white/light grey
-]
+
+
+def refine_error(e: ValidationError) -> str:
+    """Return a very short, single-line error message."""
+    lines = [f"❌Validation Error: {len(e.errors())} validation error(s)"]
+
+    for err in e.errors():
+        loc = ".".join(str(x) for x in err["loc"])
+        msg = err["msg"]
+        type_ = err["type"]
+
+        lines.append(f"{loc} : {msg} [type={type_}]")
+
+    return "\n".join(lines)
+
 
 def main() -> None:
     parser = argparse.ArgumentParser(description="Validate campaign configuration.")
@@ -50,25 +58,21 @@ def main() -> None:
                 cls, method = v.split(":", 1)
                 grouped[cls].append(method.strip())
 
-            # Assign colors to classes
-            cls_color_map = {}
-            for i, cls_name in enumerate(sorted(grouped.keys(), reverse=True)):
-                cls_color_map[cls_name] = CLASS_COLORS[i % len(CLASS_COLORS)]
-
             # 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"{cls_color_map[cls_name]}{cls_name}{RESET}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{first}{RESET}"
-                print(colored)
+                colored = f"{LEFT_COLOR}{cls_name}{RESET}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{first}{RESET}"
+                sys.stdout.write(colored)
                 # Rest methods indented
                 for method_name in methods[1:]:
                     colored = f"{' ' * len(cls_name)}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{method_name}{RESET}"
-                    print(colored)
+                    sys.stdout.write(colored)
 
-    except ValueError as e:
-        sys.stderr.write(f"{YELLOW}Validation Error:{RESET} {RED}{e}{RESET}\n")
+    except ValidationError as e:
+        clean = refine_error(e)
+        sys.stderr.write(f"{YELLOW}{clean}{RESET}\n")
 
 
 if __name__ == "__main__":
diff --git a/src/rules_validation_api/decorators/__init__.py b/src/rules_validation_api/decorators/__init__.py
new file mode 100644
index 000000000..e69de29bb

From 0e8c84bc0252e35d9641ec14f78d5cb737f989ac Mon Sep 17 00:00:00 2001
From: karthikeyannhs <174426205+Karthikeyannhs@users.noreply.github.com>
Date: Tue, 23 Dec 2025 12:30:20 +0000
Subject: [PATCH 3/3] current iteration number

---
 src/rules_validation_api/app.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/rules_validation_api/app.py b/src/rules_validation_api/app.py
index ce38e6e68..fb03df9d1 100644
--- a/src/rules_validation_api/app.py
+++ b/src/rules_validation_api/app.py
@@ -49,8 +49,11 @@ def main() -> None:
     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"{COLON_COLOR}Current Iteration Number is {RESET}{RIGHT_COLOR}"
+                f"{result.campaign_config.current_iteration.iteration_number}{RESET}\n"
+            )
 
             # Group by class
             grouped = defaultdict(list)
@@ -63,11 +66,11 @@ def main() -> None:
                 methods = sorted(grouped[cls_name])
                 # First method prints class name
                 first = methods[0]
-                colored = f"{LEFT_COLOR}{cls_name}{RESET}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{first}{RESET}"
+                colored = f"{LEFT_COLOR}{cls_name}{RESET}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{first}{RESET}\n"
                 sys.stdout.write(colored)
                 # Rest methods indented
                 for method_name in methods[1:]:
-                    colored = f"{' ' * len(cls_name)}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{method_name}{RESET}"
+                    colored = f"{' ' * len(cls_name)}{COLON_COLOR}:{RESET}{RIGHT_COLOR}{method_name}{RESET}\n"
                     sys.stdout.write(colored)
 
     except ValidationError as e:
