Deploy RICS v2 (senior baseline, CPU Spaces Dockerfile)

backend/api/routes/legacy_api_routes.py

@@ -712,6 +712,7 @@ def _content_catalog(survey_level: int, property_type: str = "") -> dict:
         "group_labels": review_taxonomy.group_labels_for(resolved),
         "structure_mode": "content",
         "property_type": resolved,
+        "taxonomy_version": review_taxonomy.REVIEW_TAXONOMY_VERSION,
     }
 
 

backend/content_based/review_taxonomy.py

@@ -37,7 +37,7 @@ from typing import Any
 from backend.content_based import taxonomy
 from backend.domain.property_type import PROPERTY_TYPES, try_canonical_property_type
 
-REVIEW_TAXONOMY_VERSION = "r2.3"
+REVIEW_TAXONOMY_VERSION = "r2.4"
 
 # Ordered groups, each with its fixed sub-topics (id + label only). Catch-all
 # "Other" chips and the second Heating chip use disambiguated on-screen labels
@@ -81,7 +81,7 @@ REVIEW_GROUPS: tuple[dict[str, Any], ...] = (
             },
             {
                 "id": "built_in_fittings",
-                "label": "Built-in fittings (e.g. wardrobes)",
+                "label": "Built-in fittings (built-in kitchen and other fittings, not including appliances)",
             },
             {
                 "id": "woodwork_joinery",

backend/note_quality/orchestrator.py

@@ -21,6 +21,7 @@ import logging
 
 from backend.config import settings
 from backend.content_based import review_taxonomy
+from backend.content_based.intake import EMPTY_SUBSECTION
 from backend.note_quality import judge as judge_llm
 from backend.note_quality.models import (
     GRADE_RED,
@@ -186,7 +187,7 @@ async def grade_subtopics(items: list[GradeItem]) -> NoteQualityResult:
             continue
 
         notes = (item.notes or "").strip()
-        if not notes:
+        if not notes or notes == EMPTY_SUBSECTION:
             result.grades[code] = SubtopicGrade(
                 code=code,
                 grade=GRADE_RED,

backend/note_quality/rubric.py

@@ -33,7 +33,7 @@ from backend.note_quality.rubric_entries import ENTRIES as _SOURCE
 # Bumped whenever the practice reissues the document, or whenever entries are
 # re-keyed onto a new schema as here, so cached grades can be invalidated and a
 # stale grade is never silently trusted.
-RUBRIC_VERSION = "practice-2026-08d"
+RUBRIC_VERSION = "practice-2026-08e"
 
 # Sub-topics shown to the surveyor but deliberately not graded, because the source
 # document does not cover them. They render neutral and stay out of the tally.

backend/note_quality/rubric_entries.py

@@ -512,25 +512,24 @@ _put(
     "Built-in Fittings",
     """**GREEN – Sufficient information**
 
-Green if the notes provide sufficient information regarding the principal built-in fittings and their general visible condition.
+Green if the notes provide sufficient information regarding the principal built-in fittings (e.g., kitchen units, worktops, taps, extractor hoods) and their general visible condition, operation, or testing limitations.
 
 Relevant information may include:
 
-* Type of fittings
-* Location
-* General condition
-* Operation where relevant
-* Damage/deterioration
-* Significant defects
+* Type and description of fittings (e.g., units, worktops, recirculating/ducted extractor hoods)
+* General condition and Condition Ratings (e.g., acceptable, average, good; CR1 or CR2)
+* Operation where relevant (e.g., tap water flow/pressure, extractor fan functionality or need for upgrades)
+* Damage/deterioration or maintenance advice (e.g., sealant condition, discolouration, water ingress risks)
+* Limitations on testing (e.g., disconnected water/electricity supply or disclaimers on built-in appliances)
 
 A complete inventory of every built-in fitting is not required.
 
 **YELLOW – Limited information**
 
-Yellow if built-in fittings are merely identified without meaningful information regarding their condition.
+Yellow if built-in fittings are merely identified without meaningful information regarding their condition, operational state, or defect notes.
 
 Example Yellow:
-“Built-in wardrobes to bedroom.”
+"Kitchen contains fitted units, worktops, a mixer tap, and an extractor hood."
 
 **RED – No information**
 

frontend/index.html

@@ -1332,6 +1332,8 @@ const state = {
   noteStagesDumpPath: '',
   /** Stage A review-chip notes keyed by review sub-topic id (for note-quality UI). */
   reviewAssignments: {},
+  /** Content-mode catalog version from GET /templates/catalog (cache-bust + relabel). */
+  reviewTaxonomyVersion: '',
   /** After content-mode Stage A, Configure shows RICS leaf cards instead of review chips. */
   notesUiRics: false,
   currentStep: 1,
@@ -1366,7 +1368,7 @@ const STATIC_L3_SECTIONS = [
   { code:'E3', group:'E', title:'Walls and partitions', hint:'walls · partitions · damp · cracking · condition rating' },
   { code:'E4', group:'E', title:'Floors', hint:'floors · suspended · solid · springy · condition rating' },
   { code:'E5', group:'E', title:'Fireplaces, chimney breasts and flues', hint:'fireplaces · chimney breasts · flues · hearth · condition rating' },
-  { code:'E6', group:'E', title:'Built-in fittings', hint:'built-in kitchen · fitted wardrobes · cupboards · condition rating' },
+  { code:'E6', group:'E', title:'Built-in fittings', hint:'built-in kitchen · worktops · cupboards · extractor hood · not appliances' },
   { code:'E7', group:'E', title:'Woodwork', hint:'staircase · skirting · architrave · internal doors · condition rating' },
   { code:'E8', group:'E', title:'Bathroom fittings', hint:'bathroom fittings · sanitaryware · shower · WC · condition rating' },
   { code:'E9', group:'E', title:'Other', hint:'cellar · basement · other inside · condition rating' },
@@ -1429,7 +1431,12 @@ async function loadTemplateCatalog(surveyLevel) {
   const modeQ = `&structure_mode=${encodeURIComponent(state.structureMode || 'rics')}`;
   // Content mode scopes the sub-topic list by property type; RICS mode ignores it.
   const ptQ = `&property_type=${encodeURIComponent(state.propertyType || 'house')}`;
-  const cat = await apiFetch('GET', `/templates/catalog?survey_level=${encodeURIComponent(sl)}${modeQ}${ptQ}`, null);
+  const isContent = (state.structureMode || 'rics') === 'content';
+  const vQ = isContent && state.reviewTaxonomyVersion
+    ? `&taxonomy_version=${encodeURIComponent(state.reviewTaxonomyVersion)}`
+    : '';
+  const cat = await apiFetch('GET', `/templates/catalog?survey_level=${encodeURIComponent(sl)}${modeQ}${ptQ}${vQ}`, null);
+  if (cat.taxonomy_version) state.reviewTaxonomyVersion = cat.taxonomy_version;
   RICS_SECTIONS = (cat.sections || []).map(s => ({
     code: s.code,
     group: s.group,
@@ -1438,7 +1445,7 @@ async function loadTemplateCatalog(surveyLevel) {
   }));
   RICS_GROUP_LABELS = { ...(cat.group_labels || {}) };
   state.surveyLevel = cat.survey_level;
-  if ((state.structureMode || 'rics') === 'content') {
+  if (isContent) {
     state.notesUiRics = false;
     REVIEW_SUBTOPICS = RICS_SECTIONS.slice();
     REVIEW_GROUP_LABELS = { ...RICS_GROUP_LABELS };
@@ -1450,11 +1457,15 @@ async function loadReviewSubtopicCatalog(surveyLevel) {
   const sl = (Number.isFinite(surveyLevel) && surveyLevel >= 1 && surveyLevel <= 3)
     ? Math.floor(Number(surveyLevel)) : 3;
   const ptQ = `&property_type=${encodeURIComponent(state.propertyType || 'house')}`;
+  const vQ = state.reviewTaxonomyVersion
+    ? `&taxonomy_version=${encodeURIComponent(state.reviewTaxonomyVersion)}`
+    : '';
   const cat = await apiFetch(
     'GET',
-    `/templates/catalog?survey_level=${encodeURIComponent(sl)}&structure_mode=content${ptQ}`,
+    `/templates/catalog?survey_level=${encodeURIComponent(sl)}&structure_mode=content${ptQ}${vQ}`,
     null,
   );
+  if (cat.taxonomy_version) state.reviewTaxonomyVersion = cat.taxonomy_version;
   REVIEW_SUBTOPICS = (cat.sections || []).map(s => ({
     code: s.code,
     group: s.group,
@@ -1462,6 +1473,7 @@ async function loadReviewSubtopicCatalog(surveyLevel) {
     hint: s.hint || '',
   }));
   REVIEW_GROUP_LABELS = { ...(cat.group_labels || {}) };
+  if ((state.structureMode || 'rics') === 'content') renderTopicCoverage();
 }
 
 /** Reload Configure cards as RICS leaves after content-mode Stage A remap. */