feat: Step Library sync + service account for default tree ownership
* feat: maintenance flow UX redesign — batch status hub, context strip, detail page upgrades (#85) - Add BatchStatusPage (/flows/:id/batches/:batchId): per-target Start/Resume/View cards, progress bar, 5s polling while in-progress, completion outcome summary - Add BatchStatusCard: handles not-started/in-progress/complete states with step progress for in-progress targets - Add ActiveBatchBanner: amber banner on detail page when a batch is running, links to BatchStatusPage - Add MaintenanceContextStrip: amber strip in ProceduralNavigationPage for maintenance flows showing target name, batch progress (X/Y complete), and Back to Batch nav - Update MaintenanceFlowDetailPage: active batch banner, clickable run history rows with mini progress dots and outcome summaries, Run button loading state, post-launch navigates to BatchStatusPage - Update ProceduralNavigationPage: renders MaintenanceContextStrip between top bar and content when tree_type === 'maintenance'; fetches batch progress once on mount - Add batch_id filter to GET /sessions backend endpoint and SessionListParams frontend type - Add /flows/:id/batches/:batchId route to router Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: session detail page — completion action + outcome summary card - In-progress sessions: amber banner with "Complete Session" button opens SessionOutcomeModal to set outcome/notes/next-steps and finalize - Completed sessions: colored outcome summary card (icon + outcome label + duration + notes + next steps) replaces dense header metadata; "Copy for Ticket" promoted to primary action inside the card - Export toolbar de-emphasized to secondary row of smaller controls below the summary card Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add library-page action props to StepCard (edit/delete/save) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: pass library-page action props through StepLibraryBrowser + refreshKey Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: StepFormModal wrapper + submitLabel/isSubmitting props on StepForm Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: Step Library page — create, edit, delete, save-to-library Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add RuntimeStep union type for procedural custom steps Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: StepChecklist accepts RuntimeStep[], renders amber Custom badge Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: StepDetail accepts RuntimeStep, renders Custom Step badge for custom steps Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: custom step insertion in procedural flow sessions Engineers can add custom steps inline during execution. Steps are persisted to session.custom_steps and restored on resume. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: suppress StepFeedback on custom steps, fix resume stepState seeding, functional updater for step index Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs: add tree forking UI design doc Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs: add tree fork UI implementation plan Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add ForkInfo type and fork fields to Tree/TreeListItem Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: align ForkInfo type with backend schema, remove redundant fork fields Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: ForkInfo placement, required fork_info field, add JSDoc Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add ForkModal component with name and reason fields Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: ForkModal accessibility and UX (escape, click-outside, labels, maxLength) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: open ForkModal on fork action in TreeLibraryPage Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add ForkModal to MyTreesPage Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: show Fork chip badge on forked tree cards Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs: add flow-to-library step sync design doc Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs: add flow-to-library sync implementation plan Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add sync tracking columns to step_library Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add sync columns and source_tree relationship to StepLibrary model Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add group_label to StepContent, is_flow_synced/source_tree_name to StepLibraryResponse Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: include is_flow_synced and source_tree_name in step list/detail responses Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: add is_flow_synced and source_tree_name to step list response Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: add selectinload and sync fields to search and get_step endpoints Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add step_sync module with extraction and upsert logic Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: safe NOT IN placeholders for asyncpg, add deactivate docstring Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: trigger step library sync on tree publish and deactivate on delete - Call sync_steps_from_tree in update_tree whenever the tree is published (status transitions to 'published' or is already published and structure changes) - Call deactivate_synced_steps_for_tree in delete_tree before db.commit() so the FK SET NULL does not nullify source_tree_id before the WHERE clause runs - Fix ::jsonb cast syntax in step_sync.py (asyncpg rejects :: operator in text() queries; replaced with CAST(:content AS jsonb)) - Add UniqueConstraint('source_tree_id','source_node_id') to StepLibrary model so Base.metadata.create_all (used by tests) creates the constraint that the ON CONFLICT clause in sync_steps_from_tree depends on Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add is_flow_synced and source_tree_name to Step types Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: show From Flow badge and lock icon on flow-synced StepCard Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: show source flow name in StepDetailModal for synced steps Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat: add Library Visibility select to procedural StepEditor Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: address code review issues in flow-to-library sync - Fix sync trigger: only fire on publish transition, not every PUT - Add TestSyncOnPublish integration tests (2 tests, 16 total passing) - Add group_label to frontend StepContent interface - Guard Library Visibility select to procedure_step nodes only - Block API edits to flow-synced steps (400 read-only guard) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: handle None author_id in step sync to avoid invalid UUID error When a system/default tree has no author (author_id is None), str(None) produces the literal string 'None' which asyncpg rejects as an invalid UUID for the created_by column. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: add ResolutionFlow service account to own default tree steps in library Default/system trees had no author_id (NULL), causing a NOT NULL violation when syncing steps to step_library.created_by on publish. - Add is_service_account flag to users table (migration 4f4137ce) - Add service_account.py: idempotent ensure_service_account() creates noreply@resolutionflow.com with unusable password on startup - Cache service account ID on app.state at lifespan startup - Add get_service_account_id() FastAPI dep (returns None in tests) - sync_steps_from_tree: resolve author_id or service_account_id as created_by - create_tree: set author_id=service_account_id for is_default trees - Migration 1490781700bc: backfill author_id on 31 existing default trees Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit was merged in pull request #89.
This commit is contained in:
chihlasm
222
backend/app/core/step_sync.py
Normal file
222
backend/app/core/step_sync.py
Normal file
@@ -0,0 +1,222 @@
|
||||
"""Sync steps from published flows into the step library."""
|
||||
from __future__ import annotations
|
||||
import json
|
||||
from typing import Any, Generator, Literal, Optional
|
||||
from uuid import UUID
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from sqlalchemy import text
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
|
||||
StepVisibility = Literal['private', 'team', 'public']
|
||||
|
||||
|
||||
def resolve_step_visibility(
|
||||
is_public: bool,
|
||||
account_id: Optional[UUID],
|
||||
node_override: Optional[str],
|
||||
) -> StepVisibility:
|
||||
"""Resolve the visibility for a synced step.
|
||||
|
||||
Priority: node-level library_visibility overrides flow visibility.
|
||||
Flow visibility: 'public' if is_public, otherwise 'team'.
|
||||
"""
|
||||
if node_override in ('team', 'public'):
|
||||
return node_override # type: ignore[return-value]
|
||||
return 'public' if is_public else 'team'
|
||||
|
||||
|
||||
def _normalize_commands(raw: Any) -> list[dict]:
|
||||
"""Normalize the commands field to a list of StepCommand dicts."""
|
||||
if not raw:
|
||||
return []
|
||||
if isinstance(raw, str):
|
||||
return [{"label": "", "command": raw, "command_type": None}]
|
||||
if isinstance(raw, list):
|
||||
result = []
|
||||
for item in raw:
|
||||
if isinstance(item, str):
|
||||
result.append({"label": "", "command": item, "command_type": None})
|
||||
elif isinstance(item, dict):
|
||||
result.append({
|
||||
"label": item.get("label", ""),
|
||||
"command": item.get("code", item.get("command", "")),
|
||||
"command_type": item.get("language", item.get("command_type")),
|
||||
})
|
||||
return result
|
||||
return []
|
||||
|
||||
|
||||
def _walk_troubleshooting(node: dict) -> Generator[dict, None, None]:
|
||||
"""Recursively yield action and solution nodes from a troubleshooting tree."""
|
||||
if node.get("type") in ("action", "solution"):
|
||||
yield node
|
||||
for child in node.get("children", []):
|
||||
yield from _walk_troubleshooting(child)
|
||||
|
||||
|
||||
def extract_steps_for_sync(
|
||||
tree_structure: dict,
|
||||
tree_type: str,
|
||||
) -> Generator[dict, None, None]:
|
||||
"""Extract step dicts ready for upsert from a tree structure.
|
||||
|
||||
Yields dicts with keys:
|
||||
source_node_id, title, step_type, content (dict), node_visibility_override
|
||||
"""
|
||||
if tree_type in ("procedural", "maintenance"):
|
||||
steps = tree_structure.get("steps", [])
|
||||
current_section: Optional[str] = None
|
||||
for node in steps:
|
||||
node_type = node.get("type")
|
||||
if node_type == "section_header":
|
||||
current_section = node.get("title") or node.get("section_header")
|
||||
continue
|
||||
if node_type != "procedure_step":
|
||||
continue
|
||||
instructions = node.get("description") or node.get("title", "")
|
||||
commands = _normalize_commands(node.get("commands")) or None
|
||||
content: dict = {"instructions": instructions}
|
||||
if node.get("expected_outcome"):
|
||||
content["help_text"] = node["expected_outcome"]
|
||||
if commands:
|
||||
content["commands"] = commands
|
||||
if current_section:
|
||||
content["group_label"] = current_section
|
||||
yield {
|
||||
"source_node_id": node["id"],
|
||||
"title": node.get("title", "Untitled step"),
|
||||
"step_type": "action",
|
||||
"content": content,
|
||||
"node_visibility_override": node.get("library_visibility"),
|
||||
}
|
||||
|
||||
elif tree_type == "troubleshooting":
|
||||
for node in _walk_troubleshooting(tree_structure):
|
||||
instructions = node.get("description") or node.get("title", "")
|
||||
yield {
|
||||
"source_node_id": node["id"],
|
||||
"title": node.get("title", "Untitled step"),
|
||||
"step_type": "action" if node["type"] == "action" else "solution",
|
||||
"content": {"instructions": instructions},
|
||||
"node_visibility_override": None,
|
||||
}
|
||||
|
||||
|
||||
async def sync_steps_from_tree(
|
||||
db: AsyncSession,
|
||||
tree_id: UUID,
|
||||
tree_type: str,
|
||||
tree_structure: dict,
|
||||
author_id: Optional[UUID],
|
||||
account_id: Optional[UUID],
|
||||
is_public: bool,
|
||||
service_account_id: Optional[UUID] = None,
|
||||
) -> int:
|
||||
"""Upsert step library entries from a published tree.
|
||||
|
||||
Returns the number of steps synced.
|
||||
|
||||
For default/system trees that have no author_id, pass service_account_id
|
||||
so that created_by is set to the ResolutionFlow service account.
|
||||
"""
|
||||
resolved_author_id = author_id or service_account_id
|
||||
if not resolved_author_id:
|
||||
return 0
|
||||
|
||||
now = datetime.now(timezone.utc)
|
||||
extracted = list(extract_steps_for_sync(tree_structure, tree_type))
|
||||
|
||||
for step_data in extracted:
|
||||
visibility = resolve_step_visibility(
|
||||
is_public=is_public,
|
||||
account_id=account_id,
|
||||
node_override=step_data["node_visibility_override"],
|
||||
)
|
||||
await db.execute(
|
||||
text("""
|
||||
INSERT INTO step_library (
|
||||
id, title, step_type, content, created_by, account_id,
|
||||
visibility, is_flow_synced, source_tree_id, source_node_id,
|
||||
last_synced_at, tags, is_active,
|
||||
usage_count, rating_average, rating_count,
|
||||
helpful_yes, helpful_no, is_featured, is_verified,
|
||||
created_at, updated_at
|
||||
) VALUES (
|
||||
gen_random_uuid(), :title, :step_type, CAST(:content AS jsonb),
|
||||
:created_by, :account_id, :visibility, true,
|
||||
:source_tree_id, :source_node_id, :last_synced_at,
|
||||
'{}', true,
|
||||
0, 0, 0, 0, 0, false, false,
|
||||
:now, :now
|
||||
)
|
||||
ON CONFLICT (source_tree_id, source_node_id)
|
||||
DO UPDATE SET
|
||||
title = EXCLUDED.title,
|
||||
step_type = EXCLUDED.step_type,
|
||||
content = EXCLUDED.content,
|
||||
visibility = EXCLUDED.visibility,
|
||||
last_synced_at = EXCLUDED.last_synced_at,
|
||||
updated_at = EXCLUDED.updated_at,
|
||||
is_active = true
|
||||
"""),
|
||||
{
|
||||
"title": step_data["title"],
|
||||
"step_type": step_data["step_type"],
|
||||
"content": json.dumps(step_data["content"]),
|
||||
"created_by": str(resolved_author_id),
|
||||
"account_id": str(account_id) if account_id else None,
|
||||
"visibility": visibility,
|
||||
"source_tree_id": str(tree_id),
|
||||
"source_node_id": step_data["source_node_id"],
|
||||
"last_synced_at": now,
|
||||
"now": now,
|
||||
}
|
||||
)
|
||||
|
||||
# Soft-delete previously synced steps that no longer exist in the tree
|
||||
current_node_ids = [s["source_node_id"] for s in extracted]
|
||||
if current_node_ids:
|
||||
# Build NOT IN using explicit named placeholders — asyncpg does not
|
||||
# auto-cast a Python list to a PostgreSQL array in text() queries.
|
||||
placeholders = ", ".join(f":id_{i}" for i in range(len(current_node_ids)))
|
||||
params = {f"id_{i}": nid for i, nid in enumerate(current_node_ids)}
|
||||
params.update({"tree_id": str(tree_id), "now": now})
|
||||
await db.execute(
|
||||
text(f"""
|
||||
UPDATE step_library
|
||||
SET is_active = false, updated_at = :now
|
||||
WHERE source_tree_id = :tree_id
|
||||
AND is_flow_synced = true
|
||||
AND source_node_id NOT IN ({placeholders})
|
||||
"""),
|
||||
params
|
||||
)
|
||||
else:
|
||||
await db.execute(
|
||||
text("""
|
||||
UPDATE step_library
|
||||
SET is_active = false, updated_at = :now
|
||||
WHERE source_tree_id = :tree_id AND is_flow_synced = true
|
||||
"""),
|
||||
{"tree_id": str(tree_id), "now": now}
|
||||
)
|
||||
|
||||
return len(extracted)
|
||||
|
||||
|
||||
async def deactivate_synced_steps_for_tree(db: AsyncSession, tree_id: UUID) -> None:
|
||||
"""Soft-delete all synced library entries for a tree (on tree delete/deactivate).
|
||||
|
||||
Must be called BEFORE deleting the tree row — after deletion the FK ondelete='SET NULL'
|
||||
will null source_tree_id, making the WHERE clause match nothing.
|
||||
"""
|
||||
await db.execute(
|
||||
text("""
|
||||
UPDATE step_library
|
||||
SET is_active = false, updated_at = :now
|
||||
WHERE source_tree_id = :tree_id AND is_flow_synced = true
|
||||
"""),
|
||||
{"tree_id": str(tree_id), "now": datetime.now(timezone.utc)}
|
||||
)
|
||||
Reference in New Issue
Block a user