UI features

requirements.txt

@@ -7,6 +7,12 @@ et_xmlfile==2.0.0
 fhir.resources==8.2.0
 fhir_core==1.1.5
 idna==3.11
+iniconfig==2.3.0
+Jinja2==3.1.6
+MarkupSafe==3.0.3
+mccabe==0.7.0
+mypy_extensions==1.1.0
+nodeenv==1.9.1
 numpy==2.4.2
 openpyxl==3.1.5
 pandas==3.0.0

src/soa_builder/web/routers/timings.py

@@ -3,6 +3,8 @@
 import os
 from typing import Optional
 
+from pydantic import ValidationError
+
 from fastapi import APIRouter, HTTPException, Request, Form
 from fastapi.responses import JSONResponse, HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
@@ -291,21 +293,25 @@ def ui_create_timing(
                 conn_c2.close()
         except Exception:
             rtf_code_uid = None
-    payload = TimingCreate(
-        name=name,
-        label=label,
-        description=description,
-        type=code_uid,
-        value=value,
-        value_label=value_label,
-        relative_to_from=rtf_code_uid,
-        relative_from_schedule_instance=relative_from_schedule_instance,
-        relative_to_schedule_instance=relative_to_schedule_instance,
-        window_label=window_label,
-        window_upper=window_upper,
-        window_lower=window_lower,
-        member_of_timeline=member_of_timeline,
-    )
+    try:
+        payload = TimingCreate(
+            name=name,
+            label=label,
+            description=description,
+            type=code_uid,
+            value=value,
+            value_label=value_label,
+            relative_to_from=rtf_code_uid,
+            relative_from_schedule_instance=relative_from_schedule_instance,
+            relative_to_schedule_instance=relative_to_schedule_instance,
+            window_label=window_label,
+            window_upper=window_upper,
+            window_lower=window_lower,
+            member_of_timeline=member_of_timeline,
+        )
+    except ValidationError as exc:
+        msgs = "; ".join(e["msg"] for e in exc.errors())
+        raise HTTPException(400, f"Validation error: {msgs}")
     create_timing(soa_id, payload)
     return RedirectResponse(url=f"/ui/soa/{int(soa_id)}/timings", status_code=303)
 
@@ -623,21 +629,25 @@ def ui_update_timing(
         # On any error, fall back to previous behavior (leave fields unchanged)
         mapped_type = None if type_submission_value not in ("",) else ""
         mapped_rtf = None if relative_to_from_submission_value not in ("",) else ""
-    payload = TimingUpdate(
-        name=name,
-        label=label,
-        description=description,
-        type=mapped_type,
-        value=value,
-        value_label=value_label,
-        relative_to_from=mapped_rtf,
-        relative_from_schedule_instance=relative_from_schedule_instance,
-        relative_to_schedule_instance=relative_to_schedule_instance,
-        window_label=window_label,
-        window_upper=window_upper,
-        window_lower=window_lower,
-        member_of_timeline=member_of_timeline,
-    )
+    try:
+        payload = TimingUpdate(
+            name=name,
+            label=label,
+            description=description,
+            type=mapped_type,
+            value=value,
+            value_label=value_label,
+            relative_to_from=mapped_rtf,
+            relative_from_schedule_instance=relative_from_schedule_instance,
+            relative_to_schedule_instance=relative_to_schedule_instance,
+            window_label=window_label,
+            window_upper=window_upper,
+            window_lower=window_lower,
+            member_of_timeline=member_of_timeline,
+        )
+    except ValidationError as exc:
+        msgs = "; ".join(e["msg"] for e in exc.errors())
+        raise HTTPException(400, f"Validation error: {msgs}")
     update_timing(soa_id, timing_id, payload)
     return RedirectResponse(url=f"/ui/soa/{int(soa_id)}/timings", status_code=303)
 

src/soa_builder/web/schemas.py

@@ -1,6 +1,50 @@
+import re
 from typing import List, Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator, model_validator
+
+# ISO 8601 duration pattern supporting both standard (-P2D) and USDM (P-2D) conventions
+_ISO8601_DURATION_RE = re.compile(
+    r"^-?P-?(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)W)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$"
+)
+
+
+def _validate_iso8601_duration(v: Optional[str]) -> Optional[str]:
+    if v is None:
+        return v
+    v = v.strip()
+    if not v:
+        return None
+    m = _ISO8601_DURATION_RE.match(v)
+    if not m or not any(m.group(i) is not None for i in range(1, 8)):
+        raise ValueError(
+            f"'{v}' is not a valid ISO 8601 duration (e.g. P1D, P2W, PT8H, -P2D)"
+        )
+    return v
+
+
+def _validate_window_all_or_none(
+    window_lower: Optional[str],
+    window_upper: Optional[str],
+    window_label: Optional[str],
+) -> None:
+    """Enforce that window_lower, window_upper, and window_label are all provided or all absent."""
+
+    def _present(v: Optional[str]) -> bool:
+        return v is not None and v.strip() != ""
+
+    provided = [_present(window_lower), _present(window_upper), _present(window_label)]
+    if any(provided) and not all(provided):
+        missing = []
+        if not _present(window_lower):
+            missing.append("window_lower")
+        if not _present(window_upper):
+            missing.append("window_upper")
+        if not _present(window_label):
+            missing.append("window_label")
+        raise ValueError(
+            f"Window fields are all-or-nothing: missing {', '.join(missing)}"
+        )
 
 
 class InstanceUpdate(BaseModel):
@@ -42,6 +86,18 @@ class TimingCreate(BaseModel):
     window_lower: Optional[str] = None
     member_of_timeline: Optional[str] = None
 
+    @field_validator("value", "window_lower", "window_upper", mode="before")
+    @classmethod
+    def check_iso8601_duration(cls, v: Optional[str]) -> Optional[str]:
+        return _validate_iso8601_duration(v)
+
+    @model_validator(mode="after")
+    def check_window_all_or_none(self) -> "TimingCreate":
+        _validate_window_all_or_none(
+            self.window_lower, self.window_upper, self.window_label
+        )
+        return self
+
 
 class TimingUpdate(BaseModel):
     name: str
@@ -58,6 +114,18 @@ class TimingUpdate(BaseModel):
     window_lower: Optional[str] = None
     member_of_timeline: Optional[str] = None
 
+    @field_validator("value", "window_lower", "window_upper", mode="before")
+    @classmethod
+    def check_iso8601_duration(cls, v: Optional[str]) -> Optional[str]:
+        return _validate_iso8601_duration(v)
+
+    @model_validator(mode="after")
+    def check_window_all_or_none(self) -> "TimingUpdate":
+        _validate_window_all_or_none(
+            self.window_lower, self.window_upper, self.window_label
+        )
+        return self
+
 
 class ScheduleTimelineCreate(BaseModel):
     name: str

src/soa_builder/web/templates/instances.html

@@ -24,7 +24,7 @@ <h2>Scheduled Activity Instances for SoA {{ soa_id }}</h2>
             <input name="description" placeholder="Description (Optional)" />
         </div>
         <div style="display: flex;flex-direction: column;gap:2px;">
-            <label><strong>Default Condition ID</strong></label>
+            <label><strong>Next Instance (default condition)</strong></label>
             <select name="default_condition_uid">
                 <option value="">-- Select Activity Instance --</option>
                 {% for name, instance_uid in (instance_options or {}).items() %}
@@ -78,7 +78,7 @@ <h2>Scheduled Activity Instances for SoA {{ soa_id }}</h2>
         <th style="text-align:left;padding:4px;">Name</th>
         <th style="text-align:left;padding:4px;">Label</th>
         <th style="text-align:left;padding:4px;">Description</th>
-        <th style="text-align:left;padding:4px;">Default Condition</th>
+        <th style="text-align:left;padding:4px;">Next Instance (default condition)</th>
         <th style="text-align:left;padding:4px;">Epoch</th>
         <th style="text-align:left;padding:4px;">Timeline ID</th>
         <th style="text-align:left;padding:4px;">Timeline Exit ID</th>