From 300d0eab6301d6aab68fb967f80b27d95db95df7 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 19 Feb 2026 15:41:17 +0200
Subject: [PATCH 01/24] Web-UI, Web-API

- Add what-if scenario simulation to Decision Journey view
- New backend POST /method/enautilus/simulate endpoint runs E-NAUTILUS greedily to completion for a
chosen objective (best or worst), ephemeral with no DB writes
- New ENautilusSimulateRequest/Response/StepResult models with deprioritize flag for worst-case
selection
- Frontend what-if buttons in iteration detail panel: "best" (blue) and "worst" (red) per objective
- Chart overlay renders simulated path as dashed lines with hollow circle markers
- Comparison table shows actual vs what-if final values with colored deltas
- Extract normalizePoint, buildNormalizationMaps, computeSimulatedJourneySteps helpers in
journey-utils
- Highlight selected iteration in chart with vertical band
- Default visualization pane to 65% height for more chart room
- Regenerate frontend client
---
 desdeo/api/models/__init__.py                 |   6 +
 desdeo/api/models/enautilus.py                |  34 +
 desdeo/api/routers/enautilus.py               | 166 +++
 uv.lock                                       |   2 +-
 .../decision-journey/decision-journey.svelte  | 154 ++-
 .../custom/decision-journey/journey-utils.ts  |  93 ++
 .../objective-evolution-chart.svelte          | 101 +-
 .../custom/method_layout/base-layout.svelte   |   4 +-
 webui/src/lib/gen/endpoints/DESDEOFastAPI.ts  | 171 +++-
 .../src/lib/gen/endpoints/DESDEOFastAPIzod.ts | 954 +++++++++++++++---
 .../BodyAddProblemJsonProblemAddJsonPost.ts   |  10 +
 .../gen/models/ENautilusSimulateRequest.ts    |  21 +
 .../gen/models/ENautilusSimulateResponse.ts   |  21 +
 ...sSimulateResponseFinalIntermediatePoint.ts |   9 +
 .../gen/models/ENautilusSimulateStepResult.ts |  22 +
 ...imulateStepResultIntermediatePointsItem.ts |   9 +
 ...NautilusSimulateStepResultSelectedPoint.ts |  12 +
 webui/src/lib/gen/models/SolutionReference.ts |   6 +
 .../lib/gen/models/SolutionReferenceLite.ts   |   3 +
 .../SolutionReferenceLiteObjectiveValues.ts   |   3 +
 .../SolutionReferenceObjectiveValues.ts       |   3 +
 .../models/SolutionReferenceVariableValues.ts |   3 +
 webui/src/lib/gen/models/index.ts             |  13 +-
 .../interactive_methods/E-NAUTILUS/handler.ts |  25 +-
 24 files changed, 1693 insertions(+), 152 deletions(-)
 create mode 100644 webui/src/lib/gen/models/ENautilusSimulateRequest.ts
 create mode 100644 webui/src/lib/gen/models/ENautilusSimulateResponse.ts
 create mode 100644 webui/src/lib/gen/models/ENautilusSimulateResponseFinalIntermediatePoint.ts
 create mode 100644 webui/src/lib/gen/models/ENautilusSimulateStepResult.ts
 create mode 100644 webui/src/lib/gen/models/ENautilusSimulateStepResultIntermediatePointsItem.ts
 create mode 100644 webui/src/lib/gen/models/ENautilusSimulateStepResultSelectedPoint.ts

diff --git a/desdeo/api/models/__init__.py b/desdeo/api/models/__init__.py
index f7b1fda1c..f8b8c23f5 100644
--- a/desdeo/api/models/__init__.py
+++ b/desdeo/api/models/__init__.py
@@ -15,6 +15,9 @@
     "ENautilusFinalState",
     "ENautilusRepresentativeSolutionsResponse",
     "ENautilusSessionTreeResponse",
+    "ENautilusSimulateRequest",
+    "ENautilusSimulateResponse",
+    "ENautilusSimulateStepResult",
     "ENautilusState",
     "ENautilusStateResponse",
     "ENautilusStepRequest",
@@ -151,6 +154,9 @@
     ENautilusFinalizeResponse,
     ENautilusRepresentativeSolutionsResponse,
     ENautilusSessionTreeResponse,
+    ENautilusSimulateRequest,
+    ENautilusSimulateResponse,
+    ENautilusSimulateStepResult,
     ENautilusStateResponse,
     ENautilusStepRequest,
     ENautilusStepResponse,
diff --git a/desdeo/api/models/enautilus.py b/desdeo/api/models/enautilus.py
index 7485bb788..d9c964a68 100644
--- a/desdeo/api/models/enautilus.py
+++ b/desdeo/api/models/enautilus.py
@@ -131,6 +131,40 @@ class ENautilusTreeNodeResponse(SQLModel):
     )
 
 
+class ENautilusSimulateRequest(SQLModel):
+    """Run E-NAUTILUS greedily from a state to completion."""
+
+    state_id: int = Field(description="Starting ENautilusState to branch from.")
+    preferred_objective: str = Field(description="Objective symbol to favor (e.g., 'f_1').")
+    deprioritize: bool = Field(
+        default=False,
+        description="If True, always pick the WORST value for the objective instead of the best.",
+    )
+    number_of_intermediate_points: int = Field(
+        default=3, description="Number of intermediate points per simulated step."
+    )
+
+
+class ENautilusSimulateStepResult(SQLModel):
+    """One step in the simulated path."""
+
+    iteration: int
+    iterations_left: int
+    selected_point: dict[str, float] = Field(sa_column=Column(JSON), description="The auto-picked intermediate point.")
+    selected_point_index: int
+    intermediate_points: list[dict[str, float]] = Field(sa_column=Column(JSON))
+    closeness_measures: list[float]
+
+
+class ENautilusSimulateResponse(SQLModel):
+    """Result of greedy E-NAUTILUS simulation."""
+
+    preferred_objective: str
+    steps: list[ENautilusSimulateStepResult]
+    final_solution: SolverResults = Field(description="Projected Pareto-optimal solution.")
+    final_intermediate_point: dict[str, float] = Field(sa_column=Column(JSON))
+
+
 class ENautilusDecisionEventResponse(SQLModel):
     """A decision event capturing a transition from parent to child node."""
 
diff --git a/desdeo/api/routers/enautilus.py b/desdeo/api/routers/enautilus.py
index fab033cf8..7bd5dc1a2 100644
--- a/desdeo/api/routers/enautilus.py
+++ b/desdeo/api/routers/enautilus.py
@@ -15,6 +15,9 @@
     ENautilusFinalState,
     ENautilusRepresentativeSolutionsResponse,
     ENautilusSessionTreeResponse,
+    ENautilusSimulateRequest,
+    ENautilusSimulateResponse,
+    ENautilusSimulateStepResult,
     ENautilusState,
     ENautilusStateResponse,
     ENautilusStepRequest,
@@ -509,6 +512,169 @@ def get_session_tree(
     )
 
 
+@router.post("/simulate")
+def simulate(
+    request: ENautilusSimulateRequest,
+    db_session: Annotated[Session, Depends(get_session)],
+) -> ENautilusSimulateResponse:
+    """Run E-NAUTILUS greedily from a state to completion.
+
+    Given a starting state, this endpoint greedily selects the best intermediate
+    point for the preferred objective at each iteration until iterations_left == 0,
+    then projects to the Pareto front. No database writes are performed.
+    """
+    # Load starting state
+    state_db: StateDB | None = db_session.exec(select(StateDB).where(StateDB.id == request.state_id)).first()
+    if state_db is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail=f"StateDB with id={request.state_id} not found."
+        )
+
+    if not isinstance(state_db.state, ENautilusState):
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST, detail="The referenced state is not an ENautilusState."
+        )
+
+    enautilus_state: ENautilusState = state_db.state
+    result: ENautilusResult = enautilus_state.enautilus_results
+
+    # Load problem
+    problem_db = db_session.exec(select(ProblemDB).where(ProblemDB.id == state_db.problem_id)).first()
+    if problem_db is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail=f"ProblemDB with id={state_db.problem_id} not found."
+        )
+
+    problem = Problem.from_problemdb(problem_db)
+
+    # Validate preferred_objective
+    obj_symbols = [obj.symbol for obj in problem.objectives]
+    if request.preferred_objective not in obj_symbols:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"'{request.preferred_objective}' is not a valid objective. Valid: {obj_symbols}",
+        )
+
+    # Determine if the preferred objective is maximized.
+    # When deprioritize is True, invert the selection logic (pick worst instead of best).
+    pref_obj = next(obj for obj in problem.objectives if obj.symbol == request.preferred_objective)
+    pref_maximize = pref_obj.maximize if not request.deprioritize else (not pref_obj.maximize)
+
+    # Load non-dominated solutions
+    non_dom_db = db_session.exec(
+        select(RepresentativeNonDominatedSolutions).where(
+            RepresentativeNonDominatedSolutions.id == enautilus_state.non_dominated_solutions_id
+        )
+    ).first()
+    if non_dom_db is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"RepresentativeNonDominatedSolutions with id={enautilus_state.non_dominated_solutions_id} not found.",
+        )
+
+    non_dom_solutions = non_dom_db.solution_data
+
+    # Start from the existing result's intermediate points
+    current_intermediate_points = result.intermediate_points
+    current_reachable_indices = result.reachable_point_indices
+    current_closeness = result.closeness_measures
+    current_iteration = result.current_iteration
+    iterations_left = result.iterations_left
+
+    steps: list[ENautilusSimulateStepResult] = []
+
+    while iterations_left > 0:
+        # Greedy selection: pick the intermediate point best for preferred_objective
+        best_idx = _pick_best_for_objective(current_intermediate_points, request.preferred_objective, pref_maximize)
+
+        selected_point = current_intermediate_points[best_idx]
+        reachable_for_selected = current_reachable_indices[best_idx]
+
+        steps.append(
+            ENautilusSimulateStepResult(
+                iteration=current_iteration,
+                iterations_left=iterations_left,
+                selected_point=selected_point,
+                selected_point_index=best_idx,
+                intermediate_points=current_intermediate_points,
+                closeness_measures=current_closeness,
+            )
+        )
+
+        if iterations_left == 0:
+            break
+
+        # Run E-NAUTILUS step (core computation, no DB writes)
+        next_result: ENautilusResult = enautilus_step(
+            problem=problem,
+            non_dominated_points=non_dom_solutions,
+            current_iteration=current_iteration,
+            iterations_left=iterations_left,
+            selected_point=selected_point,
+            number_of_intermediate_points=request.number_of_intermediate_points,
+            reachable_point_indices=reachable_for_selected,
+        )
+
+        current_intermediate_points = next_result.intermediate_points
+        current_reachable_indices = next_result.reachable_point_indices
+        current_closeness = next_result.closeness_measures
+        current_iteration = next_result.current_iteration
+        iterations_left = next_result.iterations_left
+
+    # Final selection at iterations_left == 0
+    final_best_idx = _pick_best_for_objective(current_intermediate_points, request.preferred_objective, pref_maximize)
+    final_intermediate_point = current_intermediate_points[final_best_idx]
+
+    steps.append(
+        ENautilusSimulateStepResult(
+            iteration=current_iteration,
+            iterations_left=iterations_left,
+            selected_point=final_intermediate_point,
+            selected_point_index=final_best_idx,
+            intermediate_points=current_intermediate_points,
+            closeness_measures=current_closeness,
+        )
+    )
+
+    # Build a result object for projection
+    final_result = ENautilusResult(
+        current_iteration=current_iteration,
+        iterations_left=iterations_left,
+        intermediate_points=current_intermediate_points,
+        reachable_best_bounds=[],  # not needed for projection
+        reachable_worst_bounds=[],
+        closeness_measures=current_closeness,
+        reachable_point_indices=current_reachable_indices,
+    )
+
+    non_dom_df = pl.DataFrame(non_dom_solutions)
+    representative_solutions = enautilus_get_representative_solutions(problem, final_result, non_dom_df)
+    final_solution = representative_solutions[final_best_idx]
+
+    return ENautilusSimulateResponse(
+        preferred_objective=request.preferred_objective,
+        steps=steps,
+        final_solution=final_solution,
+        final_intermediate_point=final_intermediate_point,
+    )
+
+
+def _pick_best_for_objective(
+    intermediate_points: list[dict[str, float]],
+    objective: str,
+    maximize: bool,
+) -> int:
+    """Pick the index of the intermediate point with the best value for an objective."""
+    best_idx = 0
+    best_val = intermediate_points[0][objective]
+    for i in range(1, len(intermediate_points)):
+        val = intermediate_points[i][objective]
+        if (maximize and val > best_val) or (not maximize and val < best_val):
+            best_val = val
+            best_idx = i
+    return best_idx
+
+
 def _match_chosen_point(
     chosen: dict[str, float] | None,
     options: list[dict[str, float]],
diff --git a/uv.lock b/uv.lock
index 94214f931..f153954fc 100644
--- a/uv.lock
+++ b/uv.lock
@@ -694,7 +694,7 @@ wheels = [
 
 [[package]]
 name = "desdeo"
-version = "2.2.1"
+version = "2.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "bayesian-optimization" },
diff --git a/webui/src/lib/components/custom/decision-journey/decision-journey.svelte b/webui/src/lib/components/custom/decision-journey/decision-journey.svelte
index 2b296299d..def11184d 100644
--- a/webui/src/lib/components/custom/decision-journey/decision-journey.svelte
+++ b/webui/src/lib/components/custom/decision-journey/decision-journey.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-	import type { ENautilusSessionTreeResponse, ProblemInfo } from '$lib/gen/models';
-	import { extractPathToLeaf, computeJourneyData, type JourneyStep } from './journey-utils';
+	import type { ENautilusSessionTreeResponse, ENautilusSimulateResponse, ProblemInfo } from '$lib/gen/models';
+	import { extractPathToLeaf, computeJourneyData, buildNormalizationMaps, computeSimulatedJourneySteps, type JourneyStep, type WhatIfSimulation } from './journey-utils';
 	import { COLOR_PALETTE } from '$lib/components/visualizations/utils/colors';
 	import { formatNumber } from '$lib/helpers';
+	import { simulateMethodEnautilusSimulatePost } from '$lib/gen/endpoints/DESDEOFastAPI';
 	import ObjectiveEvolutionChart from './objective-evolution-chart.svelte';
 	import PreferenceProfileChart from './preference-profile-chart.svelte';
 	import TradeoffSummary from './tradeoff-summary.svelte';
@@ -21,6 +22,9 @@
 
 	let tooltipEl = $state<HTMLDivElement>();
 	let selectedStep = $state<JourneyStep | null>(null);
+	let whatIfSimulation = $state<WhatIfSimulation | null>(null);
+	let whatIfLoading = $state(false);
+	let whatIfSectionEl = $state<HTMLDivElement>();
 
 	let journeyData = $derived.by(() => {
 		try {
@@ -41,6 +45,65 @@
 
 	function handleStepClick(step: JourneyStep) {
 		selectedStep = step;
+		whatIfSimulation = null;
+	}
+
+	async function handleWhatIf(objectiveSymbol: string, deprioritize = false) {
+		if (!selectedStep || selectedStep.nodeId < 0) return;
+
+		whatIfLoading = true;
+		try {
+			const result = await simulateMethodEnautilusSimulatePost({
+				state_id: selectedStep.nodeId,
+				preferred_objective: objectiveSymbol,
+				deprioritize,
+			});
+			if (result.status !== 200) {
+				console.error('[DecisionJourney] Simulation failed:', result.status);
+				whatIfLoading = false;
+				return;
+			}
+			const response: ENautilusSimulateResponse = result.data;
+
+			// Build normalization maps
+			const path = extractPathToLeaf(sessionTree, leafNodeId);
+			const rootPoint = path.length > 0 ? (path[0].selected_point as Record<string, number> | null) : null;
+			const { idealMap, nadirMap } = buildNormalizationMaps(problem, rootPoint);
+
+			// Convert simulation steps to JourneyStep[]
+			const simSteps = computeSimulatedJourneySteps(
+				response.steps,
+				journeyData.objectiveKeys,
+				idealMap,
+				nadirMap,
+			);
+
+			// Find branch step index
+			const branchIdx = journeyData.steps.findIndex((s) => s.nodeId === selectedStep!.nodeId);
+
+			// Extract final solution values, handling both scalar and array forms
+			const rawObjectives = response.final_solution.optimal_objectives ?? {};
+			const finalSolution: Record<string, number> = {};
+			for (const [k, v] of Object.entries(rawObjectives)) {
+				finalSolution[k] = Array.isArray(v) ? v[0] : (v as number);
+			}
+
+			whatIfSimulation = {
+				branchStepIdx: branchIdx >= 0 ? branchIdx : 0,
+				preferredObjective: response.preferred_objective,
+				deprioritize,
+				steps: simSteps,
+				finalSolution,
+			};
+
+			// Scroll the what-if section into view after render
+			requestAnimationFrame(() => {
+				whatIfSectionEl?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+			});
+		} catch (err) {
+			console.error('[DecisionJourney] What-if simulation failed:', err);
+		}
+		whatIfLoading = false;
 	}
 
 	function fmtPct(val: number): string {
@@ -71,6 +134,8 @@
 							objectiveMaximize={journeyData.objectiveMaximize}
 							bind:tooltipEl={tooltipEl}
 							onStepClick={handleStepClick}
+							{whatIfSimulation}
+							selectedIteration={selectedStep?.iteration ?? null}
 						/>
 					</div>
 				</div>
@@ -102,7 +167,7 @@
 				</h3>
 				<button
 					class="text-lg leading-none text-gray-400 hover:text-gray-700"
-					onclick={() => (selectedStep = null)}
+					onclick={() => { selectedStep = null; whatIfSimulation = null; }}
 				>&times;</button>
 			</div>
 
@@ -201,6 +266,89 @@
 				<p class="mt-2 text-[10px] text-gray-400">
 					% relative to ideal–nadir range. Green = better than alternative, red = worse.
 				</p>
+
+				<!-- What-if simulation section -->
+				<div bind:this={whatIfSectionEl} class="mt-4 border-t border-gray-200 pt-3">
+					<div class="mb-2 text-xs font-medium text-gray-500">What if you had always picked the best...</div>
+					<div class="flex flex-wrap gap-1.5">
+						{#each journeyData.objectiveKeys as oKey, j}
+							{@const oLabel = journeyData.objectiveLabels[j] ?? oKey}
+							{@const dir = journeyData.objectiveMaximize[j] ? '↑' : '↓'}
+							{@const isActive = whatIfSimulation?.preferredObjective === oKey && !whatIfSimulation?.deprioritize}
+							<button
+								class="rounded border px-2 py-1 text-xs transition-colors {isActive ? 'border-blue-400 bg-blue-50 text-blue-700 font-semibold' : 'border-gray-200 bg-white text-gray-600 hover:border-gray-300 hover:bg-gray-50'}"
+								disabled={whatIfLoading}
+								onclick={() => handleWhatIf(oKey)}
+							>
+								{oLabel} {dir}
+							</button>
+						{/each}
+					</div>
+
+					<div class="mt-2 mb-2 text-xs font-medium text-gray-500">...or always picked the worst?</div>
+					<div class="flex flex-wrap gap-1.5">
+						{#each journeyData.objectiveKeys as oKey, j}
+							{@const oLabel = journeyData.objectiveLabels[j] ?? oKey}
+							{@const dir = journeyData.objectiveMaximize[j] ? '↓' : '↑'}
+							{@const isActive = whatIfSimulation?.preferredObjective === oKey && whatIfSimulation?.deprioritize}
+							<button
+								class="rounded border px-2 py-1 text-xs transition-colors {isActive ? 'border-red-400 bg-red-50 text-red-700 font-semibold' : 'border-gray-200 bg-white text-gray-600 hover:border-gray-300 hover:bg-gray-50'}"
+								disabled={whatIfLoading}
+								onclick={() => handleWhatIf(oKey, true)}
+							>
+								{oLabel} {dir}
+							</button>
+						{/each}
+					</div>
+
+					{#if whatIfLoading}
+						<div class="mt-2 text-xs text-gray-400 italic">Simulating...</div>
+					{/if}
+
+					{#if whatIfSimulation}
+						<div class="mt-3">
+							<div class="mb-1 text-xs font-medium text-gray-500">Actual vs What-if final</div>
+							<table class="w-full text-xs">
+								<thead>
+									<tr class="border-b border-gray-200 text-left text-gray-500">
+										<th class="pb-1 pr-2 font-medium">Objective</th>
+										<th class="pb-1 px-1.5 font-medium text-center">Actual</th>
+										<th class="pb-1 px-1.5 font-medium text-center">What-if</th>
+										<th class="pb-1 px-1.5 font-medium text-center">Δ</th>
+									</tr>
+								</thead>
+								<tbody>
+									{#each journeyData.objectiveKeys as oKey, j}
+										{@const actualRaw = journeyData.steps[journeyData.steps.length - 1]?.rawValues[oKey]}
+										{@const whatIfRaw = whatIfSimulation.finalSolution[oKey]}
+										{@const delta = actualRaw != null && whatIfRaw != null ? whatIfRaw - actualRaw : null}
+										{@const isMax = journeyData.objectiveMaximize[j]}
+										{@const isGood = delta != null && ((isMax && delta > 0) || (!isMax && delta < 0))}
+										{@const isBad = delta != null && ((isMax && delta < 0) || (!isMax && delta > 0))}
+										<tr class="border-b border-gray-100">
+											<td class="py-1 pr-2 text-gray-600">
+												<span class="inline-block h-1.5 w-1.5 rounded-full mr-1" style="background:{COLOR_PALETTE[j % COLOR_PALETTE.length]}"></span>
+												{journeyData.objectiveLabels[j] ?? oKey}
+											</td>
+											<td class="py-1 px-1.5 text-center">{actualRaw != null ? formatNumber(actualRaw, 4) : '—'}</td>
+											<td class="py-1 px-1.5 text-center">{whatIfRaw != null ? formatNumber(whatIfRaw, 4) : '—'}</td>
+											<td class="py-1 px-1.5 text-center font-semibold" style="color: {isGood ? '#059669' : isBad ? '#dc2626' : '#666'}">
+												{delta != null ? (delta > 0 ? '+' : '') + formatNumber(delta, 4) : '—'}
+											</td>
+										</tr>
+									{/each}
+								</tbody>
+							</table>
+
+							<button
+								class="mt-2 rounded border border-gray-200 px-2 py-1 text-xs text-gray-500 hover:bg-gray-50"
+								onclick={() => (whatIfSimulation = null)}
+							>
+								Clear what-if
+							</button>
+						</div>
+					{/if}
+				</div>
 			</div>
 		</div>
 	{:else}
diff --git a/webui/src/lib/components/custom/decision-journey/journey-utils.ts b/webui/src/lib/components/custom/decision-journey/journey-utils.ts
index 85aa2ae87..6f80b65e7 100644
--- a/webui/src/lib/components/custom/decision-journey/journey-utils.ts
+++ b/webui/src/lib/components/custom/decision-journey/journey-utils.ts
@@ -63,6 +63,19 @@ export interface JourneyData {
 	pairwiseTradeoffs: PairwiseTradeoffEntry[];
 }
 
+export interface WhatIfSimulation {
+	/** Which step in the journey this branches from */
+	branchStepIdx: number;
+	/** Which objective was favored */
+	preferredObjective: string;
+	/** Whether this simulation deprioritized (picked worst) the objective */
+	deprioritize: boolean;
+	/** Normalized steps for the simulated path (same shape as JourneyStep[]) */
+	steps: JourneyStep[];
+	/** The projected final solution objective values */
+	finalSolution: Record<string, number>;
+}
+
 /**
  * Walk the parent_node_id chain from the leaf back to the root,
  * then reverse to get a root-first ordering.
@@ -331,3 +344,83 @@ export function computeJourneyData(
 
 	return { steps, objectiveKeys, objectiveLabels, objectiveMaximize, preferenceProfile, pairwiseTradeoffs };
 }
+
+/**
+ * Normalize a single point given ideal/nadir maps.
+ * lo = min(ideal, nadir), hi = max(ideal, nadir).
+ */
+export function normalizePoint(
+	rawValues: Record<string, number>,
+	objectiveKeys: string[],
+	idealMap: Record<string, number>,
+	nadirMap: Record<string, number>,
+): Record<string, number> {
+	const normalized: Record<string, number> = {};
+	for (const key of objectiveKeys) {
+		const value = rawValues[key];
+		if (value == null) continue;
+		const ideal = idealMap[key];
+		const nadir = nadirMap[key];
+		if (ideal != null && nadir != null && ideal !== nadir) {
+			const lo = Math.min(ideal, nadir);
+			const hi = Math.max(ideal, nadir);
+			normalized[key] = (value - lo) / (hi - lo);
+		} else {
+			normalized[key] = 0.5;
+		}
+	}
+	return normalized;
+}
+
+/**
+ * Build ideal and nadir normalization maps from problem info and root node.
+ */
+export function buildNormalizationMaps(
+	problem: ProblemInfo,
+	rootSelectedPoint: Record<string, number> | null,
+): { idealMap: Record<string, number>; nadirMap: Record<string, number> } {
+	const idealMap: Record<string, number> = {};
+	for (const obj of problem.objectives) {
+		if (obj.ideal != null) idealMap[obj.symbol] = obj.ideal;
+	}
+
+	const nadirMap: Record<string, number> = {};
+	if (rootSelectedPoint) {
+		for (const obj of problem.objectives) {
+			if (rootSelectedPoint[obj.symbol] != null) {
+				nadirMap[obj.symbol] = rootSelectedPoint[obj.symbol];
+			}
+		}
+	}
+	for (const obj of problem.objectives) {
+		if (nadirMap[obj.symbol] == null && obj.nadir != null) {
+			nadirMap[obj.symbol] = obj.nadir;
+		}
+	}
+
+	return { idealMap, nadirMap };
+}
+
+/**
+ * Convert a simulation response into normalized JourneyStep[] for chart overlay.
+ */
+export function computeSimulatedJourneySteps(
+	simulationSteps: Array<{
+		iteration: number;
+		selected_point: Record<string, number>;
+	}>,
+	objectiveKeys: string[],
+	idealMap: Record<string, number>,
+	nadirMap: Record<string, number>,
+): JourneyStep[] {
+	return simulationSteps.map((step) => ({
+		iteration: step.iteration,
+		nodeId: -1, // simulated, not a real node
+		normalizedValues: normalizePoint(step.selected_point, objectiveKeys, idealMap, nadirMap),
+		rawValues: { ...step.selected_point },
+		tradeoffs: null,
+		alternativeDeltas: null,
+		intermediatePoints: null,
+		chosenOptionIdx: null,
+	}));
+}
diff --git a/webui/src/lib/components/custom/decision-journey/objective-evolution-chart.svelte b/webui/src/lib/components/custom/decision-journey/objective-evolution-chart.svelte
index 6f1f1666b..0a17cfca3 100644
--- a/webui/src/lib/components/custom/decision-journey/objective-evolution-chart.svelte
+++ b/webui/src/lib/components/custom/decision-journey/objective-evolution-chart.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { onMount, onDestroy } from 'svelte';
 	import * as d3 from 'd3';
-	import type { JourneyStep } from './journey-utils';
+	import type { JourneyStep, WhatIfSimulation } from './journey-utils';
 	import { COLOR_PALETTE } from '$lib/components/visualizations/utils/colors';
 	import { formatNumber } from '$lib/helpers';
 
@@ -12,9 +12,11 @@
 		objectiveMaximize: boolean[];
 		tooltipEl?: HTMLDivElement;
 		onStepClick?: (step: JourneyStep) => void;
+		whatIfSimulation?: WhatIfSimulation | null;
+		selectedIteration?: number | null;
 	}
 
-	let { steps, objectiveKeys, objectiveLabels, objectiveMaximize, tooltipEl = $bindable(), onStepClick }: Props = $props();
+	let { steps, objectiveKeys, objectiveLabels, objectiveMaximize, tooltipEl = $bindable(), onStepClick, whatIfSimulation = null, selectedIteration = null }: Props = $props();
 
 	let container: HTMLDivElement;
 	let svg: SVGSVGElement;
@@ -49,8 +51,11 @@
 		if (!tooltipEl) return;
 		const tooltip = d3.select(tooltipEl);
 
-		// X scale: iteration number
+		// X scale: iteration number (extend domain for what-if steps if needed)
 		const iterations = steps.map((s) => s.iteration);
+		if (whatIfSimulation?.steps) {
+			for (const s of whatIfSimulation.steps) iterations.push(s.iteration);
+		}
 		const xMin = d3.min(iterations)!;
 		const xMax = d3.max(iterations)!;
 		const xScale = d3.scaleLinear().domain([xMin, xMax]).range([0, innerWidth]);
@@ -70,6 +75,29 @@
 			.attr('stroke', '#e5e7eb')
 			.attr('stroke-dasharray', '3,3');
 
+		// Selected iteration highlight band
+		if (selectedIteration != null) {
+			const bandHalf = innerWidth / Math.max(xMax - xMin, 1) * 0.35;
+			const cx = xScale(selectedIteration);
+			g.append('rect')
+				.attr('x', cx - bandHalf)
+				.attr('y', 0)
+				.attr('width', bandHalf * 2)
+				.attr('height', innerHeight)
+				.attr('fill', '#3b82f6')
+				.attr('opacity', 0.08)
+				.attr('rx', 4);
+			g.append('line')
+				.attr('x1', cx)
+				.attr('x2', cx)
+				.attr('y1', 0)
+				.attr('y2', innerHeight)
+				.attr('stroke', '#3b82f6')
+				.attr('stroke-width', 1.5)
+				.attr('stroke-dasharray', '4,3')
+				.attr('opacity', 0.35);
+		}
+
 		// Axes
 		const tickCount = Math.min(steps.length, 10);
 		g.append('g')
@@ -225,6 +253,71 @@
 				});
 		}
 
+		// What-if simulation overlay (dashed lines + hollow circles)
+		if (whatIfSimulation?.steps && whatIfSimulation.steps.length > 0) {
+			const branchIdx = whatIfSimulation.branchStepIdx;
+			const branchStep = branchIdx >= 0 && branchIdx < steps.length ? steps[branchIdx] : null;
+
+			for (let k = 0; k < objectiveKeys.length; k++) {
+				const key = objectiveKeys[k];
+				const color = COLOR_PALETTE[k % COLOR_PALETTE.length];
+
+				// Build combined path: branch point + simulated steps
+				const simData: JourneyStep[] = [];
+				if (branchStep && branchStep.normalizedValues[key] != null) {
+					simData.push(branchStep);
+				}
+				for (const s of whatIfSimulation.steps) {
+					if (s.normalizedValues[key] != null) simData.push(s);
+				}
+
+				if (simData.length < 2) continue;
+
+				// Dashed line
+				const simLine = d3
+					.line<JourneyStep>()
+					.x((d) => xScale(d.iteration))
+					.y((d) => yScale(d.normalizedValues[key]))
+					.curve(d3.curveLinear);
+
+				g.append('path')
+					.datum(simData)
+					.attr('fill', 'none')
+					.attr('stroke', color)
+					.attr('stroke-width', 2.5)
+					.attr('stroke-dasharray', '6,4')
+					.attr('opacity', 0.7)
+					.attr('d', simLine);
+
+				// Hollow circle dots (skip branch point — it's already rendered)
+				const simOnly = whatIfSimulation.steps.filter((s) => s.normalizedValues[key] != null);
+				g.selectAll(`.sim-dot-${k}`)
+					.data(simOnly)
+					.join('circle')
+					.attr('cx', (d) => xScale(d.iteration))
+					.attr('cy', (d) => yScale(d.normalizedValues[key]))
+					.attr('r', 5)
+					.attr('fill', '#fff')
+					.attr('stroke', color)
+					.attr('stroke-width', 2)
+					.attr('opacity', 0.85);
+			}
+
+			// "what-if" label at the end of the branch
+			const lastSim = whatIfSimulation.steps[whatIfSimulation.steps.length - 1];
+			const firstKey = objectiveKeys[0];
+			if (lastSim.normalizedValues[firstKey] != null) {
+				g.append('text')
+					.attr('x', xScale(lastSim.iteration) + 8)
+					.attr('y', yScale(lastSim.normalizedValues[firstKey]))
+					.attr('fill', '#9ca3af')
+					.attr('font-size', '10px')
+					.attr('font-style', 'italic')
+					.attr('dominant-baseline', 'middle')
+					.text('what-if');
+			}
+		}
+
 		// Legend: horizontal row(s) below the plot
 		const legendY = innerHeight + 50;
 		const colWidth = Math.floor(innerWidth / Math.min(objectiveKeys.length, 3));
@@ -278,6 +371,8 @@
 		objectiveLabels;
 		objectiveMaximize;
 		tooltipEl;
+		whatIfSimulation;
+		selectedIteration;
 		width;
 		height;
 		drawChart();
diff --git a/webui/src/lib/components/custom/method_layout/base-layout.svelte b/webui/src/lib/components/custom/method_layout/base-layout.svelte
index d978e41ae..c1d39ee22 100644
--- a/webui/src/lib/components/custom/method_layout/base-layout.svelte
+++ b/webui/src/lib/components/custom/method_layout/base-layout.svelte
@@ -54,7 +54,7 @@
 	<!-- Main Content Area -->
 	<div class="flex min-w-0 flex-1 flex-col">
 		<Resizable.PaneGroup direction="vertical" class="flex-1">
-			<Resizable.Pane class="flex min-h-0 flex-col">
+			<Resizable.Pane defaultSize={65} class="flex min-h-0 flex-col">
 				<!-- Top Panel: Explorer Title and Controls -->
 				<div class="flex-shrink-0 p-2">
 					<div class="flex flex-row items-center justify-between gap-4 pb-2">
@@ -89,7 +89,7 @@
 
 			<ResizableHandle />
 			<!-- Bottom Panel: Numerical Values and Tables -->
-			<Resizable.Pane class="flex min-h-0 flex-col p-2">
+			<Resizable.Pane defaultSize={35} class="flex min-h-0 flex-col p-2">
 					<Tabs.Root value="numerical-values" class="flex flex-col min-h-0 h-full">
 						<Tabs.List class="flex-shrink-0">
 						{#if tabsList}
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
index 851f7c7fe..891b3ed9d 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
@@ -16,6 +16,8 @@ import type {
 	ENautilusFinalizeResponse,
 	ENautilusRepresentativeSolutionsResponse,
 	ENautilusSessionTreeResponse,
+	ENautilusSimulateRequest,
+	ENautilusSimulateResponse,
 	ENautilusStateResponse,
 	ENautilusStepRequest,
 	ENautilusStepResponse,
@@ -57,8 +59,6 @@ import type {
 	RPMSolveRequest,
 	RPMState,
 	RepresentativeNonDominatedSolutions,
-	RepresentativeSolutionSetFull,
-	RepresentativeSolutionSetInfo,
 	RepresentativeSolutionSetRequest,
 	SCOREBandsGDMConfig,
 	ScoreBandsRequest,
@@ -566,21 +566,42 @@ export type addProblemProblemAddPostResponse200 = {
 	status: 200;
 };
 
+export type addProblemProblemAddPostResponse422 = {
+	data: HTTPValidationError;
+	status: 422;
+};
+
 export type addProblemProblemAddPostResponseSuccess = addProblemProblemAddPostResponse200 & {
 	headers: Headers;
 };
-export type addProblemProblemAddPostResponse = addProblemProblemAddPostResponseSuccess;
+export type addProblemProblemAddPostResponseError = addProblemProblemAddPostResponse422 & {
+	headers: Headers;
+};
+
+export type addProblemProblemAddPostResponse =
+	| addProblemProblemAddPostResponseSuccess
+	| addProblemProblemAddPostResponseError;
 
 export const getAddProblemProblemAddPostUrl = () => {
 	return `http://localhost:8000/problem/add`;
 };
 
 export const addProblemProblemAddPost = async (
+	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| RepresentativeSolutionSetRequest
+		| CreateSessionRequest
+		| null,
 	options?: RequestInit
 ): Promise<addProblemProblemAddPostResponse> => {
 	return customFetch<addProblemProblemAddPostResponse>(getAddProblemProblemAddPostUrl(), {
 		...options,
-		method: 'POST'
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json', ...options?.headers },
+		body: JSON.stringify(
+			rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
+		)
 	});
 };
 
@@ -632,6 +653,12 @@ export const addProblemJsonProblemAddJsonPost = async (
 ): Promise<addProblemJsonProblemAddJsonPostResponse> => {
 	const formData = new FormData();
 	formData.append(`json_file`, bodyAddProblemJsonProblemAddJsonPost.json_file);
+	if (
+		bodyAddProblemJsonProblemAddJsonPost.request !== undefined &&
+		bodyAddProblemJsonProblemAddJsonPost.request !== null
+	) {
+		formData.append(`request`, bodyAddProblemJsonProblemAddJsonPost.request);
+	}
 
 	return customFetch<addProblemJsonProblemAddJsonPostResponse>(
 		getAddProblemJsonProblemAddJsonPostUrl(),
@@ -806,7 +833,7 @@ Returns:
  * @summary Add Representative Solution Set
  */
 export type addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse200 = {
-	data: RepresentativeSolutionSetInfo;
+	data: unknown;
 	status: 200;
 };
 
@@ -855,7 +882,7 @@ Returns only name, description, ideal, and nadir for each set.
  */
 export type getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse200 =
 	{
-		data: RepresentativeSolutionSetInfo[];
+		data: unknown;
 		status: 200;
 	};
 
@@ -887,6 +914,12 @@ export const getGetAllRepresentativeSolutionSetsProblemAllRepresentativeSolution
 export const getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGet =
 	async (
 		problemId: number,
+		rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+			| RPMSolveRequest
+			| ENautilusStepRequest
+			| RepresentativeSolutionSetRequest
+			| CreateSessionRequest
+			| null,
 		options?: RequestInit
 	): Promise<getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse> => {
 		return customFetch<getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse>(
@@ -895,17 +928,21 @@ export const getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSet
 			),
 			{
 				...options,
-				method: 'GET'
+				method: 'GET',
+				headers: { 'Content-Type': 'application/json', ...options?.headers },
+				body: JSON.stringify(
+					rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
+				)
 			}
 		);
 	};
 
 /**
- * Fetch full information of a single representative solution by its ID.
+ * Fetch full information of a single representative solution set by its ID.
  * @summary Get Representative Solution Set
  */
 export type getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetResponse200 = {
-	data: RepresentativeSolutionSetFull;
+	data: unknown;
 	status: 200;
 };
 
@@ -935,13 +972,23 @@ export const getGetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetI
 
 export const getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGet = async (
 	setId: number,
+	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| RepresentativeSolutionSetRequest
+		| CreateSessionRequest
+		| null,
 	options?: RequestInit
 ): Promise<getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetResponse> => {
 	return customFetch<getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetResponse>(
 		getGetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetUrl(setId),
 		{
 			...options,
-			method: 'GET'
+			method: 'GET',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(
+				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
+			)
 		}
 	);
 };
@@ -983,13 +1030,23 @@ export const getDeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetS
 
 export const deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDelete = async (
 	setId: number,
+	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| RepresentativeSolutionSetRequest
+		| CreateSessionRequest
+		| null,
 	options?: RequestInit
 ): Promise<deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteResponse> => {
 	return customFetch<deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteResponse>(
 		getDeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteUrl(setId),
 		{
 			...options,
-			method: 'DELETE'
+			method: 'DELETE',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(
+				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
+			)
 		}
 	);
 };
@@ -1027,13 +1084,23 @@ export const getDeleteProblemProblemProblemIdDeleteUrl = (problemId: number) =>
 
 export const deleteProblemProblemProblemIdDelete = async (
 	problemId: number,
+	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| RepresentativeSolutionSetRequest
+		| CreateSessionRequest
+		| null,
 	options?: RequestInit
 ): Promise<deleteProblemProblemProblemIdDeleteResponse> => {
 	return customFetch<deleteProblemProblemProblemIdDeleteResponse>(
 		getDeleteProblemProblemProblemIdDeleteUrl(problemId),
 		{
 			...options,
-			method: 'DELETE'
+			method: 'DELETE',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(
+				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
+			)
 		}
 	);
 };
@@ -1071,13 +1138,23 @@ export const getGetProblemJsonProblemProblemIdJsonGetUrl = (problemId: number) =
 
 export const getProblemJsonProblemProblemIdJsonGet = async (
 	problemId: number,
+	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| RepresentativeSolutionSetRequest
+		| CreateSessionRequest
+		| null,
 	options?: RequestInit
 ): Promise<getProblemJsonProblemProblemIdJsonGetResponse> => {
 	return customFetch<getProblemJsonProblemProblemIdJsonGetResponse>(
 		getGetProblemJsonProblemProblemIdJsonGetUrl(problemId),
 		{
 			...options,
-			method: 'GET'
+			method: 'GET',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(
+				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
+			)
 		}
 	);
 };
@@ -1536,7 +1613,7 @@ export const getOrInitializeMethodNimbusGetOrInitializePost = async (
 
 Args:
     request (NIMBUSFinalizeRequest): The request containing the final solution, etc.
-    context (Annotated[User, get_session_context): The current context.
+    context (Annotated[SessionContext, SessionContextGuard): The current context.
 
 Raises:
     HTTPException
@@ -1746,7 +1823,7 @@ export const calculateScoreBandsFromObjectiveDataMethodGenericScoreBandsObjDataP
 Args:
     request (UtopiaRequest): the set of decision variables and problem for which the utopia forest map is requested
         for.
-    context (Annotated[SessionContext, Depends(get_session_context)]): the current session context
+    context (Annotated[SessionContext, Depends(SessionContextGuard)]): the current session context
 
 Raises:
     HTTPException:
@@ -2594,7 +2671,7 @@ decision events capturing what the DM chose at each transition.
 
 Args:
     session_id: The interactive session ID.
-    db_session: The database session.
+    context: The context of the query.
 
 Returns:
     ENautilusSessionTreeResponse with nodes, edges, root_ids, and decision_events.
@@ -2629,13 +2706,73 @@ export const getGetSessionTreeMethodEnautilusSessionTreeSessionIdGetUrl = (sessi
 
 export const getSessionTreeMethodEnautilusSessionTreeSessionIdGet = async (
 	sessionId: number,
+	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| RepresentativeSolutionSetRequest
+		| CreateSessionRequest
+		| null,
 	options?: RequestInit
 ): Promise<getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse> => {
 	return customFetch<getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse>(
 		getGetSessionTreeMethodEnautilusSessionTreeSessionIdGetUrl(sessionId),
 		{
 			...options,
-			method: 'GET'
+			method: 'GET',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(
+				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
+			)
+		}
+	);
+};
+
+/**
+ * Run E-NAUTILUS greedily from a state to completion.
+
+Given a starting state, this endpoint greedily selects the best intermediate
+point for the preferred objective at each iteration until iterations_left == 0,
+then projects to the Pareto front. No database writes are performed.
+ * @summary Simulate
+ */
+export type simulateMethodEnautilusSimulatePostResponse200 = {
+	data: ENautilusSimulateResponse;
+	status: 200;
+};
+
+export type simulateMethodEnautilusSimulatePostResponse422 = {
+	data: HTTPValidationError;
+	status: 422;
+};
+
+export type simulateMethodEnautilusSimulatePostResponseSuccess =
+	simulateMethodEnautilusSimulatePostResponse200 & {
+		headers: Headers;
+	};
+export type simulateMethodEnautilusSimulatePostResponseError =
+	simulateMethodEnautilusSimulatePostResponse422 & {
+		headers: Headers;
+	};
+
+export type simulateMethodEnautilusSimulatePostResponse =
+	| simulateMethodEnautilusSimulatePostResponseSuccess
+	| simulateMethodEnautilusSimulatePostResponseError;
+
+export const getSimulateMethodEnautilusSimulatePostUrl = () => {
+	return `http://localhost:8000/method/enautilus/simulate`;
+};
+
+export const simulateMethodEnautilusSimulatePost = async (
+	eNautilusSimulateRequest: ENautilusSimulateRequest,
+	options?: RequestInit
+): Promise<simulateMethodEnautilusSimulatePostResponse> => {
+	return customFetch<simulateMethodEnautilusSimulatePostResponse>(
+		getSimulateMethodEnautilusSimulatePostUrl(),
+		{
+			...options,
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(eNautilusSimulateRequest)
 		}
 	);
 };
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
index 3bc553afa..07fa0eff4 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
@@ -1392,6 +1392,81 @@ Returns:
     ProblemInfo: the information about the problem added.
  * @summary Add Problem
  */
+export const addProblemProblemAddPostBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const AddProblemProblemAddPostBody = zod.union([
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			scalarization_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			solver: zod.union([zod.string(), zod.null()]).optional(),
+			solver_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			preference: zod
+				.object({
+					preference_type: zod
+						.literal('reference_point')
+						.default(addProblemProblemAddPostBodyOnePreferencePreferenceTypeDefault),
+					aspiration_levels: zod.record(zod.string(), zod.number())
+				})
+				.optional()
+				.describe('Model for representing a reference point type of preference.')
+		})
+		.describe('Model of the request to the reference point method.'),
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			representative_solutions_id: zod
+				.number()
+				.describe('The id of the representative solutions to be used.'),
+			current_iteration: zod.number().describe('The number of the current iteration.'),
+			iterations_left: zod.number().describe('The number of iterations left.'),
+			selected_point: zod
+				.union([zod.record(zod.string(), zod.number()), zod.null()])
+				.describe(
+					'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+				),
+			reachable_point_indices: zod
+				.array(zod.number())
+				.describe(
+					'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+				),
+			number_of_intermediate_points: zod
+				.number()
+				.describe('The number of intermediate points to be generated.')
+		})
+		.describe('Model of the request to the E-NAUTILUS method.'),
+	zod
+		.object({
+			name: zod.string(),
+			description: zod.union([zod.string(), zod.null()]).optional(),
+			solution_data: zod.record(zod.string(), zod.array(zod.number())),
+			ideal: zod.record(zod.string(), zod.number()),
+			nadir: zod.record(zod.string(), zod.number()),
+			problem_id: zod.number()
+		})
+		.describe('Model of the request to the representative solution set.'),
+	zod
+		.object({
+			info: zod.union([zod.string(), zod.null()]).optional()
+		})
+		.describe('Model of the request to create a new session.'),
+	zod.null()
+]);
+
 export const addProblemProblemAddPostResponseObjectivesItemMaximizeDefault = false;
 export const addProblemProblemAddPostResponseObjectivesItemIsLinearDefault = false;
 export const addProblemProblemAddPostResponseObjectivesItemIsConvexDefault = false;
@@ -1970,8 +2045,86 @@ Returns:
     ProblemInfo: a description of the added problem.
  * @summary Add Problem Json
  */
+export const addProblemJsonProblemAddJsonPostBodyRequestOnePreferencePreferenceTypeDefault = `reference_point`;
+
 export const AddProblemJsonProblemAddJsonPostBody = zod.object({
-	json_file: zod.instanceof(File)
+	json_file: zod.instanceof(File),
+	request: zod
+		.union([
+			zod
+				.object({
+					problem_id: zod.number(),
+					session_id: zod.union([zod.number(), zod.null()]).optional(),
+					parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+					scalarization_options: zod
+						.union([
+							zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+							zod.null()
+						])
+						.optional(),
+					solver: zod.union([zod.string(), zod.null()]).optional(),
+					solver_options: zod
+						.union([
+							zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+							zod.null()
+						])
+						.optional(),
+					preference: zod
+						.object({
+							preference_type: zod
+								.literal('reference_point')
+								.default(
+									addProblemJsonProblemAddJsonPostBodyRequestOnePreferencePreferenceTypeDefault
+								),
+							aspiration_levels: zod.record(zod.string(), zod.number())
+						})
+						.optional()
+						.describe('Model for representing a reference point type of preference.')
+				})
+				.describe('Model of the request to the reference point method.'),
+			zod
+				.object({
+					problem_id: zod.number(),
+					session_id: zod.union([zod.number(), zod.null()]).optional(),
+					parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+					representative_solutions_id: zod
+						.number()
+						.describe('The id of the representative solutions to be used.'),
+					current_iteration: zod.number().describe('The number of the current iteration.'),
+					iterations_left: zod.number().describe('The number of iterations left.'),
+					selected_point: zod
+						.union([zod.record(zod.string(), zod.number()), zod.null()])
+						.describe(
+							'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+						),
+					reachable_point_indices: zod
+						.array(zod.number())
+						.describe(
+							'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+						),
+					number_of_intermediate_points: zod
+						.number()
+						.describe('The number of intermediate points to be generated.')
+				})
+				.describe('Model of the request to the E-NAUTILUS method.'),
+			zod
+				.object({
+					name: zod.string(),
+					description: zod.union([zod.string(), zod.null()]).optional(),
+					solution_data: zod.record(zod.string(), zod.array(zod.number())),
+					ideal: zod.record(zod.string(), zod.number()),
+					nadir: zod.record(zod.string(), zod.number()),
+					problem_id: zod.number()
+				})
+				.describe('Model of the request to the representative solution set.'),
+			zod
+				.object({
+					info: zod.union([zod.string(), zod.null()]).optional()
+				})
+				.describe('Model of the request to create a new session.'),
+			zod.null()
+		])
+		.optional()
 });
 
 export const addProblemJsonProblemAddJsonPostResponseObjectivesItemMaximizeDefault = false;
@@ -2694,16 +2847,8 @@ export const AddRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPost
 	})
 	.describe('Model of the request to the representative solution set.');
 
-export const AddRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse = zod
-	.object({
-		id: zod.number(),
-		problem_id: zod.number(),
-		name: zod.string(),
-		description: zod.union([zod.string(), zod.null()]).optional(),
-		ideal: zod.record(zod.string(), zod.number()),
-		nadir: zod.record(zod.string(), zod.number())
-	})
-	.describe('Model of the representative solution set info.');
+export const AddRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse =
+	zod.unknown();
 
 /**
  * Get meta information about all representative solution sets for a given problem.
@@ -2716,24 +2861,89 @@ export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSet
 		problem_id: zod.number()
 	});
 
-export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponseItem =
-	zod
-		.object({
-			id: zod.number(),
-			problem_id: zod.number(),
-			name: zod.string(),
-			description: zod.union([zod.string(), zod.null()]).optional(),
-			ideal: zod.record(zod.string(), zod.number()),
-			nadir: zod.record(zod.string(), zod.number())
-		})
-		.describe('Model of the representative solution set info.');
+export const getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetBody =
+	zod.union([
+		zod
+			.object({
+				problem_id: zod.number(),
+				session_id: zod.union([zod.number(), zod.null()]).optional(),
+				parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+				scalarization_options: zod
+					.union([
+						zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+						zod.null()
+					])
+					.optional(),
+				solver: zod.union([zod.string(), zod.null()]).optional(),
+				solver_options: zod
+					.union([
+						zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+						zod.null()
+					])
+					.optional(),
+				preference: zod
+					.object({
+						preference_type: zod
+							.literal('reference_point')
+							.default(
+								getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetBodyOnePreferencePreferenceTypeDefault
+							),
+						aspiration_levels: zod.record(zod.string(), zod.number())
+					})
+					.optional()
+					.describe('Model for representing a reference point type of preference.')
+			})
+			.describe('Model of the request to the reference point method.'),
+		zod
+			.object({
+				problem_id: zod.number(),
+				session_id: zod.union([zod.number(), zod.null()]).optional(),
+				parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+				representative_solutions_id: zod
+					.number()
+					.describe('The id of the representative solutions to be used.'),
+				current_iteration: zod.number().describe('The number of the current iteration.'),
+				iterations_left: zod.number().describe('The number of iterations left.'),
+				selected_point: zod
+					.union([zod.record(zod.string(), zod.number()), zod.null()])
+					.describe(
+						'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+					),
+				reachable_point_indices: zod
+					.array(zod.number())
+					.describe(
+						'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+					),
+				number_of_intermediate_points: zod
+					.number()
+					.describe('The number of intermediate points to be generated.')
+			})
+			.describe('Model of the request to the E-NAUTILUS method.'),
+		zod
+			.object({
+				name: zod.string(),
+				description: zod.union([zod.string(), zod.null()]).optional(),
+				solution_data: zod.record(zod.string(), zod.array(zod.number())),
+				ideal: zod.record(zod.string(), zod.number()),
+				nadir: zod.record(zod.string(), zod.number()),
+				problem_id: zod.number()
+			})
+			.describe('Model of the request to the representative solution set.'),
+		zod
+			.object({
+				info: zod.union([zod.string(), zod.null()]).optional()
+			})
+			.describe('Model of the request to create a new session.'),
+		zod.null()
+	]);
+
 export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse =
-	zod.array(
-		GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponseItem
-	);
+	zod.unknown();
 
 /**
- * Fetch full information of a single representative solution by its ID.
+ * Fetch full information of a single representative solution set by its ID.
  * @summary Get Representative Solution Set
  */
 export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams =
@@ -2741,17 +2951,85 @@ export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGe
 		set_id: zod.number()
 	});
 
-export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetResponse = zod
-	.object({
-		id: zod.number(),
-		problem_id: zod.number(),
-		name: zod.string(),
-		description: zod.union([zod.string(), zod.null()]).optional(),
-		ideal: zod.record(zod.string(), zod.number()),
-		nadir: zod.record(zod.string(), zod.number()),
-		solution_data: zod.record(zod.string(), zod.array(zod.number()))
-	})
-	.describe('Model of the representative solution set full info.');
+export const getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetBody = zod.union([
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			scalarization_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			solver: zod.union([zod.string(), zod.null()]).optional(),
+			solver_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			preference: zod
+				.object({
+					preference_type: zod
+						.literal('reference_point')
+						.default(
+							getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetBodyOnePreferencePreferenceTypeDefault
+						),
+					aspiration_levels: zod.record(zod.string(), zod.number())
+				})
+				.optional()
+				.describe('Model for representing a reference point type of preference.')
+		})
+		.describe('Model of the request to the reference point method.'),
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			representative_solutions_id: zod
+				.number()
+				.describe('The id of the representative solutions to be used.'),
+			current_iteration: zod.number().describe('The number of the current iteration.'),
+			iterations_left: zod.number().describe('The number of iterations left.'),
+			selected_point: zod
+				.union([zod.record(zod.string(), zod.number()), zod.null()])
+				.describe(
+					'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+				),
+			reachable_point_indices: zod
+				.array(zod.number())
+				.describe(
+					'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+				),
+			number_of_intermediate_points: zod
+				.number()
+				.describe('The number of intermediate points to be generated.')
+		})
+		.describe('Model of the request to the E-NAUTILUS method.'),
+	zod
+		.object({
+			name: zod.string(),
+			description: zod.union([zod.string(), zod.null()]).optional(),
+			solution_data: zod.record(zod.string(), zod.array(zod.number())),
+			ideal: zod.record(zod.string(), zod.number()),
+			nadir: zod.record(zod.string(), zod.number()),
+			problem_id: zod.number()
+		})
+		.describe('Model of the request to the representative solution set.'),
+	zod
+		.object({
+			info: zod.union([zod.string(), zod.null()]).optional()
+		})
+		.describe('Model of the request to create a new session.'),
+	zod.null()
+]);
+
+export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetResponse =
+	zod.unknown();
 
 /**
  * Delete a representative solution set by its ID.
@@ -2762,6 +3040,84 @@ export const DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetI
 		set_id: zod.number()
 	});
 
+export const deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteBody =
+	zod.union([
+		zod
+			.object({
+				problem_id: zod.number(),
+				session_id: zod.union([zod.number(), zod.null()]).optional(),
+				parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+				scalarization_options: zod
+					.union([
+						zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+						zod.null()
+					])
+					.optional(),
+				solver: zod.union([zod.string(), zod.null()]).optional(),
+				solver_options: zod
+					.union([
+						zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+						zod.null()
+					])
+					.optional(),
+				preference: zod
+					.object({
+						preference_type: zod
+							.literal('reference_point')
+							.default(
+								deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteBodyOnePreferencePreferenceTypeDefault
+							),
+						aspiration_levels: zod.record(zod.string(), zod.number())
+					})
+					.optional()
+					.describe('Model for representing a reference point type of preference.')
+			})
+			.describe('Model of the request to the reference point method.'),
+		zod
+			.object({
+				problem_id: zod.number(),
+				session_id: zod.union([zod.number(), zod.null()]).optional(),
+				parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+				representative_solutions_id: zod
+					.number()
+					.describe('The id of the representative solutions to be used.'),
+				current_iteration: zod.number().describe('The number of the current iteration.'),
+				iterations_left: zod.number().describe('The number of iterations left.'),
+				selected_point: zod
+					.union([zod.record(zod.string(), zod.number()), zod.null()])
+					.describe(
+						'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+					),
+				reachable_point_indices: zod
+					.array(zod.number())
+					.describe(
+						'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+					),
+				number_of_intermediate_points: zod
+					.number()
+					.describe('The number of intermediate points to be generated.')
+			})
+			.describe('Model of the request to the E-NAUTILUS method.'),
+		zod
+			.object({
+				name: zod.string(),
+				description: zod.union([zod.string(), zod.null()]).optional(),
+				solution_data: zod.record(zod.string(), zod.array(zod.number())),
+				ideal: zod.record(zod.string(), zod.number()),
+				nadir: zod.record(zod.string(), zod.number()),
+				problem_id: zod.number()
+			})
+			.describe('Model of the request to the representative solution set.'),
+		zod
+			.object({
+				info: zod.union([zod.string(), zod.null()]).optional()
+			})
+			.describe('Model of the request to create a new session.'),
+		zod.null()
+	]);
+
 /**
  * Delete a problem by its ID.
  * @summary Delete Problem
@@ -2770,6 +3126,81 @@ export const DeleteProblemProblemProblemIdDeleteParams = zod.object({
 	problem_id: zod.number()
 });
 
+export const deleteProblemProblemProblemIdDeleteBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const DeleteProblemProblemProblemIdDeleteBody = zod.union([
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			scalarization_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			solver: zod.union([zod.string(), zod.null()]).optional(),
+			solver_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			preference: zod
+				.object({
+					preference_type: zod
+						.literal('reference_point')
+						.default(deleteProblemProblemProblemIdDeleteBodyOnePreferencePreferenceTypeDefault),
+					aspiration_levels: zod.record(zod.string(), zod.number())
+				})
+				.optional()
+				.describe('Model for representing a reference point type of preference.')
+		})
+		.describe('Model of the request to the reference point method.'),
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			representative_solutions_id: zod
+				.number()
+				.describe('The id of the representative solutions to be used.'),
+			current_iteration: zod.number().describe('The number of the current iteration.'),
+			iterations_left: zod.number().describe('The number of iterations left.'),
+			selected_point: zod
+				.union([zod.record(zod.string(), zod.number()), zod.null()])
+				.describe(
+					'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+				),
+			reachable_point_indices: zod
+				.array(zod.number())
+				.describe(
+					'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+				),
+			number_of_intermediate_points: zod
+				.number()
+				.describe('The number of intermediate points to be generated.')
+		})
+		.describe('Model of the request to the E-NAUTILUS method.'),
+	zod
+		.object({
+			name: zod.string(),
+			description: zod.union([zod.string(), zod.null()]).optional(),
+			solution_data: zod.record(zod.string(), zod.array(zod.number())),
+			ideal: zod.record(zod.string(), zod.number()),
+			nadir: zod.record(zod.string(), zod.number()),
+			problem_id: zod.number()
+		})
+		.describe('Model of the request to the representative solution set.'),
+	zod
+		.object({
+			info: zod.union([zod.string(), zod.null()]).optional()
+		})
+		.describe('Model of the request to create a new session.'),
+	zod.null()
+]);
+
 /**
  * Return a Problem as a serialized JSON object suitable for download/re-upload.
  * @summary Get Problem Json
@@ -2778,6 +3209,81 @@ export const GetProblemJsonProblemProblemIdJsonGetParams = zod.object({
 	problem_id: zod.number()
 });
 
+export const getProblemJsonProblemProblemIdJsonGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const GetProblemJsonProblemProblemIdJsonGetBody = zod.union([
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			scalarization_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			solver: zod.union([zod.string(), zod.null()]).optional(),
+			solver_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			preference: zod
+				.object({
+					preference_type: zod
+						.literal('reference_point')
+						.default(getProblemJsonProblemProblemIdJsonGetBodyOnePreferencePreferenceTypeDefault),
+					aspiration_levels: zod.record(zod.string(), zod.number())
+				})
+				.optional()
+				.describe('Model for representing a reference point type of preference.')
+		})
+		.describe('Model of the request to the reference point method.'),
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			representative_solutions_id: zod
+				.number()
+				.describe('The id of the representative solutions to be used.'),
+			current_iteration: zod.number().describe('The number of the current iteration.'),
+			iterations_left: zod.number().describe('The number of iterations left.'),
+			selected_point: zod
+				.union([zod.record(zod.string(), zod.number()), zod.null()])
+				.describe(
+					'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+				),
+			reachable_point_indices: zod
+				.array(zod.number())
+				.describe(
+					'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+				),
+			number_of_intermediate_points: zod
+				.number()
+				.describe('The number of intermediate points to be generated.')
+		})
+		.describe('Model of the request to the E-NAUTILUS method.'),
+	zod
+		.object({
+			name: zod.string(),
+			description: zod.union([zod.string(), zod.null()]).optional(),
+			solution_data: zod.record(zod.string(), zod.array(zod.number())),
+			ideal: zod.record(zod.string(), zod.number()),
+			nadir: zod.record(zod.string(), zod.number()),
+			problem_id: zod.number()
+		})
+		.describe('Model of the request to the representative solution set.'),
+	zod
+		.object({
+			info: zod.union([zod.string(), zod.null()]).optional()
+		})
+		.describe('Model of the request to create a new session.'),
+	zod.null()
+]);
+
 export const GetProblemJsonProblemProblemIdJsonGetResponse = zod.unknown();
 
 /**
@@ -4032,7 +4538,7 @@ export const GetOrInitializeMethodNimbusGetOrInitializePostResponse = zod.union(
 
 Args:
     request (NIMBUSFinalizeRequest): The request containing the final solution, etc.
-    context (Annotated[User, get_session_context): The current context.
+    context (Annotated[SessionContext, SessionContextGuard): The current context.
 
 Raises:
     HTTPException
@@ -4434,7 +4940,7 @@ export const CalculateScoreBandsFromObjectiveDataMethodGenericScoreBandsObjDataP
 Args:
     request (UtopiaRequest): the set of decision variables and problem for which the utopia forest map is requested
         for.
-    context (Annotated[SessionContext, Depends(get_session_context)]): the current session context
+    context (Annotated[SessionContext, Depends(SessionContextGuard)]): the current session context
 
 Raises:
     HTTPException:
@@ -4705,49 +5211,59 @@ export const GetLatestResultsGnimbusGetLatestResultsPostResponse = zod
 							state_id: zod.union([zod.number(), zod.null()]).optional()
 						})
 						.describe('State holder with a single relationship to the base State.'),
-					state_id: zod.number(),
-					num_solutions: zod.number(),
-					objective_values_all: zod.array(zod.record(zod.string(), zod.number())),
-					variable_values_all: zod.array(
-						zod.record(
-							zod.string(),
-							zod.union([
-								zod.number(),
-								zod.number(),
-								zod.boolean(),
+					state_id: zod.number().describe('The state id.'),
+					num_solutions: zod
+						.number()
+						.describe('Number of solutions contained in the referenced state.'),
+					objective_values_all: zod
+						.array(zod.record(zod.string(), zod.number()))
+						.describe('All the objective values of the result.'),
+					variable_values_all: zod
+						.array(
+							zod.record(
+								zod.string(),
 								zod.union([
-									zod.array(zod.unknown()),
-									zod.array(zod.union([zod.number(), zod.number(), zod.boolean()])),
 									zod.number(),
 									zod.number(),
 									zod.boolean(),
-									zod.literal('List'),
-									zod.null()
+									zod.union([
+										zod.array(zod.unknown()),
+										zod.array(zod.union([zod.number(), zod.number(), zod.boolean()])),
+										zod.number(),
+										zod.number(),
+										zod.boolean(),
+										zod.literal('List'),
+										zod.null()
+									])
 								])
-							])
+							)
 						)
-					),
-					objective_values: zod.union([zod.record(zod.string(), zod.number()), zod.null()]),
-					variable_values: zod.union([
-						zod.record(
-							zod.string(),
-							zod.union([
-								zod.number(),
-								zod.number(),
-								zod.boolean(),
+						.describe('All the variable values of the result.'),
+					objective_values: zod
+						.union([zod.record(zod.string(), zod.number()), zod.null()])
+						.describe('The objective values of the referenced solution. None if not applicable.'),
+					variable_values: zod
+						.union([
+							zod.record(
+								zod.string(),
 								zod.union([
-									zod.array(zod.unknown()),
-									zod.array(zod.union([zod.number(), zod.number(), zod.boolean()])),
 									zod.number(),
 									zod.number(),
 									zod.boolean(),
-									zod.literal('List'),
-									zod.null()
+									zod.union([
+										zod.array(zod.unknown()),
+										zod.array(zod.union([zod.number(), zod.number(), zod.boolean()])),
+										zod.number(),
+										zod.number(),
+										zod.boolean(),
+										zod.literal('List'),
+										zod.null()
+									])
 								])
-							])
-						),
-						zod.null()
-					])
+							),
+							zod.null()
+						])
+						.describe('The variable values of the referenced solution. None if not apllicable.')
 				})
 				.describe('A full solution reference with objectives and variables.')
 		),
@@ -4773,49 +5289,59 @@ export const GetLatestResultsGnimbusGetLatestResultsPostResponse = zod
 							state_id: zod.union([zod.number(), zod.null()]).optional()
 						})
 						.describe('State holder with a single relationship to the base State.'),
-					state_id: zod.number(),
-					num_solutions: zod.number(),
-					objective_values_all: zod.array(zod.record(zod.string(), zod.number())),
-					variable_values_all: zod.array(
-						zod.record(
-							zod.string(),
-							zod.union([
-								zod.number(),
-								zod.number(),
-								zod.boolean(),
+					state_id: zod.number().describe('The state id.'),
+					num_solutions: zod
+						.number()
+						.describe('Number of solutions contained in the referenced state.'),
+					objective_values_all: zod
+						.array(zod.record(zod.string(), zod.number()))
+						.describe('All the objective values of the result.'),
+					variable_values_all: zod
+						.array(
+							zod.record(
+								zod.string(),
 								zod.union([
-									zod.array(zod.unknown()),
-									zod.array(zod.union([zod.number(), zod.number(), zod.boolean()])),
 									zod.number(),
 									zod.number(),
 									zod.boolean(),
-									zod.literal('List'),
-									zod.null()
+									zod.union([
+										zod.array(zod.unknown()),
+										zod.array(zod.union([zod.number(), zod.number(), zod.boolean()])),
+										zod.number(),
+										zod.number(),
+										zod.boolean(),
+										zod.literal('List'),
+										zod.null()
+									])
 								])
-							])
+							)
 						)
-					),
-					objective_values: zod.union([zod.record(zod.string(), zod.number()), zod.null()]),
-					variable_values: zod.union([
-						zod.record(
-							zod.string(),
-							zod.union([
-								zod.number(),
-								zod.number(),
-								zod.boolean(),
+						.describe('All the variable values of the result.'),
+					objective_values: zod
+						.union([zod.record(zod.string(), zod.number()), zod.null()])
+						.describe('The objective values of the referenced solution. None if not applicable.'),
+					variable_values: zod
+						.union([
+							zod.record(
+								zod.string(),
 								zod.union([
-									zod.array(zod.unknown()),
-									zod.array(zod.union([zod.number(), zod.number(), zod.boolean()])),
 									zod.number(),
 									zod.number(),
 									zod.boolean(),
-									zod.literal('List'),
-									zod.null()
+									zod.union([
+										zod.array(zod.unknown()),
+										zod.array(zod.union([zod.number(), zod.number(), zod.boolean()])),
+										zod.number(),
+										zod.number(),
+										zod.boolean(),
+										zod.literal('List'),
+										zod.null()
+									])
 								])
-							])
-						),
-						zod.null()
-					])
+							),
+							zod.null()
+						])
+						.describe('The variable values of the referenced solution. None if not apllicable.')
 				})
 				.describe('A full solution reference with objectives and variables.')
 		),
@@ -4945,9 +5471,15 @@ export const FullIterationGnimbusAllIterationsPostResponse = zod
 											state_id: zod.union([zod.number(), zod.null()]).optional()
 										})
 										.describe('State holder with a single relationship to the base State.'),
-									state_id: zod.number(),
-									num_solutions: zod.number(),
-									objective_values: zod.union([zod.record(zod.string(), zod.number()), zod.null()])
+									state_id: zod.number().describe('The state id.'),
+									num_solutions: zod
+										.number()
+										.describe('Number of solutions contained in the referenced state.'),
+									objective_values: zod
+										.union([zod.record(zod.string(), zod.number()), zod.null()])
+										.describe(
+											'The objective values of the referenced solution. None if not applicable.'
+										)
 								})
 								.describe(
 									'The same as SolutionReference, but without decision variables for more efficient transport over the internet.'
@@ -4980,9 +5512,15 @@ export const FullIterationGnimbusAllIterationsPostResponse = zod
 											state_id: zod.union([zod.number(), zod.null()]).optional()
 										})
 										.describe('State holder with a single relationship to the base State.'),
-									state_id: zod.number(),
-									num_solutions: zod.number(),
-									objective_values: zod.union([zod.record(zod.string(), zod.number()), zod.null()])
+									state_id: zod.number().describe('The state id.'),
+									num_solutions: zod
+										.number()
+										.describe('Number of solutions contained in the referenced state.'),
+									objective_values: zod
+										.union([zod.record(zod.string(), zod.number()), zod.null()])
+										.describe(
+											'The objective values of the referenced solution. None if not applicable.'
+										)
 								})
 								.describe(
 									'The same as SolutionReference, but without decision variables for more efficient transport over the internet.'
@@ -5012,9 +5550,15 @@ export const FullIterationGnimbusAllIterationsPostResponse = zod
 											state_id: zod.union([zod.number(), zod.null()]).optional()
 										})
 										.describe('State holder with a single relationship to the base State.'),
-									state_id: zod.number(),
-									num_solutions: zod.number(),
-									objective_values: zod.union([zod.record(zod.string(), zod.number()), zod.null()])
+									state_id: zod.number().describe('The state id.'),
+									num_solutions: zod
+										.number()
+										.describe('Number of solutions contained in the referenced state.'),
+									objective_values: zod
+										.union([zod.record(zod.string(), zod.number()), zod.null()])
+										.describe(
+											'The objective values of the referenced solution. None if not applicable.'
+										)
 								})
 								.describe(
 									'The same as SolutionReference, but without decision variables for more efficient transport over the internet.'
@@ -5047,9 +5591,15 @@ export const FullIterationGnimbusAllIterationsPostResponse = zod
 											state_id: zod.union([zod.number(), zod.null()]).optional()
 										})
 										.describe('State holder with a single relationship to the base State.'),
-									state_id: zod.number(),
-									num_solutions: zod.number(),
-									objective_values: zod.union([zod.record(zod.string(), zod.number()), zod.null()])
+									state_id: zod.number().describe('The state id.'),
+									num_solutions: zod
+										.number()
+										.describe('Number of solutions contained in the referenced state.'),
+									objective_values: zod
+										.union([zod.record(zod.string(), zod.number()), zod.null()])
+										.describe(
+											'The objective values of the referenced solution. None if not applicable.'
+										)
 								})
 								.describe(
 									'The same as SolutionReference, but without decision variables for more efficient transport over the internet.'
@@ -5442,7 +5992,7 @@ decision events capturing what the DM chose at each transition.
 
 Args:
     session_id: The interactive session ID.
-    db_session: The database session.
+    context: The context of the query.
 
 Returns:
     ENautilusSessionTreeResponse with nodes, edges, root_ids, and decision_events.
@@ -5452,6 +6002,83 @@ export const GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams = zod.ob
 	session_id: zod.number()
 });
 
+export const getSessionTreeMethodEnautilusSessionTreeSessionIdGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const GetSessionTreeMethodEnautilusSessionTreeSessionIdGetBody = zod.union([
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			scalarization_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			solver: zod.union([zod.string(), zod.null()]).optional(),
+			solver_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			preference: zod
+				.object({
+					preference_type: zod
+						.literal('reference_point')
+						.default(
+							getSessionTreeMethodEnautilusSessionTreeSessionIdGetBodyOnePreferencePreferenceTypeDefault
+						),
+					aspiration_levels: zod.record(zod.string(), zod.number())
+				})
+				.optional()
+				.describe('Model for representing a reference point type of preference.')
+		})
+		.describe('Model of the request to the reference point method.'),
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			representative_solutions_id: zod
+				.number()
+				.describe('The id of the representative solutions to be used.'),
+			current_iteration: zod.number().describe('The number of the current iteration.'),
+			iterations_left: zod.number().describe('The number of iterations left.'),
+			selected_point: zod
+				.union([zod.record(zod.string(), zod.number()), zod.null()])
+				.describe(
+					'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+				),
+			reachable_point_indices: zod
+				.array(zod.number())
+				.describe(
+					'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+				),
+			number_of_intermediate_points: zod
+				.number()
+				.describe('The number of intermediate points to be generated.')
+		})
+		.describe('Model of the request to the E-NAUTILUS method.'),
+	zod
+		.object({
+			name: zod.string(),
+			description: zod.union([zod.string(), zod.null()]).optional(),
+			solution_data: zod.record(zod.string(), zod.array(zod.number())),
+			ideal: zod.record(zod.string(), zod.number()),
+			nadir: zod.record(zod.string(), zod.number()),
+			problem_id: zod.number()
+		})
+		.describe('Model of the request to the representative solution set.'),
+	zod
+		.object({
+			info: zod.union([zod.string(), zod.null()]).optional()
+		})
+		.describe('Model of the request to create a new session.'),
+	zod.null()
+]);
+
 export const GetSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse = zod
 	.object({
 		session_id: zod.number().describe('The interactive session id.'),
@@ -5534,6 +6161,101 @@ export const GetSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse = zod
 	})
 	.describe('The complete E-NAUTILUS session tree.');
 
+/**
+ * Run E-NAUTILUS greedily from a state to completion.
+
+Given a starting state, this endpoint greedily selects the best intermediate
+point for the preferred objective at each iteration until iterations_left == 0,
+then projects to the Pareto front. No database writes are performed.
+ * @summary Simulate
+ */
+export const simulateMethodEnautilusSimulatePostBodyDeprioritizeDefault = false;
+export const simulateMethodEnautilusSimulatePostBodyNumberOfIntermediatePointsDefault = 3;
+
+export const SimulateMethodEnautilusSimulatePostBody = zod
+	.object({
+		state_id: zod.number().describe('Starting ENautilusState to branch from.'),
+		preferred_objective: zod.string().describe("Objective symbol to favor (e.g., 'f_1')."),
+		deprioritize: zod
+			.boolean()
+			.default(simulateMethodEnautilusSimulatePostBodyDeprioritizeDefault)
+			.describe('If True, always pick the WORST value for the objective instead of the best.'),
+		number_of_intermediate_points: zod
+			.number()
+			.default(simulateMethodEnautilusSimulatePostBodyNumberOfIntermediatePointsDefault)
+			.describe('Number of intermediate points per simulated step.')
+	})
+	.describe('Run E-NAUTILUS greedily from a state to completion.');
+
+export const SimulateMethodEnautilusSimulatePostResponse = zod
+	.object({
+		preferred_objective: zod.string(),
+		steps: zod.array(
+			zod
+				.object({
+					iteration: zod.number(),
+					iterations_left: zod.number(),
+					selected_point: zod
+						.record(zod.string(), zod.number())
+						.describe('The auto-picked intermediate point.'),
+					selected_point_index: zod.number(),
+					intermediate_points: zod.array(zod.record(zod.string(), zod.number())),
+					closeness_measures: zod.array(zod.number())
+				})
+				.describe('One step in the simulated path.')
+		),
+		final_solution: zod
+			.object({
+				optimal_variables: zod
+					.record(zod.string(), zod.union([zod.number(), zod.number(), zod.array(zod.unknown())]))
+					.describe('The optimal decision variables found.'),
+				optimal_objectives: zod
+					.record(zod.string(), zod.union([zod.number(), zod.array(zod.number())]))
+					.describe(
+						'The objective function values corresponding to the optimal decision variables found.'
+					),
+				constraint_values: zod
+					.union([
+						zod.record(
+							zod.string(),
+							zod.union([
+								zod.number(),
+								zod.number(),
+								zod.array(zod.number()),
+								zod.array(zod.unknown())
+							])
+						),
+						zod.unknown(),
+						zod.null()
+					])
+					.optional()
+					.describe(
+						'The constraint values of the problem. A negative value means the constraint is respected, a positive one means it has been breached.'
+					),
+				extra_func_values: zod
+					.union([
+						zod.record(zod.string(), zod.union([zod.number(), zod.array(zod.number())])),
+						zod.null()
+					])
+					.optional()
+					.describe('The extra function values of the problem.'),
+				scalarization_values: zod
+					.union([
+						zod.record(zod.string(), zod.union([zod.number(), zod.array(zod.number())])),
+						zod.null()
+					])
+					.optional()
+					.describe('The scalarization function values of the problem.'),
+				success: zod
+					.boolean()
+					.describe('A boolean flag indicating whether the optimization was successful or not.'),
+				message: zod.string().describe('Description of the cause of termination.')
+			})
+			.describe('Defines a schema for a dataclass to store the results of a solver.'),
+		final_intermediate_point: zod.record(zod.string(), zod.number())
+	})
+	.describe('Result of greedy E-NAUTILUS simulation.');
+
 /**
  * Vote for a band using this endpoint.
 
diff --git a/webui/src/lib/gen/models/BodyAddProblemJsonProblemAddJsonPost.ts b/webui/src/lib/gen/models/BodyAddProblemJsonProblemAddJsonPost.ts
index a51b070ad..2d99ba70f 100644
--- a/webui/src/lib/gen/models/BodyAddProblemJsonProblemAddJsonPost.ts
+++ b/webui/src/lib/gen/models/BodyAddProblemJsonProblemAddJsonPost.ts
@@ -5,7 +5,17 @@
  * A rest API for the DESDEO framework.
  * OpenAPI spec version: 0.1.0
  */
+import type { CreateSessionRequest } from './CreateSessionRequest';
+import type { ENautilusStepRequest } from './ENautilusStepRequest';
+import type { RepresentativeSolutionSetRequest } from './RepresentativeSolutionSetRequest';
+import type { RPMSolveRequest } from './RPMSolveRequest';
 
 export interface BodyAddProblemJsonProblemAddJsonPost {
 	json_file: Blob;
+	request?:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| RepresentativeSolutionSetRequest
+		| CreateSessionRequest
+		| null;
 }
diff --git a/webui/src/lib/gen/models/ENautilusSimulateRequest.ts b/webui/src/lib/gen/models/ENautilusSimulateRequest.ts
new file mode 100644
index 000000000..b2c9b6533
--- /dev/null
+++ b/webui/src/lib/gen/models/ENautilusSimulateRequest.ts
@@ -0,0 +1,21 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * Run E-NAUTILUS greedily from a state to completion.
+ */
+export interface ENautilusSimulateRequest {
+	/** Starting ENautilusState to branch from. */
+	state_id: number;
+	/** Objective symbol to favor (e.g., 'f_1'). */
+	preferred_objective: string;
+	/** If True, always pick the WORST value for the objective instead of the best. */
+	deprioritize?: boolean;
+	/** Number of intermediate points per simulated step. */
+	number_of_intermediate_points?: number;
+}
diff --git a/webui/src/lib/gen/models/ENautilusSimulateResponse.ts b/webui/src/lib/gen/models/ENautilusSimulateResponse.ts
new file mode 100644
index 000000000..22a289683
--- /dev/null
+++ b/webui/src/lib/gen/models/ENautilusSimulateResponse.ts
@@ -0,0 +1,21 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+import type { ENautilusSimulateResponseFinalIntermediatePoint } from './ENautilusSimulateResponseFinalIntermediatePoint';
+import type { ENautilusSimulateStepResult } from './ENautilusSimulateStepResult';
+import type { SolverResults } from './SolverResults';
+
+/**
+ * Result of greedy E-NAUTILUS simulation.
+ */
+export interface ENautilusSimulateResponse {
+	preferred_objective: string;
+	steps: ENautilusSimulateStepResult[];
+	/** Projected Pareto-optimal solution. */
+	final_solution: SolverResults;
+	final_intermediate_point: ENautilusSimulateResponseFinalIntermediatePoint;
+}
diff --git a/webui/src/lib/gen/models/ENautilusSimulateResponseFinalIntermediatePoint.ts b/webui/src/lib/gen/models/ENautilusSimulateResponseFinalIntermediatePoint.ts
new file mode 100644
index 000000000..bc425ef20
--- /dev/null
+++ b/webui/src/lib/gen/models/ENautilusSimulateResponseFinalIntermediatePoint.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type ENautilusSimulateResponseFinalIntermediatePoint = { [key: string]: number };
diff --git a/webui/src/lib/gen/models/ENautilusSimulateStepResult.ts b/webui/src/lib/gen/models/ENautilusSimulateStepResult.ts
new file mode 100644
index 000000000..fb0f18b0f
--- /dev/null
+++ b/webui/src/lib/gen/models/ENautilusSimulateStepResult.ts
@@ -0,0 +1,22 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+import type { ENautilusSimulateStepResultIntermediatePointsItem } from './ENautilusSimulateStepResultIntermediatePointsItem';
+import type { ENautilusSimulateStepResultSelectedPoint } from './ENautilusSimulateStepResultSelectedPoint';
+
+/**
+ * One step in the simulated path.
+ */
+export interface ENautilusSimulateStepResult {
+	iteration: number;
+	iterations_left: number;
+	/** The auto-picked intermediate point. */
+	selected_point: ENautilusSimulateStepResultSelectedPoint;
+	selected_point_index: number;
+	intermediate_points: ENautilusSimulateStepResultIntermediatePointsItem[];
+	closeness_measures: number[];
+}
diff --git a/webui/src/lib/gen/models/ENautilusSimulateStepResultIntermediatePointsItem.ts b/webui/src/lib/gen/models/ENautilusSimulateStepResultIntermediatePointsItem.ts
new file mode 100644
index 000000000..7bc1723c4
--- /dev/null
+++ b/webui/src/lib/gen/models/ENautilusSimulateStepResultIntermediatePointsItem.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type ENautilusSimulateStepResultIntermediatePointsItem = { [key: string]: number };
diff --git a/webui/src/lib/gen/models/ENautilusSimulateStepResultSelectedPoint.ts b/webui/src/lib/gen/models/ENautilusSimulateStepResultSelectedPoint.ts
new file mode 100644
index 000000000..fdd3d9bfc
--- /dev/null
+++ b/webui/src/lib/gen/models/ENautilusSimulateStepResultSelectedPoint.ts
@@ -0,0 +1,12 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * The auto-picked intermediate point.
+ */
+export type ENautilusSimulateStepResultSelectedPoint = { [key: string]: number };
diff --git a/webui/src/lib/gen/models/SolutionReference.ts b/webui/src/lib/gen/models/SolutionReference.ts
index 8961092be..835bff7e8 100644
--- a/webui/src/lib/gen/models/SolutionReference.ts
+++ b/webui/src/lib/gen/models/SolutionReference.ts
@@ -21,10 +21,16 @@ export interface SolutionReference {
 	solution_index?: number | null;
 	/** The reference state with the solution information. */
 	state: StateDB;
+	/** The state id. */
 	readonly state_id: number;
+	/** Number of solutions contained in the referenced state. */
 	readonly num_solutions: number;
+	/** All the objective values of the result. */
 	readonly objective_values_all: readonly SolutionReferenceObjectiveValuesAllItem[];
+	/** All the variable values of the result. */
 	readonly variable_values_all: readonly SolutionReferenceVariableValuesAllItem[];
+	/** The objective values of the referenced solution. None if not applicable. */
 	readonly objective_values: SolutionReferenceObjectiveValues;
+	/** The variable values of the referenced solution. None if not apllicable. */
 	readonly variable_values: SolutionReferenceVariableValues;
 }
diff --git a/webui/src/lib/gen/models/SolutionReferenceLite.ts b/webui/src/lib/gen/models/SolutionReferenceLite.ts
index 7c9cdc143..a86b1f5ce 100644
--- a/webui/src/lib/gen/models/SolutionReferenceLite.ts
+++ b/webui/src/lib/gen/models/SolutionReferenceLite.ts
@@ -18,7 +18,10 @@ export interface SolutionReferenceLite {
 	solution_index?: number | null;
 	/** The reference state with the solution information. */
 	state: StateDB;
+	/** The state id. */
 	readonly state_id: number;
+	/** Number of solutions contained in the referenced state. */
 	readonly num_solutions: number;
+	/** The objective values of the referenced solution. None if not applicable. */
 	readonly objective_values: SolutionReferenceLiteObjectiveValues;
 }
diff --git a/webui/src/lib/gen/models/SolutionReferenceLiteObjectiveValues.ts b/webui/src/lib/gen/models/SolutionReferenceLiteObjectiveValues.ts
index 402e7bdea..5e57f44ed 100644
--- a/webui/src/lib/gen/models/SolutionReferenceLiteObjectiveValues.ts
+++ b/webui/src/lib/gen/models/SolutionReferenceLiteObjectiveValues.ts
@@ -6,4 +6,7 @@
  * OpenAPI spec version: 0.1.0
  */
 
+/**
+ * The objective values of the referenced solution. None if not applicable.
+ */
 export type SolutionReferenceLiteObjectiveValues = { [key: string]: number } | null;
diff --git a/webui/src/lib/gen/models/SolutionReferenceObjectiveValues.ts b/webui/src/lib/gen/models/SolutionReferenceObjectiveValues.ts
index 5a02eb47b..3b0c11dab 100644
--- a/webui/src/lib/gen/models/SolutionReferenceObjectiveValues.ts
+++ b/webui/src/lib/gen/models/SolutionReferenceObjectiveValues.ts
@@ -6,4 +6,7 @@
  * OpenAPI spec version: 0.1.0
  */
 
+/**
+ * The objective values of the referenced solution. None if not applicable.
+ */
 export type SolutionReferenceObjectiveValues = { [key: string]: number } | null;
diff --git a/webui/src/lib/gen/models/SolutionReferenceVariableValues.ts b/webui/src/lib/gen/models/SolutionReferenceVariableValues.ts
index dc92cc6d8..cfadc8181 100644
--- a/webui/src/lib/gen/models/SolutionReferenceVariableValues.ts
+++ b/webui/src/lib/gen/models/SolutionReferenceVariableValues.ts
@@ -7,6 +7,9 @@
  */
 import type { Tensor } from './Tensor';
 
+/**
+ * The variable values of the referenced solution. None if not apllicable.
+ */
 export type SolutionReferenceVariableValues = {
 	[key: string]: number | number | boolean | Tensor;
 } | null;
diff --git a/webui/src/lib/gen/models/index.ts b/webui/src/lib/gen/models/index.ts
index 9b519e5bf..f697e2bca 100644
--- a/webui/src/lib/gen/models/index.ts
+++ b/webui/src/lib/gen/models/index.ts
@@ -31,6 +31,12 @@ export * from './ENautilusFinalizeResponse';
 export * from './ENautilusFinalizeResponseSelectedIntermediatePoint';
 export * from './ENautilusRepresentativeSolutionsResponse';
 export * from './ENautilusSessionTreeResponse';
+export * from './ENautilusSimulateRequest';
+export * from './ENautilusSimulateResponse';
+export * from './ENautilusSimulateResponseFinalIntermediatePoint';
+export * from './ENautilusSimulateStepResult';
+export * from './ENautilusSimulateStepResultIntermediatePointsItem';
+export * from './ENautilusSimulateStepResultSelectedPoint';
 export * from './ENautilusStateResponse';
 export * from './ENautilusStepRequest';
 export * from './ENautilusStepRequestSelectedPoint';
@@ -116,13 +122,6 @@ export * from './RepresentativeNonDominatedSolutions';
 export * from './RepresentativeNonDominatedSolutionsIdeal';
 export * from './RepresentativeNonDominatedSolutionsNadir';
 export * from './RepresentativeNonDominatedSolutionsSolutionData';
-export * from './RepresentativeSolutionSetFull';
-export * from './RepresentativeSolutionSetFullIdeal';
-export * from './RepresentativeSolutionSetFullNadir';
-export * from './RepresentativeSolutionSetFullSolutionData';
-export * from './RepresentativeSolutionSetInfo';
-export * from './RepresentativeSolutionSetInfoIdeal';
-export * from './RepresentativeSolutionSetInfoNadir';
 export * from './RepresentativeSolutionSetRequest';
 export * from './RepresentativeSolutionSetRequestIdeal';
 export * from './RepresentativeSolutionSetRequestNadir';
diff --git a/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts b/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
index 0e1accfd2..1a1b05df6 100644
--- a/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
+++ b/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
@@ -1,6 +1,6 @@
-import type { ENautilusRepresentativeSolutionsResponse, ENautilusSessionTreeResponse, ENautilusStateResponse, ENautilusStepRequest, ENautilusStepResponse, ProblemGetRequest, ProblemInfo } from "$lib/gen/models";
-import type { getRepresentativeMethodEnautilusGetRepresentativeStateIdGetResponse, getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse, getStateMethodEnautilusGetStateStateIdGetResponse, stepMethodEnautilusStepPostResponse } from "$lib/gen/endpoints/DESDEOFastAPI";
-import { stepMethodEnautilusStepPost, getProblemProblemGetPost, getStateMethodEnautilusGetStateStateIdGet, getRepresentativeMethodEnautilusGetRepresentativeStateIdGet, getSessionTreeMethodEnautilusSessionTreeSessionIdGet } from "$lib/gen/endpoints/DESDEOFastAPI";
+import type { ENautilusRepresentativeSolutionsResponse, ENautilusSessionTreeResponse, ENautilusSimulateResponse, ENautilusStateResponse, ENautilusStepRequest, ENautilusStepResponse, ProblemGetRequest, ProblemInfo } from "$lib/gen/models";
+import type { getRepresentativeMethodEnautilusGetRepresentativeStateIdGetResponse, getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse, getStateMethodEnautilusGetStateStateIdGetResponse, simulateMethodEnautilusSimulatePostResponse, stepMethodEnautilusStepPostResponse } from "$lib/gen/endpoints/DESDEOFastAPI";
+import { stepMethodEnautilusStepPost, getProblemProblemGetPost, getStateMethodEnautilusGetStateStateIdGet, getRepresentativeMethodEnautilusGetRepresentativeStateIdGet, getSessionTreeMethodEnautilusSessionTreeSessionIdGet, simulateMethodEnautilusSimulatePost } from "$lib/gen/endpoints/DESDEOFastAPI";
 import type { getProblemProblemGetPostResponse } from "$lib/gen/endpoints/DESDEOFastAPI";
 import { fetch_sessions, create_session } from '../../methods/sessions/handler';
 export { fetch_sessions, create_session };
@@ -115,3 +115,22 @@ export async function fetch_session_tree(
 
     return response.data;
 }
+
+export async function simulate_enautilus(
+    state_id: number,
+    preferred_objective: string,
+    number_of_intermediate_points?: number,
+): Promise<ENautilusSimulateResponse | null> {
+    const response: simulateMethodEnautilusSimulatePostResponse = await simulateMethodEnautilusSimulatePost({
+        state_id,
+        preferred_objective,
+        ...(number_of_intermediate_points != null ? { number_of_intermediate_points } : {}),
+    });
+
+    if (response.status !== 200) {
+        console.error("E-NAUTILUS simulation failed:", response.status);
+        return null;
+    }
+
+    return response.data;
+}

From fec7b3a9ae9ecf4d994197011296a3c843b98971 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 26 Feb 2026 16:24:45 +0200
Subject: [PATCH 02/24] clinic

- Added map support to the UI
---
 desdeo/api/app.py                             |   2 +
 desdeo/api/models/__init__.py                 |   5 +
 desdeo/api/models/clinic_map.py               |  43 ++++
 desdeo/api/routers/clinic_map.py              | 157 ++++++++++++++
 desdeo/mcdm/enautilus.py                      |  24 ++-
 webui/package-lock.json                       |  79 ++++---
 webui/package.json                            |   2 +
 .../custom/clinic-map/clinic-map.svelte       | 192 ++++++++++++++++++
 .../decision-journey/decision-journey.svelte  |  19 +-
 .../custom/decision-journey/journey-utils.ts  |   3 +
 .../E-NAUTILUS/+page.svelte                   |  37 +++-
 11 files changed, 526 insertions(+), 37 deletions(-)
 create mode 100644 desdeo/api/models/clinic_map.py
 create mode 100644 desdeo/api/routers/clinic_map.py
 create mode 100644 webui/src/lib/components/custom/clinic-map/clinic-map.svelte

diff --git a/desdeo/api/app.py b/desdeo/api/app.py
index c66d135cb..9b322eb40 100644
--- a/desdeo/api/app.py
+++ b/desdeo/api/app.py
@@ -5,6 +5,7 @@
 
 from desdeo.api.config import AuthConfig
 from desdeo.api.routers import (
+    clinic_map,
     emo,
     enautilus,
     generic,
@@ -37,6 +38,7 @@
 app.include_router(gdm_aggregate.router)
 app.include_router(gnimbus_routers.router)
 app.include_router(enautilus.router)
+app.include_router(clinic_map.router)
 app.include_router(gdm_score_bands_routers.router)
 
 origins = AuthConfig.cors_origins
diff --git a/desdeo/api/models/__init__.py b/desdeo/api/models/__init__.py
index f8b8c23f5..48c19440b 100644
--- a/desdeo/api/models/__init__.py
+++ b/desdeo/api/models/__init__.py
@@ -2,6 +2,10 @@
 
 __all__ = [  # noqa: RUF022
     "Bounds",
+    "ClinicMapCity",
+    "ClinicMapLine",
+    "ClinicMapRequest",
+    "ClinicMapResponse",
     "ConstantDB",
     "ConstraintDB",
     "CreateSessionRequest",
@@ -138,6 +142,7 @@
 
 
 from .archive import UserSavedEMOResults
+from .clinic_map import ClinicMapCity, ClinicMapLine, ClinicMapRequest, ClinicMapResponse
 from .emo import (
     EMOFetchRequest,
     EMOFetchResponse,
diff --git a/desdeo/api/models/clinic_map.py b/desdeo/api/models/clinic_map.py
new file mode 100644
index 000000000..f416b8d4e
--- /dev/null
+++ b/desdeo/api/models/clinic_map.py
@@ -0,0 +1,43 @@
+"""Models for the clinic map visualization endpoint."""
+
+from pydantic import BaseModel
+
+
+class ClinicMapRequest(BaseModel):
+    """Request body for the clinic map endpoint.
+
+    Attributes:
+        sv: Binary vector of length 60 indicating visited sites.
+        cover: Binary vector of length 36 indicating covered cities.
+    """
+
+    sv: list[float]
+    cover: list[float]
+
+
+class ClinicMapCity(BaseModel):
+    """A city marker on the map."""
+
+    city: str
+    lat: float
+    lon: float
+    size: float
+    color: str
+    tooltip: str
+
+
+class ClinicMapLine(BaseModel):
+    """A coverage connection line between two cities."""
+
+    from_lat: float
+    from_lon: float
+    to_lat: float
+    to_lon: float
+
+
+class ClinicMapResponse(BaseModel):
+    """Response body for the clinic map endpoint."""
+
+    cities: list[ClinicMapCity]
+    lines: list[ClinicMapLine]
+    center: list[float]
diff --git a/desdeo/api/routers/clinic_map.py b/desdeo/api/routers/clinic_map.py
new file mode 100644
index 000000000..37c0686d9
--- /dev/null
+++ b/desdeo/api/routers/clinic_map.py
@@ -0,0 +1,157 @@
+"""Endpoint for building clinic map visualization data from a solution's binary vectors."""
+
+from pathlib import Path
+
+import numpy as np
+import polars as pl
+from fastapi import APIRouter, HTTPException
+
+from desdeo.api.models.clinic_map import (
+    ClinicMapCity,
+    ClinicMapLine,
+    ClinicMapRequest,
+    ClinicMapResponse,
+)
+
+router = APIRouter(prefix="/clinic", tags=["Clinic"])
+
+DATA_DIR = Path(__file__).resolve().parent.parent.parent.parent / "experiments" / "clinic" / "data"
+FOOD_DESERT_THRESHOLD = 15  # minutes
+
+N_SITES = 60
+N_CITIES = 36
+
+
+@router.post("/map", response_model=ClinicMapResponse)
+def build_clinic_map(req: ClinicMapRequest) -> ClinicMapResponse:
+    """Build Leaflet-compatible map data from a clinic solution's binary vectors.
+
+    Takes sv (60 site-visit booleans) and cover (36 city-coverage booleans)
+    and returns city markers with colors/tooltips plus coverage connection lines.
+    """
+    if len(req.sv) != N_SITES:
+        raise HTTPException(status_code=422, detail=f"sv must have {N_SITES} values, got {len(req.sv)}")
+    if len(req.cover) != N_CITIES:
+        raise HTTPException(status_code=422, detail=f"cover must have {N_CITIES} values, got {len(req.cover)}")
+
+    # --- Load static data ---
+    cities_df = pl.read_csv(DATA_DIR / "cities.csv")
+    sites_df = pl.read_csv(DATA_DIR / "proposedSitesProcessed.csv")
+    adj_ttime_df = pl.read_csv(DATA_DIR / "adjacencyMatrixTravelTime.csv")
+
+    all_city_names: list[str] = cities_df["city"].to_list()
+    site_city_names: list[str] = sites_df["city"].to_list()
+
+    # --- Parse binary vectors ---
+    sv = [bool(round(v)) for v in req.sv]
+    cover = [bool(round(v)) for v in req.cover]
+
+    visited_site_indices = [i for i, v in enumerate(sv) if v]
+    covered_city_indices = [i for i, v in enumerate(cover) if v]
+
+    # --- Build travel-time adjacency (36x36) and close-cities mask ---
+    ttime_city_names = adj_ttime_df.columns[1:]  # 36 city column names
+    ttime_matrix = adj_ttime_df.select(ttime_city_names).to_numpy()  # (36, 36)
+    city_to_idx = {name: i for i, name in enumerate(ttime_city_names)}
+
+    close_cities = (ttime_matrix < FOOD_DESERT_THRESHOLD).astype(np.int8)  # (36, 36)
+
+    # Each site inherits the adjacency row of its host city → (60, 36)
+    site_city_idxs = [city_to_idx[c] for c in site_city_names]
+    cities_adj2sites = close_cities[site_city_idxs, :]  # (60, 36)
+
+    # --- Group visited sites by city (for tooltips) ---
+    sites_in_cities: dict[str, list[str]] = {}
+    for i in visited_site_indices:
+        city = site_city_names[i]
+        name = sites_df["siteName"][i]
+        sites_in_cities.setdefault(city, []).append(name)
+
+    event_city_names = set(sites_in_cities.keys())
+    covered_city_names = {all_city_names[i] for i in covered_city_indices}
+
+    # --- Build coverage connections ---
+    # For each visited site, find which cities it covers (within threshold)
+    visited_site_city_list = [site_city_names[i] for i in visited_site_indices]
+
+    # site_city → set of nearby cities it covers (excluding itself)
+    site2covered: dict[str, set[str]] = {}
+    for idx_in_visited, site_idx in enumerate(visited_site_indices):
+        site_city = site_city_names[site_idx]
+        nearby: set[str] = set()
+        for c_idx in range(N_CITIES):
+            if cities_adj2sites[site_idx, c_idx]:
+                nearby.add(all_city_names[c_idx])
+        nearby.discard(site_city)
+        if nearby:
+            existing = site2covered.get(site_city, set())
+            site2covered[site_city] = existing | nearby
+
+    # Invert: covered_city → set of site-cities that cover it.
+    # Only include cities that are actually covered (cover=1) or have events,
+    # not just physically nearby. The cover vector is a solver decision —
+    # a city can be within threshold but uncovered when the epsilon constraint
+    # on f_4 is loose.
+    adjacent_sites: dict[str, set[str]] = {}
+    for site_city, covered_set in site2covered.items():
+        for cov_city in covered_set:
+            if cov_city in covered_city_names or cov_city in event_city_names:
+                adjacent_sites.setdefault(cov_city, set()).add(site_city)
+
+    # --- Coordinate lookup ---
+    city_coords: dict[str, tuple[float, float]] = {}
+    for row in cities_df.iter_rows(named=True):
+        city_coords[row["city"]] = (row["lat"], row["long"])
+
+    # --- Build lines with resolved coordinates ---
+    lines: list[ClinicMapLine] = []
+    for cov_city, src_cities in adjacent_sites.items():
+        to_lat, to_lon = city_coords[cov_city]
+        for src_city in src_cities:
+            from_lat, from_lon = city_coords[src_city]
+            lines.append(ClinicMapLine(from_lat=from_lat, from_lon=from_lon, to_lat=to_lat, to_lon=to_lon))
+
+    # --- Build city markers ---
+    cities_out: list[ClinicMapCity] = []
+    for row in cities_df.iter_rows(named=True):
+        city_name: str = row["city"]
+        lat: float = row["lat"]
+        lon: float = row["long"]
+        pop: int = row["pop"]
+
+        # Color assignment
+        if city_name in event_city_names:
+            color = "orange"
+        elif city_name in covered_city_names:
+            color = "yellow"
+        else:
+            color = "grey"
+
+        size = max(5.0, pop / 1000)
+
+        # Tooltip HTML
+        if city_name in sites_in_cities:
+            site_list_html = "<br>".join(sites_in_cities[city_name])
+            tooltip = (
+                f"<b>{city_name}</b><br>"
+                f"<b>Population:</b> {pop}<br>"
+                f"<b>Sites with events:</b><br>{site_list_html}"
+            )
+        elif city_name in adjacent_sites:
+            covered_by = "<br>".join(sorted(adjacent_sites[city_name]))
+            tooltip = (
+                f"<b>{city_name}</b><br>"
+                f"<b>Population:</b> {pop}<br>"
+                f"<b>No Healthwise Clinics</b><br>"
+                f"<b>Covered by events in:</b><br>{covered_by}"
+            )
+        else:
+            tooltip = f"<b>{city_name}</b><br>" f"<b>Population:</b> {pop}<br>" f"<b>No Healthwise Clinics</b>"
+
+        cities_out.append(ClinicMapCity(city=city_name, lat=lat, lon=lon, size=size, color=color, tooltip=tooltip))
+
+    # --- Center of the map (average of all city coordinates) ---
+    avg_lat = sum(c.lat for c in cities_out) / len(cities_out)
+    avg_lon = sum(c.lon for c in cities_out) / len(cities_out)
+
+    return ClinicMapResponse(cities=cities_out, lines=lines, center=[avg_lat, avg_lon])
diff --git a/desdeo/mcdm/enautilus.py b/desdeo/mcdm/enautilus.py
index 6d8ec8497..dd30fcd6d 100644
--- a/desdeo/mcdm/enautilus.py
+++ b/desdeo/mcdm/enautilus.py
@@ -19,6 +19,7 @@
     numpy_array_to_objective_dict,
     objective_dict_to_numpy_array,
 )
+from desdeo.problem.schema import TensorVariable
 from desdeo.tools import SolverResults, flip_maximized_objective_values
 
 
@@ -61,11 +62,30 @@ def enautilus_get_representative_solutions(
             supplied `non_dominated_points` should contain this information.
     """
     obj_syms = [obj.symbol for obj in problem.objectives]
-    var_syms = [var.symbol for var in problem.variables]
     const_syms = [con.symbol for con in problem.constraints] if problem.constraints else None
     extra_syms = [extra.symbol for extra in problem.extra_funcs] if problem.extra_funcs else None
     scal_syms = [scal.symbol for scal in problem.scalarization_funcs] if problem.scalarization_funcs else None
 
+    # Build the list of variable column names present in the DataFrame.
+    # Scalar variables use their symbol directly; tensor variables are unrolled
+    # into columns like "sv_1", "sv_2", ... matching the convention used by
+    # solve_epsilon.py and the representative solution set upload.
+    available_cols = set(non_dominated_points.columns)
+    var_col_names: list[str] = []
+    for var in problem.variables:
+        if isinstance(var, TensorVariable):
+            # Collect unrolled columns: symbol_1, symbol_2, ...
+            n_elements = 1
+            for d in var.shape:
+                n_elements *= d
+            for i in range(1, n_elements + 1):
+                col = f"{var.symbol}_{i}"
+                if col in available_cols:
+                    var_col_names.append(col)
+        else:
+            if var.symbol in available_cols:
+                var_col_names.append(var.symbol)
+
     # Objective matrix (rows = ND points, cols = objectives, original senses)
     obj_matrix = non_dominated_points.select(obj_syms).to_numpy()
 
@@ -79,7 +99,7 @@ def enautilus_get_representative_solutions(
 
         row = non_dominated_points[idx]
 
-        var_dict = {sym: row[sym] for sym in var_syms if sym in row}
+        var_dict = {col: row[col] for col in var_col_names}
         obj_dict = {sym: row[sym] for sym in obj_syms}
         const_dict = {sym: row[sym] for sym in const_syms if sym in row} if const_syms is not None else None
         extra_dict = {sym: row[sym] for sym in extra_syms if sym in row} if extra_syms is not None else None
diff --git a/webui/package-lock.json b/webui/package-lock.json
index 9f7ab411e..e6e273ff1 100644
--- a/webui/package-lock.json
+++ b/webui/package-lock.json
@@ -20,6 +20,7 @@
         "formsnap": "^2.0.1",
         "katex": "^0.16.23",
         "layerchart": "^2.0.0-next.10",
+        "leaflet": "^1.9.4",
         "mathlive": "^0.107.1",
         "mode-watcher": "^1.1.0",
         "msw": "^2.11.5",
@@ -58,6 +59,7 @@
         "@testing-library/jest-dom": "^6.9.1",
         "@testing-library/svelte": "^5.2.8",
         "@types/d3": "^7.4.3",
+        "@types/leaflet": "^1.9.21",
         "@types/node": "^24.7.1",
         "@vitest/browser": "^3.2.4",
         "@vitest/coverage-v8": "^3.2.4",
@@ -371,6 +373,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -414,6 +417,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -1266,6 +1270,7 @@
       "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.10.1.tgz",
       "integrity": "sha512-oJrXtQiAXLvT9clCf1K4kxp3eKsQhIaZqxEyowkBcsvZDdZkbWrVmnGknxs5flTD0VGsxrxKgBCZty1EzoiMzA==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@swc/helpers": "^0.5.0"
       }
@@ -2274,6 +2279,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -2572,6 +2578,7 @@
       "integrity": "sha512-G2ASV/Q16YkJf/3+4NXX1MdxFTO5qztePwGR12U8yKyyV2NjKtgnCA3jkvSakBLhRbO1nbD8+H13FgQrRfxdbQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ts-dedent": "^2.0.0",
         "type-fest": "~2.19"
@@ -2669,6 +2676,7 @@
       "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.50.0.tgz",
       "integrity": "sha512-Hj8sR8O27p2zshFEIJzsvfhLzxga/hWw6tRLnBjMYw70m1aS9BSYCqAUtzDBjRREtX1EvLMYgaC0mYE3Hz4KWA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
         "@sveltejs/acorn-typescript": "^1.0.5",
@@ -2711,6 +2719,7 @@
       "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.2.4.tgz",
       "integrity": "sha512-ou/d51QSdTyN26D7h6dSpusAKaZkAiGM55/AKYi+9AGZw7q85hElbjK3kEyzXHhLSnRISHOYzVge6x0jRZ7DXA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0",
         "deepmerge": "^4.3.1",
@@ -3556,7 +3565,18 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@types/leaflet": {
+      "version": "1.9.21",
+      "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.21.tgz",
+      "integrity": "sha512-TbAd9DaPGSnzp6QvtYngntMZgcRk+igFELwR2N99XZn7RXUdKgsXMR+28bUO0rPsWp8MIu/f47luLIQuSLYv/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/geojson": "*"
+      }
     },
     "node_modules/@types/mdast": {
       "version": "4.0.4",
@@ -3581,6 +3601,7 @@
       "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -3699,6 +3720,7 @@
       "integrity": "sha512-nm3cvFN9SqZGXjmw5bZ6cGmvJSyJPn0wU9gHAZZHDnZl2wF9PhHv78Xf06E0MaNk4zLVHL8hb2/c32XvyJOLQg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.53.1",
         "@typescript-eslint/types": "8.53.1",
@@ -3956,6 +3978,7 @@
       "integrity": "sha512-tJxiPrWmzH8a+w9nLKlQMzAKX/7VjFs50MWgcAj7p9XQ7AQ9/35fByFYptgPELyLw+0aixTnC4pUWV+APcZ/kw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@testing-library/dom": "^10.4.0",
         "@testing-library/user-event": "^14.6.1",
@@ -4150,6 +4173,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4566,18 +4590,6 @@
         }
       }
     },
-    "node_modules/class-validator": {
-      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/class-validator/-/class-validator-0.14.3.tgz",
-      "integrity": "sha512-rXXekcjofVN1LTOSw+u4u9WXVEUvNBVjORW154q/IdmYWy1nMbOU9aNtZB0t8m+FJQ9q91jlr2f9CwwUFdFMRA==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@types/validator": "^13.15.3",
-        "libphonenumber-js": "^1.11.1",
-        "validator": "^13.15.20"
-      }
-    },
     "node_modules/cli-width": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
@@ -4800,8 +4812,7 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
       "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/d3": {
       "version": "7.9.0",
@@ -5181,6 +5192,7 @@
       "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
       "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
       "license": "ISC",
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -5526,7 +5538,8 @@
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
       "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/embla-carousel-reactive-utils": {
       "version": "8.6.0",
@@ -5695,6 +5708,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -6901,6 +6915,7 @@
       "integrity": "sha512-mjzqwWRD9Y1J1KUi7W97Gja1bwOOM5Ug0EZ6UDK3xS7j7mndrkwozHtSblfomlzyB4NepioNt+B2sOSzczVgtQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@acemir/cssom": "^0.9.28",
         "@asamuzakjp/dom-selector": "^6.7.6",
@@ -7096,6 +7111,12 @@
         "svelte": "^5.7.0"
       }
     },
+    "node_modules/leaflet": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
+      "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==",
+      "license": "BSD-2-Clause"
+    },
     "node_modules/leven": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-4.1.0.tgz",
@@ -7122,13 +7143,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/libphonenumber-js": {
-      "version": "1.12.34",
-      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.12.34.tgz",
-      "integrity": "sha512-v/Ip8k8eYdp7bINpzqDh46V/PaQ8sK+qi97nMQgjZzFlb166YFqlR/HVI+MzsI9JqcyyVWCOipmmretiaSyQyw==",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/lightningcss": {
       "version": "1.30.2",
       "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz",
@@ -8120,6 +8134,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
       "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20"
       }
@@ -8542,6 +8557,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -8675,6 +8691,7 @@
       "integrity": "sha512-yEPsovQfpxYfgWNhCfECjG5AQaO+K3dp6XERmOepyPDVqcJm+bjyCVO3pmU+nAPe0N5dDvekfGezt/EIiRe1TA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -8691,6 +8708,7 @@
       "integrity": "sha512-xL49LCloMoZRvSwa6IEdN2GV6cq2IqpYGstYtMT+5wmml1/dClEoI0MZR78MiVPpu6BdQFfN0/y73yO6+br5Pg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "prettier": "^3.0.0",
         "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0"
@@ -8912,6 +8930,7 @@
       "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8922,6 +8941,7 @@
       "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -9064,6 +9084,7 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.55.3.tgz",
       "integrity": "sha512-y9yUpfQvetAjiDLtNMf1hL9NXchIJgWt6zIKeoB+tCd3npX08Eqfzg60V9DhIGVMtQ0AlMkFw5xa+AQ37zxnAA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -9347,6 +9368,7 @@
       "integrity": "sha512-pKP5jXJYM4OjvNklGuHKO53wOCAwfx79KvZyOWHoi9zXUH5WVMFUe/ZfWyxXG/GTcj0maRgHGUjq/0I43r0dDQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@storybook/global": "^5.0.0",
         "@storybook/icons": "^2.0.0",
@@ -9596,6 +9618,7 @@
       "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.47.1.tgz",
       "integrity": "sha512-MhSWfWEpG5T57z0Oyfk9D1GhAz/KTZKZZlWtGEsy9zNk2fafpuU7sJQlXNSA8HtvwKxVC9XlDyl5YovXUXjjHA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jridgewell/remapping": "^2.3.4",
         "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -9860,6 +9883,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "devalue": "^5.6.1",
         "memoize-weak": "^1.0.2",
@@ -9995,7 +10019,8 @@
       "version": "4.1.18",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.18.tgz",
       "integrity": "sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/tapable": {
       "version": "2.3.0",
@@ -10308,6 +10333,7 @@
       "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.28.16.tgz",
       "integrity": "sha512-x4xW77QC3i5DUFMBp0qjukOTnr/sSg+oEs86nB3LjDslvAmwe/PUGDWbe3GrIqt59oTqoXK5GRK9tAa0sYMiog==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@gerrit0/mini-shiki": "^3.17.0",
         "lunr": "^2.3.9",
@@ -10379,6 +10405,7 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -10558,6 +10585,7 @@
       "resolved": "https://registry.npmjs.org/valibot/-/valibot-1.2.0.tgz",
       "integrity": "sha512-mm1rxUsmOxzrwnX5arGS+U4T25RdvpPjPN4yR0u9pUBov9+zGVtO84tif1eY4r6zWxVxu3KzIyknJy3rxfRZZg==",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "typescript": ">=5"
       },
@@ -10649,6 +10677,7 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -10780,6 +10809,7 @@
       "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/chai": "^5.2.2",
         "@vitest/expect": "3.2.4",
@@ -11249,6 +11279,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.5.tgz",
       "integrity": "sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/webui/package.json b/webui/package.json
index 14e83bd87..18f1c4fb5 100644
--- a/webui/package.json
+++ b/webui/package.json
@@ -33,6 +33,7 @@
     "formsnap": "^2.0.1",
     "katex": "^0.16.23",
     "layerchart": "^2.0.0-next.10",
+    "leaflet": "^1.9.4",
     "mathlive": "^0.107.1",
     "mode-watcher": "^1.1.0",
     "msw": "^2.11.5",
@@ -71,6 +72,7 @@
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/svelte": "^5.2.8",
     "@types/d3": "^7.4.3",
+    "@types/leaflet": "^1.9.21",
     "@types/node": "^24.7.1",
     "@vitest/browser": "^3.2.4",
     "@vitest/coverage-v8": "^3.2.4",
diff --git a/webui/src/lib/components/custom/clinic-map/clinic-map.svelte b/webui/src/lib/components/custom/clinic-map/clinic-map.svelte
new file mode 100644
index 000000000..8db05012a
--- /dev/null
+++ b/webui/src/lib/components/custom/clinic-map/clinic-map.svelte
@@ -0,0 +1,192 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import type { SolverResults } from '$lib/gen/models';
+
+	const API_URL = import.meta.env.VITE_API_URL;
+
+	interface ClinicMapCity {
+		city: string;
+		lat: number;
+		lon: number;
+		size: number;
+		color: string;
+		tooltip: string;
+	}
+
+	interface ClinicMapLine {
+		from_lat: number;
+		from_lon: number;
+		to_lat: number;
+		to_lon: number;
+	}
+
+	interface ClinicMapResponse {
+		cities: ClinicMapCity[];
+		lines: ClinicMapLine[];
+		center: [number, number];
+	}
+
+	interface Props {
+		solution: SolverResults;
+	}
+
+	let { solution }: Props = $props();
+
+	let mapContainer: HTMLDivElement;
+	let map: L.Map | null = null;
+	let loading = $state(true);
+	let error = $state<string | null>(null);
+
+	function extractVectors(sol: SolverResults): { sv: number[]; cover: number[] } {
+		const vars = sol.optimal_variables as Record<string, number | number[]>;
+		const sv: number[] = [];
+		const cover: number[] = [];
+
+		for (let i = 1; i <= 60; i++) {
+			const key = `sv_${i}`;
+			const val = vars[key];
+			sv.push(Array.isArray(val) ? val[0] : (val as number));
+		}
+		for (let i = 1; i <= 36; i++) {
+			const key = `cover_${i}`;
+			const val = vars[key];
+			cover.push(Array.isArray(val) ? val[0] : (val as number));
+		}
+		return { sv, cover };
+	}
+
+	async function fetchMapData(sv: number[], cover: number[]): Promise<ClinicMapResponse> {
+		const res = await fetch(`${API_URL}/clinic/map`, {
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json' },
+			credentials: 'include',
+			body: JSON.stringify({ sv, cover })
+		});
+		if (!res.ok) {
+			throw new Error(`Map API error: ${res.status}`);
+		}
+		return res.json();
+	}
+
+	async function renderMap(data: ClinicMapResponse) {
+		const L = await import('leaflet');
+
+		if (map) {
+			map.remove();
+			map = null;
+		}
+
+		map = L.map(mapContainer, {
+			center: data.center as [number, number],
+			zoom: 9
+		});
+
+		L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
+			attribution:
+				'&copy; <a href="https://www.openstreetmap.org/copyright">OSM</a> &copy; <a href="https://carto.com/">CARTO</a>',
+			subdomains: 'abcd',
+			maxZoom: 19
+		}).addTo(map);
+
+		// Draw coverage lines
+		for (const line of data.lines) {
+			L.polyline(
+				[
+					[line.from_lat, line.from_lon],
+					[line.to_lat, line.to_lon]
+				],
+				{ color: 'black', weight: 1.5, opacity: 0.5 }
+			).addTo(map);
+		}
+
+		// Draw city markers
+		const bounds: L.LatLngExpression[] = [];
+		for (const city of data.cities) {
+			const marker = L.circleMarker([city.lat, city.lon], {
+				radius: city.size,
+				color: 'black',
+				weight: 1,
+				fillColor: city.color,
+				fillOpacity: 0.7
+			}).addTo(map);
+
+			marker.bindTooltip(city.tooltip, { direction: 'top', offset: [0, -5] });
+			bounds.push([city.lat, city.lon]);
+		}
+
+		if (bounds.length > 0) {
+			map.fitBounds(L.latLngBounds(bounds), { padding: [20, 20] });
+		}
+
+		// Legend
+		const legend = new L.Control({ position: 'bottomright' });
+		legend.onAdd = () => {
+			const div = L.DomUtil.create('div', 'leaflet-legend');
+			div.innerHTML = `
+				<div style="background:white; padding:8px 12px; border-radius:6px; box-shadow:0 1px 4px rgba(0,0,0,.3); font-size:12px; line-height:20px;">
+					<div style="font-weight:600; margin-bottom:4px;">Legend</div>
+					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:orange;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Has clinic events</div>
+					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:yellow;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Covered by nearby events</div>
+					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:grey;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Not covered</div>
+					<div style="margin-top:4px;"><span style="display:inline-block;width:20px;height:2px;background:black;vertical-align:middle;margin-right:6px;"></span>Coverage link</div>
+				</div>`;
+			return div;
+		};
+		legend.addTo(map);
+	}
+
+	async function loadMap() {
+		loading = true;
+		error = null;
+		try {
+			const { sv, cover } = extractVectors(solution);
+			const data = await fetchMapData(sv, cover);
+			await renderMap(data);
+		} catch (e) {
+			error = e instanceof Error ? e.message : String(e);
+			console.error('Clinic map error:', e);
+		} finally {
+			loading = false;
+		}
+	}
+
+	onMount(() => {
+		loadMap();
+		return () => {
+			if (map) {
+				map.remove();
+				map = null;
+			}
+		};
+	});
+
+	$effect(() => {
+		// Re-render when solution changes (after initial mount)
+		if (solution && mapContainer) {
+			loadMap();
+		}
+	});
+</script>
+
+<svelte:head>
+	<link
+		rel="stylesheet"
+		href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
+		integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
+		crossorigin=""
+	/>
+</svelte:head>
+
+<div class="relative h-full w-full">
+	{#if loading}
+		<div class="flex h-full items-center justify-center text-sm text-gray-400">
+			Loading map...
+		</div>
+	{/if}
+	{#if error}
+		<div class="flex h-full items-center justify-center text-sm text-red-400">
+			{error}
+		</div>
+	{/if}
+	<div bind:this={mapContainer} class="h-full w-full" class:invisible={loading || !!error}></div>
+</div>
diff --git a/webui/src/lib/components/custom/decision-journey/decision-journey.svelte b/webui/src/lib/components/custom/decision-journey/decision-journey.svelte
index def11184d..9a05193c4 100644
--- a/webui/src/lib/components/custom/decision-journey/decision-journey.svelte
+++ b/webui/src/lib/components/custom/decision-journey/decision-journey.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { ENautilusSessionTreeResponse, ENautilusSimulateResponse, ProblemInfo } from '$lib/gen/models';
+	import type { ENautilusSessionTreeResponse, ENautilusSimulateResponse, ProblemInfo, SolverResults } from '$lib/gen/models';
 	import { extractPathToLeaf, computeJourneyData, buildNormalizationMaps, computeSimulatedJourneySteps, type JourneyStep, type WhatIfSimulation } from './journey-utils';
 	import { COLOR_PALETTE } from '$lib/components/visualizations/utils/colors';
 	import { formatNumber } from '$lib/helpers';
@@ -16,9 +16,11 @@
 		/** Projected final solution values (from representative solutions).
 		 *  Overrides the last step's raw values so the chart matches the final view. */
 		finalSolutionPoint?: Record<string, number> | null;
+		/** Called when the user wants to adopt the what-if simulation's final solution. */
+		onAdoptSolution?: (solution: SolverResults) => void;
 	}
 
-	let { sessionTree, leafNodeId, problem, finalSolutionPoint = null }: Props = $props();
+	let { sessionTree, leafNodeId, problem, finalSolutionPoint = null, onAdoptSolution }: Props = $props();
 
 	let tooltipEl = $state<HTMLDivElement>();
 	let selectedStep = $state<JourneyStep | null>(null);
@@ -94,6 +96,7 @@
 				deprioritize,
 				steps: simSteps,
 				finalSolution,
+				fullSolverResults: response.final_solution,
 			};
 
 			// Scroll the what-if section into view after render
@@ -340,13 +343,23 @@
 								</tbody>
 							</table>
 
+							<div class="mt-2 flex gap-2">
+							{#if onAdoptSolution}
+								<button
+									class="rounded border border-blue-300 bg-blue-50 px-2 py-1 text-xs font-medium text-blue-700 hover:bg-blue-100"
+									onclick={() => onAdoptSolution?.(whatIfSimulation!.fullSolverResults)}
+								>
+									Use this solution
+								</button>
+							{/if}
 							<button
-								class="mt-2 rounded border border-gray-200 px-2 py-1 text-xs text-gray-500 hover:bg-gray-50"
+								class="rounded border border-gray-200 px-2 py-1 text-xs text-gray-500 hover:bg-gray-50"
 								onclick={() => (whatIfSimulation = null)}
 							>
 								Clear what-if
 							</button>
 						</div>
+						</div>
 					{/if}
 				</div>
 			</div>
diff --git a/webui/src/lib/components/custom/decision-journey/journey-utils.ts b/webui/src/lib/components/custom/decision-journey/journey-utils.ts
index 6f80b65e7..8af20024d 100644
--- a/webui/src/lib/components/custom/decision-journey/journey-utils.ts
+++ b/webui/src/lib/components/custom/decision-journey/journey-utils.ts
@@ -5,6 +5,7 @@ import type {
 	ENautilusTreeNodeResponse,
 	ENautilusDecisionEventResponse,
 	ProblemInfo,
+	SolverResults,
 } from "$lib/gen/models";
 import { analyzeTradeoffs, type ObjectiveTradeoff } from "$lib/components/custom/decision-tree/tree-utils";
 
@@ -74,6 +75,8 @@ export interface WhatIfSimulation {
 	steps: JourneyStep[];
 	/** The projected final solution objective values */
 	finalSolution: Record<string, number>;
+	/** The full SolverResults from the simulation (for adopting the solution) */
+	fullSolverResults: SolverResults;
 }
 
 /**
diff --git a/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte b/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
index 7841b2afb..4e05af9a4 100644
--- a/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
+++ b/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
@@ -2,7 +2,7 @@
 	import { onMount } from 'svelte';
 	import { methodSelection } from '../../../stores/methodSelection';
 	import type { MethodSelectionState } from '../../../stores/methodSelection';
-	import { type ENautilusRepresentativeSolutionsResponse, type InteractiveSessionBase } from '$lib/gen/models';
+	import { type ENautilusRepresentativeSolutionsResponse, type InteractiveSessionBase, type SolverResults } from '$lib/gen/models';
 	import { isLoading, errorMessage } from '../../../stores/uiState';
 
 	import BaseLayout from '$lib/components/custom/method_layout/base-layout.svelte';
@@ -14,6 +14,7 @@
 	import Combobox from '$lib/components/ui/combobox/combobox.svelte';
 	import { EndStateView } from '$lib/components/custom/end-state-view';
 	import { DecisionJourney } from '$lib/components/custom/decision-journey';
+	import ClinicMap from '$lib/components/custom/clinic-map/clinic-map.svelte';
 	import type { ENautilusSessionTreeResponse } from '$lib/gen/models';
 
 	import type {
@@ -59,6 +60,7 @@
 	let finalView = $state<FinalView>("visualization");
 	let representative = $state<ENautilusRepresentativeSolutionsResponse | null>(null);
 	let final_selected_index = $state<number>(0);
+	let adoptedSolution = $state<SolverResults | null>(null);
 
 	let selection = $state<MethodSelectionState>({ selectedProblemId: null, selectedMethod: null, selectedSessionId: null, selectedSessionInfo: null
 	});
@@ -175,6 +177,7 @@
 	});
 
 	let finalSolution = $derived.by(() => {
+		if (adoptedSolution) return adoptedSolution;
 		if (!representative) return null;
 		return representative.solutions[final_selected_index] ?? null;
 	})
@@ -188,15 +191,19 @@
 		return out;
 	}
 
+	function handleAdoptSolution(solution: SolverResults) {
+		adoptedSolution = solution;
+		finalView = 'visualization';
+	}
+
 	let finalTableData = $derived.by(() => {
-		if (!representative) return [];
-		const sol = representative.solutions[final_selected_index];
+		const sol = finalSolution;
 		if (!sol) return [];
 		return [{
 			objective_values: unwrapSolverRecord(sol.optimal_objectives),
 			variable_values: unwrapSolverRecord(sol.optimal_variables),
-			name: null,
-			solution_index: final_selected_index
+			name: adoptedSolution ? 'What-if solution' : null,
+			solution_index: adoptedSolution ? -1 : final_selected_index
 		}];
 	});
 
@@ -692,10 +699,23 @@
 		{#snippet visualizationArea()}
 			{#if problem_info && representative && representativeObjectiveValues.length > 0}
 				<div class="relative h-full">
+					{#if adoptedSolution}
+						<div class="absolute top-2 left-1/2 z-10 -translate-x-1/2 flex items-center gap-2 rounded-full border border-blue-200 bg-blue-50 px-3 py-1 text-xs text-blue-700 shadow-sm">
+							<span>Viewing what-if solution</span>
+							<button
+								class="font-semibold hover:text-blue-900"
+								onclick={() => (adoptedSolution = null)}
+							>&times; Revert</button>
+						</div>
+					{/if}
 					{#if finalView === 'map'}
-					<div class="flex h-full items-center justify-center text-sm text-gray-400">
-						Map visualization coming soon.
-					</div>
+						{#if finalSolution}
+							<ClinicMap solution={finalSolution} />
+						{:else}
+							<div class="flex h-full items-center justify-center text-sm text-gray-400">
+								No solution available for map.
+							</div>
+						{/if}
 				{:else if finalView === 'journey'}
 						{#if sessionTree && previous_response?.state_id != null}
 							<DecisionJourney
@@ -703,6 +723,7 @@
 								leafNodeId={previous_response.state_id}
 								problem={problem_info}
 								finalSolutionPoint={finalSolution ? unwrapSolverRecord(finalSolution.optimal_objectives) : null}
+								onAdoptSolution={handleAdoptSolution}
 							/>
 						{:else}
 							<div class="flex h-full items-center justify-center text-gray-500">

From c42d614b07567faf1f81eab999babf04047fbbc1 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Wed, 18 Mar 2026 16:40:41 +0200
Subject: [PATCH 03/24]  Web-API, Web-UI

  - Replace hardcoded clinic map system with metadata-driven site selection map
  - Add SiteSelectionMetaData DB model (follows ForestProblemMetaData pattern)
  - Add POST /site-selection/load_metadata endpoint (with ownership check)
  - Add POST /site-selection/map endpoint (reads metadata + solution variables)
  - Remove /clinic/ router, ClinicMapRequest/Response models, and clinic_map.py
  - Rename clinic-map.svelte to site-selection-map.svelte (accepts problem_id prop)
  - Add map metadata upload dialog on Problems page (JSON file upload)
  - Fix orval import mismatches after regeneration (getProblemProblemGetPost, addRepresentativeSolutionSet)
  - Fix swapped arguments in fetch_interactive_session call (utils.py line 229)
  - Add test_site_selection.py with model and endpoint tests
---
 desdeo/api/app.py                             |   5 +-
 desdeo/api/models/__init__.py                 |   7 +-
 desdeo/api/models/clinic_map.py               |  43 -
 desdeo/api/models/problem.py                  |  42 +-
 desdeo/api/routers/clinic_map.py              | 157 ----
 desdeo/api/routers/problem.py                 |   8 +-
 desdeo/api/routers/site_selection.py          | 264 ++++++
 desdeo/api/routers/utils.py                   |  15 +-
 desdeo/api/tests/test_site_selection.py       | 316 +++++++
 .../site-selection-map.svelte}                |  92 +-
 webui/src/lib/gen/endpoints/DESDEOFastAPI.ts  | 850 ++++++++++++-----
 .../src/lib/gen/endpoints/DESDEOFastAPIzod.ts | 862 +++++++++++++-----
 .../AddProblemJsonProblemAddJsonPostParams.ts |  11 +
 .../models/AddProblemProblemAddPostParams.ts  |  11 +
 .../BodyAddProblemJsonProblemAddJsonPost.ts   |   8 +-
 .../CreateNewSessionSessionNewPostParams.ts   |  11 +
 ...resentativeSolutionSetSetIdDeleteParams.ts |  11 +
 ...eteSaveMethodNimbusDeleteSavePostParams.ts |  11 +
 ...utilusMethodEnautilusFinalizePostParams.ts |  11 +
 ...izeNimbusMethodNimbusFinalizePostParams.ts |  11 +
 ...GetMetadataProblemGetMetadataPostParams.ts |  11 +
 ...zeMethodNimbusGetOrInitializePostParams.ts |  11 +
 ...RepresentativeSolutionSetSetIdGetParams.ts |  11 +
 ...dEnautilusSessionTreeSessionIdGetParams.ts |  11 +
 .../models/GetUtopiaDataUtopiaPostParams.ts   |  11 +
 ...tializeMethodNimbusInitializePostParams.ts |  11 +
 .../lib/gen/models/ProblemMetaDataPublic.ts   |   2 +
 .../models/RepresentativeSolutionSetBase.ts   |  21 +
 .../RepresentativeSolutionSetBaseIdeal.ts     |   9 +
 .../RepresentativeSolutionSetBaseNadir.ts     |   9 +
 ...presentativeSolutionSetBaseSolutionData.ts |   9 +
 .../models/SaveMethodNimbusSavePostParams.ts  |  11 +
 ...lectSolverProblemAssignSolverPostParams.ts |  11 +
 .../lib/gen/models/SiteSelectionMapEdge.ts    |  17 +
 .../lib/gen/models/SiteSelectionMapNode.ts    |  19 +
 .../lib/gen/models/SiteSelectionMapRequest.ts |  16 +
 ...SiteSelectionMapRequestOptimalVariables.ts |   9 +
 .../gen/models/SiteSelectionMapResponse.ts    |  18 +
 .../lib/gen/models/SiteSelectionMetaData.ts   |  31 +
 .../models/SiteSelectionMetaDataRequest.ts    |  22 +
 .../SiteSelectionMetaDataRequestNodesItem.ts  |   9 +
 .../SiteSelectionMetaDataRequestSitesItem.ts  |   9 +
 ...iateMethodGenericIntermediatePostParams.ts |  11 +
 ...diateMethodNimbusIntermediatePostParams.ts |  11 +
 ...lveSolutionsMethodNimbusSolvePostParams.ts |  11 +
 .../SolveSolutionsMethodRpmSolvePostParams.ts |  11 +
 .../StepMethodEnautilusStepPostParams.ts      |  11 +
 webui/src/lib/gen/models/index.ts             |  38 +-
 .../E-NAUTILUS/+page.svelte                   |  10 +-
 .../interactive_methods/E-NAUTILUS/handler.ts |  10 +-
 webui/src/routes/problems/+page.svelte        | 185 +++-
 webui/src/routes/problems/define/handler.ts   |   4 +-
 webui/src/routes/problems/handler.ts          |  23 +-
 53 files changed, 2624 insertions(+), 735 deletions(-)
 delete mode 100644 desdeo/api/models/clinic_map.py
 delete mode 100644 desdeo/api/routers/clinic_map.py
 create mode 100644 desdeo/api/routers/site_selection.py
 create mode 100644 desdeo/api/tests/test_site_selection.py
 rename webui/src/lib/components/custom/{clinic-map/clinic-map.svelte => site-selection-map/site-selection-map.svelte} (59%)
 create mode 100644 webui/src/lib/gen/models/AddProblemJsonProblemAddJsonPostParams.ts
 create mode 100644 webui/src/lib/gen/models/AddProblemProblemAddPostParams.ts
 create mode 100644 webui/src/lib/gen/models/CreateNewSessionSessionNewPostParams.ts
 create mode 100644 webui/src/lib/gen/models/DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams.ts
 create mode 100644 webui/src/lib/gen/models/DeleteSaveMethodNimbusDeleteSavePostParams.ts
 create mode 100644 webui/src/lib/gen/models/FinalizeEnautilusMethodEnautilusFinalizePostParams.ts
 create mode 100644 webui/src/lib/gen/models/FinalizeNimbusMethodNimbusFinalizePostParams.ts
 create mode 100644 webui/src/lib/gen/models/GetMetadataProblemGetMetadataPostParams.ts
 create mode 100644 webui/src/lib/gen/models/GetOrInitializeMethodNimbusGetOrInitializePostParams.ts
 create mode 100644 webui/src/lib/gen/models/GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams.ts
 create mode 100644 webui/src/lib/gen/models/GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams.ts
 create mode 100644 webui/src/lib/gen/models/GetUtopiaDataUtopiaPostParams.ts
 create mode 100644 webui/src/lib/gen/models/InitializeMethodNimbusInitializePostParams.ts
 create mode 100644 webui/src/lib/gen/models/RepresentativeSolutionSetBase.ts
 create mode 100644 webui/src/lib/gen/models/RepresentativeSolutionSetBaseIdeal.ts
 create mode 100644 webui/src/lib/gen/models/RepresentativeSolutionSetBaseNadir.ts
 create mode 100644 webui/src/lib/gen/models/RepresentativeSolutionSetBaseSolutionData.ts
 create mode 100644 webui/src/lib/gen/models/SaveMethodNimbusSavePostParams.ts
 create mode 100644 webui/src/lib/gen/models/SelectSolverProblemAssignSolverPostParams.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMapEdge.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMapNode.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMapRequest.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMapRequestOptimalVariables.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMapResponse.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMetaData.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMetaDataRequest.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMetaDataRequestNodesItem.ts
 create mode 100644 webui/src/lib/gen/models/SiteSelectionMetaDataRequestSitesItem.ts
 create mode 100644 webui/src/lib/gen/models/SolveIntermediateMethodGenericIntermediatePostParams.ts
 create mode 100644 webui/src/lib/gen/models/SolveNimbusIntermediateMethodNimbusIntermediatePostParams.ts
 create mode 100644 webui/src/lib/gen/models/SolveSolutionsMethodNimbusSolvePostParams.ts
 create mode 100644 webui/src/lib/gen/models/SolveSolutionsMethodRpmSolvePostParams.ts
 create mode 100644 webui/src/lib/gen/models/StepMethodEnautilusStepPostParams.ts

diff --git a/desdeo/api/app.py b/desdeo/api/app.py
index 9b322eb40..aff1187bd 100644
--- a/desdeo/api/app.py
+++ b/desdeo/api/app.py
@@ -5,14 +5,13 @@
 
 from desdeo.api.config import AuthConfig
 from desdeo.api.routers import (
-    clinic_map,
-    emo,
     enautilus,
     generic,
     nimbus,
     problem,
     reference_point_method,
     session,
+    site_selection,
     user_authentication,
     utopia,
 )
@@ -38,7 +37,7 @@
 app.include_router(gdm_aggregate.router)
 app.include_router(gnimbus_routers.router)
 app.include_router(enautilus.router)
-app.include_router(clinic_map.router)
+app.include_router(site_selection.router)
 app.include_router(gdm_score_bands_routers.router)
 
 origins = AuthConfig.cors_origins
diff --git a/desdeo/api/models/__init__.py b/desdeo/api/models/__init__.py
index 98e2779ad..2b6c913f3 100644
--- a/desdeo/api/models/__init__.py
+++ b/desdeo/api/models/__init__.py
@@ -2,10 +2,6 @@
 
 __all__ = [  # noqa: RUF022
     "Bounds",
-    "ClinicMapCity",
-    "ClinicMapLine",
-    "ClinicMapRequest",
-    "ClinicMapResponse",
     "ConstantDB",
     "ConstraintDB",
     "CreateSessionRequest",
@@ -112,6 +108,7 @@
     "SolutionReference",
     "SolutionReferenceLite",
     "SolutionReferenceResponse",
+    "SiteSelectionMetaData",
     "SolverSelectionMetadata",
     "UserSavedEMOResults",
     "UserSavedSolutionDB",
@@ -140,7 +137,6 @@
 
 
 from .archive import UserSavedEMOResults
-from .clinic_map import ClinicMapCity, ClinicMapLine, ClinicMapRequest, ClinicMapResponse
 from .emo import (
     EMOFetchRequest,
     EMOFetchResponse,
@@ -254,6 +250,7 @@
     RepresentativeNonDominatedSolutions,
     ScalarizationFunctionDB,
     SimulatorDB,
+    SiteSelectionMetaData,
     SolverSelectionMetadata,
     TensorConstantDB,
     TensorVariableDB,
diff --git a/desdeo/api/models/clinic_map.py b/desdeo/api/models/clinic_map.py
deleted file mode 100644
index f416b8d4e..000000000
--- a/desdeo/api/models/clinic_map.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""Models for the clinic map visualization endpoint."""
-
-from pydantic import BaseModel
-
-
-class ClinicMapRequest(BaseModel):
-    """Request body for the clinic map endpoint.
-
-    Attributes:
-        sv: Binary vector of length 60 indicating visited sites.
-        cover: Binary vector of length 36 indicating covered cities.
-    """
-
-    sv: list[float]
-    cover: list[float]
-
-
-class ClinicMapCity(BaseModel):
-    """A city marker on the map."""
-
-    city: str
-    lat: float
-    lon: float
-    size: float
-    color: str
-    tooltip: str
-
-
-class ClinicMapLine(BaseModel):
-    """A coverage connection line between two cities."""
-
-    from_lat: float
-    from_lon: float
-    to_lat: float
-    to_lon: float
-
-
-class ClinicMapResponse(BaseModel):
-    """Response body for the clinic map endpoint."""
-
-    cities: list[ClinicMapCity]
-    lines: list[ClinicMapLine]
-    center: list[float]
diff --git a/desdeo/api/models/problem.py b/desdeo/api/models/problem.py
index fefd6c1a1..08b8245bd 100644
--- a/desdeo/api/models/problem.py
+++ b/desdeo/api/models/problem.py
@@ -283,6 +283,39 @@ class SolverSelectionMetadata(SQLModel, table=True):
     metadata_instance: "ProblemMetaDataDB" = Relationship(back_populates="solver_selection_metadata")
 
 
+class SiteSelectionMetaData(SQLModel, table=True):
+    """A problem metadata class to hold site selection problem specific information.
+
+    Stores geographic data and variable mappings needed to visualize binary
+    site-selection solutions on a map (e.g., clinic placement, facility location).
+    """
+
+    id: int | None = Field(primary_key=True, default=None)
+    metadata_id: int | None = Field(foreign_key="problemmetadatadb.id", default=None)
+
+    metadata_type: str = "site_selection_metadata"
+
+    # Geographic data (embedded JSON, not file paths)
+    sites_json: str = Field(description="JSON array: [{name, node, lat, lon}, ...] one per site variable")
+    nodes_json: str = Field(description="JSON array: [{name, lat, lon, size}, ...] one per map node")
+    travel_time_matrix_json: str = Field(description="JSON: 2D list[list[float]], shape [n_nodes, n_nodes]")
+
+    # Variable mapping
+    site_variable_symbols: list[str] = Field(
+        sa_column=Column(JSON), description="Ordered list of site variable symbols matching sites_json positions"
+    )
+    coverage_variable_symbols: list[str] | None = Field(
+        sa_column=Column(JSON),
+        default=None,
+        description="Ordered list of coverage variable symbols matching nodes_json positions, or None",
+    )
+
+    # Display config
+    coverage_threshold: float = Field(default=15.0, description="Threshold for coverage edges (e.g., minutes, km)")
+
+    metadata_instance: "ProblemMetaDataDB" = Relationship(back_populates="site_selection_metadata")
+
+
 class ProblemMetaDataDB(SQLModel, table=True):
     """Store Problem MetaData to DB with this class."""
 
@@ -296,17 +329,23 @@ class ProblemMetaDataDB(SQLModel, table=True):
     solver_selection_metadata: list[SolverSelectionMetadata] = Relationship(
         back_populates="metadata_instance", cascade_delete=True
     )
+    site_selection_metadata: list[SiteSelectionMetaData] = Relationship(
+        back_populates="metadata_instance", cascade_delete=True
+    )
     problem: ProblemDB = Relationship(back_populates="problem_metadata")
 
     @property
     def all_metadata(
         self,
-    ) -> list[ForestProblemMetaData | RepresentativeNonDominatedSolutions | SolverSelectionMetadata]:
+    ) -> list[
+        ForestProblemMetaData | RepresentativeNonDominatedSolutions | SolverSelectionMetadata | SiteSelectionMetaData
+    ]:
         """Return all metadata in one list."""
         return (
             (self.forest_metadata or [])
             + (self.representative_nd_metadata or [])
             + (self.solver_selection_metadata or [])
+            + (self.site_selection_metadata or [])
         )
 
 
@@ -317,6 +356,7 @@ class ProblemMetaDataPublic(SQLModel):
 
     forest_metadata: list[ForestProblemMetaData] | None
     representative_nd_metadata: list[RepresentativeNonDominatedSolutions] | None
+    site_selection_metadata: list[SiteSelectionMetaData] | None
 
 
 class ProblemMetaDataGetRequest(SQLModel):
diff --git a/desdeo/api/routers/clinic_map.py b/desdeo/api/routers/clinic_map.py
deleted file mode 100644
index 37c0686d9..000000000
--- a/desdeo/api/routers/clinic_map.py
+++ /dev/null
@@ -1,157 +0,0 @@
-"""Endpoint for building clinic map visualization data from a solution's binary vectors."""
-
-from pathlib import Path
-
-import numpy as np
-import polars as pl
-from fastapi import APIRouter, HTTPException
-
-from desdeo.api.models.clinic_map import (
-    ClinicMapCity,
-    ClinicMapLine,
-    ClinicMapRequest,
-    ClinicMapResponse,
-)
-
-router = APIRouter(prefix="/clinic", tags=["Clinic"])
-
-DATA_DIR = Path(__file__).resolve().parent.parent.parent.parent / "experiments" / "clinic" / "data"
-FOOD_DESERT_THRESHOLD = 15  # minutes
-
-N_SITES = 60
-N_CITIES = 36
-
-
-@router.post("/map", response_model=ClinicMapResponse)
-def build_clinic_map(req: ClinicMapRequest) -> ClinicMapResponse:
-    """Build Leaflet-compatible map data from a clinic solution's binary vectors.
-
-    Takes sv (60 site-visit booleans) and cover (36 city-coverage booleans)
-    and returns city markers with colors/tooltips plus coverage connection lines.
-    """
-    if len(req.sv) != N_SITES:
-        raise HTTPException(status_code=422, detail=f"sv must have {N_SITES} values, got {len(req.sv)}")
-    if len(req.cover) != N_CITIES:
-        raise HTTPException(status_code=422, detail=f"cover must have {N_CITIES} values, got {len(req.cover)}")
-
-    # --- Load static data ---
-    cities_df = pl.read_csv(DATA_DIR / "cities.csv")
-    sites_df = pl.read_csv(DATA_DIR / "proposedSitesProcessed.csv")
-    adj_ttime_df = pl.read_csv(DATA_DIR / "adjacencyMatrixTravelTime.csv")
-
-    all_city_names: list[str] = cities_df["city"].to_list()
-    site_city_names: list[str] = sites_df["city"].to_list()
-
-    # --- Parse binary vectors ---
-    sv = [bool(round(v)) for v in req.sv]
-    cover = [bool(round(v)) for v in req.cover]
-
-    visited_site_indices = [i for i, v in enumerate(sv) if v]
-    covered_city_indices = [i for i, v in enumerate(cover) if v]
-
-    # --- Build travel-time adjacency (36x36) and close-cities mask ---
-    ttime_city_names = adj_ttime_df.columns[1:]  # 36 city column names
-    ttime_matrix = adj_ttime_df.select(ttime_city_names).to_numpy()  # (36, 36)
-    city_to_idx = {name: i for i, name in enumerate(ttime_city_names)}
-
-    close_cities = (ttime_matrix < FOOD_DESERT_THRESHOLD).astype(np.int8)  # (36, 36)
-
-    # Each site inherits the adjacency row of its host city → (60, 36)
-    site_city_idxs = [city_to_idx[c] for c in site_city_names]
-    cities_adj2sites = close_cities[site_city_idxs, :]  # (60, 36)
-
-    # --- Group visited sites by city (for tooltips) ---
-    sites_in_cities: dict[str, list[str]] = {}
-    for i in visited_site_indices:
-        city = site_city_names[i]
-        name = sites_df["siteName"][i]
-        sites_in_cities.setdefault(city, []).append(name)
-
-    event_city_names = set(sites_in_cities.keys())
-    covered_city_names = {all_city_names[i] for i in covered_city_indices}
-
-    # --- Build coverage connections ---
-    # For each visited site, find which cities it covers (within threshold)
-    visited_site_city_list = [site_city_names[i] for i in visited_site_indices]
-
-    # site_city → set of nearby cities it covers (excluding itself)
-    site2covered: dict[str, set[str]] = {}
-    for idx_in_visited, site_idx in enumerate(visited_site_indices):
-        site_city = site_city_names[site_idx]
-        nearby: set[str] = set()
-        for c_idx in range(N_CITIES):
-            if cities_adj2sites[site_idx, c_idx]:
-                nearby.add(all_city_names[c_idx])
-        nearby.discard(site_city)
-        if nearby:
-            existing = site2covered.get(site_city, set())
-            site2covered[site_city] = existing | nearby
-
-    # Invert: covered_city → set of site-cities that cover it.
-    # Only include cities that are actually covered (cover=1) or have events,
-    # not just physically nearby. The cover vector is a solver decision —
-    # a city can be within threshold but uncovered when the epsilon constraint
-    # on f_4 is loose.
-    adjacent_sites: dict[str, set[str]] = {}
-    for site_city, covered_set in site2covered.items():
-        for cov_city in covered_set:
-            if cov_city in covered_city_names or cov_city in event_city_names:
-                adjacent_sites.setdefault(cov_city, set()).add(site_city)
-
-    # --- Coordinate lookup ---
-    city_coords: dict[str, tuple[float, float]] = {}
-    for row in cities_df.iter_rows(named=True):
-        city_coords[row["city"]] = (row["lat"], row["long"])
-
-    # --- Build lines with resolved coordinates ---
-    lines: list[ClinicMapLine] = []
-    for cov_city, src_cities in adjacent_sites.items():
-        to_lat, to_lon = city_coords[cov_city]
-        for src_city in src_cities:
-            from_lat, from_lon = city_coords[src_city]
-            lines.append(ClinicMapLine(from_lat=from_lat, from_lon=from_lon, to_lat=to_lat, to_lon=to_lon))
-
-    # --- Build city markers ---
-    cities_out: list[ClinicMapCity] = []
-    for row in cities_df.iter_rows(named=True):
-        city_name: str = row["city"]
-        lat: float = row["lat"]
-        lon: float = row["long"]
-        pop: int = row["pop"]
-
-        # Color assignment
-        if city_name in event_city_names:
-            color = "orange"
-        elif city_name in covered_city_names:
-            color = "yellow"
-        else:
-            color = "grey"
-
-        size = max(5.0, pop / 1000)
-
-        # Tooltip HTML
-        if city_name in sites_in_cities:
-            site_list_html = "<br>".join(sites_in_cities[city_name])
-            tooltip = (
-                f"<b>{city_name}</b><br>"
-                f"<b>Population:</b> {pop}<br>"
-                f"<b>Sites with events:</b><br>{site_list_html}"
-            )
-        elif city_name in adjacent_sites:
-            covered_by = "<br>".join(sorted(adjacent_sites[city_name]))
-            tooltip = (
-                f"<b>{city_name}</b><br>"
-                f"<b>Population:</b> {pop}<br>"
-                f"<b>No Healthwise Clinics</b><br>"
-                f"<b>Covered by events in:</b><br>{covered_by}"
-            )
-        else:
-            tooltip = f"<b>{city_name}</b><br>" f"<b>Population:</b> {pop}<br>" f"<b>No Healthwise Clinics</b>"
-
-        cities_out.append(ClinicMapCity(city=city_name, lat=lat, lon=lon, size=size, color=color, tooltip=tooltip))
-
-    # --- Center of the map (average of all city coordinates) ---
-    avg_lat = sum(c.lat for c in cities_out) / len(cities_out)
-    avg_lon = sum(c.lon for c in cities_out) / len(cities_out)
-
-    return ClinicMapResponse(cities=cities_out, lines=lines, center=[avg_lat, avg_lon])
diff --git a/desdeo/api/routers/problem.py b/desdeo/api/routers/problem.py
index 94bbfb782..8d6d09ff3 100644
--- a/desdeo/api/routers/problem.py
+++ b/desdeo/api/routers/problem.py
@@ -16,6 +16,7 @@
     ProblemMetaDataGetRequest,
     ProblemSelectSolverRequest,
     RepresentativeNonDominatedSolutions,
+    SiteSelectionMetaData,
     SolverSelectionMetadata,
     User,
     UserRole,
@@ -88,6 +89,7 @@ def get_problems_info(user: Annotated[User, Depends(get_current_user)]) -> list[
     """
     return user.problems
 
+
 @router.get("/{problem_id}")
 def get_problem(
     problem_id: int,
@@ -110,6 +112,7 @@ def get_problem(
     """
     return context.problem_db
 
+
 @router.post("/add")
 def add_problem(
     request: Annotated[Problem, Depends(parse_problem_json)],
@@ -199,7 +202,9 @@ def add_problem_json(
 def get_metadata(
     request: ProblemMetaDataGetRequest,
     context: Annotated[SessionContext, Depends(SessionContextGuard(require=[]))],
-) -> list[ForestProblemMetaData | RepresentativeNonDominatedSolutions | SolverSelectionMetadata]:
+) -> list[
+    ForestProblemMetaData | RepresentativeNonDominatedSolutions | SolverSelectionMetadata | SiteSelectionMetaData
+]:
     """Fetch specific metadata for a specific problem.
 
     Fetch specific metadata for a specific problem. See all the possible
@@ -351,6 +356,7 @@ def add_representative_solution_set(
         nadir=repr_metadata.nadir,
     )
 
+
 @router.get("/{problem_id}/all_representative_solution_sets")
 def get_all_representative_solution_sets(
     problem_id: int,
diff --git a/desdeo/api/routers/site_selection.py b/desdeo/api/routers/site_selection.py
new file mode 100644
index 000000000..ab2ad5166
--- /dev/null
+++ b/desdeo/api/routers/site_selection.py
@@ -0,0 +1,264 @@
+"""Endpoints for site selection map visualization and metadata management."""
+
+import json
+from typing import Annotated
+
+import numpy as np
+from fastapi import APIRouter, Depends, HTTPException
+from pydantic import BaseModel
+from sqlmodel import Session, select
+
+from desdeo.api.db import get_session
+from desdeo.api.models import ProblemDB, ProblemMetaDataDB, SiteSelectionMetaData, User
+from desdeo.api.routers.user_authentication import get_current_user
+
+router = APIRouter(prefix="/site-selection", tags=["Site Selection"])
+
+# Color constants for map nodes
+COLOR_ACTIVE = "#FFA500"  # node has at least one visited site
+COLOR_COVERED = "#FFFF00"  # node is covered by a nearby visited site
+COLOR_INACTIVE = "#808080"  # node is not covered
+
+
+# --- Request / Response models ---
+
+
+class SiteSelectionMetaDataRequest(BaseModel):
+    """Request body for loading site selection metadata."""
+
+    problem_id: int
+    sites: list[dict]  # [{name, node, lat, lon}]
+    nodes: list[dict]  # [{name, lat, lon, size}]
+    travel_time_matrix: list[list[float]]
+    site_variable_symbols: list[str]
+    coverage_variable_symbols: list[str] | None = None
+    coverage_threshold: float = 15.0
+
+
+class SiteSelectionMapRequest(BaseModel):
+    """Request body for building the site selection map."""
+
+    problem_id: int
+    optimal_variables: dict  # from SolverResults.optimal_variables
+
+
+class SiteSelectionMapNode(BaseModel):
+    """A node marker on the map."""
+
+    name: str
+    lat: float
+    lon: float
+    size: float
+    color: str
+    tooltip: str
+
+
+class SiteSelectionMapEdge(BaseModel):
+    """A coverage connection edge between two nodes."""
+
+    from_lat: float
+    from_lon: float
+    to_lat: float
+    to_lon: float
+
+
+class SiteSelectionMapResponse(BaseModel):
+    """Response body for the site selection map endpoint."""
+
+    nodes: list[SiteSelectionMapNode]
+    edges: list[SiteSelectionMapEdge]
+    center: list[float]
+
+
+# --- Endpoints ---
+
+
+@router.post("/load_metadata")
+def load_metadata(
+    req: SiteSelectionMetaDataRequest,
+    user: Annotated[User, Depends(get_current_user)],
+    session: Annotated[Session, Depends(get_session)],
+) -> SiteSelectionMetaData:
+    """Store site selection metadata for a problem.
+
+    The authenticated user must own the problem.
+    """
+    problem = session.get(ProblemDB, req.problem_id)
+    if problem is None:
+        raise HTTPException(status_code=404, detail=f"Problem with ID {req.problem_id} not found.")
+
+    if problem.user_id != user.id:
+        raise HTTPException(status_code=403, detail="You do not own this problem.")
+
+    # Ensure ProblemMetaDataDB exists for this problem
+    metadata_db = session.exec(select(ProblemMetaDataDB).where(ProblemMetaDataDB.problem_id == req.problem_id)).first()
+    if metadata_db is None:
+        metadata_db = ProblemMetaDataDB(problem_id=req.problem_id)
+        session.add(metadata_db)
+        session.commit()
+        session.refresh(metadata_db)
+
+    site_sel = SiteSelectionMetaData(
+        metadata_id=metadata_db.id,
+        sites_json=json.dumps(req.sites),
+        nodes_json=json.dumps(req.nodes),
+        travel_time_matrix_json=json.dumps(req.travel_time_matrix),
+        site_variable_symbols=req.site_variable_symbols,
+        coverage_variable_symbols=req.coverage_variable_symbols,
+        coverage_threshold=req.coverage_threshold,
+    )
+    session.add(site_sel)
+    session.commit()
+    session.refresh(site_sel)
+
+    return site_sel
+
+
+@router.post("/map", response_model=SiteSelectionMapResponse)
+def build_map(
+    req: SiteSelectionMapRequest,
+    user: Annotated[User, Depends(get_current_user)],
+    session: Annotated[Session, Depends(get_session)],
+) -> SiteSelectionMapResponse:
+    """Build Leaflet-compatible map data from a site selection solution.
+
+    Reads site selection metadata from the DB and extracts variable values
+    from the provided solution to determine node colors and coverage edges.
+    """
+    # Load metadata
+    metadata_db = session.exec(select(ProblemMetaDataDB).where(ProblemMetaDataDB.problem_id == req.problem_id)).first()
+
+    if metadata_db is None:
+        raise HTTPException(status_code=404, detail="No metadata found for this problem.")
+
+    site_sel_list = [m for m in metadata_db.all_metadata if m.metadata_type == "site_selection_metadata"]
+    if not site_sel_list:
+        raise HTTPException(status_code=404, detail="No site selection metadata found for this problem.")
+
+    meta: SiteSelectionMetaData = site_sel_list[-1]
+
+    # Parse embedded JSON
+    sites: list[dict] = json.loads(meta.sites_json)
+    nodes: list[dict] = json.loads(meta.nodes_json)
+    ttime_matrix: list[list[float]] = json.loads(meta.travel_time_matrix_json)
+
+    n_nodes = len(nodes)
+    n_sites = len(sites)
+
+    # Extract site visit values from solution variables
+    sv = []
+    for sym in meta.site_variable_symbols:
+        val = req.optimal_variables.get(sym)
+        if isinstance(val, list):
+            sv.append(bool(round(val[0])))
+        elif val is not None:
+            sv.append(bool(round(val)))
+        else:
+            sv.append(False)
+
+    # Extract coverage values
+    cover = []
+    if meta.coverage_variable_symbols:
+        for sym in meta.coverage_variable_symbols:
+            val = req.optimal_variables.get(sym)
+            if isinstance(val, list):
+                cover.append(bool(round(val[0])))
+            elif val is not None:
+                cover.append(bool(round(val)))
+            else:
+                cover.append(False)
+    else:
+        cover = [False] * n_nodes
+
+    visited_site_indices = [i for i, v in enumerate(sv) if v]
+    covered_node_indices = [i for i, v in enumerate(cover) if v]
+
+    # Build node name lookup
+    node_names = [n["name"] for n in nodes]
+    node_name_to_idx = {name: i for i, name in enumerate(node_names)}
+
+    # Build travel-time close-nodes mask: shape (n_nodes, n_nodes)
+    ttime_np = np.array(ttime_matrix)
+    close_nodes = (ttime_np < meta.coverage_threshold).astype(np.int8)
+
+    # Each site maps to its host node -> build (n_sites, n_nodes) adjacency
+    site_node_names = [s["node"] for s in sites]
+    site_node_idxs = [node_name_to_idx[n] for n in site_node_names]
+    sites_adj2nodes = close_nodes[site_node_idxs, :]  # (n_sites, n_nodes)
+
+    # Group visited sites by node (for tooltips)
+    sites_in_nodes: dict[str, list[str]] = {}
+    for i in visited_site_indices:
+        node_name = site_node_names[i]
+        site_name = sites[i]["name"]
+        sites_in_nodes.setdefault(node_name, []).append(site_name)
+
+    active_node_names = set(sites_in_nodes.keys())
+    covered_node_names = {node_names[i] for i in covered_node_indices}
+
+    # Build coverage connections: site_node -> set of nearby nodes it covers
+    site2covered: dict[str, set[str]] = {}
+    for site_idx in visited_site_indices:
+        site_node = site_node_names[site_idx]
+        nearby: set[str] = set()
+        for n_idx in range(n_nodes):
+            if sites_adj2nodes[site_idx, n_idx]:
+                nearby.add(node_names[n_idx])
+        nearby.discard(site_node)
+        if nearby:
+            existing = site2covered.get(site_node, set())
+            site2covered[site_node] = existing | nearby
+
+    # Invert: covered_node -> set of site-nodes that cover it
+    adjacent_sites: dict[str, set[str]] = {}
+    for site_node, covered_set in site2covered.items():
+        for cov_node in covered_set:
+            if cov_node in covered_node_names or cov_node in active_node_names:
+                adjacent_sites.setdefault(cov_node, set()).add(site_node)
+
+    # Coordinate lookup
+    node_coords: dict[str, tuple[float, float]] = {}
+    for n in nodes:
+        node_coords[n["name"]] = (n["lat"], n["lon"])
+
+    # Build edges
+    edges: list[SiteSelectionMapEdge] = []
+    for cov_node, src_nodes in adjacent_sites.items():
+        to_lat, to_lon = node_coords[cov_node]
+        for src_node in src_nodes:
+            from_lat, from_lon = node_coords[src_node]
+            edges.append(SiteSelectionMapEdge(from_lat=from_lat, from_lon=from_lon, to_lat=to_lat, to_lon=to_lon))
+
+    # Build node markers
+    nodes_out: list[SiteSelectionMapNode] = []
+    for n in nodes:
+        name = n["name"]
+        lat = n["lat"]
+        lon = n["lon"]
+        size = n.get("size", 5.0)
+
+        # Color assignment
+        if name in active_node_names:
+            color = COLOR_ACTIVE
+        elif name in covered_node_names:
+            color = COLOR_COVERED
+        else:
+            color = COLOR_INACTIVE
+
+        # Tooltip HTML
+        if name in sites_in_nodes:
+            site_list_html = "<br>".join(sites_in_nodes[name])
+            tooltip = f"<b>{name}</b><br><b>Sites:</b><br>{site_list_html}"
+        elif name in adjacent_sites:
+            covered_by = "<br>".join(sorted(adjacent_sites[name]))
+            tooltip = f"<b>{name}</b><br><b>Covered by sites in:</b><br>{covered_by}"
+        else:
+            tooltip = f"<b>{name}</b>"
+
+        nodes_out.append(SiteSelectionMapNode(name=name, lat=lat, lon=lon, size=size, color=color, tooltip=tooltip))
+
+    # Center of the map
+    avg_lat = sum(n.lat for n in nodes_out) / len(nodes_out)
+    avg_lon = sum(n.lon for n in nodes_out) / len(nodes_out)
+
+    return SiteSelectionMapResponse(nodes=nodes_out, edges=edges, center=[avg_lat, avg_lon])
diff --git a/desdeo/api/routers/utils.py b/desdeo/api/routers/utils.py
index 557042d75..af490e892 100644
--- a/desdeo/api/routers/utils.py
+++ b/desdeo/api/routers/utils.py
@@ -27,11 +27,11 @@
 
 
 def fetch_interactive_session(
-        user: User,
-        session: Session,
-        request: RequestType | None = None,
-        session_id: int | None = None,
-    ) -> InteractiveSessionDB | None:
+    user: User,
+    session: Session,
+    request: RequestType | None = None,
+    session_id: int | None = None,
+) -> InteractiveSessionDB | None:
     """Gets the desired instance of `InteractiveSessionDB`.
 
     Args:
@@ -55,7 +55,6 @@ def fetch_interactive_session(
     # session_id param has highest priority
     actual_session_id = session_id or (getattr(request, "session_id", None) if request else None)
 
-
     if actual_session_id is not None:
         # specific interactive session id is given, try using that
         statement = select(InteractiveSessionDB).where(InteractiveSessionDB.id == actual_session_id)
@@ -218,15 +217,17 @@ def __call__(
                 problem_db = fetch_user_problem(user, request, db_session)
 
             if problem_db is None and problem_id is not None:
+
                 class _ProblemOnly:
                     def __init__(self, problem_id: int):
                         self.problem_id = problem_id
                         self.session_id = None
                         self.parent_state_id = None
+
                 problem_db = fetch_user_problem(user, _ProblemOnly(problem_id), db_session)
 
             if hasattr(request, "interactive_session_id") or hasattr(request, "problem_id"):
-                interactive_session = fetch_interactive_session(user, request, db_session)
+                interactive_session = fetch_interactive_session(user, db_session, request)
 
             if hasattr(request, "parent_state_id") or hasattr(request, "problem_id"):
                 parent_state = fetch_parent_state(
diff --git a/desdeo/api/tests/test_site_selection.py b/desdeo/api/tests/test_site_selection.py
new file mode 100644
index 000000000..752c85c71
--- /dev/null
+++ b/desdeo/api/tests/test_site_selection.py
@@ -0,0 +1,316 @@
+"""Tests for the site selection metadata and map endpoints."""
+
+import json
+
+from fastapi.testclient import TestClient
+from sqlmodel import Session, select
+
+from desdeo.api.models import (
+    ProblemDB,
+    ProblemMetaDataDB,
+    SiteSelectionMetaData,
+    User,
+    UserRole,
+)
+from desdeo.api.routers.user_authentication import get_password_hash
+from desdeo.problem.testproblems import river_pollution_problem
+
+from .conftest import login, post_json
+
+# --- Minimal synthetic data for tests ---
+
+SITES = [
+    {"name": "Library A", "node": "CityA", "lat": 40.0, "lon": -83.0},
+    {"name": "Center B", "node": "CityA", "lat": 40.01, "lon": -83.01},
+    {"name": "Clinic C", "node": "CityB", "lat": 40.1, "lon": -83.1},
+]
+NODES = [
+    {"name": "CityA", "lat": 40.0, "lon": -83.0, "size": 10.0},
+    {"name": "CityB", "lat": 40.1, "lon": -83.1, "size": 5.0},
+]
+TRAVEL_TIME_MATRIX = [
+    [0.0, 10.0],
+    [10.0, 0.0],
+]
+SITE_VARS = ["x_1", "x_2", "x_3"]
+COVER_VARS = ["cover_1", "cover_2"]
+
+
+# --- Model tests ---
+
+
+def test_site_selection_metadata_create(session_and_user: dict):
+    """Create a SiteSelectionMetaData instance and verify round-trip through DB."""
+    session: Session = session_and_user["session"]
+
+    problem = session.exec(select(ProblemDB)).first()
+    metadata_db = ProblemMetaDataDB(problem_id=problem.id)
+    session.add(metadata_db)
+    session.commit()
+    session.refresh(metadata_db)
+
+    site_sel = SiteSelectionMetaData(
+        metadata_id=metadata_db.id,
+        sites_json=json.dumps(SITES),
+        nodes_json=json.dumps(NODES),
+        travel_time_matrix_json=json.dumps(TRAVEL_TIME_MATRIX),
+        site_variable_symbols=SITE_VARS,
+        coverage_variable_symbols=COVER_VARS,
+        coverage_threshold=15.0,
+    )
+    session.add(site_sel)
+    session.commit()
+    session.refresh(site_sel)
+
+    loaded = session.get(SiteSelectionMetaData, site_sel.id)
+    assert loaded is not None
+    assert loaded.site_variable_symbols == SITE_VARS
+    assert loaded.coverage_variable_symbols == COVER_VARS
+    assert json.loads(loaded.sites_json) == SITES
+    assert json.loads(loaded.nodes_json) == NODES
+    assert json.loads(loaded.travel_time_matrix_json) == TRAVEL_TIME_MATRIX
+    assert loaded.coverage_threshold == 15.0
+
+
+def test_site_selection_metadata_coverage_optional(session_and_user: dict):
+    """Verify that coverage_variable_symbols=None is accepted."""
+    session: Session = session_and_user["session"]
+
+    problem = session.exec(select(ProblemDB)).first()
+    metadata_db = ProblemMetaDataDB(problem_id=problem.id)
+    session.add(metadata_db)
+    session.commit()
+    session.refresh(metadata_db)
+
+    site_sel = SiteSelectionMetaData(
+        metadata_id=metadata_db.id,
+        sites_json=json.dumps(SITES),
+        nodes_json=json.dumps(NODES),
+        travel_time_matrix_json=json.dumps(TRAVEL_TIME_MATRIX),
+        site_variable_symbols=SITE_VARS,
+        coverage_variable_symbols=None,
+        coverage_threshold=20.0,
+    )
+    session.add(site_sel)
+    session.commit()
+    session.refresh(site_sel)
+
+    loaded = session.get(SiteSelectionMetaData, site_sel.id)
+    assert loaded is not None
+    assert loaded.coverage_variable_symbols is None
+
+
+# --- Endpoint tests: /site-selection/load_metadata ---
+
+
+def test_load_metadata_success(client: TestClient, session_and_user: dict):
+    """POST with valid data for an owned problem returns 200."""
+    access_token = login(client)
+
+    session: Session = session_and_user["session"]
+    problem = session.exec(select(ProblemDB)).first()
+
+    payload = {
+        "problem_id": problem.id,
+        "sites": SITES,
+        "nodes": NODES,
+        "travel_time_matrix": TRAVEL_TIME_MATRIX,
+        "site_variable_symbols": SITE_VARS,
+        "coverage_variable_symbols": COVER_VARS,
+        "coverage_threshold": 15.0,
+    }
+
+    response = post_json(client, "/site-selection/load_metadata", payload, access_token)
+    assert response.status_code == 200
+
+    data = response.json()
+    assert data["site_variable_symbols"] == SITE_VARS
+    assert data["coverage_variable_symbols"] == COVER_VARS
+
+    # Verify in DB
+    loaded = session.exec(select(SiteSelectionMetaData)).first()
+    assert loaded is not None
+
+
+def test_load_metadata_wrong_owner(client: TestClient, session_and_user: dict):
+    """POST with a problem_id owned by a different user returns 403."""
+    session: Session = session_and_user["session"]
+
+    # Create a second user and a problem owned by them
+    other_user = User(
+        username="other",
+        password_hash=get_password_hash("other"),
+        role=UserRole.analyst,
+        group="test",
+    )
+    session.add(other_user)
+    session.commit()
+    session.refresh(other_user)
+
+    other_problem = ProblemDB.from_problem(river_pollution_problem(), user=other_user)
+    session.add(other_problem)
+    session.commit()
+    session.refresh(other_problem)
+
+    # Login as the original "analyst" user
+    access_token = login(client)
+
+    payload = {
+        "problem_id": other_problem.id,
+        "sites": SITES,
+        "nodes": NODES,
+        "travel_time_matrix": TRAVEL_TIME_MATRIX,
+        "site_variable_symbols": SITE_VARS,
+    }
+
+    response = post_json(client, "/site-selection/load_metadata", payload, access_token)
+    assert response.status_code == 403
+
+
+def test_load_metadata_problem_not_found(client: TestClient, session_and_user: dict):
+    """POST with a nonexistent problem_id returns 404."""
+    access_token = login(client)
+
+    payload = {
+        "problem_id": 99999,
+        "sites": SITES,
+        "nodes": NODES,
+        "travel_time_matrix": TRAVEL_TIME_MATRIX,
+        "site_variable_symbols": SITE_VARS,
+    }
+
+    response = post_json(client, "/site-selection/load_metadata", payload, access_token)
+    assert response.status_code == 404
+
+
+# --- Endpoint tests: /site-selection/map ---
+
+
+def _setup_metadata(session: Session, problem_id: int, coverage: bool = True) -> SiteSelectionMetaData:
+    """Helper: create ProblemMetaDataDB + SiteSelectionMetaData for a problem."""
+    metadata_db = session.exec(select(ProblemMetaDataDB).where(ProblemMetaDataDB.problem_id == problem_id)).first()
+    if metadata_db is None:
+        metadata_db = ProblemMetaDataDB(problem_id=problem_id)
+        session.add(metadata_db)
+        session.commit()
+        session.refresh(metadata_db)
+
+    site_sel = SiteSelectionMetaData(
+        metadata_id=metadata_db.id,
+        sites_json=json.dumps(SITES),
+        nodes_json=json.dumps(NODES),
+        travel_time_matrix_json=json.dumps(TRAVEL_TIME_MATRIX),
+        site_variable_symbols=SITE_VARS,
+        coverage_variable_symbols=COVER_VARS if coverage else None,
+        coverage_threshold=15.0,
+    )
+    session.add(site_sel)
+    session.commit()
+    session.refresh(site_sel)
+    return site_sel
+
+
+def test_map_success(client: TestClient, session_and_user: dict):
+    """POST with valid problem_id and solution returns nodes, edges, center."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    problem = session.exec(select(ProblemDB)).first()
+    _setup_metadata(session, problem.id)
+
+    payload = {
+        "problem_id": problem.id,
+        "optimal_variables": {"x_1": 1.0, "x_2": 0.0, "x_3": 1.0, "cover_1": 1.0, "cover_2": 0.0},
+    }
+
+    response = post_json(client, "/site-selection/map", payload, access_token)
+    assert response.status_code == 200
+
+    data = response.json()
+    assert "nodes" in data
+    assert "edges" in data
+    assert "center" in data
+    assert len(data["nodes"]) == 2
+    assert len(data["center"]) == 2
+
+
+def test_map_no_metadata(client: TestClient, session_and_user: dict):
+    """POST with a problem_id that has no SiteSelectionMetaData returns 404."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    # Use a problem that has no site selection metadata (river pollution from conftest)
+    problem = session.exec(select(ProblemDB).where(ProblemDB.name == "The river pollution problem")).first()
+
+    payload = {
+        "problem_id": problem.id,
+        "optimal_variables": {},
+    }
+
+    response = post_json(client, "/site-selection/map", payload, access_token)
+    # Could be 404 — river pollution has ProblemMetaDataDB from conftest but no site_selection_metadata
+    assert response.status_code == 404
+
+
+def test_map_color_active(client: TestClient, session_and_user: dict):
+    """A node hosting a visited site receives COLOR_ACTIVE (#FFA500)."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    problem = session.exec(select(ProblemDB)).first()
+    _setup_metadata(session, problem.id)
+
+    # x_1 and x_2 are in CityA, x_3 is in CityB — visit only x_1
+    payload = {
+        "problem_id": problem.id,
+        "optimal_variables": {"x_1": 1.0, "x_2": 0.0, "x_3": 0.0, "cover_1": 0.0, "cover_2": 0.0},
+    }
+
+    response = post_json(client, "/site-selection/map", payload, access_token)
+    assert response.status_code == 200
+
+    data = response.json()
+    city_a = next(n for n in data["nodes"] if n["name"] == "CityA")
+    assert city_a["color"] == "#FFA500"
+
+
+def test_map_color_inactive(client: TestClient, session_and_user: dict):
+    """A node with no visited sites and no coverage receives COLOR_INACTIVE (#808080)."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    problem = session.exec(select(ProblemDB)).first()
+    _setup_metadata(session, problem.id)
+
+    # Visit x_1 (CityA only), no coverage
+    payload = {
+        "problem_id": problem.id,
+        "optimal_variables": {"x_1": 1.0, "x_2": 0.0, "x_3": 0.0, "cover_1": 0.0, "cover_2": 0.0},
+    }
+
+    response = post_json(client, "/site-selection/map", payload, access_token)
+    assert response.status_code == 200
+
+    data = response.json()
+    city_b = next(n for n in data["nodes"] if n["name"] == "CityB")
+    assert city_b["color"] == "#808080"
+
+
+def test_map_no_coverage_variables(client: TestClient, session_and_user: dict):
+    """POST with metadata where coverage_variable_symbols=None returns 200 with no edges."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    problem = session.exec(select(ProblemDB)).first()
+    _setup_metadata(session, problem.id, coverage=False)
+
+    payload = {
+        "problem_id": problem.id,
+        "optimal_variables": {"x_1": 1.0, "x_2": 0.0, "x_3": 0.0},
+    }
+
+    response = post_json(client, "/site-selection/map", payload, access_token)
+    assert response.status_code == 200
+
+    data = response.json()
+    assert data["edges"] == []
diff --git a/webui/src/lib/components/custom/clinic-map/clinic-map.svelte b/webui/src/lib/components/custom/site-selection-map/site-selection-map.svelte
similarity index 59%
rename from webui/src/lib/components/custom/clinic-map/clinic-map.svelte
rename to webui/src/lib/components/custom/site-selection-map/site-selection-map.svelte
index 8db05012a..e119b353f 100644
--- a/webui/src/lib/components/custom/clinic-map/clinic-map.svelte
+++ b/webui/src/lib/components/custom/site-selection-map/site-selection-map.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import type { SolverResults } from '$lib/gen/models';
+	import { buildMapSiteSelectionMapPost } from '$lib/gen/endpoints/DESDEOFastAPI';
 
-	const API_URL = import.meta.env.VITE_API_URL;
-
-	interface ClinicMapCity {
-		city: string;
+	interface SiteSelectionMapNode {
+		name: string;
 		lat: number;
 		lon: number;
 		size: number;
@@ -13,62 +12,46 @@
 		tooltip: string;
 	}
 
-	interface ClinicMapLine {
+	interface SiteSelectionMapEdge {
 		from_lat: number;
 		from_lon: number;
 		to_lat: number;
 		to_lon: number;
 	}
 
-	interface ClinicMapResponse {
-		cities: ClinicMapCity[];
-		lines: ClinicMapLine[];
+	interface SiteSelectionMapResponse {
+		nodes: SiteSelectionMapNode[];
+		edges: SiteSelectionMapEdge[];
 		center: [number, number];
 	}
 
 	interface Props {
+		problem_id: number;
 		solution: SolverResults;
 	}
 
-	let { solution }: Props = $props();
+	let { problem_id, solution }: Props = $props();
 
-	let mapContainer: HTMLDivElement;
+	let mapContainer = $state<HTMLDivElement>();
 	let map: L.Map | null = null;
 	let loading = $state(true);
 	let error = $state<string | null>(null);
 
-	function extractVectors(sol: SolverResults): { sv: number[]; cover: number[] } {
-		const vars = sol.optimal_variables as Record<string, number | number[]>;
-		const sv: number[] = [];
-		const cover: number[] = [];
-
-		for (let i = 1; i <= 60; i++) {
-			const key = `sv_${i}`;
-			const val = vars[key];
-			sv.push(Array.isArray(val) ? val[0] : (val as number));
-		}
-		for (let i = 1; i <= 36; i++) {
-			const key = `cover_${i}`;
-			const val = vars[key];
-			cover.push(Array.isArray(val) ? val[0] : (val as number));
-		}
-		return { sv, cover };
-	}
-
-	async function fetchMapData(sv: number[], cover: number[]): Promise<ClinicMapResponse> {
-		const res = await fetch(`${API_URL}/clinic/map`, {
-			method: 'POST',
-			headers: { 'Content-Type': 'application/json' },
-			credentials: 'include',
-			body: JSON.stringify({ sv, cover })
+	async function fetchMapData(): Promise<SiteSelectionMapResponse> {
+		const res = await buildMapSiteSelectionMapPost({
+			problem_id,
+			optimal_variables: solution.optimal_variables as Record<string, unknown>
 		});
-		if (!res.ok) {
+		if (res.status === 404) {
+			throw new Error('No site selection map metadata configured for this problem.');
+		}
+		if (res.status !== 200) {
 			throw new Error(`Map API error: ${res.status}`);
 		}
-		return res.json();
+		return res.data as SiteSelectionMapResponse;
 	}
 
-	async function renderMap(data: ClinicMapResponse) {
+	async function renderMap(data: SiteSelectionMapResponse) {
 		const L = await import('leaflet');
 
 		if (map) {
@@ -76,7 +59,7 @@
 			map = null;
 		}
 
-		map = L.map(mapContainer, {
+		map = L.map(mapContainer!, {
 			center: data.center as [number, number],
 			zoom: 9
 		});
@@ -88,30 +71,30 @@
 			maxZoom: 19
 		}).addTo(map);
 
-		// Draw coverage lines
-		for (const line of data.lines) {
+		// Draw coverage edges
+		for (const edge of data.edges) {
 			L.polyline(
 				[
-					[line.from_lat, line.from_lon],
-					[line.to_lat, line.to_lon]
+					[edge.from_lat, edge.from_lon],
+					[edge.to_lat, edge.to_lon]
 				],
 				{ color: 'black', weight: 1.5, opacity: 0.5 }
 			).addTo(map);
 		}
 
-		// Draw city markers
+		// Draw node markers
 		const bounds: L.LatLngExpression[] = [];
-		for (const city of data.cities) {
-			const marker = L.circleMarker([city.lat, city.lon], {
-				radius: city.size,
+		for (const node of data.nodes) {
+			const marker = L.circleMarker([node.lat, node.lon], {
+				radius: node.size,
 				color: 'black',
 				weight: 1,
-				fillColor: city.color,
+				fillColor: node.color,
 				fillOpacity: 0.7
 			}).addTo(map);
 
-			marker.bindTooltip(city.tooltip, { direction: 'top', offset: [0, -5] });
-			bounds.push([city.lat, city.lon]);
+			marker.bindTooltip(node.tooltip, { direction: 'top', offset: [0, -5] });
+			bounds.push([node.lat, node.lon]);
 		}
 
 		if (bounds.length > 0) {
@@ -125,9 +108,9 @@
 			div.innerHTML = `
 				<div style="background:white; padding:8px 12px; border-radius:6px; box-shadow:0 1px 4px rgba(0,0,0,.3); font-size:12px; line-height:20px;">
 					<div style="font-weight:600; margin-bottom:4px;">Legend</div>
-					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:orange;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Has clinic events</div>
-					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:yellow;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Covered by nearby events</div>
-					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:grey;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Not covered</div>
+					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:#FFA500;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Has active sites</div>
+					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:#FFFF00;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Covered by nearby sites</div>
+					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:#808080;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Not covered</div>
 					<div style="margin-top:4px;"><span style="display:inline-block;width:20px;height:2px;background:black;vertical-align:middle;margin-right:6px;"></span>Coverage link</div>
 				</div>`;
 			return div;
@@ -139,12 +122,11 @@
 		loading = true;
 		error = null;
 		try {
-			const { sv, cover } = extractVectors(solution);
-			const data = await fetchMapData(sv, cover);
+			const data = await fetchMapData();
 			await renderMap(data);
 		} catch (e) {
 			error = e instanceof Error ? e.message : String(e);
-			console.error('Clinic map error:', e);
+			console.error('Site selection map error:', e);
 		} finally {
 			loading = false;
 		}
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
index 891b3ed9d..4f5becf6b 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
@@ -6,12 +6,17 @@
  * OpenAPI spec version: 0.1.0
  */
 import type {
+	AddProblemJsonProblemAddJsonPostParams,
+	AddProblemProblemAddPostParams,
 	BodyAddNewAnalystAddNewAnalystPost,
 	BodyAddNewDmAddNewDmPost,
 	BodyAddProblemJsonProblemAddJsonPost,
 	BodyLoginLoginPost,
 	ConfigureGdmGdmScoreBandsConfigurePostParams,
+	CreateNewSessionSessionNewPostParams,
 	CreateSessionRequest,
+	DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams,
+	DeleteSaveMethodNimbusDeleteSavePostParams,
 	ENautilusFinalizeRequest,
 	ENautilusFinalizeResponse,
 	ENautilusRepresentativeSolutionsResponse,
@@ -21,6 +26,8 @@ import type {
 	ENautilusStateResponse,
 	ENautilusStepRequest,
 	ENautilusStepResponse,
+	FinalizeEnautilusMethodEnautilusFinalizePostParams,
+	FinalizeNimbusMethodNimbusFinalizePostParams,
 	ForestProblemMetaData,
 	GDMSCOREBandsHistoryResponse,
 	GDMSCOREBandsRevertRequest,
@@ -31,12 +38,18 @@ import type {
 	GNIMBUSSwitchPhaseRequest,
 	GNIMBUSSwitchPhaseResponse,
 	GenericIntermediateSolutionResponse,
+	GetMetadataProblemGetMetadataPostParams,
+	GetOrInitializeMethodNimbusGetOrInitializePostParams,
+	GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams,
+	GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams,
+	GetUtopiaDataUtopiaPostParams,
 	GroupCreateRequest,
 	GroupInfoRequest,
 	GroupModifyRequest,
 	GroupPublic,
 	GroupRevertRequest,
 	HTTPValidationError,
+	InitializeMethodNimbusInitializePostParams,
 	InteractiveSessionBase,
 	IntermediateSolutionRequest,
 	LoginLoginPostParams,
@@ -51,7 +64,6 @@ import type {
 	NIMBUSIntermediateSolutionResponse,
 	NIMBUSSaveRequest,
 	NIMBUSSaveResponse,
-	ProblemGetRequest,
 	ProblemInfo,
 	ProblemInfoSmall,
 	ProblemMetaDataGetRequest,
@@ -59,11 +71,22 @@ import type {
 	RPMSolveRequest,
 	RPMState,
 	RepresentativeNonDominatedSolutions,
-	RepresentativeSolutionSetRequest,
+	RepresentativeSolutionSetBase,
 	SCOREBandsGDMConfig,
+	SaveMethodNimbusSavePostParams,
 	ScoreBandsRequest,
 	ScoreBandsResponse,
+	SelectSolverProblemAssignSolverPostParams,
+	SiteSelectionMapRequest,
+	SiteSelectionMapResponse,
+	SiteSelectionMetaData,
+	SiteSelectionMetaDataRequest,
+	SolveIntermediateMethodGenericIntermediatePostParams,
+	SolveNimbusIntermediateMethodNimbusIntermediatePostParams,
+	SolveSolutionsMethodNimbusSolvePostParams,
+	SolveSolutionsMethodRpmSolvePostParams,
 	SolverSelectionMetadata,
+	StepMethodEnautilusStepPostParams,
 	Tokens,
 	UserPublic,
 	UtopiaRequest,
@@ -494,54 +517,115 @@ export const getProblemsInfoProblemAllInfoGet = async (
 };
 
 /**
- * Get the model of a specific problem.
+ * Get a specific problem by id.
 
 Args:
-    request (ProblemGetRequest): the request containing the problem's id `problem_id`.
-    context (Annotated[SessionContext, Depends): the session context.
+     problem_id (int): problem id.
+     context (Annotated[SessionContext, Depends): the session context.
 
 Raises:
-    HTTPException: could not find a problem with the given id.
+     HTTPException: could not find a problem with the given id.
 
 Returns:
-    ProblemInfo: detailed information on the requested problem.
+     ProblemInfo: detailed information on the requested problem.
  * @summary Get Problem
  */
-export type getProblemProblemGetPostResponse200 = {
+export type getProblemProblemProblemIdGetResponse200 = {
 	data: ProblemInfo;
 	status: 200;
 };
 
-export type getProblemProblemGetPostResponse422 = {
+export type getProblemProblemProblemIdGetResponse422 = {
 	data: HTTPValidationError;
 	status: 422;
 };
 
-export type getProblemProblemGetPostResponseSuccess = getProblemProblemGetPostResponse200 & {
-	headers: Headers;
+export type getProblemProblemProblemIdGetResponseSuccess =
+	getProblemProblemProblemIdGetResponse200 & {
+		headers: Headers;
+	};
+export type getProblemProblemProblemIdGetResponseError =
+	getProblemProblemProblemIdGetResponse422 & {
+		headers: Headers;
+	};
+
+export type getProblemProblemProblemIdGetResponse =
+	| getProblemProblemProblemIdGetResponseSuccess
+	| getProblemProblemProblemIdGetResponseError;
+
+export const getGetProblemProblemProblemIdGetUrl = (problemId: number | null) => {
+	return `http://localhost:8000/problem/${problemId}`;
 };
-export type getProblemProblemGetPostResponseError = getProblemProblemGetPostResponse422 & {
-	headers: Headers;
+
+export const getProblemProblemProblemIdGet = async (
+	problemId: number | null,
+	rPMSolveRequestENautilusStepRequestCreateSessionRequestNull:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| CreateSessionRequest
+		| null,
+	options?: RequestInit
+): Promise<getProblemProblemProblemIdGetResponse> => {
+	return customFetch<getProblemProblemProblemIdGetResponse>(
+		getGetProblemProblemProblemIdGetUrl(problemId),
+		{
+			...options,
+			method: 'GET',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(rPMSolveRequestENautilusStepRequestCreateSessionRequestNull)
+		}
+	);
+};
+
+/**
+ * Delete a problem by its ID.
+ * @summary Delete Problem
+ */
+export type deleteProblemProblemProblemIdDeleteResponse204 = {
+	data: void;
+	status: 204;
 };
 
-export type getProblemProblemGetPostResponse =
-	| getProblemProblemGetPostResponseSuccess
-	| getProblemProblemGetPostResponseError;
+export type deleteProblemProblemProblemIdDeleteResponse422 = {
+	data: HTTPValidationError;
+	status: 422;
+};
 
-export const getGetProblemProblemGetPostUrl = () => {
-	return `http://localhost:8000/problem/get`;
+export type deleteProblemProblemProblemIdDeleteResponseSuccess =
+	deleteProblemProblemProblemIdDeleteResponse204 & {
+		headers: Headers;
+	};
+export type deleteProblemProblemProblemIdDeleteResponseError =
+	deleteProblemProblemProblemIdDeleteResponse422 & {
+		headers: Headers;
+	};
+
+export type deleteProblemProblemProblemIdDeleteResponse =
+	| deleteProblemProblemProblemIdDeleteResponseSuccess
+	| deleteProblemProblemProblemIdDeleteResponseError;
+
+export const getDeleteProblemProblemProblemIdDeleteUrl = (problemId: number | null) => {
+	return `http://localhost:8000/problem/${problemId}`;
 };
 
-export const getProblemProblemGetPost = async (
-	problemGetRequest: ProblemGetRequest,
+export const deleteProblemProblemProblemIdDelete = async (
+	problemId: number | null,
+	rPMSolveRequestENautilusStepRequestCreateSessionRequestNull:
+		| RPMSolveRequest
+		| ENautilusStepRequest
+		| CreateSessionRequest
+		| null,
 	options?: RequestInit
-): Promise<getProblemProblemGetPostResponse> => {
-	return customFetch<getProblemProblemGetPostResponse>(getGetProblemProblemGetPostUrl(), {
-		...options,
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json', ...options?.headers },
-		body: JSON.stringify(problemGetRequest)
-	});
+): Promise<deleteProblemProblemProblemIdDeleteResponse> => {
+	return customFetch<deleteProblemProblemProblemIdDeleteResponse>(
+		getDeleteProblemProblemProblemIdDeleteUrl(problemId),
+		{
+			...options,
+			method: 'DELETE',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(rPMSolveRequestENautilusStepRequestCreateSessionRequestNull)
+		}
+	);
 };
 
 /**
@@ -582,26 +666,36 @@ export type addProblemProblemAddPostResponse =
 	| addProblemProblemAddPostResponseSuccess
 	| addProblemProblemAddPostResponseError;
 
-export const getAddProblemProblemAddPostUrl = () => {
-	return `http://localhost:8000/problem/add`;
+export const getAddProblemProblemAddPostUrl = (params?: AddProblemProblemAddPostParams) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/problem/add?${stringifiedParams}`
+		: `http://localhost:8000/problem/add`;
 };
 
 export const addProblemProblemAddPost = async (
-	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+	rPMSolveRequestENautilusStepRequestCreateSessionRequestNull:
 		| RPMSolveRequest
 		| ENautilusStepRequest
-		| RepresentativeSolutionSetRequest
 		| CreateSessionRequest
 		| null,
+	params?: AddProblemProblemAddPostParams,
 	options?: RequestInit
 ): Promise<addProblemProblemAddPostResponse> => {
-	return customFetch<addProblemProblemAddPostResponse>(getAddProblemProblemAddPostUrl(), {
+	return customFetch<addProblemProblemAddPostResponse>(getAddProblemProblemAddPostUrl(params), {
 		...options,
 		method: 'POST',
 		headers: { 'Content-Type': 'application/json', ...options?.headers },
-		body: JSON.stringify(
-			rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
-		)
+		body: JSON.stringify(rPMSolveRequestENautilusStepRequestCreateSessionRequestNull)
 	});
 };
 
@@ -643,12 +737,27 @@ export type addProblemJsonProblemAddJsonPostResponse =
 	| addProblemJsonProblemAddJsonPostResponseSuccess
 	| addProblemJsonProblemAddJsonPostResponseError;
 
-export const getAddProblemJsonProblemAddJsonPostUrl = () => {
-	return `http://localhost:8000/problem/add_json`;
+export const getAddProblemJsonProblemAddJsonPostUrl = (
+	params?: AddProblemJsonProblemAddJsonPostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/problem/add_json?${stringifiedParams}`
+		: `http://localhost:8000/problem/add_json`;
 };
 
 export const addProblemJsonProblemAddJsonPost = async (
 	bodyAddProblemJsonProblemAddJsonPost: BodyAddProblemJsonProblemAddJsonPost,
+	params?: AddProblemJsonProblemAddJsonPostParams,
 	options?: RequestInit
 ): Promise<addProblemJsonProblemAddJsonPostResponse> => {
 	const formData = new FormData();
@@ -661,7 +770,7 @@ export const addProblemJsonProblemAddJsonPost = async (
 	}
 
 	return customFetch<addProblemJsonProblemAddJsonPostResponse>(
-		getAddProblemJsonProblemAddJsonPostUrl(),
+		getAddProblemJsonProblemAddJsonPostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -688,7 +797,12 @@ Returns:
  * @summary Get Metadata
  */
 export type getMetadataProblemGetMetadataPostResponse200 = {
-	data: (ForestProblemMetaData | RepresentativeNonDominatedSolutions | SolverSelectionMetadata)[];
+	data: (
+		| ForestProblemMetaData
+		| RepresentativeNonDominatedSolutions
+		| SolverSelectionMetadata
+		| SiteSelectionMetaData
+	)[];
 	status: 200;
 };
 
@@ -710,16 +824,31 @@ export type getMetadataProblemGetMetadataPostResponse =
 	| getMetadataProblemGetMetadataPostResponseSuccess
 	| getMetadataProblemGetMetadataPostResponseError;
 
-export const getGetMetadataProblemGetMetadataPostUrl = () => {
-	return `http://localhost:8000/problem/get_metadata`;
+export const getGetMetadataProblemGetMetadataPostUrl = (
+	params?: GetMetadataProblemGetMetadataPostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/problem/get_metadata?${stringifiedParams}`
+		: `http://localhost:8000/problem/get_metadata`;
 };
 
 export const getMetadataProblemGetMetadataPost = async (
 	problemMetaDataGetRequest: ProblemMetaDataGetRequest,
+	params?: GetMetadataProblemGetMetadataPostParams,
 	options?: RequestInit
 ): Promise<getMetadataProblemGetMetadataPostResponse> => {
 	return customFetch<getMetadataProblemGetMetadataPostResponse>(
-		getGetMetadataProblemGetMetadataPostUrl(),
+		getGetMetadataProblemGetMetadataPostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -798,16 +927,31 @@ export type selectSolverProblemAssignSolverPostResponse =
 	| selectSolverProblemAssignSolverPostResponseSuccess
 	| selectSolverProblemAssignSolverPostResponseError;
 
-export const getSelectSolverProblemAssignSolverPostUrl = () => {
-	return `http://localhost:8000/problem/assign_solver`;
+export const getSelectSolverProblemAssignSolverPostUrl = (
+	params?: SelectSolverProblemAssignSolverPostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/problem/assign_solver?${stringifiedParams}`
+		: `http://localhost:8000/problem/assign_solver`;
 };
 
 export const selectSolverProblemAssignSolverPost = async (
 	problemSelectSolverRequest: ProblemSelectSolverRequest,
+	params?: SelectSolverProblemAssignSolverPostParams,
 	options?: RequestInit
 ): Promise<selectSolverProblemAssignSolverPostResponse> => {
 	return customFetch<selectSolverProblemAssignSolverPostResponse>(
-		getSelectSolverProblemAssignSolverPostUrl(),
+		getSelectSolverProblemAssignSolverPostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -821,7 +965,8 @@ export const selectSolverProblemAssignSolverPost = async (
  * Add a new representative solution set as metadata to a problem.
 
 Args:
-    request (RepresentativeSolutionSetRequest): The JSON body containing the
+    problem_id: int,
+    request (RepresentativeSolutionSetBase): The JSON body containing the
         details of the representative solution set (name, description, solution data, ideal, nadir).
     context (SessionContext): The session context providing the current user and database session.
 
@@ -832,44 +977,49 @@ Returns:
     RepresentativeSolutionSetInfo: information about the added set.
  * @summary Add Representative Solution Set
  */
-export type addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse200 = {
-	data: unknown;
-	status: 200;
-};
+export type addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponse200 =
+	{
+		data: unknown;
+		status: 200;
+	};
 
-export type addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse422 = {
-	data: HTTPValidationError;
-	status: 422;
-};
+export type addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponse422 =
+	{
+		data: HTTPValidationError;
+		status: 422;
+	};
 
-export type addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponseSuccess =
-	addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse200 & {
+export type addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponseSuccess =
+	addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponse200 & {
 		headers: Headers;
 	};
-export type addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponseError =
-	addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse422 & {
+export type addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponseError =
+	addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponse422 & {
 		headers: Headers;
 	};
 
-export type addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse =
-	| addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponseSuccess
-	| addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponseError;
+export type addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponse =
+	| addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponseSuccess
+	| addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponseError;
 
-export const getAddRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostUrl = () => {
-	return `http://localhost:8000/problem/add_representative_solution_set`;
+export const getAddRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostUrl = (
+	problemId: number | null
+) => {
+	return `http://localhost:8000/problem/${problemId}/add_representative_solution_set`;
 };
 
-export const addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPost = async (
-	representativeSolutionSetRequest: RepresentativeSolutionSetRequest,
+export const addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPost = async (
+	problemId: number | null,
+	representativeSolutionSetBase: RepresentativeSolutionSetBase,
 	options?: RequestInit
-): Promise<addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse> => {
-	return customFetch<addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse>(
-		getAddRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostUrl(),
+): Promise<addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponse> => {
+	return customFetch<addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponse>(
+		getAddRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostUrl(problemId),
 		{
 			...options,
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json', ...options?.headers },
-			body: JSON.stringify(representativeSolutionSetRequest)
+			body: JSON.stringify(representativeSolutionSetBase)
 		}
 	);
 };
@@ -880,59 +1030,56 @@ export const addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPost
 Returns only name, description, ideal, and nadir for each set.
  * @summary Get All Representative Solution Sets
  */
-export type getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse200 =
+export type getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponse200 =
 	{
 		data: unknown;
 		status: 200;
 	};
 
-export type getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse422 =
+export type getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponse422 =
 	{
 		data: HTTPValidationError;
 		status: 422;
 	};
 
-export type getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponseSuccess =
-	getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse200 & {
+export type getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponseSuccess =
+	getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponse200 & {
 		headers: Headers;
 	};
-export type getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponseError =
-	getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse422 & {
+export type getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponseError =
+	getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponse422 & {
 		headers: Headers;
 	};
 
-export type getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse =
+export type getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponse =
 
-		| getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponseSuccess
-		| getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponseError;
+		| getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponseSuccess
+		| getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponseError;
 
-export const getGetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetUrl =
-	(problemId: number) => {
-		return `http://localhost:8000/problem/all_representative_solution_sets/${problemId}`;
+export const getGetAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetUrl =
+	(problemId: number | null) => {
+		return `http://localhost:8000/problem/${problemId}/all_representative_solution_sets`;
 	};
 
-export const getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGet =
+export const getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGet =
 	async (
-		problemId: number,
-		rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+		problemId: number | null,
+		rPMSolveRequestENautilusStepRequestCreateSessionRequestNull:
 			| RPMSolveRequest
 			| ENautilusStepRequest
-			| RepresentativeSolutionSetRequest
 			| CreateSessionRequest
 			| null,
 		options?: RequestInit
-	): Promise<getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse> => {
-		return customFetch<getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse>(
-			getGetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetUrl(
+	): Promise<getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponse> => {
+		return customFetch<getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponse>(
+			getGetAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetUrl(
 				problemId
 			),
 			{
 				...options,
 				method: 'GET',
 				headers: { 'Content-Type': 'application/json', ...options?.headers },
-				body: JSON.stringify(
-					rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
-				)
+				body: JSON.stringify(rPMSolveRequestENautilusStepRequestCreateSessionRequestNull)
 			}
 		);
 	};
@@ -965,30 +1112,41 @@ export type getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGet
 	| getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetResponseError;
 
 export const getGetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetUrl = (
-	setId: number
+	setId: number,
+	params?: GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams
 ) => {
-	return `http://localhost:8000/problem/representative_solution_set/${setId}`;
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/problem/representative_solution_set/${setId}?${stringifiedParams}`
+		: `http://localhost:8000/problem/representative_solution_set/${setId}`;
 };
 
 export const getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGet = async (
 	setId: number,
-	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+	rPMSolveRequestENautilusStepRequestCreateSessionRequestNull:
 		| RPMSolveRequest
 		| ENautilusStepRequest
-		| RepresentativeSolutionSetRequest
 		| CreateSessionRequest
 		| null,
+	params?: GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams,
 	options?: RequestInit
 ): Promise<getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetResponse> => {
 	return customFetch<getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetResponse>(
-		getGetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetUrl(setId),
+		getGetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetUrl(setId, params),
 		{
 			...options,
 			method: 'GET',
 			headers: { 'Content-Type': 'application/json', ...options?.headers },
-			body: JSON.stringify(
-				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
-			)
+			body: JSON.stringify(rPMSolveRequestENautilusStepRequestCreateSessionRequestNull)
 		}
 	);
 };
@@ -1023,84 +1181,41 @@ export type deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetId
 	| deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteResponseError;
 
 export const getDeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteUrl = (
-	setId: number
+	setId: number,
+	params?: DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams
 ) => {
-	return `http://localhost:8000/problem/representative_solution_set/${setId}`;
-};
+	const normalizedParams = new URLSearchParams();
 
-export const deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDelete = async (
-	setId: number,
-	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
-		| RPMSolveRequest
-		| ENautilusStepRequest
-		| RepresentativeSolutionSetRequest
-		| CreateSessionRequest
-		| null,
-	options?: RequestInit
-): Promise<deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteResponse> => {
-	return customFetch<deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteResponse>(
-		getDeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteUrl(setId),
-		{
-			...options,
-			method: 'DELETE',
-			headers: { 'Content-Type': 'application/json', ...options?.headers },
-			body: JSON.stringify(
-				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
-			)
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
 		}
-	);
-};
-
-/**
- * Delete a problem by its ID.
- * @summary Delete Problem
- */
-export type deleteProblemProblemProblemIdDeleteResponse204 = {
-	data: void;
-	status: 204;
-};
-
-export type deleteProblemProblemProblemIdDeleteResponse422 = {
-	data: HTTPValidationError;
-	status: 422;
-};
-
-export type deleteProblemProblemProblemIdDeleteResponseSuccess =
-	deleteProblemProblemProblemIdDeleteResponse204 & {
-		headers: Headers;
-	};
-export type deleteProblemProblemProblemIdDeleteResponseError =
-	deleteProblemProblemProblemIdDeleteResponse422 & {
-		headers: Headers;
-	};
+	});
 
-export type deleteProblemProblemProblemIdDeleteResponse =
-	| deleteProblemProblemProblemIdDeleteResponseSuccess
-	| deleteProblemProblemProblemIdDeleteResponseError;
+	const stringifiedParams = normalizedParams.toString();
 
-export const getDeleteProblemProblemProblemIdDeleteUrl = (problemId: number) => {
-	return `http://localhost:8000/problem/${problemId}`;
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/problem/representative_solution_set/${setId}?${stringifiedParams}`
+		: `http://localhost:8000/problem/representative_solution_set/${setId}`;
 };
 
-export const deleteProblemProblemProblemIdDelete = async (
-	problemId: number,
-	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+export const deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDelete = async (
+	setId: number,
+	rPMSolveRequestENautilusStepRequestCreateSessionRequestNull:
 		| RPMSolveRequest
 		| ENautilusStepRequest
-		| RepresentativeSolutionSetRequest
 		| CreateSessionRequest
 		| null,
+	params?: DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams,
 	options?: RequestInit
-): Promise<deleteProblemProblemProblemIdDeleteResponse> => {
-	return customFetch<deleteProblemProblemProblemIdDeleteResponse>(
-		getDeleteProblemProblemProblemIdDeleteUrl(problemId),
+): Promise<deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteResponse> => {
+	return customFetch<deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteResponse>(
+		getDeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteUrl(setId, params),
 		{
 			...options,
 			method: 'DELETE',
 			headers: { 'Content-Type': 'application/json', ...options?.headers },
-			body: JSON.stringify(
-				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
-			)
+			body: JSON.stringify(rPMSolveRequestENautilusStepRequestCreateSessionRequestNull)
 		}
 	);
 };
@@ -1132,16 +1247,15 @@ export type getProblemJsonProblemProblemIdJsonGetResponse =
 	| getProblemJsonProblemProblemIdJsonGetResponseSuccess
 	| getProblemJsonProblemProblemIdJsonGetResponseError;
 
-export const getGetProblemJsonProblemProblemIdJsonGetUrl = (problemId: number) => {
+export const getGetProblemJsonProblemProblemIdJsonGetUrl = (problemId: number | null) => {
 	return `http://localhost:8000/problem/${problemId}/json`;
 };
 
 export const getProblemJsonProblemProblemIdJsonGet = async (
-	problemId: number,
-	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+	problemId: number | null,
+	rPMSolveRequestENautilusStepRequestCreateSessionRequestNull:
 		| RPMSolveRequest
 		| ENautilusStepRequest
-		| RepresentativeSolutionSetRequest
 		| CreateSessionRequest
 		| null,
 	options?: RequestInit
@@ -1152,9 +1266,7 @@ export const getProblemJsonProblemProblemIdJsonGet = async (
 			...options,
 			method: 'GET',
 			headers: { 'Content-Type': 'application/json', ...options?.headers },
-			body: JSON.stringify(
-				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
-			)
+			body: JSON.stringify(rPMSolveRequestENautilusStepRequestCreateSessionRequestNull)
 		}
 	);
 };
@@ -1186,16 +1298,31 @@ export type createNewSessionSessionNewPostResponse =
 	| createNewSessionSessionNewPostResponseSuccess
 	| createNewSessionSessionNewPostResponseError;
 
-export const getCreateNewSessionSessionNewPostUrl = () => {
-	return `http://localhost:8000/session/new`;
+export const getCreateNewSessionSessionNewPostUrl = (
+	params?: CreateNewSessionSessionNewPostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/session/new?${stringifiedParams}`
+		: `http://localhost:8000/session/new`;
 };
 
 export const createNewSessionSessionNewPost = async (
 	createSessionRequest: CreateSessionRequest,
+	params?: CreateNewSessionSessionNewPostParams,
 	options?: RequestInit
 ): Promise<createNewSessionSessionNewPostResponse> => {
 	return customFetch<createNewSessionSessionNewPostResponse>(
-		getCreateNewSessionSessionNewPostUrl(),
+		getCreateNewSessionSessionNewPostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1360,16 +1487,31 @@ export type solveSolutionsMethodRpmSolvePostResponse =
 	| solveSolutionsMethodRpmSolvePostResponseSuccess
 	| solveSolutionsMethodRpmSolvePostResponseError;
 
-export const getSolveSolutionsMethodRpmSolvePostUrl = () => {
-	return `http://localhost:8000/method/rpm/solve`;
+export const getSolveSolutionsMethodRpmSolvePostUrl = (
+	params?: SolveSolutionsMethodRpmSolvePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/rpm/solve?${stringifiedParams}`
+		: `http://localhost:8000/method/rpm/solve`;
 };
 
 export const solveSolutionsMethodRpmSolvePost = async (
 	rPMSolveRequest: RPMSolveRequest,
+	params?: SolveSolutionsMethodRpmSolvePostParams,
 	options?: RequestInit
 ): Promise<solveSolutionsMethodRpmSolvePostResponse> => {
 	return customFetch<solveSolutionsMethodRpmSolvePostResponse>(
-		getSolveSolutionsMethodRpmSolvePostUrl(),
+		getSolveSolutionsMethodRpmSolvePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1406,16 +1548,31 @@ export type solveSolutionsMethodNimbusSolvePostResponse =
 	| solveSolutionsMethodNimbusSolvePostResponseSuccess
 	| solveSolutionsMethodNimbusSolvePostResponseError;
 
-export const getSolveSolutionsMethodNimbusSolvePostUrl = () => {
-	return `http://localhost:8000/method/nimbus/solve`;
+export const getSolveSolutionsMethodNimbusSolvePostUrl = (
+	params?: SolveSolutionsMethodNimbusSolvePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/nimbus/solve?${stringifiedParams}`
+		: `http://localhost:8000/method/nimbus/solve`;
 };
 
 export const solveSolutionsMethodNimbusSolvePost = async (
 	nIMBUSClassificationRequest: NIMBUSClassificationRequest,
+	params?: SolveSolutionsMethodNimbusSolvePostParams,
 	options?: RequestInit
 ): Promise<solveSolutionsMethodNimbusSolvePostResponse> => {
 	return customFetch<solveSolutionsMethodNimbusSolvePostResponse>(
-		getSolveSolutionsMethodNimbusSolvePostUrl(),
+		getSolveSolutionsMethodNimbusSolvePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1452,16 +1609,31 @@ export type initializeMethodNimbusInitializePostResponse =
 	| initializeMethodNimbusInitializePostResponseSuccess
 	| initializeMethodNimbusInitializePostResponseError;
 
-export const getInitializeMethodNimbusInitializePostUrl = () => {
-	return `http://localhost:8000/method/nimbus/initialize`;
+export const getInitializeMethodNimbusInitializePostUrl = (
+	params?: InitializeMethodNimbusInitializePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/nimbus/initialize?${stringifiedParams}`
+		: `http://localhost:8000/method/nimbus/initialize`;
 };
 
 export const initializeMethodNimbusInitializePost = async (
 	nIMBUSInitializationRequest: NIMBUSInitializationRequest,
+	params?: InitializeMethodNimbusInitializePostParams,
 	options?: RequestInit
 ): Promise<initializeMethodNimbusInitializePostResponse> => {
 	return customFetch<initializeMethodNimbusInitializePostResponse>(
-		getInitializeMethodNimbusInitializePostUrl(),
+		getInitializeMethodNimbusInitializePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1496,15 +1668,28 @@ export type saveMethodNimbusSavePostResponse =
 	| saveMethodNimbusSavePostResponseSuccess
 	| saveMethodNimbusSavePostResponseError;
 
-export const getSaveMethodNimbusSavePostUrl = () => {
-	return `http://localhost:8000/method/nimbus/save`;
+export const getSaveMethodNimbusSavePostUrl = (params?: SaveMethodNimbusSavePostParams) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/nimbus/save?${stringifiedParams}`
+		: `http://localhost:8000/method/nimbus/save`;
 };
 
 export const saveMethodNimbusSavePost = async (
 	nIMBUSSaveRequest: NIMBUSSaveRequest,
+	params?: SaveMethodNimbusSavePostParams,
 	options?: RequestInit
 ): Promise<saveMethodNimbusSavePostResponse> => {
-	return customFetch<saveMethodNimbusSavePostResponse>(getSaveMethodNimbusSavePostUrl(), {
+	return customFetch<saveMethodNimbusSavePostResponse>(getSaveMethodNimbusSavePostUrl(params), {
 		...options,
 		method: 'POST',
 		headers: { 'Content-Type': 'application/json', ...options?.headers },
@@ -1539,16 +1724,31 @@ export type solveNimbusIntermediateMethodNimbusIntermediatePostResponse =
 	| solveNimbusIntermediateMethodNimbusIntermediatePostResponseSuccess
 	| solveNimbusIntermediateMethodNimbusIntermediatePostResponseError;
 
-export const getSolveNimbusIntermediateMethodNimbusIntermediatePostUrl = () => {
-	return `http://localhost:8000/method/nimbus/intermediate`;
+export const getSolveNimbusIntermediateMethodNimbusIntermediatePostUrl = (
+	params?: SolveNimbusIntermediateMethodNimbusIntermediatePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/nimbus/intermediate?${stringifiedParams}`
+		: `http://localhost:8000/method/nimbus/intermediate`;
 };
 
 export const solveNimbusIntermediateMethodNimbusIntermediatePost = async (
 	intermediateSolutionRequest: IntermediateSolutionRequest,
+	params?: SolveNimbusIntermediateMethodNimbusIntermediatePostParams,
 	options?: RequestInit
 ): Promise<solveNimbusIntermediateMethodNimbusIntermediatePostResponse> => {
 	return customFetch<solveNimbusIntermediateMethodNimbusIntermediatePostResponse>(
-		getSolveNimbusIntermediateMethodNimbusIntermediatePostUrl(),
+		getSolveNimbusIntermediateMethodNimbusIntermediatePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1589,16 +1789,31 @@ export type getOrInitializeMethodNimbusGetOrInitializePostResponse =
 	| getOrInitializeMethodNimbusGetOrInitializePostResponseSuccess
 	| getOrInitializeMethodNimbusGetOrInitializePostResponseError;
 
-export const getGetOrInitializeMethodNimbusGetOrInitializePostUrl = () => {
-	return `http://localhost:8000/method/nimbus/get-or-initialize`;
+export const getGetOrInitializeMethodNimbusGetOrInitializePostUrl = (
+	params?: GetOrInitializeMethodNimbusGetOrInitializePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/nimbus/get-or-initialize?${stringifiedParams}`
+		: `http://localhost:8000/method/nimbus/get-or-initialize`;
 };
 
 export const getOrInitializeMethodNimbusGetOrInitializePost = async (
 	nIMBUSInitializationRequest: NIMBUSInitializationRequest,
+	params?: GetOrInitializeMethodNimbusGetOrInitializePostParams,
 	options?: RequestInit
 ): Promise<getOrInitializeMethodNimbusGetOrInitializePostResponse> => {
 	return customFetch<getOrInitializeMethodNimbusGetOrInitializePostResponse>(
-		getGetOrInitializeMethodNimbusGetOrInitializePostUrl(),
+		getGetOrInitializeMethodNimbusGetOrInitializePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1645,16 +1860,31 @@ export type finalizeNimbusMethodNimbusFinalizePostResponse =
 	| finalizeNimbusMethodNimbusFinalizePostResponseSuccess
 	| finalizeNimbusMethodNimbusFinalizePostResponseError;
 
-export const getFinalizeNimbusMethodNimbusFinalizePostUrl = () => {
-	return `http://localhost:8000/method/nimbus/finalize`;
+export const getFinalizeNimbusMethodNimbusFinalizePostUrl = (
+	params?: FinalizeNimbusMethodNimbusFinalizePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/nimbus/finalize?${stringifiedParams}`
+		: `http://localhost:8000/method/nimbus/finalize`;
 };
 
 export const finalizeNimbusMethodNimbusFinalizePost = async (
 	nIMBUSFinalizeRequest: NIMBUSFinalizeRequest,
+	params?: FinalizeNimbusMethodNimbusFinalizePostParams,
 	options?: RequestInit
 ): Promise<finalizeNimbusMethodNimbusFinalizePostResponse> => {
 	return customFetch<finalizeNimbusMethodNimbusFinalizePostResponse>(
-		getFinalizeNimbusMethodNimbusFinalizePostUrl(),
+		getFinalizeNimbusMethodNimbusFinalizePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1701,16 +1931,31 @@ export type deleteSaveMethodNimbusDeleteSavePostResponse =
 	| deleteSaveMethodNimbusDeleteSavePostResponseSuccess
 	| deleteSaveMethodNimbusDeleteSavePostResponseError;
 
-export const getDeleteSaveMethodNimbusDeleteSavePostUrl = () => {
-	return `http://localhost:8000/method/nimbus/delete_save`;
+export const getDeleteSaveMethodNimbusDeleteSavePostUrl = (
+	params?: DeleteSaveMethodNimbusDeleteSavePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/nimbus/delete_save?${stringifiedParams}`
+		: `http://localhost:8000/method/nimbus/delete_save`;
 };
 
 export const deleteSaveMethodNimbusDeleteSavePost = async (
 	nIMBUSDeleteSaveRequest: NIMBUSDeleteSaveRequest,
+	params?: DeleteSaveMethodNimbusDeleteSavePostParams,
 	options?: RequestInit
 ): Promise<deleteSaveMethodNimbusDeleteSavePostResponse> => {
 	return customFetch<deleteSaveMethodNimbusDeleteSavePostResponse>(
-		getDeleteSaveMethodNimbusDeleteSavePostUrl(),
+		getDeleteSaveMethodNimbusDeleteSavePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1752,16 +1997,31 @@ export type solveIntermediateMethodGenericIntermediatePostResponse =
 	| solveIntermediateMethodGenericIntermediatePostResponseSuccess
 	| solveIntermediateMethodGenericIntermediatePostResponseError;
 
-export const getSolveIntermediateMethodGenericIntermediatePostUrl = () => {
-	return `http://localhost:8000/method/generic/intermediate`;
+export const getSolveIntermediateMethodGenericIntermediatePostUrl = (
+	params?: SolveIntermediateMethodGenericIntermediatePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/generic/intermediate?${stringifiedParams}`
+		: `http://localhost:8000/method/generic/intermediate`;
 };
 
 export const solveIntermediateMethodGenericIntermediatePost = async (
 	intermediateSolutionRequest: IntermediateSolutionRequest,
+	params?: SolveIntermediateMethodGenericIntermediatePostParams,
 	options?: RequestInit
 ): Promise<solveIntermediateMethodGenericIntermediatePostResponse> => {
 	return customFetch<solveIntermediateMethodGenericIntermediatePostResponse>(
-		getSolveIntermediateMethodGenericIntermediatePostUrl(),
+		getSolveIntermediateMethodGenericIntermediatePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -1852,15 +2112,28 @@ export type getUtopiaDataUtopiaPostResponse =
 	| getUtopiaDataUtopiaPostResponseSuccess
 	| getUtopiaDataUtopiaPostResponseError;
 
-export const getGetUtopiaDataUtopiaPostUrl = () => {
-	return `http://localhost:8000/utopia/`;
+export const getGetUtopiaDataUtopiaPostUrl = (params?: GetUtopiaDataUtopiaPostParams) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/utopia/?${stringifiedParams}`
+		: `http://localhost:8000/utopia/`;
 };
 
 export const getUtopiaDataUtopiaPost = async (
 	utopiaRequest: UtopiaRequest,
+	params?: GetUtopiaDataUtopiaPostParams,
 	options?: RequestInit
 ): Promise<getUtopiaDataUtopiaPostResponse> => {
-	return customFetch<getUtopiaDataUtopiaPostResponse>(getGetUtopiaDataUtopiaPostUrl(), {
+	return customFetch<getUtopiaDataUtopiaPostResponse>(getGetUtopiaDataUtopiaPostUrl(params), {
 		...options,
 		method: 'POST',
 		headers: { 'Content-Type': 'application/json', ...options?.headers },
@@ -2474,20 +2747,36 @@ export type stepMethodEnautilusStepPostResponse =
 	| stepMethodEnautilusStepPostResponseSuccess
 	| stepMethodEnautilusStepPostResponseError;
 
-export const getStepMethodEnautilusStepPostUrl = () => {
-	return `http://localhost:8000/method/enautilus/step`;
+export const getStepMethodEnautilusStepPostUrl = (params?: StepMethodEnautilusStepPostParams) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/enautilus/step?${stringifiedParams}`
+		: `http://localhost:8000/method/enautilus/step`;
 };
 
 export const stepMethodEnautilusStepPost = async (
 	eNautilusStepRequest: ENautilusStepRequest,
+	params?: StepMethodEnautilusStepPostParams,
 	options?: RequestInit
 ): Promise<stepMethodEnautilusStepPostResponse> => {
-	return customFetch<stepMethodEnautilusStepPostResponse>(getStepMethodEnautilusStepPostUrl(), {
-		...options,
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json', ...options?.headers },
-		body: JSON.stringify(eNautilusStepRequest)
-	});
+	return customFetch<stepMethodEnautilusStepPostResponse>(
+		getStepMethodEnautilusStepPostUrl(params),
+		{
+			...options,
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(eNautilusStepRequest)
+		}
+	);
 };
 
 /**
@@ -2644,16 +2933,31 @@ export type finalizeEnautilusMethodEnautilusFinalizePostResponse =
 	| finalizeEnautilusMethodEnautilusFinalizePostResponseSuccess
 	| finalizeEnautilusMethodEnautilusFinalizePostResponseError;
 
-export const getFinalizeEnautilusMethodEnautilusFinalizePostUrl = () => {
-	return `http://localhost:8000/method/enautilus/finalize`;
+export const getFinalizeEnautilusMethodEnautilusFinalizePostUrl = (
+	params?: FinalizeEnautilusMethodEnautilusFinalizePostParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/enautilus/finalize?${stringifiedParams}`
+		: `http://localhost:8000/method/enautilus/finalize`;
 };
 
 export const finalizeEnautilusMethodEnautilusFinalizePost = async (
 	eNautilusFinalizeRequest: ENautilusFinalizeRequest,
+	params?: FinalizeEnautilusMethodEnautilusFinalizePostParams,
 	options?: RequestInit
 ): Promise<finalizeEnautilusMethodEnautilusFinalizePostResponse> => {
 	return customFetch<finalizeEnautilusMethodEnautilusFinalizePostResponse>(
-		getFinalizeEnautilusMethodEnautilusFinalizePostUrl(),
+		getFinalizeEnautilusMethodEnautilusFinalizePostUrl(params),
 		{
 			...options,
 			method: 'POST',
@@ -2700,29 +3004,42 @@ export type getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse =
 	| getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponseSuccess
 	| getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponseError;
 
-export const getGetSessionTreeMethodEnautilusSessionTreeSessionIdGetUrl = (sessionId: number) => {
-	return `http://localhost:8000/method/enautilus/session_tree/${sessionId}`;
+export const getGetSessionTreeMethodEnautilusSessionTreeSessionIdGetUrl = (
+	sessionId: number,
+	params?: GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams
+) => {
+	const normalizedParams = new URLSearchParams();
+
+	Object.entries(params || {}).forEach(([key, value]) => {
+		if (value !== undefined) {
+			normalizedParams.append(key, value === null ? 'null' : value.toString());
+		}
+	});
+
+	const stringifiedParams = normalizedParams.toString();
+
+	return stringifiedParams.length > 0
+		? `http://localhost:8000/method/enautilus/session_tree/${sessionId}?${stringifiedParams}`
+		: `http://localhost:8000/method/enautilus/session_tree/${sessionId}`;
 };
 
 export const getSessionTreeMethodEnautilusSessionTreeSessionIdGet = async (
 	sessionId: number,
-	rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull:
+	rPMSolveRequestENautilusStepRequestCreateSessionRequestNull:
 		| RPMSolveRequest
 		| ENautilusStepRequest
-		| RepresentativeSolutionSetRequest
 		| CreateSessionRequest
 		| null,
+	params?: GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams,
 	options?: RequestInit
 ): Promise<getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse> => {
 	return customFetch<getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse>(
-		getGetSessionTreeMethodEnautilusSessionTreeSessionIdGetUrl(sessionId),
+		getGetSessionTreeMethodEnautilusSessionTreeSessionIdGetUrl(sessionId, params),
 		{
 			...options,
 			method: 'GET',
 			headers: { 'Content-Type': 'application/json', ...options?.headers },
-			body: JSON.stringify(
-				rPMSolveRequestENautilusStepRequestRepresentativeSolutionSetRequestCreateSessionRequestNull
-			)
+			body: JSON.stringify(rPMSolveRequestENautilusStepRequestCreateSessionRequestNull)
 		}
 	);
 };
@@ -2777,6 +3094,99 @@ export const simulateMethodEnautilusSimulatePost = async (
 	);
 };
 
+/**
+ * Store site selection metadata for a problem.
+
+The authenticated user must own the problem.
+ * @summary Load Metadata
+ */
+export type loadMetadataSiteSelectionLoadMetadataPostResponse200 = {
+	data: SiteSelectionMetaData;
+	status: 200;
+};
+
+export type loadMetadataSiteSelectionLoadMetadataPostResponse422 = {
+	data: HTTPValidationError;
+	status: 422;
+};
+
+export type loadMetadataSiteSelectionLoadMetadataPostResponseSuccess =
+	loadMetadataSiteSelectionLoadMetadataPostResponse200 & {
+		headers: Headers;
+	};
+export type loadMetadataSiteSelectionLoadMetadataPostResponseError =
+	loadMetadataSiteSelectionLoadMetadataPostResponse422 & {
+		headers: Headers;
+	};
+
+export type loadMetadataSiteSelectionLoadMetadataPostResponse =
+	| loadMetadataSiteSelectionLoadMetadataPostResponseSuccess
+	| loadMetadataSiteSelectionLoadMetadataPostResponseError;
+
+export const getLoadMetadataSiteSelectionLoadMetadataPostUrl = () => {
+	return `http://localhost:8000/site-selection/load_metadata`;
+};
+
+export const loadMetadataSiteSelectionLoadMetadataPost = async (
+	siteSelectionMetaDataRequest: SiteSelectionMetaDataRequest,
+	options?: RequestInit
+): Promise<loadMetadataSiteSelectionLoadMetadataPostResponse> => {
+	return customFetch<loadMetadataSiteSelectionLoadMetadataPostResponse>(
+		getLoadMetadataSiteSelectionLoadMetadataPostUrl(),
+		{
+			...options,
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(siteSelectionMetaDataRequest)
+		}
+	);
+};
+
+/**
+ * Build Leaflet-compatible map data from a site selection solution.
+
+Reads site selection metadata from the DB and extracts variable values
+from the provided solution to determine node colors and coverage edges.
+ * @summary Build Map
+ */
+export type buildMapSiteSelectionMapPostResponse200 = {
+	data: SiteSelectionMapResponse;
+	status: 200;
+};
+
+export type buildMapSiteSelectionMapPostResponse422 = {
+	data: HTTPValidationError;
+	status: 422;
+};
+
+export type buildMapSiteSelectionMapPostResponseSuccess =
+	buildMapSiteSelectionMapPostResponse200 & {
+		headers: Headers;
+	};
+export type buildMapSiteSelectionMapPostResponseError = buildMapSiteSelectionMapPostResponse422 & {
+	headers: Headers;
+};
+
+export type buildMapSiteSelectionMapPostResponse =
+	| buildMapSiteSelectionMapPostResponseSuccess
+	| buildMapSiteSelectionMapPostResponseError;
+
+export const getBuildMapSiteSelectionMapPostUrl = () => {
+	return `http://localhost:8000/site-selection/map`;
+};
+
+export const buildMapSiteSelectionMapPost = async (
+	siteSelectionMapRequest: SiteSelectionMapRequest,
+	options?: RequestInit
+): Promise<buildMapSiteSelectionMapPostResponse> => {
+	return customFetch<buildMapSiteSelectionMapPostResponse>(getBuildMapSiteSelectionMapPostUrl(), {
+		...options,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json', ...options?.headers },
+		body: JSON.stringify(siteSelectionMapRequest)
+	});
+};
+
 /**
  * Vote for a band using this endpoint.
 
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
index 07fa0eff4..aeff63b07 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
@@ -125,6 +125,8 @@ Returns:
  */
 export const getProblemsProblemAllGetResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault = `forest_problem_metadata`;
 export const getProblemsProblemAllGetResponseProblemMetadataOneRepresentativeNdMetadataOneItemMetadataTypeDefault = `representative_non_dominated_solutions`;
+export const getProblemsProblemAllGetResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault = `site_selection_metadata`;
+export const getProblemsProblemAllGetResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault = 15;
 
 export const GetProblemsProblemAllGetResponseItem = zod
 	.object({
@@ -199,6 +201,50 @@ export const GetProblemsProblemAllGetResponseItem = zod
 								)
 						),
 						zod.null()
+					]),
+					site_selection_metadata: zod.union([
+						zod.array(
+							zod
+								.object({
+									id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_type: zod
+										.string()
+										.default(
+											getProblemsProblemAllGetResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault
+										),
+									sites_json: zod
+										.string()
+										.describe('JSON array: [{name, node, lat, lon}, ...] one per site variable'),
+									nodes_json: zod
+										.string()
+										.describe('JSON array: [{name, lat, lon, size}, ...] one per map node'),
+									travel_time_matrix_json: zod
+										.string()
+										.describe('JSON: 2D list[list[float]], shape [n_nodes, n_nodes]'),
+									site_variable_symbols: zod
+										.array(zod.string())
+										.describe(
+											'Ordered list of site variable symbols matching sites_json positions'
+										),
+									coverage_variable_symbols: zod
+										.union([zod.array(zod.string()), zod.null()])
+										.optional()
+										.describe(
+											'Ordered list of coverage variable symbols matching nodes_json positions, or None'
+										),
+									coverage_threshold: zod
+										.number()
+										.default(
+											getProblemsProblemAllGetResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault
+										)
+										.describe('Threshold for coverage edges (e.g., minutes, km)')
+								})
+								.describe(
+									'A problem metadata class to hold site selection problem specific information.\n\nStores geographic data and variable mappings needed to visualize binary\nsite-selection solutions on a map (e.g., clinic placement, facility location).'
+								)
+						),
+						zod.null()
 					])
 				})
 				.describe('Response model for ProblemMetaData.'),
@@ -234,6 +280,8 @@ export const getProblemsInfoProblemAllInfoGetResponseExtraFuncsOneItemIsTwiceDif
 export const getProblemsInfoProblemAllInfoGetResponseDiscreteRepresentationOneNonDominatedDefault = false;
 export const getProblemsInfoProblemAllInfoGetResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault = `forest_problem_metadata`;
 export const getProblemsInfoProblemAllInfoGetResponseProblemMetadataOneRepresentativeNdMetadataOneItemMetadataTypeDefault = `representative_non_dominated_solutions`;
+export const getProblemsInfoProblemAllInfoGetResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault = `site_selection_metadata`;
+export const getProblemsInfoProblemAllInfoGetResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault = 15;
 
 export const GetProblemsInfoProblemAllInfoGetResponseItem = zod
 	.object({
@@ -781,6 +829,50 @@ export const GetProblemsInfoProblemAllInfoGetResponseItem = zod
 								)
 						),
 						zod.null()
+					]),
+					site_selection_metadata: zod.union([
+						zod.array(
+							zod
+								.object({
+									id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_type: zod
+										.string()
+										.default(
+											getProblemsInfoProblemAllInfoGetResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault
+										),
+									sites_json: zod
+										.string()
+										.describe('JSON array: [{name, node, lat, lon}, ...] one per site variable'),
+									nodes_json: zod
+										.string()
+										.describe('JSON array: [{name, lat, lon, size}, ...] one per map node'),
+									travel_time_matrix_json: zod
+										.string()
+										.describe('JSON: 2D list[list[float]], shape [n_nodes, n_nodes]'),
+									site_variable_symbols: zod
+										.array(zod.string())
+										.describe(
+											'Ordered list of site variable symbols matching sites_json positions'
+										),
+									coverage_variable_symbols: zod
+										.union([zod.array(zod.string()), zod.null()])
+										.optional()
+										.describe(
+											'Ordered list of coverage variable symbols matching nodes_json positions, or None'
+										),
+									coverage_threshold: zod
+										.number()
+										.default(
+											getProblemsInfoProblemAllInfoGetResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault
+										)
+										.describe('Threshold for coverage edges (e.g., minutes, km)')
+								})
+								.describe(
+									'A problem metadata class to hold site selection problem specific information.\n\nStores geographic data and variable mappings needed to visualize binary\nsite-selection solutions on a map (e.g., clinic placement, facility location).'
+								)
+						),
+						zod.null()
 					])
 				})
 				.describe('Response model for ProblemMetaData.'),
@@ -793,43 +885,108 @@ export const GetProblemsInfoProblemAllInfoGetResponse = zod.array(
 );
 
 /**
- * Get the model of a specific problem.
+ * Get a specific problem by id.
 
 Args:
-    request (ProblemGetRequest): the request containing the problem's id `problem_id`.
-    context (Annotated[SessionContext, Depends): the session context.
+     problem_id (int): problem id.
+     context (Annotated[SessionContext, Depends): the session context.
 
 Raises:
-    HTTPException: could not find a problem with the given id.
+     HTTPException: could not find a problem with the given id.
 
 Returns:
-    ProblemInfo: detailed information on the requested problem.
+     ProblemInfo: detailed information on the requested problem.
  * @summary Get Problem
  */
-export const GetProblemProblemGetPostBody = zod
-	.object({
-		problem_id: zod.number()
-	})
-	.describe('Model to deal with problem fetching requests.');
-
-export const getProblemProblemGetPostResponseObjectivesItemMaximizeDefault = false;
-export const getProblemProblemGetPostResponseObjectivesItemIsLinearDefault = false;
-export const getProblemProblemGetPostResponseObjectivesItemIsConvexDefault = false;
-export const getProblemProblemGetPostResponseObjectivesItemIsTwiceDifferentiableDefault = false;
-export const getProblemProblemGetPostResponseConstraintsOneItemIsLinearDefault = true;
-export const getProblemProblemGetPostResponseConstraintsOneItemIsConvexDefault = false;
-export const getProblemProblemGetPostResponseConstraintsOneItemIsTwiceDifferentiableDefault = false;
-export const getProblemProblemGetPostResponseScalarizationFuncsOneItemIsLinearDefault = false;
-export const getProblemProblemGetPostResponseScalarizationFuncsOneItemIsConvexDefault = false;
-export const getProblemProblemGetPostResponseScalarizationFuncsOneItemIsTwiceDifferentiableDefault = false;
-export const getProblemProblemGetPostResponseExtraFuncsOneItemIsLinearDefault = false;
-export const getProblemProblemGetPostResponseExtraFuncsOneItemIsConvexDefault = false;
-export const getProblemProblemGetPostResponseExtraFuncsOneItemIsTwiceDifferentiableDefault = false;
-export const getProblemProblemGetPostResponseDiscreteRepresentationOneNonDominatedDefault = false;
-export const getProblemProblemGetPostResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault = `forest_problem_metadata`;
-export const getProblemProblemGetPostResponseProblemMetadataOneRepresentativeNdMetadataOneItemMetadataTypeDefault = `representative_non_dominated_solutions`;
-
-export const GetProblemProblemGetPostResponse = zod
+export const GetProblemProblemProblemIdGetParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()])
+});
+
+export const getProblemProblemProblemIdGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const GetProblemProblemProblemIdGetBody = zod.union([
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			scalarization_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			solver: zod.union([zod.string(), zod.null()]).optional(),
+			solver_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			preference: zod
+				.object({
+					preference_type: zod
+						.literal('reference_point')
+						.default(getProblemProblemProblemIdGetBodyOnePreferencePreferenceTypeDefault),
+					aspiration_levels: zod.record(zod.string(), zod.number())
+				})
+				.optional()
+				.describe('Model for representing a reference point type of preference.')
+		})
+		.describe('Model of the request to the reference point method.'),
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			representative_solutions_id: zod
+				.number()
+				.describe('The id of the representative solutions to be used.'),
+			current_iteration: zod.number().describe('The number of the current iteration.'),
+			iterations_left: zod.number().describe('The number of iterations left.'),
+			selected_point: zod
+				.union([zod.record(zod.string(), zod.number()), zod.null()])
+				.describe(
+					'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+				),
+			reachable_point_indices: zod
+				.array(zod.number())
+				.describe(
+					'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+				),
+			number_of_intermediate_points: zod
+				.number()
+				.describe('The number of intermediate points to be generated.')
+		})
+		.describe('Model of the request to the E-NAUTILUS method.'),
+	zod
+		.object({
+			info: zod.union([zod.string(), zod.null()]).optional()
+		})
+		.describe('Model of the request to create a new session.'),
+	zod.null()
+]);
+
+export const getProblemProblemProblemIdGetResponseObjectivesItemMaximizeDefault = false;
+export const getProblemProblemProblemIdGetResponseObjectivesItemIsLinearDefault = false;
+export const getProblemProblemProblemIdGetResponseObjectivesItemIsConvexDefault = false;
+export const getProblemProblemProblemIdGetResponseObjectivesItemIsTwiceDifferentiableDefault = false;
+export const getProblemProblemProblemIdGetResponseConstraintsOneItemIsLinearDefault = true;
+export const getProblemProblemProblemIdGetResponseConstraintsOneItemIsConvexDefault = false;
+export const getProblemProblemProblemIdGetResponseConstraintsOneItemIsTwiceDifferentiableDefault = false;
+export const getProblemProblemProblemIdGetResponseScalarizationFuncsOneItemIsLinearDefault = false;
+export const getProblemProblemProblemIdGetResponseScalarizationFuncsOneItemIsConvexDefault = false;
+export const getProblemProblemProblemIdGetResponseScalarizationFuncsOneItemIsTwiceDifferentiableDefault = false;
+export const getProblemProblemProblemIdGetResponseExtraFuncsOneItemIsLinearDefault = false;
+export const getProblemProblemProblemIdGetResponseExtraFuncsOneItemIsConvexDefault = false;
+export const getProblemProblemProblemIdGetResponseExtraFuncsOneItemIsTwiceDifferentiableDefault = false;
+export const getProblemProblemProblemIdGetResponseDiscreteRepresentationOneNonDominatedDefault = false;
+export const getProblemProblemProblemIdGetResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault = `forest_problem_metadata`;
+export const getProblemProblemProblemIdGetResponseProblemMetadataOneRepresentativeNdMetadataOneItemMetadataTypeDefault = `representative_non_dominated_solutions`;
+export const getProblemProblemProblemIdGetResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault = `site_selection_metadata`;
+export const getProblemProblemProblemIdGetResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault = 15;
+
+export const GetProblemProblemProblemIdGetResponse = zod
 	.object({
 		name: zod.string(),
 		description: zod.string(),
@@ -1043,7 +1200,7 @@ export const GetProblemProblemGetPostResponse = zod
 						),
 					maximize: zod
 						.boolean()
-						.default(getProblemProblemGetPostResponseObjectivesItemMaximizeDefault)
+						.default(getProblemProblemProblemIdGetResponseObjectivesItemMaximizeDefault)
 						.describe('Whether the objective function is to be maximized or minimized.'),
 					ideal: zod
 						.union([zod.number(), zod.null()])
@@ -1059,17 +1216,19 @@ export const GetProblemProblemGetPostResponse = zod
 						.describe('An enumerator for supported objective function types.'),
 					is_linear: zod
 						.boolean()
-						.default(getProblemProblemGetPostResponseObjectivesItemIsLinearDefault)
+						.default(getProblemProblemProblemIdGetResponseObjectivesItemIsLinearDefault)
 						.describe('Whether the function expression is linear or not. Defaults to `False`.'),
 					is_convex: zod
 						.boolean()
-						.default(getProblemProblemGetPostResponseObjectivesItemIsConvexDefault)
+						.default(getProblemProblemProblemIdGetResponseObjectivesItemIsConvexDefault)
 						.describe(
 							'Whether the function expression is convex or not (non-convex). Defaults to `False`.'
 						),
 					is_twice_differentiable: zod
 						.boolean()
-						.default(getProblemProblemGetPostResponseObjectivesItemIsTwiceDifferentiableDefault)
+						.default(
+							getProblemProblemProblemIdGetResponseObjectivesItemIsTwiceDifferentiableDefault
+						)
 						.describe(
 							'Whether the function expression is twice differentiable or not. Defaults to `False`'
 						),
@@ -1121,20 +1280,20 @@ export const GetProblemProblemGetPostResponse = zod
 							.describe('An enumerator for supported constraint expression types.'),
 						is_linear: zod
 							.boolean()
-							.default(getProblemProblemGetPostResponseConstraintsOneItemIsLinearDefault)
+							.default(getProblemProblemProblemIdGetResponseConstraintsOneItemIsLinearDefault)
 							.describe(
 								'Whether the constraint is linear or not. Defaults to True, e.g., a linear constraint is assumed.'
 							),
 						is_convex: zod
 							.boolean()
-							.default(getProblemProblemGetPostResponseConstraintsOneItemIsConvexDefault)
+							.default(getProblemProblemProblemIdGetResponseConstraintsOneItemIsConvexDefault)
 							.describe(
 								'Whether the function expression is convex or not (non-convex). Defaults to `False`.'
 							),
 						is_twice_differentiable: zod
 							.boolean()
 							.default(
-								getProblemProblemGetPostResponseConstraintsOneItemIsTwiceDifferentiableDefault
+								getProblemProblemProblemIdGetResponseConstraintsOneItemIsTwiceDifferentiableDefault
 							)
 							.describe(
 								'Whether the function expression is twice differentiable or not. Defaults to `False`'
@@ -1161,18 +1320,22 @@ export const GetProblemProblemGetPostResponse = zod
 							),
 						is_linear: zod
 							.boolean()
-							.default(getProblemProblemGetPostResponseScalarizationFuncsOneItemIsLinearDefault)
+							.default(
+								getProblemProblemProblemIdGetResponseScalarizationFuncsOneItemIsLinearDefault
+							)
 							.describe('Whether the function expression is linear or not. Defaults to `False`.'),
 						is_convex: zod
 							.boolean()
-							.default(getProblemProblemGetPostResponseScalarizationFuncsOneItemIsConvexDefault)
+							.default(
+								getProblemProblemProblemIdGetResponseScalarizationFuncsOneItemIsConvexDefault
+							)
 							.describe(
 								'Whether the function expression is convex or not (non-convex). Defaults to `False`.'
 							),
 						is_twice_differentiable: zod
 							.boolean()
 							.default(
-								getProblemProblemGetPostResponseScalarizationFuncsOneItemIsTwiceDifferentiableDefault
+								getProblemProblemProblemIdGetResponseScalarizationFuncsOneItemIsTwiceDifferentiableDefault
 							)
 							.describe(
 								'Whether the function expression is twice differentiable or not. Defaults to `False`'
@@ -1222,18 +1385,18 @@ export const GetProblemProblemGetPostResponse = zod
 							),
 						is_linear: zod
 							.boolean()
-							.default(getProblemProblemGetPostResponseExtraFuncsOneItemIsLinearDefault)
+							.default(getProblemProblemProblemIdGetResponseExtraFuncsOneItemIsLinearDefault)
 							.describe('Whether the function expression is linear or not. Defaults to `False`.'),
 						is_convex: zod
 							.boolean()
-							.default(getProblemProblemGetPostResponseExtraFuncsOneItemIsConvexDefault)
+							.default(getProblemProblemProblemIdGetResponseExtraFuncsOneItemIsConvexDefault)
 							.describe(
 								'Whether the function expression is convex or not (non-convex). Defaults to `False`.'
 							),
 						is_twice_differentiable: zod
 							.boolean()
 							.default(
-								getProblemProblemGetPostResponseExtraFuncsOneItemIsTwiceDifferentiableDefault
+								getProblemProblemProblemIdGetResponseExtraFuncsOneItemIsTwiceDifferentiableDefault
 							)
 							.describe(
 								'Whether the function expression is twice differentiable or not. Defaults to `False`'
@@ -1250,7 +1413,9 @@ export const GetProblemProblemGetPostResponse = zod
 				.object({
 					non_dominated: zod
 						.boolean()
-						.default(getProblemProblemGetPostResponseDiscreteRepresentationOneNonDominatedDefault),
+						.default(
+							getProblemProblemProblemIdGetResponseDiscreteRepresentationOneNonDominatedDefault
+						),
 					variable_values: zod.record(
 						zod.string(),
 						zod.array(zod.union([zod.number(), zod.number(), zod.boolean()]))
@@ -1320,7 +1485,7 @@ export const GetProblemProblemGetPostResponse = zod
 									metadata_type: zod
 										.string()
 										.default(
-											getProblemProblemGetPostResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault
+											getProblemProblemProblemIdGetResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault
 										),
 									map_json: zod.string(),
 									schedule_dict: zod.record(zod.string(), zod.unknown()),
@@ -1359,7 +1524,7 @@ export const GetProblemProblemGetPostResponse = zod
 									metadata_type: zod
 										.string()
 										.default(
-											getProblemProblemGetPostResponseProblemMetadataOneRepresentativeNdMetadataOneItemMetadataTypeDefault
+											getProblemProblemProblemIdGetResponseProblemMetadataOneRepresentativeNdMetadataOneItemMetadataTypeDefault
 										)
 								})
 								.describe(
@@ -1367,6 +1532,50 @@ export const GetProblemProblemGetPostResponse = zod
 								)
 						),
 						zod.null()
+					]),
+					site_selection_metadata: zod.union([
+						zod.array(
+							zod
+								.object({
+									id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_type: zod
+										.string()
+										.default(
+											getProblemProblemProblemIdGetResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault
+										),
+									sites_json: zod
+										.string()
+										.describe('JSON array: [{name, node, lat, lon}, ...] one per site variable'),
+									nodes_json: zod
+										.string()
+										.describe('JSON array: [{name, lat, lon, size}, ...] one per map node'),
+									travel_time_matrix_json: zod
+										.string()
+										.describe('JSON: 2D list[list[float]], shape [n_nodes, n_nodes]'),
+									site_variable_symbols: zod
+										.array(zod.string())
+										.describe(
+											'Ordered list of site variable symbols matching sites_json positions'
+										),
+									coverage_variable_symbols: zod
+										.union([zod.array(zod.string()), zod.null()])
+										.optional()
+										.describe(
+											'Ordered list of coverage variable symbols matching nodes_json positions, or None'
+										),
+									coverage_threshold: zod
+										.number()
+										.default(
+											getProblemProblemProblemIdGetResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault
+										)
+										.describe('Threshold for coverage edges (e.g., minutes, km)')
+								})
+								.describe(
+									'A problem metadata class to hold site selection problem specific information.\n\nStores geographic data and variable mappings needed to visualize binary\nsite-selection solutions on a map (e.g., clinic placement, facility location).'
+								)
+						),
+						zod.null()
 					])
 				})
 				.describe('Response model for ProblemMetaData.'),
@@ -1375,6 +1584,79 @@ export const GetProblemProblemGetPostResponse = zod
 	})
 	.describe('Problem info request return data.');
 
+/**
+ * Delete a problem by its ID.
+ * @summary Delete Problem
+ */
+export const DeleteProblemProblemProblemIdDeleteParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()])
+});
+
+export const deleteProblemProblemProblemIdDeleteBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+
+export const DeleteProblemProblemProblemIdDeleteBody = zod.union([
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			scalarization_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			solver: zod.union([zod.string(), zod.null()]).optional(),
+			solver_options: zod
+				.union([
+					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
+					zod.null()
+				])
+				.optional(),
+			preference: zod
+				.object({
+					preference_type: zod
+						.literal('reference_point')
+						.default(deleteProblemProblemProblemIdDeleteBodyOnePreferencePreferenceTypeDefault),
+					aspiration_levels: zod.record(zod.string(), zod.number())
+				})
+				.optional()
+				.describe('Model for representing a reference point type of preference.')
+		})
+		.describe('Model of the request to the reference point method.'),
+	zod
+		.object({
+			problem_id: zod.number(),
+			session_id: zod.union([zod.number(), zod.null()]).optional(),
+			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
+			representative_solutions_id: zod
+				.number()
+				.describe('The id of the representative solutions to be used.'),
+			current_iteration: zod.number().describe('The number of the current iteration.'),
+			iterations_left: zod.number().describe('The number of iterations left.'),
+			selected_point: zod
+				.union([zod.record(zod.string(), zod.number()), zod.null()])
+				.describe(
+					'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
+				),
+			reachable_point_indices: zod
+				.array(zod.number())
+				.describe(
+					'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
+				),
+			number_of_intermediate_points: zod
+				.number()
+				.describe('The number of intermediate points to be generated.')
+		})
+		.describe('Model of the request to the E-NAUTILUS method.'),
+	zod
+		.object({
+			info: zod.union([zod.string(), zod.null()]).optional()
+		})
+		.describe('Model of the request to create a new session.'),
+	zod.null()
+]);
+
 /**
  * Add a newly defined problem to the database.
 
@@ -1392,6 +1674,10 @@ Returns:
     ProblemInfo: the information about the problem added.
  * @summary Add Problem
  */
+export const AddProblemProblemAddPostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const addProblemProblemAddPostBodyOnePreferencePreferenceTypeDefault = `reference_point`;
 
 export const AddProblemProblemAddPostBody = zod.union([
@@ -1449,16 +1735,6 @@ export const AddProblemProblemAddPostBody = zod.union([
 				.describe('The number of intermediate points to be generated.')
 		})
 		.describe('Model of the request to the E-NAUTILUS method.'),
-	zod
-		.object({
-			name: zod.string(),
-			description: zod.union([zod.string(), zod.null()]).optional(),
-			solution_data: zod.record(zod.string(), zod.array(zod.number())),
-			ideal: zod.record(zod.string(), zod.number()),
-			nadir: zod.record(zod.string(), zod.number()),
-			problem_id: zod.number()
-		})
-		.describe('Model of the request to the representative solution set.'),
 	zod
 		.object({
 			info: zod.union([zod.string(), zod.null()]).optional()
@@ -1483,6 +1759,8 @@ export const addProblemProblemAddPostResponseExtraFuncsOneItemIsTwiceDifferentia
 export const addProblemProblemAddPostResponseDiscreteRepresentationOneNonDominatedDefault = false;
 export const addProblemProblemAddPostResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault = `forest_problem_metadata`;
 export const addProblemProblemAddPostResponseProblemMetadataOneRepresentativeNdMetadataOneItemMetadataTypeDefault = `representative_non_dominated_solutions`;
+export const addProblemProblemAddPostResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault = `site_selection_metadata`;
+export const addProblemProblemAddPostResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault = 15;
 
 export const AddProblemProblemAddPostResponse = zod
 	.object({
@@ -2022,6 +2300,50 @@ export const AddProblemProblemAddPostResponse = zod
 								)
 						),
 						zod.null()
+					]),
+					site_selection_metadata: zod.union([
+						zod.array(
+							zod
+								.object({
+									id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_type: zod
+										.string()
+										.default(
+											addProblemProblemAddPostResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault
+										),
+									sites_json: zod
+										.string()
+										.describe('JSON array: [{name, node, lat, lon}, ...] one per site variable'),
+									nodes_json: zod
+										.string()
+										.describe('JSON array: [{name, lat, lon, size}, ...] one per map node'),
+									travel_time_matrix_json: zod
+										.string()
+										.describe('JSON: 2D list[list[float]], shape [n_nodes, n_nodes]'),
+									site_variable_symbols: zod
+										.array(zod.string())
+										.describe(
+											'Ordered list of site variable symbols matching sites_json positions'
+										),
+									coverage_variable_symbols: zod
+										.union([zod.array(zod.string()), zod.null()])
+										.optional()
+										.describe(
+											'Ordered list of coverage variable symbols matching nodes_json positions, or None'
+										),
+									coverage_threshold: zod
+										.number()
+										.default(
+											addProblemProblemAddPostResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault
+										)
+										.describe('Threshold for coverage edges (e.g., minutes, km)')
+								})
+								.describe(
+									'A problem metadata class to hold site selection problem specific information.\n\nStores geographic data and variable mappings needed to visualize binary\nsite-selection solutions on a map (e.g., clinic placement, facility location).'
+								)
+						),
+						zod.null()
 					])
 				})
 				.describe('Response model for ProblemMetaData.'),
@@ -2045,6 +2367,10 @@ Returns:
     ProblemInfo: a description of the added problem.
  * @summary Add Problem Json
  */
+export const AddProblemJsonProblemAddJsonPostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const addProblemJsonProblemAddJsonPostBodyRequestOnePreferencePreferenceTypeDefault = `reference_point`;
 
 export const AddProblemJsonProblemAddJsonPostBody = zod.object({
@@ -2107,16 +2433,6 @@ export const AddProblemJsonProblemAddJsonPostBody = zod.object({
 						.describe('The number of intermediate points to be generated.')
 				})
 				.describe('Model of the request to the E-NAUTILUS method.'),
-			zod
-				.object({
-					name: zod.string(),
-					description: zod.union([zod.string(), zod.null()]).optional(),
-					solution_data: zod.record(zod.string(), zod.array(zod.number())),
-					ideal: zod.record(zod.string(), zod.number()),
-					nadir: zod.record(zod.string(), zod.number()),
-					problem_id: zod.number()
-				})
-				.describe('Model of the request to the representative solution set.'),
 			zod
 				.object({
 					info: zod.union([zod.string(), zod.null()]).optional()
@@ -2143,6 +2459,8 @@ export const addProblemJsonProblemAddJsonPostResponseExtraFuncsOneItemIsTwiceDif
 export const addProblemJsonProblemAddJsonPostResponseDiscreteRepresentationOneNonDominatedDefault = false;
 export const addProblemJsonProblemAddJsonPostResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault = `forest_problem_metadata`;
 export const addProblemJsonProblemAddJsonPostResponseProblemMetadataOneRepresentativeNdMetadataOneItemMetadataTypeDefault = `representative_non_dominated_solutions`;
+export const addProblemJsonProblemAddJsonPostResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault = `site_selection_metadata`;
+export const addProblemJsonProblemAddJsonPostResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault = 15;
 
 export const AddProblemJsonProblemAddJsonPostResponse = zod
 	.object({
@@ -2690,6 +3008,50 @@ export const AddProblemJsonProblemAddJsonPostResponse = zod
 								)
 						),
 						zod.null()
+					]),
+					site_selection_metadata: zod.union([
+						zod.array(
+							zod
+								.object({
+									id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_id: zod.union([zod.number(), zod.null()]).optional(),
+									metadata_type: zod
+										.string()
+										.default(
+											addProblemJsonProblemAddJsonPostResponseProblemMetadataOneSiteSelectionMetadataOneItemMetadataTypeDefault
+										),
+									sites_json: zod
+										.string()
+										.describe('JSON array: [{name, node, lat, lon}, ...] one per site variable'),
+									nodes_json: zod
+										.string()
+										.describe('JSON array: [{name, lat, lon, size}, ...] one per map node'),
+									travel_time_matrix_json: zod
+										.string()
+										.describe('JSON: 2D list[list[float]], shape [n_nodes, n_nodes]'),
+									site_variable_symbols: zod
+										.array(zod.string())
+										.describe(
+											'Ordered list of site variable symbols matching sites_json positions'
+										),
+									coverage_variable_symbols: zod
+										.union([zod.array(zod.string()), zod.null()])
+										.optional()
+										.describe(
+											'Ordered list of coverage variable symbols matching nodes_json positions, or None'
+										),
+									coverage_threshold: zod
+										.number()
+										.default(
+											addProblemJsonProblemAddJsonPostResponseProblemMetadataOneSiteSelectionMetadataOneItemCoverageThresholdDefault
+										)
+										.describe('Threshold for coverage edges (e.g., minutes, km)')
+								})
+								.describe(
+									'A problem metadata class to hold site selection problem specific information.\n\nStores geographic data and variable mappings needed to visualize binary\nsite-selection solutions on a map (e.g., clinic placement, facility location).'
+								)
+						),
+						zod.null()
 					])
 				})
 				.describe('Response model for ProblemMetaData.'),
@@ -2715,6 +3077,10 @@ Returns:
         returns an empty list.
  * @summary Get Metadata
  */
+export const GetMetadataProblemGetMetadataPostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const GetMetadataProblemGetMetadataPostBody = zod
 	.object({
 		problem_id: zod.number(),
@@ -2725,6 +3091,8 @@ export const GetMetadataProblemGetMetadataPostBody = zod
 export const getMetadataProblemGetMetadataPostResponseOneMetadataTypeDefault = `forest_problem_metadata`;
 export const getMetadataProblemGetMetadataPostResponseTwoMetadataTypeDefault = `representative_non_dominated_solutions`;
 export const getMetadataProblemGetMetadataPostResponseThreeMetadataTypeDefault = `solver_selection_metadata`;
+export const getMetadataProblemGetMetadataPostResponseFourMetadataTypeDefault = `site_selection_metadata`;
+export const getMetadataProblemGetMetadataPostResponseFourCoverageThresholdDefault = 15;
 
 export const GetMetadataProblemGetMetadataPostResponseItem = zod.union([
 	zod
@@ -2779,6 +3147,39 @@ export const GetMetadataProblemGetMetadataPostResponseItem = zod.union([
 		})
 		.describe(
 			'A problem metadata class to store the preferred solver of a problem.\n\nA problem metadata class to store the preferred solver of a problem.\nSee desdeo/tools/utils.py -> available_solvers for available solvers.'
+		),
+	zod
+		.object({
+			id: zod.union([zod.number(), zod.null()]).optional(),
+			metadata_id: zod.union([zod.number(), zod.null()]).optional(),
+			metadata_type: zod
+				.string()
+				.default(getMetadataProblemGetMetadataPostResponseFourMetadataTypeDefault),
+			sites_json: zod
+				.string()
+				.describe('JSON array: [{name, node, lat, lon}, ...] one per site variable'),
+			nodes_json: zod
+				.string()
+				.describe('JSON array: [{name, lat, lon, size}, ...] one per map node'),
+			travel_time_matrix_json: zod
+				.string()
+				.describe('JSON: 2D list[list[float]], shape [n_nodes, n_nodes]'),
+			site_variable_symbols: zod
+				.array(zod.string())
+				.describe('Ordered list of site variable symbols matching sites_json positions'),
+			coverage_variable_symbols: zod
+				.union([zod.array(zod.string()), zod.null()])
+				.optional()
+				.describe(
+					'Ordered list of coverage variable symbols matching nodes_json positions, or None'
+				),
+			coverage_threshold: zod
+				.number()
+				.default(getMetadataProblemGetMetadataPostResponseFourCoverageThresholdDefault)
+				.describe('Threshold for coverage edges (e.g., minutes, km)')
+		})
+		.describe(
+			'A problem metadata class to hold site selection problem specific information.\n\nStores geographic data and variable mappings needed to visualize binary\nsite-selection solutions on a map (e.g., clinic placement, facility location).'
 		)
 ]);
 export const GetMetadataProblemGetMetadataPostResponse = zod.array(
@@ -2808,6 +3209,10 @@ Returns:
     JSONResponse: A simple confirmation.
  * @summary Select Solver
  */
+export const SelectSolverProblemAssignSolverPostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const SelectSolverProblemAssignSolverPostBody = zod
 	.object({
 		problem_id: zod.number().describe('ID of the problem that the solver is assigned to.'),
@@ -2825,7 +3230,8 @@ export const SelectSolverProblemAssignSolverPostResponse = zod.unknown();
  * Add a new representative solution set as metadata to a problem.
 
 Args:
-    request (RepresentativeSolutionSetRequest): The JSON body containing the
+    problem_id: int,
+    request (RepresentativeSolutionSetBase): The JSON body containing the
         details of the representative solution set (name, description, solution data, ideal, nadir).
     context (SessionContext): The session context providing the current user and database session.
 
@@ -2836,18 +3242,22 @@ Returns:
     RepresentativeSolutionSetInfo: information about the added set.
  * @summary Add Representative Solution Set
  */
-export const AddRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostBody = zod
+export const AddRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostParams =
+	zod.object({
+		problem_id: zod.union([zod.number(), zod.null()])
+	});
+
+export const AddRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostBody = zod
 	.object({
 		name: zod.string(),
 		description: zod.union([zod.string(), zod.null()]).optional(),
 		solution_data: zod.record(zod.string(), zod.array(zod.number())),
 		ideal: zod.record(zod.string(), zod.number()),
-		nadir: zod.record(zod.string(), zod.number()),
-		problem_id: zod.number()
+		nadir: zod.record(zod.string(), zod.number())
 	})
-	.describe('Model of the request to the representative solution set.');
+	.describe('Shared base model for representative solution sets.');
 
-export const AddRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPostResponse =
+export const AddRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPostResponse =
 	zod.unknown();
 
 /**
@@ -2856,14 +3266,14 @@ export const AddRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPost
 Returns only name, description, ideal, and nadir for each set.
  * @summary Get All Representative Solution Sets
  */
-export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetParams =
+export const GetAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetParams =
 	zod.object({
-		problem_id: zod.number()
+		problem_id: zod.union([zod.number(), zod.null()])
 	});
 
-export const getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
+export const getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
 
-export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetBody =
+export const GetAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetBody =
 	zod.union([
 		zod
 			.object({
@@ -2888,7 +3298,7 @@ export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSet
 						preference_type: zod
 							.literal('reference_point')
 							.default(
-								getAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetBodyOnePreferencePreferenceTypeDefault
+								getAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetBodyOnePreferencePreferenceTypeDefault
 							),
 						aspiration_levels: zod.record(zod.string(), zod.number())
 					})
@@ -2921,16 +3331,6 @@ export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSet
 					.describe('The number of intermediate points to be generated.')
 			})
 			.describe('Model of the request to the E-NAUTILUS method.'),
-		zod
-			.object({
-				name: zod.string(),
-				description: zod.union([zod.string(), zod.null()]).optional(),
-				solution_data: zod.record(zod.string(), zod.array(zod.number())),
-				ideal: zod.record(zod.string(), zod.number()),
-				nadir: zod.record(zod.string(), zod.number()),
-				problem_id: zod.number()
-			})
-			.describe('Model of the request to the representative solution set.'),
 		zod
 			.object({
 				info: zod.union([zod.string(), zod.null()]).optional()
@@ -2939,7 +3339,7 @@ export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSet
 		zod.null()
 	]);
 
-export const GetAllRepresentativeSolutionSetsProblemAllRepresentativeSolutionSetsProblemIdGetResponse =
+export const GetAllRepresentativeSolutionSetsProblemProblemIdAllRepresentativeSolutionSetsGetResponse =
 	zod.unknown();
 
 /**
@@ -2951,6 +3351,11 @@ export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGe
 		set_id: zod.number()
 	});
 
+export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetQueryParams =
+	zod.object({
+		problem_id: zod.union([zod.number(), zod.null()]).optional()
+	});
+
 export const getRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
 
 export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetBody = zod.union([
@@ -3010,16 +3415,6 @@ export const GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGe
 				.describe('The number of intermediate points to be generated.')
 		})
 		.describe('Model of the request to the E-NAUTILUS method.'),
-	zod
-		.object({
-			name: zod.string(),
-			description: zod.union([zod.string(), zod.null()]).optional(),
-			solution_data: zod.record(zod.string(), zod.array(zod.number())),
-			ideal: zod.record(zod.string(), zod.number()),
-			nadir: zod.record(zod.string(), zod.number()),
-			problem_id: zod.number()
-		})
-		.describe('Model of the request to the representative solution set.'),
 	zod
 		.object({
 			info: zod.union([zod.string(), zod.null()]).optional()
@@ -3040,6 +3435,11 @@ export const DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetI
 		set_id: zod.number()
 	});
 
+export const DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteQueryParams =
+	zod.object({
+		problem_id: zod.union([zod.number(), zod.null()]).optional()
+	});
+
 export const deleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteBodyOnePreferencePreferenceTypeDefault = `reference_point`;
 
 export const DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteBody =
@@ -3100,16 +3500,6 @@ export const DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetI
 					.describe('The number of intermediate points to be generated.')
 			})
 			.describe('Model of the request to the E-NAUTILUS method.'),
-		zod
-			.object({
-				name: zod.string(),
-				description: zod.union([zod.string(), zod.null()]).optional(),
-				solution_data: zod.record(zod.string(), zod.array(zod.number())),
-				ideal: zod.record(zod.string(), zod.number()),
-				nadir: zod.record(zod.string(), zod.number()),
-				problem_id: zod.number()
-			})
-			.describe('Model of the request to the representative solution set.'),
 		zod
 			.object({
 				info: zod.union([zod.string(), zod.null()]).optional()
@@ -3118,95 +3508,12 @@ export const DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetI
 		zod.null()
 	]);
 
-/**
- * Delete a problem by its ID.
- * @summary Delete Problem
- */
-export const DeleteProblemProblemProblemIdDeleteParams = zod.object({
-	problem_id: zod.number()
-});
-
-export const deleteProblemProblemProblemIdDeleteBodyOnePreferencePreferenceTypeDefault = `reference_point`;
-
-export const DeleteProblemProblemProblemIdDeleteBody = zod.union([
-	zod
-		.object({
-			problem_id: zod.number(),
-			session_id: zod.union([zod.number(), zod.null()]).optional(),
-			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
-			scalarization_options: zod
-				.union([
-					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
-					zod.null()
-				])
-				.optional(),
-			solver: zod.union([zod.string(), zod.null()]).optional(),
-			solver_options: zod
-				.union([
-					zod.record(zod.string(), zod.union([zod.number(), zod.string(), zod.boolean()])),
-					zod.null()
-				])
-				.optional(),
-			preference: zod
-				.object({
-					preference_type: zod
-						.literal('reference_point')
-						.default(deleteProblemProblemProblemIdDeleteBodyOnePreferencePreferenceTypeDefault),
-					aspiration_levels: zod.record(zod.string(), zod.number())
-				})
-				.optional()
-				.describe('Model for representing a reference point type of preference.')
-		})
-		.describe('Model of the request to the reference point method.'),
-	zod
-		.object({
-			problem_id: zod.number(),
-			session_id: zod.union([zod.number(), zod.null()]).optional(),
-			parent_state_id: zod.union([zod.number(), zod.null()]).optional(),
-			representative_solutions_id: zod
-				.number()
-				.describe('The id of the representative solutions to be used.'),
-			current_iteration: zod.number().describe('The number of the current iteration.'),
-			iterations_left: zod.number().describe('The number of iterations left.'),
-			selected_point: zod
-				.union([zod.record(zod.string(), zod.number()), zod.null()])
-				.describe(
-					'The selected intermediate point. If first iteration, set this to be the (approximated) nadir point. If not set, then the point is assumed to be the nadir point of the current approximating set.'
-				),
-			reachable_point_indices: zod
-				.array(zod.number())
-				.describe(
-					'The indices indicating the point on the non-dominated set that are reachable from the currently selected point.'
-				),
-			number_of_intermediate_points: zod
-				.number()
-				.describe('The number of intermediate points to be generated.')
-		})
-		.describe('Model of the request to the E-NAUTILUS method.'),
-	zod
-		.object({
-			name: zod.string(),
-			description: zod.union([zod.string(), zod.null()]).optional(),
-			solution_data: zod.record(zod.string(), zod.array(zod.number())),
-			ideal: zod.record(zod.string(), zod.number()),
-			nadir: zod.record(zod.string(), zod.number()),
-			problem_id: zod.number()
-		})
-		.describe('Model of the request to the representative solution set.'),
-	zod
-		.object({
-			info: zod.union([zod.string(), zod.null()]).optional()
-		})
-		.describe('Model of the request to create a new session.'),
-	zod.null()
-]);
-
 /**
  * Return a Problem as a serialized JSON object suitable for download/re-upload.
  * @summary Get Problem Json
  */
 export const GetProblemJsonProblemProblemIdJsonGetParams = zod.object({
-	problem_id: zod.number()
+	problem_id: zod.union([zod.number(), zod.null()])
 });
 
 export const getProblemJsonProblemProblemIdJsonGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
@@ -3266,16 +3573,6 @@ export const GetProblemJsonProblemProblemIdJsonGetBody = zod.union([
 				.describe('The number of intermediate points to be generated.')
 		})
 		.describe('Model of the request to the E-NAUTILUS method.'),
-	zod
-		.object({
-			name: zod.string(),
-			description: zod.union([zod.string(), zod.null()]).optional(),
-			solution_data: zod.record(zod.string(), zod.array(zod.number())),
-			ideal: zod.record(zod.string(), zod.number()),
-			nadir: zod.record(zod.string(), zod.number()),
-			problem_id: zod.number()
-		})
-		.describe('Model of the request to the representative solution set.'),
 	zod
 		.object({
 			info: zod.union([zod.string(), zod.null()]).optional()
@@ -3290,6 +3587,10 @@ export const GetProblemJsonProblemProblemIdJsonGetResponse = zod.unknown();
  * Creates a new interactive session.
  * @summary Create New Session
  */
+export const CreateNewSessionSessionNewPostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const CreateNewSessionSessionNewPostBody = zod
 	.object({
 		info: zod.union([zod.string(), zod.null()]).optional()
@@ -3356,6 +3657,10 @@ Returns:
         once.
  * @summary Solve Solutions
  */
+export const SolveSolutionsMethodRpmSolvePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const solveSolutionsMethodRpmSolvePostBodyPreferencePreferenceTypeDefault = `reference_point`;
 
 export const SolveSolutionsMethodRpmSolvePostBody = zod
@@ -3471,6 +3776,10 @@ export const SolveSolutionsMethodRpmSolvePostResponse = zod
  * Solve the problem using the NIMBUS method.
  * @summary Solve Solutions
  */
+export const SolveSolutionsMethodNimbusSolvePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const solveSolutionsMethodNimbusSolvePostBodyPreferencePreferenceTypeDefault = `reference_point`;
 export const solveSolutionsMethodNimbusSolvePostBodyNumDesiredDefault = 1;
 
@@ -3641,6 +3950,10 @@ export const SolveSolutionsMethodNimbusSolvePostResponse = zod
  * Initialize the problem for the NIMBUS method.
  * @summary Initialize
  */
+export const InitializeMethodNimbusInitializePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const initializeMethodNimbusInitializePostBodyStartingPointOnePreferenceTypeDefault = `reference_point`;
 
 export const InitializeMethodNimbusInitializePostBody = zod
@@ -3808,6 +4121,10 @@ export const InitializeMethodNimbusInitializePostResponse = zod
  * Save solutions.
  * @summary Save
  */
+export const SaveMethodNimbusSavePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const SaveMethodNimbusSavePostBody = zod
 	.object({
 		problem_id: zod.number(),
@@ -3845,6 +4162,10 @@ export const SaveMethodNimbusSavePostResponse = zod
  * Solve intermediate solutions by forwarding the request to generic intermediate endpoint with context nimbus.
  * @summary Solve Nimbus Intermediate
  */
+export const SolveNimbusIntermediateMethodNimbusIntermediatePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const solveNimbusIntermediateMethodNimbusIntermediatePostBodyNumDesiredDefault = 1;
 
 export const SolveNimbusIntermediateMethodNimbusIntermediatePostBody = zod
@@ -4019,6 +4340,10 @@ export const SolveNimbusIntermediateMethodNimbusIntermediatePostResponse = zod
  * Get the latest NIMBUS state if it exists, or initialize a new one if it doesn't.
  * @summary Get Or Initialize
  */
+export const GetOrInitializeMethodNimbusGetOrInitializePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const getOrInitializeMethodNimbusGetOrInitializePostBodyStartingPointOnePreferenceTypeDefault = `reference_point`;
 
 export const GetOrInitializeMethodNimbusGetOrInitializePostBody = zod
@@ -4547,6 +4872,10 @@ Returns:
     NIMBUSFinalizeResponse: Response containing info on the final solution.
  * @summary Finalize Nimbus
  */
+export const FinalizeNimbusMethodNimbusFinalizePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const FinalizeNimbusMethodNimbusFinalizePostBody = zod
 	.object({
 		problem_id: zod.number(),
@@ -4690,6 +5019,10 @@ Returns:
     NIMBUSDeleteSaveResponse: Response acknowledging the deletion of save and other useful info.
  * @summary Delete Save
  */
+export const DeleteSaveMethodNimbusDeleteSavePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const DeleteSaveMethodNimbusDeleteSavePostBody = zod
 	.object({
 		state_id: zod.number().describe('The ID of the save state.'),
@@ -4718,6 +5051,10 @@ Args:
     context (Annotated[SessionContext, Depends]): The session context.
  * @summary Solve Intermediate
  */
+export const SolveIntermediateMethodGenericIntermediatePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const solveIntermediateMethodGenericIntermediatePostBodyNumDesiredDefault = 1;
 
 export const SolveIntermediateMethodGenericIntermediatePostBody = zod
@@ -4948,6 +5285,10 @@ Returns:
     UtopiaResponse: the map for the forest, to be rendered in frontend
  * @summary Get Utopia Data
  */
+export const GetUtopiaDataUtopiaPostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const GetUtopiaDataUtopiaPostBody = zod
 	.object({
 		problem_id: zod.number().describe('Problem for which the map is generated'),
@@ -5677,6 +6018,10 @@ export const RevertIterationGnimbusRevertIterationPostResponse = zod.unknown();
  * Steps the E-NAUTILUS method.
  * @summary Step
  */
+export const StepMethodEnautilusStepPostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const StepMethodEnautilusStepPostBody = zod
 	.object({
 		problem_id: zod.number(),
@@ -5909,6 +6254,10 @@ Raises:
     HTTPException: 404 if referenced states/solutions not found.
  * @summary Finalize Enautilus
  */
+export const FinalizeEnautilusMethodEnautilusFinalizePostQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const FinalizeEnautilusMethodEnautilusFinalizePostBody = zod
 	.object({
 		problem_id: zod.number(),
@@ -6002,6 +6351,10 @@ export const GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams = zod.ob
 	session_id: zod.number()
 });
 
+export const GetSessionTreeMethodEnautilusSessionTreeSessionIdGetQueryParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()]).optional()
+});
+
 export const getSessionTreeMethodEnautilusSessionTreeSessionIdGetBodyOnePreferencePreferenceTypeDefault = `reference_point`;
 
 export const GetSessionTreeMethodEnautilusSessionTreeSessionIdGetBody = zod.union([
@@ -6061,16 +6414,6 @@ export const GetSessionTreeMethodEnautilusSessionTreeSessionIdGetBody = zod.unio
 				.describe('The number of intermediate points to be generated.')
 		})
 		.describe('Model of the request to the E-NAUTILUS method.'),
-	zod
-		.object({
-			name: zod.string(),
-			description: zod.union([zod.string(), zod.null()]).optional(),
-			solution_data: zod.record(zod.string(), zod.array(zod.number())),
-			ideal: zod.record(zod.string(), zod.number()),
-			nadir: zod.record(zod.string(), zod.number()),
-			problem_id: zod.number()
-		})
-		.describe('Model of the request to the representative solution set.'),
 	zod
 		.object({
 			info: zod.union([zod.string(), zod.null()]).optional()
@@ -6256,6 +6599,103 @@ export const SimulateMethodEnautilusSimulatePostResponse = zod
 	})
 	.describe('Result of greedy E-NAUTILUS simulation.');
 
+/**
+ * Store site selection metadata for a problem.
+
+The authenticated user must own the problem.
+ * @summary Load Metadata
+ */
+export const loadMetadataSiteSelectionLoadMetadataPostBodyCoverageThresholdDefault = 15;
+
+export const LoadMetadataSiteSelectionLoadMetadataPostBody = zod
+	.object({
+		problem_id: zod.number(),
+		sites: zod.array(zod.record(zod.string(), zod.unknown())),
+		nodes: zod.array(zod.record(zod.string(), zod.unknown())),
+		travel_time_matrix: zod.array(zod.array(zod.number())),
+		site_variable_symbols: zod.array(zod.string()),
+		coverage_variable_symbols: zod.union([zod.array(zod.string()), zod.null()]).optional(),
+		coverage_threshold: zod
+			.number()
+			.default(loadMetadataSiteSelectionLoadMetadataPostBodyCoverageThresholdDefault)
+	})
+	.describe('Request body for loading site selection metadata.');
+
+export const loadMetadataSiteSelectionLoadMetadataPostResponseMetadataTypeDefault = `site_selection_metadata`;
+export const loadMetadataSiteSelectionLoadMetadataPostResponseCoverageThresholdDefault = 15;
+
+export const LoadMetadataSiteSelectionLoadMetadataPostResponse = zod
+	.object({
+		id: zod.union([zod.number(), zod.null()]).optional(),
+		metadata_id: zod.union([zod.number(), zod.null()]).optional(),
+		metadata_type: zod
+			.string()
+			.default(loadMetadataSiteSelectionLoadMetadataPostResponseMetadataTypeDefault),
+		sites_json: zod
+			.string()
+			.describe('JSON array: [{name, node, lat, lon}, ...] one per site variable'),
+		nodes_json: zod.string().describe('JSON array: [{name, lat, lon, size}, ...] one per map node'),
+		travel_time_matrix_json: zod
+			.string()
+			.describe('JSON: 2D list[list[float]], shape [n_nodes, n_nodes]'),
+		site_variable_symbols: zod
+			.array(zod.string())
+			.describe('Ordered list of site variable symbols matching sites_json positions'),
+		coverage_variable_symbols: zod
+			.union([zod.array(zod.string()), zod.null()])
+			.optional()
+			.describe('Ordered list of coverage variable symbols matching nodes_json positions, or None'),
+		coverage_threshold: zod
+			.number()
+			.default(loadMetadataSiteSelectionLoadMetadataPostResponseCoverageThresholdDefault)
+			.describe('Threshold for coverage edges (e.g., minutes, km)')
+	})
+	.describe(
+		'A problem metadata class to hold site selection problem specific information.\n\nStores geographic data and variable mappings needed to visualize binary\nsite-selection solutions on a map (e.g., clinic placement, facility location).'
+	);
+
+/**
+ * Build Leaflet-compatible map data from a site selection solution.
+
+Reads site selection metadata from the DB and extracts variable values
+from the provided solution to determine node colors and coverage edges.
+ * @summary Build Map
+ */
+export const BuildMapSiteSelectionMapPostBody = zod
+	.object({
+		problem_id: zod.number(),
+		optimal_variables: zod.record(zod.string(), zod.unknown())
+	})
+	.describe('Request body for building the site selection map.');
+
+export const BuildMapSiteSelectionMapPostResponse = zod
+	.object({
+		nodes: zod.array(
+			zod
+				.object({
+					name: zod.string(),
+					lat: zod.number(),
+					lon: zod.number(),
+					size: zod.number(),
+					color: zod.string(),
+					tooltip: zod.string()
+				})
+				.describe('A node marker on the map.')
+		),
+		edges: zod.array(
+			zod
+				.object({
+					from_lat: zod.number(),
+					from_lon: zod.number(),
+					to_lat: zod.number(),
+					to_lon: zod.number()
+				})
+				.describe('A coverage connection edge between two nodes.')
+		),
+		center: zod.array(zod.number())
+	})
+	.describe('Response body for the site selection map endpoint.');
+
 /**
  * Vote for a band using this endpoint.
 
diff --git a/webui/src/lib/gen/models/AddProblemJsonProblemAddJsonPostParams.ts b/webui/src/lib/gen/models/AddProblemJsonProblemAddJsonPostParams.ts
new file mode 100644
index 000000000..0ddce9a40
--- /dev/null
+++ b/webui/src/lib/gen/models/AddProblemJsonProblemAddJsonPostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type AddProblemJsonProblemAddJsonPostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/AddProblemProblemAddPostParams.ts b/webui/src/lib/gen/models/AddProblemProblemAddPostParams.ts
new file mode 100644
index 000000000..d5dac0837
--- /dev/null
+++ b/webui/src/lib/gen/models/AddProblemProblemAddPostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type AddProblemProblemAddPostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/BodyAddProblemJsonProblemAddJsonPost.ts b/webui/src/lib/gen/models/BodyAddProblemJsonProblemAddJsonPost.ts
index 2d99ba70f..4ed522d34 100644
--- a/webui/src/lib/gen/models/BodyAddProblemJsonProblemAddJsonPost.ts
+++ b/webui/src/lib/gen/models/BodyAddProblemJsonProblemAddJsonPost.ts
@@ -7,15 +7,9 @@
  */
 import type { CreateSessionRequest } from './CreateSessionRequest';
 import type { ENautilusStepRequest } from './ENautilusStepRequest';
-import type { RepresentativeSolutionSetRequest } from './RepresentativeSolutionSetRequest';
 import type { RPMSolveRequest } from './RPMSolveRequest';
 
 export interface BodyAddProblemJsonProblemAddJsonPost {
 	json_file: Blob;
-	request?:
-		| RPMSolveRequest
-		| ENautilusStepRequest
-		| RepresentativeSolutionSetRequest
-		| CreateSessionRequest
-		| null;
+	request?: RPMSolveRequest | ENautilusStepRequest | CreateSessionRequest | null;
 }
diff --git a/webui/src/lib/gen/models/CreateNewSessionSessionNewPostParams.ts b/webui/src/lib/gen/models/CreateNewSessionSessionNewPostParams.ts
new file mode 100644
index 000000000..dd0f91dea
--- /dev/null
+++ b/webui/src/lib/gen/models/CreateNewSessionSessionNewPostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type CreateNewSessionSessionNewPostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams.ts b/webui/src/lib/gen/models/DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams.ts
new file mode 100644
index 000000000..67ec4e2b2
--- /dev/null
+++ b/webui/src/lib/gen/models/DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/DeleteSaveMethodNimbusDeleteSavePostParams.ts b/webui/src/lib/gen/models/DeleteSaveMethodNimbusDeleteSavePostParams.ts
new file mode 100644
index 000000000..8bf1e9e0d
--- /dev/null
+++ b/webui/src/lib/gen/models/DeleteSaveMethodNimbusDeleteSavePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type DeleteSaveMethodNimbusDeleteSavePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/FinalizeEnautilusMethodEnautilusFinalizePostParams.ts b/webui/src/lib/gen/models/FinalizeEnautilusMethodEnautilusFinalizePostParams.ts
new file mode 100644
index 000000000..f5005fe43
--- /dev/null
+++ b/webui/src/lib/gen/models/FinalizeEnautilusMethodEnautilusFinalizePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type FinalizeEnautilusMethodEnautilusFinalizePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/FinalizeNimbusMethodNimbusFinalizePostParams.ts b/webui/src/lib/gen/models/FinalizeNimbusMethodNimbusFinalizePostParams.ts
new file mode 100644
index 000000000..aa9c01e4a
--- /dev/null
+++ b/webui/src/lib/gen/models/FinalizeNimbusMethodNimbusFinalizePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type FinalizeNimbusMethodNimbusFinalizePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/GetMetadataProblemGetMetadataPostParams.ts b/webui/src/lib/gen/models/GetMetadataProblemGetMetadataPostParams.ts
new file mode 100644
index 000000000..3f6d3a730
--- /dev/null
+++ b/webui/src/lib/gen/models/GetMetadataProblemGetMetadataPostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type GetMetadataProblemGetMetadataPostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/GetOrInitializeMethodNimbusGetOrInitializePostParams.ts b/webui/src/lib/gen/models/GetOrInitializeMethodNimbusGetOrInitializePostParams.ts
new file mode 100644
index 000000000..b8e7efa6e
--- /dev/null
+++ b/webui/src/lib/gen/models/GetOrInitializeMethodNimbusGetOrInitializePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type GetOrInitializeMethodNimbusGetOrInitializePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams.ts b/webui/src/lib/gen/models/GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams.ts
new file mode 100644
index 000000000..f58e4808a
--- /dev/null
+++ b/webui/src/lib/gen/models/GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams.ts b/webui/src/lib/gen/models/GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams.ts
new file mode 100644
index 000000000..5a54dc4cb
--- /dev/null
+++ b/webui/src/lib/gen/models/GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/GetUtopiaDataUtopiaPostParams.ts b/webui/src/lib/gen/models/GetUtopiaDataUtopiaPostParams.ts
new file mode 100644
index 000000000..8000fad89
--- /dev/null
+++ b/webui/src/lib/gen/models/GetUtopiaDataUtopiaPostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type GetUtopiaDataUtopiaPostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/InitializeMethodNimbusInitializePostParams.ts b/webui/src/lib/gen/models/InitializeMethodNimbusInitializePostParams.ts
new file mode 100644
index 000000000..32e918344
--- /dev/null
+++ b/webui/src/lib/gen/models/InitializeMethodNimbusInitializePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type InitializeMethodNimbusInitializePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/ProblemMetaDataPublic.ts b/webui/src/lib/gen/models/ProblemMetaDataPublic.ts
index dfc857df5..4f8b41ed3 100644
--- a/webui/src/lib/gen/models/ProblemMetaDataPublic.ts
+++ b/webui/src/lib/gen/models/ProblemMetaDataPublic.ts
@@ -7,6 +7,7 @@
  */
 import type { ForestProblemMetaData } from './ForestProblemMetaData';
 import type { RepresentativeNonDominatedSolutions } from './RepresentativeNonDominatedSolutions';
+import type { SiteSelectionMetaData } from './SiteSelectionMetaData';
 
 /**
  * Response model for ProblemMetaData.
@@ -15,4 +16,5 @@ export interface ProblemMetaDataPublic {
 	problem_id: number;
 	forest_metadata: ForestProblemMetaData[] | null;
 	representative_nd_metadata: RepresentativeNonDominatedSolutions[] | null;
+	site_selection_metadata: SiteSelectionMetaData[] | null;
 }
diff --git a/webui/src/lib/gen/models/RepresentativeSolutionSetBase.ts b/webui/src/lib/gen/models/RepresentativeSolutionSetBase.ts
new file mode 100644
index 000000000..47c1e5e27
--- /dev/null
+++ b/webui/src/lib/gen/models/RepresentativeSolutionSetBase.ts
@@ -0,0 +1,21 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+import type { RepresentativeSolutionSetBaseIdeal } from './RepresentativeSolutionSetBaseIdeal';
+import type { RepresentativeSolutionSetBaseNadir } from './RepresentativeSolutionSetBaseNadir';
+import type { RepresentativeSolutionSetBaseSolutionData } from './RepresentativeSolutionSetBaseSolutionData';
+
+/**
+ * Shared base model for representative solution sets.
+ */
+export interface RepresentativeSolutionSetBase {
+	name: string;
+	description?: string | null;
+	solution_data: RepresentativeSolutionSetBaseSolutionData;
+	ideal: RepresentativeSolutionSetBaseIdeal;
+	nadir: RepresentativeSolutionSetBaseNadir;
+}
diff --git a/webui/src/lib/gen/models/RepresentativeSolutionSetBaseIdeal.ts b/webui/src/lib/gen/models/RepresentativeSolutionSetBaseIdeal.ts
new file mode 100644
index 000000000..d56478078
--- /dev/null
+++ b/webui/src/lib/gen/models/RepresentativeSolutionSetBaseIdeal.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type RepresentativeSolutionSetBaseIdeal = { [key: string]: number };
diff --git a/webui/src/lib/gen/models/RepresentativeSolutionSetBaseNadir.ts b/webui/src/lib/gen/models/RepresentativeSolutionSetBaseNadir.ts
new file mode 100644
index 000000000..2b14288c6
--- /dev/null
+++ b/webui/src/lib/gen/models/RepresentativeSolutionSetBaseNadir.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type RepresentativeSolutionSetBaseNadir = { [key: string]: number };
diff --git a/webui/src/lib/gen/models/RepresentativeSolutionSetBaseSolutionData.ts b/webui/src/lib/gen/models/RepresentativeSolutionSetBaseSolutionData.ts
new file mode 100644
index 000000000..b70621bc6
--- /dev/null
+++ b/webui/src/lib/gen/models/RepresentativeSolutionSetBaseSolutionData.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type RepresentativeSolutionSetBaseSolutionData = { [key: string]: number[] };
diff --git a/webui/src/lib/gen/models/SaveMethodNimbusSavePostParams.ts b/webui/src/lib/gen/models/SaveMethodNimbusSavePostParams.ts
new file mode 100644
index 000000000..c155c9b38
--- /dev/null
+++ b/webui/src/lib/gen/models/SaveMethodNimbusSavePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SaveMethodNimbusSavePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/SelectSolverProblemAssignSolverPostParams.ts b/webui/src/lib/gen/models/SelectSolverProblemAssignSolverPostParams.ts
new file mode 100644
index 000000000..e2e485ad1
--- /dev/null
+++ b/webui/src/lib/gen/models/SelectSolverProblemAssignSolverPostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SelectSolverProblemAssignSolverPostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/SiteSelectionMapEdge.ts b/webui/src/lib/gen/models/SiteSelectionMapEdge.ts
new file mode 100644
index 000000000..9c57ea2fe
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMapEdge.ts
@@ -0,0 +1,17 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * A coverage connection edge between two nodes.
+ */
+export interface SiteSelectionMapEdge {
+	from_lat: number;
+	from_lon: number;
+	to_lat: number;
+	to_lon: number;
+}
diff --git a/webui/src/lib/gen/models/SiteSelectionMapNode.ts b/webui/src/lib/gen/models/SiteSelectionMapNode.ts
new file mode 100644
index 000000000..1d17684df
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMapNode.ts
@@ -0,0 +1,19 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * A node marker on the map.
+ */
+export interface SiteSelectionMapNode {
+	name: string;
+	lat: number;
+	lon: number;
+	size: number;
+	color: string;
+	tooltip: string;
+}
diff --git a/webui/src/lib/gen/models/SiteSelectionMapRequest.ts b/webui/src/lib/gen/models/SiteSelectionMapRequest.ts
new file mode 100644
index 000000000..a9a662a9a
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMapRequest.ts
@@ -0,0 +1,16 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+import type { SiteSelectionMapRequestOptimalVariables } from './SiteSelectionMapRequestOptimalVariables';
+
+/**
+ * Request body for building the site selection map.
+ */
+export interface SiteSelectionMapRequest {
+	problem_id: number;
+	optimal_variables: SiteSelectionMapRequestOptimalVariables;
+}
diff --git a/webui/src/lib/gen/models/SiteSelectionMapRequestOptimalVariables.ts b/webui/src/lib/gen/models/SiteSelectionMapRequestOptimalVariables.ts
new file mode 100644
index 000000000..f43dfc10c
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMapRequestOptimalVariables.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SiteSelectionMapRequestOptimalVariables = { [key: string]: unknown };
diff --git a/webui/src/lib/gen/models/SiteSelectionMapResponse.ts b/webui/src/lib/gen/models/SiteSelectionMapResponse.ts
new file mode 100644
index 000000000..231123d74
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMapResponse.ts
@@ -0,0 +1,18 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+import type { SiteSelectionMapEdge } from './SiteSelectionMapEdge';
+import type { SiteSelectionMapNode } from './SiteSelectionMapNode';
+
+/**
+ * Response body for the site selection map endpoint.
+ */
+export interface SiteSelectionMapResponse {
+	nodes: SiteSelectionMapNode[];
+	edges: SiteSelectionMapEdge[];
+	center: number[];
+}
diff --git a/webui/src/lib/gen/models/SiteSelectionMetaData.ts b/webui/src/lib/gen/models/SiteSelectionMetaData.ts
new file mode 100644
index 000000000..88a3562d5
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMetaData.ts
@@ -0,0 +1,31 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * A problem metadata class to hold site selection problem specific information.
+
+Stores geographic data and variable mappings needed to visualize binary
+site-selection solutions on a map (e.g., clinic placement, facility location).
+ */
+export interface SiteSelectionMetaData {
+	id?: number | null;
+	metadata_id?: number | null;
+	metadata_type?: string;
+	/** JSON array: [{name, node, lat, lon}, ...] one per site variable */
+	sites_json: string;
+	/** JSON array: [{name, lat, lon, size}, ...] one per map node */
+	nodes_json: string;
+	/** JSON: 2D list[list[float]], shape [n_nodes, n_nodes] */
+	travel_time_matrix_json: string;
+	/** Ordered list of site variable symbols matching sites_json positions */
+	site_variable_symbols: string[];
+	/** Ordered list of coverage variable symbols matching nodes_json positions, or None */
+	coverage_variable_symbols?: string[] | null;
+	/** Threshold for coverage edges (e.g., minutes, km) */
+	coverage_threshold?: number;
+}
diff --git a/webui/src/lib/gen/models/SiteSelectionMetaDataRequest.ts b/webui/src/lib/gen/models/SiteSelectionMetaDataRequest.ts
new file mode 100644
index 000000000..043965f23
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMetaDataRequest.ts
@@ -0,0 +1,22 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+import type { SiteSelectionMetaDataRequestNodesItem } from './SiteSelectionMetaDataRequestNodesItem';
+import type { SiteSelectionMetaDataRequestSitesItem } from './SiteSelectionMetaDataRequestSitesItem';
+
+/**
+ * Request body for loading site selection metadata.
+ */
+export interface SiteSelectionMetaDataRequest {
+	problem_id: number;
+	sites: SiteSelectionMetaDataRequestSitesItem[];
+	nodes: SiteSelectionMetaDataRequestNodesItem[];
+	travel_time_matrix: number[][];
+	site_variable_symbols: string[];
+	coverage_variable_symbols?: string[] | null;
+	coverage_threshold?: number;
+}
diff --git a/webui/src/lib/gen/models/SiteSelectionMetaDataRequestNodesItem.ts b/webui/src/lib/gen/models/SiteSelectionMetaDataRequestNodesItem.ts
new file mode 100644
index 000000000..fe71fe984
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMetaDataRequestNodesItem.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SiteSelectionMetaDataRequestNodesItem = { [key: string]: unknown };
diff --git a/webui/src/lib/gen/models/SiteSelectionMetaDataRequestSitesItem.ts b/webui/src/lib/gen/models/SiteSelectionMetaDataRequestSitesItem.ts
new file mode 100644
index 000000000..cd27e5884
--- /dev/null
+++ b/webui/src/lib/gen/models/SiteSelectionMetaDataRequestSitesItem.ts
@@ -0,0 +1,9 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SiteSelectionMetaDataRequestSitesItem = { [key: string]: unknown };
diff --git a/webui/src/lib/gen/models/SolveIntermediateMethodGenericIntermediatePostParams.ts b/webui/src/lib/gen/models/SolveIntermediateMethodGenericIntermediatePostParams.ts
new file mode 100644
index 000000000..53eace1d3
--- /dev/null
+++ b/webui/src/lib/gen/models/SolveIntermediateMethodGenericIntermediatePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SolveIntermediateMethodGenericIntermediatePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/SolveNimbusIntermediateMethodNimbusIntermediatePostParams.ts b/webui/src/lib/gen/models/SolveNimbusIntermediateMethodNimbusIntermediatePostParams.ts
new file mode 100644
index 000000000..d00fd1d4d
--- /dev/null
+++ b/webui/src/lib/gen/models/SolveNimbusIntermediateMethodNimbusIntermediatePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SolveNimbusIntermediateMethodNimbusIntermediatePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/SolveSolutionsMethodNimbusSolvePostParams.ts b/webui/src/lib/gen/models/SolveSolutionsMethodNimbusSolvePostParams.ts
new file mode 100644
index 000000000..687e52aed
--- /dev/null
+++ b/webui/src/lib/gen/models/SolveSolutionsMethodNimbusSolvePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SolveSolutionsMethodNimbusSolvePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/SolveSolutionsMethodRpmSolvePostParams.ts b/webui/src/lib/gen/models/SolveSolutionsMethodRpmSolvePostParams.ts
new file mode 100644
index 000000000..5eff0d36f
--- /dev/null
+++ b/webui/src/lib/gen/models/SolveSolutionsMethodRpmSolvePostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type SolveSolutionsMethodRpmSolvePostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/StepMethodEnautilusStepPostParams.ts b/webui/src/lib/gen/models/StepMethodEnautilusStepPostParams.ts
new file mode 100644
index 000000000..332a3f69d
--- /dev/null
+++ b/webui/src/lib/gen/models/StepMethodEnautilusStepPostParams.ts
@@ -0,0 +1,11 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+export type StepMethodEnautilusStepPostParams = {
+	problem_id?: number | null;
+};
diff --git a/webui/src/lib/gen/models/index.ts b/webui/src/lib/gen/models/index.ts
index f697e2bca..b73e9e2f8 100644
--- a/webui/src/lib/gen/models/index.ts
+++ b/webui/src/lib/gen/models/index.ts
@@ -6,6 +6,8 @@
  * OpenAPI spec version: 0.1.0
  */
 
+export * from './AddProblemJsonProblemAddJsonPostParams';
+export * from './AddProblemProblemAddPostParams';
 export * from './BodyAddNewAnalystAddNewAnalystPost';
 export * from './BodyAddNewDmAddNewDmPost';
 export * from './BodyAddProblemJsonProblemAddJsonPost';
@@ -14,9 +16,12 @@ export * from './ConfigureGdmGdmScoreBandsConfigurePostParams';
 export * from './ConstantDB';
 export * from './ConstraintDB';
 export * from './ConstraintTypeEnum';
+export * from './CreateNewSessionSessionNewPostParams';
 export * from './CreateSessionRequest';
 export * from './CustomClusterOptions';
 export * from './DBSCANOptions';
+export * from './DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams';
+export * from './DeleteSaveMethodNimbusDeleteSavePostParams';
 export * from './DimensionClusterOptions';
 export * from './DimensionClusterOptionsKind';
 export * from './DiscreteRepresentationDB';
@@ -52,6 +57,8 @@ export * from './ENautilusTreeNodeResponseSelectedPoint';
 export * from './EndProcessPreference';
 export * from './EndProcessPreferenceSetPreferences';
 export * from './ExtraFunctionDB';
+export * from './FinalizeEnautilusMethodEnautilusFinalizePostParams';
+export * from './FinalizeNimbusMethodNimbusFinalizePostParams';
 export * from './ForestProblemMetaData';
 export * from './ForestProblemMetaDataScheduleDict';
 export * from './ForestProblemMetaDataStandDescriptor';
@@ -69,6 +76,11 @@ export * from './GDMSCOREBandsResponse';
 export * from './GDMSCOREBandsRevertRequest';
 export * from './GDMScoreBandsVoteRequest';
 export * from './GenericIntermediateSolutionResponse';
+export * from './GetMetadataProblemGetMetadataPostParams';
+export * from './GetOrInitializeMethodNimbusGetOrInitializePostParams';
+export * from './GetRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdGetParams';
+export * from './GetSessionTreeMethodEnautilusSessionTreeSessionIdGetParams';
+export * from './GetUtopiaDataUtopiaPostParams';
 export * from './GMMOptions';
 export * from './GMMOptionsScoringMethod';
 export * from './GNIMBUSAllIterationsResponse';
@@ -81,6 +93,7 @@ export * from './GroupModifyRequest';
 export * from './GroupPublic';
 export * from './GroupRevertRequest';
 export * from './HTTPValidationError';
+export * from './InitializeMethodNimbusInitializePostParams';
 export * from './InteractiveSessionBase';
 export * from './IntermediateSolutionRequest';
 export * from './IntermediateSolutionRequestScalarizationOptions';
@@ -110,7 +123,6 @@ export * from './ObjectiveDB';
 export * from './ObjectiveTypeEnum';
 export * from './OptimizationPreference';
 export * from './OptimizationPreferenceSetPreferences';
-export * from './ProblemGetRequest';
 export * from './ProblemInfo';
 export * from './ProblemInfoSmall';
 export * from './ProblemMetaDataGetRequest';
@@ -122,16 +134,17 @@ export * from './RepresentativeNonDominatedSolutions';
 export * from './RepresentativeNonDominatedSolutionsIdeal';
 export * from './RepresentativeNonDominatedSolutionsNadir';
 export * from './RepresentativeNonDominatedSolutionsSolutionData';
-export * from './RepresentativeSolutionSetRequest';
-export * from './RepresentativeSolutionSetRequestIdeal';
-export * from './RepresentativeSolutionSetRequestNadir';
-export * from './RepresentativeSolutionSetRequestSolutionData';
+export * from './RepresentativeSolutionSetBase';
+export * from './RepresentativeSolutionSetBaseIdeal';
+export * from './RepresentativeSolutionSetBaseNadir';
+export * from './RepresentativeSolutionSetBaseSolutionData';
 export * from './RPMSolveRequest';
 export * from './RPMSolveRequestScalarizationOptions';
 export * from './RPMSolveRequestSolverOptions';
 export * from './RPMState';
 export * from './RPMStateScalarizationOptions';
 export * from './RPMStateSolverOptions';
+export * from './SaveMethodNimbusSavePostParams';
 export * from './ScalarizationFunctionDB';
 export * from './SCOREBandsConfig';
 export * from './SCOREBandsConfigAxisPositions';
@@ -146,8 +159,18 @@ export * from './SCOREBandsResultAxisPositions';
 export * from './SCOREBandsResultBands';
 export * from './SCOREBandsResultCardinalities';
 export * from './SCOREBandsResultMedians';
+export * from './SelectSolverProblemAssignSolverPostParams';
 export * from './SimulatorDB';
 export * from './SimulatorDBParameterOptions';
+export * from './SiteSelectionMapEdge';
+export * from './SiteSelectionMapNode';
+export * from './SiteSelectionMapRequest';
+export * from './SiteSelectionMapRequestOptimalVariables';
+export * from './SiteSelectionMapResponse';
+export * from './SiteSelectionMetaData';
+export * from './SiteSelectionMetaDataRequest';
+export * from './SiteSelectionMetaDataRequestNodesItem';
+export * from './SiteSelectionMetaDataRequestSitesItem';
 export * from './SolutionInfo';
 export * from './SolutionReference';
 export * from './SolutionReferenceLite';
@@ -159,6 +182,8 @@ export * from './SolutionReferenceResponseObjectiveValues';
 export * from './SolutionReferenceResponseVariableValues';
 export * from './SolutionReferenceVariableValues';
 export * from './SolutionReferenceVariableValuesAllItem';
+export * from './SolveIntermediateMethodGenericIntermediatePostParams';
+export * from './SolveNimbusIntermediateMethodNimbusIntermediatePostParams';
 export * from './SolverResults';
 export * from './SolverResultsConstraintValues';
 export * from './SolverResultsExtraFuncValues';
@@ -166,7 +191,10 @@ export * from './SolverResultsOptimalObjectives';
 export * from './SolverResultsOptimalVariables';
 export * from './SolverResultsScalarizationValues';
 export * from './SolverSelectionMetadata';
+export * from './SolveSolutionsMethodNimbusSolvePostParams';
+export * from './SolveSolutionsMethodRpmSolvePostParams';
 export * from './StateDB';
+export * from './StepMethodEnautilusStepPostParams';
 export * from './Tensor';
 export * from './TensorConstantDB';
 export * from './TensorVariableDB';
diff --git a/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte b/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
index 4e05af9a4..1e48e3502 100644
--- a/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
+++ b/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
@@ -14,13 +14,12 @@
 	import Combobox from '$lib/components/ui/combobox/combobox.svelte';
 	import { EndStateView } from '$lib/components/custom/end-state-view';
 	import { DecisionJourney } from '$lib/components/custom/decision-journey';
-	import ClinicMap from '$lib/components/custom/clinic-map/clinic-map.svelte';
+	import SiteSelectionMap from '$lib/components/custom/site-selection-map/site-selection-map.svelte';
 	import type { ENautilusSessionTreeResponse } from '$lib/gen/models';
 
 	import type {
 		ENautilusStepRequest,
 		ENautilusStepResponse,
-		ProblemGetRequest,
 		ProblemInfo
 	} from '$lib/gen/models';
 	import {
@@ -292,8 +291,7 @@
 				isLoading.set(true);
 
 				// fetch problem info
-				const request: ProblemGetRequest = { problem_id: selection.selectedProblemId };
-				const response = await fetch_problem_info(request);
+				const response = await fetch_problem_info(selection.selectedProblemId);
 
 				if (response === null) {
 					console.log('Could not fetch problem.');
@@ -581,7 +579,7 @@
 			// If the loaded state belongs to a different problem, sync it
 			const stateProblemId = state_resp.request.problem_id;
 			if (stateProblemId != null && stateProblemId !== selection.selectedProblemId) {
-				const info = await fetch_problem_info({ problem_id: stateProblemId });
+				const info = await fetch_problem_info(stateProblemId);
 				if (!info) {
 					errorMessage.set("Failed to load problem info for the resumed state.");
 					return;
@@ -710,7 +708,7 @@
 					{/if}
 					{#if finalView === 'map'}
 						{#if finalSolution}
-							<ClinicMap solution={finalSolution} />
+							<SiteSelectionMap problem_id={selection.selectedProblemId} solution={finalSolution} />
 						{:else}
 							<div class="flex h-full items-center justify-center text-sm text-gray-400">
 								No solution available for map.
diff --git a/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts b/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
index 1a1b05df6..ffebd2159 100644
--- a/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
+++ b/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
@@ -1,7 +1,7 @@
-import type { ENautilusRepresentativeSolutionsResponse, ENautilusSessionTreeResponse, ENautilusSimulateResponse, ENautilusStateResponse, ENautilusStepRequest, ENautilusStepResponse, ProblemGetRequest, ProblemInfo } from "$lib/gen/models";
+import type { ENautilusRepresentativeSolutionsResponse, ENautilusSessionTreeResponse, ENautilusSimulateResponse, ENautilusStateResponse, ENautilusStepRequest, ENautilusStepResponse, ProblemInfo } from "$lib/gen/models";
 import type { getRepresentativeMethodEnautilusGetRepresentativeStateIdGetResponse, getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse, getStateMethodEnautilusGetStateStateIdGetResponse, simulateMethodEnautilusSimulatePostResponse, stepMethodEnautilusStepPostResponse } from "$lib/gen/endpoints/DESDEOFastAPI";
-import { stepMethodEnautilusStepPost, getProblemProblemGetPost, getStateMethodEnautilusGetStateStateIdGet, getRepresentativeMethodEnautilusGetRepresentativeStateIdGet, getSessionTreeMethodEnautilusSessionTreeSessionIdGet, simulateMethodEnautilusSimulatePost } from "$lib/gen/endpoints/DESDEOFastAPI";
-import type { getProblemProblemGetPostResponse } from "$lib/gen/endpoints/DESDEOFastAPI";
+import { stepMethodEnautilusStepPost, getProblemProblemProblemIdGet, getStateMethodEnautilusGetStateStateIdGet, getRepresentativeMethodEnautilusGetRepresentativeStateIdGet, getSessionTreeMethodEnautilusSessionTreeSessionIdGet, simulateMethodEnautilusSimulatePost } from "$lib/gen/endpoints/DESDEOFastAPI";
+import type { getProblemProblemProblemIdGetResponse } from "$lib/gen/endpoints/DESDEOFastAPI";
 import { fetch_sessions, create_session } from '../../methods/sessions/handler';
 export { fetch_sessions, create_session };
 
@@ -61,8 +61,8 @@ export async function step_enautilus(
     return {request: request, response: response.data};
 }
 
-export async function fetch_problem_info(request: ProblemGetRequest): Promise<ProblemInfo | null> {
-    const response: getProblemProblemGetPostResponse = await getProblemProblemGetPost(request);
+export async function fetch_problem_info(problem_id: number): Promise<ProblemInfo | null> {
+    const response: getProblemProblemProblemIdGetResponse = await getProblemProblemProblemIdGet(problem_id);
 
     if (response.status != 200) {
         console.log("Could not fetch problem info.", response.status);
diff --git a/webui/src/routes/problems/+page.svelte b/webui/src/routes/problems/+page.svelte
index 1b608a6e9..6cca1632f 100644
--- a/webui/src/routes/problems/+page.svelte
+++ b/webui/src/routes/problems/+page.svelte
@@ -46,7 +46,7 @@
 	import type { components } from '$lib/api/client-types';
 	import { methodSelection } from '../../stores/methodSelection';
 	import { invalidateAll } from '$app/navigation';
-	import { deleteProblem, downloadProblemJson, getAssignedSolver, getAvailableSolvers, assignSolver, addRepresentativeSolutionSet } from './handler';
+	import { deleteProblem, downloadProblemJson, getAssignedSolver, getAvailableSolvers, assignSolver, addRepresentativeSolutionSet, uploadSiteSelectionMetadata } from './handler';
 	import * as Select from '$lib/components/ui/select/index.js';
 	import { Input } from '$lib/components/ui/input/index.js';
 	import { Label } from '$lib/components/ui/label/index.js';
@@ -79,6 +79,76 @@
 	let importSubmitting = $state(false);
 	let fileInputEl = $state<HTMLInputElement | undefined>();
 
+	// Site selection map metadata upload state
+	let mapMetaDialogOpen = $state(false);
+	let mapMetaError = $state('');
+	let mapMetaSubmitting = $state(false);
+	let mapMetaParsed = $state<{
+		sites: { name: string; node: string; lat: number; lon: number }[];
+		nodes: { name: string; lat: number; lon: number; size: number }[];
+		travel_time_matrix: number[][];
+		site_variable_symbols: string[];
+		coverage_variable_symbols: string[] | null;
+		coverage_threshold: number;
+	} | null>(null);
+	let mapMetaFileInputEl = $state<HTMLInputElement | undefined>();
+
+	function handleMapMetaFileSelected(event: Event) {
+		const input = event.target as HTMLInputElement;
+		const file = input.files?.[0];
+		if (!file) return;
+		input.value = '';
+		mapMetaError = '';
+
+		file.text().then((text) => {
+			try {
+				const parsed = JSON.parse(text);
+				if (!parsed.sites || !parsed.nodes || !parsed.travel_time_matrix || !parsed.site_variable_symbols) {
+					mapMetaError = 'JSON must contain: sites, nodes, travel_time_matrix, site_variable_symbols';
+					mapMetaDialogOpen = true;
+					return;
+				}
+				mapMetaParsed = {
+					sites: parsed.sites,
+					nodes: parsed.nodes,
+					travel_time_matrix: parsed.travel_time_matrix,
+					site_variable_symbols: parsed.site_variable_symbols,
+					coverage_variable_symbols: parsed.coverage_variable_symbols ?? null,
+					coverage_threshold: parsed.coverage_threshold ?? 15.0,
+				};
+				mapMetaDialogOpen = true;
+			} catch (e) {
+				mapMetaError = `Failed to parse JSON: ${e instanceof Error ? e.message : String(e)}`;
+				mapMetaDialogOpen = true;
+			}
+		});
+	}
+
+	async function handleMapMetaSubmit() {
+		if (!selectedProblem || !mapMetaParsed) return;
+		mapMetaSubmitting = true;
+		mapMetaError = '';
+		try {
+			const success = await uploadSiteSelectionMetadata({
+				problem_id: selectedProblem.id,
+				...mapMetaParsed,
+			});
+			if (success) {
+				mapMetaDialogOpen = false;
+				mapMetaParsed = null;
+				const problemId = selectedProblem.id;
+				await invalidateAll();
+				selectedProblem = problemList.find((p) => p.id === problemId);
+			} else {
+				mapMetaError = 'Failed to upload metadata. Check the server logs.';
+			}
+		} catch (e) {
+			mapMetaError = `Error: ${e instanceof Error ? e.message : String(e)}`;
+		} finally {
+			mapMetaSubmitting = false;
+		}
+	}
+
 	function computeIdealNadir(solutionData: { [key: string]: number[] }) {
 		const ideal: { [key: string]: number } = {};
 		const nadir: { [key: string]: number } = {};
@@ -180,13 +250,12 @@
 		importSubmitting = true;
 		importError = '';
 		try {
-			const success = await addRepresentativeSolutionSet({
+			const success = await addRepresentativeSolutionSet(selectedProblem.id, {
 				name: importName,
 				description: importDescription || undefined,
 				solution_data: importSolutionData,
 				ideal: importIdeal,
 				nadir: importNadir,
-				problem_id: selectedProblem.id
 			});
 			if (success) {
 				importDialogOpen = false;
@@ -765,6 +834,54 @@
 									{/each}
 								</div>
 							{/if}
+
+							<!-- Site Selection Map Metadata -->
+							{#if selectedProblem.problem_metadata?.site_selection_metadata?.length}
+								<div class="my-4 rounded-lg border border-gray-200 bg-gray-50 p-4 shadow-sm">
+									<h3 class="mb-2 font-semibold">Site Selection Map Metadata</h3>
+									{#each selectedProblem.problem_metadata.site_selection_metadata as meta}
+										<div class="grid w-full grid-cols-2 gap-x-4 gap-y-2">
+											<div class="col-span-2 flex">
+												<div class="w-40 font-semibold">Sites</div>
+												<div class="flex-1">{meta.site_variable_symbols.length} sites configured</div>
+											</div>
+											<div class="col-span-2 border-b border-gray-300"></div>
+											<div class="col-span-2 flex">
+												<div class="w-40 font-semibold">Nodes</div>
+												<div class="flex-1">{JSON.parse(meta.nodes_json).length} map nodes</div>
+											</div>
+											<div class="col-span-2 border-b border-gray-300"></div>
+											<div class="col-span-2 flex">
+												<div class="w-40 font-semibold">Coverage</div>
+												<div class="flex-1">
+													{meta.coverage_variable_symbols
+														? `${meta.coverage_variable_symbols.length} coverage variables`
+														: 'No coverage variables'}
+												</div>
+											</div>
+											<div class="col-span-2 border-b border-gray-300"></div>
+											<div class="col-span-2 flex">
+												<div class="w-40 font-semibold">Threshold</div>
+												<div class="flex-1">{meta.coverage_threshold}</div>
+											</div>
+										</div>
+									{/each}
+								</div>
+							{/if}
+							<input
+								type="file"
+								accept=".json"
+								class="hidden"
+								bind:this={mapMetaFileInputEl}
+								onchange={handleMapMetaFileSelected}
+							/>
+							<Button
+								variant="outline"
+								class="mt-3"
+								onclick={() => mapMetaFileInputEl?.click()}
+							>
+								Upload map metadata
+							</Button>
 						{:else}
 							Select a problem to see details.
 						{/if}
@@ -843,4 +960,66 @@
 </div>
 {/if}
 
+<!-- Upload Site Selection Map Metadata Dialog -->
+{#if mapMetaDialogOpen}
+<!-- svelte-ignore a11y_no_static_element_interactions -->
+<!-- svelte-ignore a11y_click_events_have_key_events -->
+<div class="fixed inset-0 z-50 flex items-center justify-center">
+	<div class="fixed inset-0 bg-black/50" onclick={() => (mapMetaDialogOpen = false)}></div>
+	<div class="bg-background relative z-50 grid w-full max-w-lg gap-4 rounded-lg border p-6 shadow-lg max-h-[80vh] overflow-y-auto">
+		<div>
+			<h2 class="text-lg font-semibold">Upload Site Selection Map Metadata</h2>
+			<p class="text-muted-foreground text-sm">Review the parsed metadata before uploading.</p>
+		</div>
+		<div class="grid gap-4 py-4">
+			{#if mapMetaError}
+				<p class="text-sm text-red-600">{mapMetaError}</p>
+			{/if}
+			{#if mapMetaParsed}
+				<div class="space-y-2 text-sm">
+					<div class="flex justify-between">
+						<span class="font-semibold">Sites</span>
+						<span>{mapMetaParsed.sites.length}</span>
+					</div>
+					<div class="flex justify-between">
+						<span class="font-semibold">Map nodes</span>
+						<span>{mapMetaParsed.nodes.length}</span>
+					</div>
+					<div class="flex justify-between">
+						<span class="font-semibold">Site variables</span>
+						<span>{mapMetaParsed.site_variable_symbols.length}</span>
+					</div>
+					<div class="flex justify-between">
+						<span class="font-semibold">Coverage variables</span>
+						<span>{mapMetaParsed.coverage_variable_symbols?.length ?? 'None'}</span>
+					</div>
+					<div class="flex justify-between">
+						<span class="font-semibold">Coverage threshold</span>
+						<span>{mapMetaParsed.coverage_threshold}</span>
+					</div>
+					<div class="flex justify-between">
+						<span class="font-semibold">Travel time matrix</span>
+						<span>{mapMetaParsed.travel_time_matrix.length} x {mapMetaParsed.travel_time_matrix[0]?.length ?? 0}</span>
+					</div>
+				</div>
+				<details class="text-xs">
+					<summary class="cursor-pointer text-gray-500">Site variable symbols</summary>
+					<pre class="mt-1 max-h-32 overflow-y-auto rounded bg-gray-100 p-2">{mapMetaParsed.site_variable_symbols.join('\n')}</pre>
+				</details>
+				<details class="text-xs">
+					<summary class="cursor-pointer text-gray-500">Node names</summary>
+					<pre class="mt-1 max-h-32 overflow-y-auto rounded bg-gray-100 p-2">{mapMetaParsed.nodes.map(n => n.name).join('\n')}</pre>
+				</details>
+			{/if}
+		</div>
+		<div class="flex justify-end gap-2">
+			<Button variant="outline" onclick={() => (mapMetaDialogOpen = false)}>Cancel</Button>
+			<Button disabled={mapMetaSubmitting || !mapMetaParsed} onclick={handleMapMetaSubmit}>
+				{mapMetaSubmitting ? 'Uploading...' : 'Upload'}
+			</Button>
+		</div>
+	</div>
+</div>
+{/if}
+
 </div>
diff --git a/webui/src/routes/problems/define/handler.ts b/webui/src/routes/problems/define/handler.ts
index 4695cff02..0f1b51627 100644
--- a/webui/src/routes/problems/define/handler.ts
+++ b/webui/src/routes/problems/define/handler.ts
@@ -6,7 +6,7 @@ import type {
 	ProblemInfo,
 	VariableDB
 } from '$lib/gen/models';
-import { addProblemJsonProblemAddJsonPost, addProblemProblemAddPost, getProblemProblemGetPost } from '$lib/gen/endpoints/DESDEOFastAPI';
+import { addProblemJsonProblemAddJsonPost, addProblemProblemAddPost, getProblemProblemProblemIdGet } from '$lib/gen/endpoints/DESDEOFastAPI';
 
 export type ObjectivePayload = Omit<ObjectiveDB, 'func'> & {
 	func: ObjectiveDB['func'] | string | null;
@@ -70,7 +70,7 @@ export async function uploadProblemJson(
 
 export async function fetchProblem(problemId: number): Promise<ProblemResponse> {
 	try {
-		const response = await getProblemProblemGetPost({ problem_id: problemId });
+		const response = await getProblemProblemProblemIdGet(problemId);
 
 		if (response.status !== 200) {
 			return { ok: false, error: 'Failed to fetch problem.', status: response.status };
diff --git a/webui/src/routes/problems/handler.ts b/webui/src/routes/problems/handler.ts
index c3436a7e9..dedea5d92 100644
--- a/webui/src/routes/problems/handler.ts
+++ b/webui/src/routes/problems/handler.ts
@@ -5,8 +5,9 @@ import { getProblemJsonProblemProblemIdJsonGet } from '$lib/gen/endpoints/DESDEO
 import { getMetadataProblemGetMetadataPost } from '$lib/gen/endpoints/DESDEOFastAPI';
 import { getAvailableSolversProblemAssignSolverGet } from '$lib/gen/endpoints/DESDEOFastAPI';
 import { selectSolverProblemAssignSolverPost } from '$lib/gen/endpoints/DESDEOFastAPI';
-import { addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPost } from '$lib/gen/endpoints/DESDEOFastAPI';
-import type { RepresentativeSolutionSetRequest } from '$lib/gen/models';
+import { addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPost } from '$lib/gen/endpoints/DESDEOFastAPI';
+import { loadMetadataSiteSelectionLoadMetadataPost } from '$lib/gen/endpoints/DESDEOFastAPI';
+import type { RepresentativeSolutionSetBase, SiteSelectionMetaDataRequest } from '$lib/gen/models';
 
 export async function deleteProblem(problemId: number): Promise<boolean> {
 	const response: deleteProblemProblemProblemIdDeleteResponse =
@@ -76,11 +77,25 @@ export async function assignSolver(problemId: number, solver: string): Promise<b
 	return true;
 }
 
+export async function uploadSiteSelectionMetadata(
+	payload: SiteSelectionMetaDataRequest
+): Promise<boolean> {
+	const response = await loadMetadataSiteSelectionLoadMetadataPost(payload);
+
+	if (response.status !== 200) {
+		console.error('Failed to upload site selection metadata:', response.status);
+		return false;
+	}
+
+	return true;
+}
+
 export async function addRepresentativeSolutionSet(
-	payload: RepresentativeSolutionSetRequest
+	problemId: number,
+	payload: RepresentativeSolutionSetBase
 ): Promise<boolean> {
 	const response =
-		await addRepresentativeSolutionSetProblemAddRepresentativeSolutionSetPost(payload);
+		await addRepresentativeSolutionSetProblemProblemIdAddRepresentativeSolutionSetPost(problemId, payload);
 
 	if (response.status !== 200) {
 		console.error('Failed to add representative solution set:', response.status);

From 8d7b4ade6a1702ae98fd7fda5f6a74fe6480fe19 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 19 Mar 2026 09:50:14 +0200
Subject: [PATCH 04/24] Tests

- Fixed relative path making conftest hang on Dimitry test problem
---
 .../dmitry_forest_problem_discrete.py           | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/desdeo/problem/testproblems/dmitry_forest_problem_discrete.py b/desdeo/problem/testproblems/dmitry_forest_problem_discrete.py
index 2105caec0..8e7bfe139 100644
--- a/desdeo/problem/testproblems/dmitry_forest_problem_discrete.py
+++ b/desdeo/problem/testproblems/dmitry_forest_problem_discrete.py
@@ -1,4 +1,5 @@
 """A forest problem with discrete representation."""
+
 from pathlib import Path
 
 import polars as pl
@@ -19,18 +20,22 @@ def dmitry_forest_problem_disc() -> Problem:
     Returns:
         Problem: A problem instance representing the forest problem.
     """
-    path = Path(__file__)
-    while not str(path).endswith("/DESDEO"):
-        path = path.parent
-
-    path = path / "tests/data/dmitry_discrete_repr/dmitry_forest_problem_non_dom_solns.csv"
+    # __file__ is desdeo/problem/testproblems/dmitry_forest_problem_discrete.py
+    # CSV is at <repo_root>/tests/data/dmitry_discrete_repr/...
+    path = (
+        Path(__file__).resolve().parent.parent.parent.parent
+        / "tests/data/dmitry_discrete_repr/dmitry_forest_problem_non_dom_solns.csv"
+    )
 
     obj_names = ["Rev", "HA", "Carb", "DW"]
 
     var_name = "index"
 
     data = pl.read_csv(
-        path, has_header=True, columns=["Rev", "HA", "Carb", "DW"], separator=",", #decimal_comma=True
+        path,
+        has_header=True,
+        columns=["Rev", "HA", "Carb", "DW"],
+        separator=",",  # decimal_comma=True
     )
 
     variables = [

From 7a240f03a8ef1b06d2669e0d5a7e533d6105384b Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 19 Mar 2026 10:38:03 +0200
Subject: [PATCH 05/24] Web-API

- Add constrained variant endpoint POST
  /problem/{problem_id}/constrained_variant
- Add VariableFixing, ConstrainedVariantRequest,
  ConstrainedVariantResponse models
- Add is_temporary and parent_problem_id fields to ProblemDB for variant
  tracking
- Use SessionContextGuard for ownership/existence checks in the new
  endpoint
- Simplify DELETE /problem/{problem_id}: owners can delete any of their
  problems
- Add test_constraint_variant.py with 12 tests (model, endpoint, delete
  behavior)
- Fix infinite loop in dmitry_forest_problem_disc() (use relative path
  instead of walking to /DESDEO)
---
 desdeo/api/models/__init__.py               |   6 +
 desdeo/api/models/problem.py                |  30 +++
 desdeo/api/routers/problem.py               |  71 +++++-
 desdeo/api/tests/test_constraint_variant.py | 259 ++++++++++++++++++++
 4 files changed, 364 insertions(+), 2 deletions(-)
 create mode 100644 desdeo/api/tests/test_constraint_variant.py

diff --git a/desdeo/api/models/__init__.py b/desdeo/api/models/__init__.py
index 2b6c913f3..eeb105f25 100644
--- a/desdeo/api/models/__init__.py
+++ b/desdeo/api/models/__init__.py
@@ -2,6 +2,8 @@
 
 __all__ = [  # noqa: RUF022
     "Bounds",
+    "ConstrainedVariantRequest",
+    "ConstrainedVariantResponse",
     "ConstantDB",
     "ConstraintDB",
     "CreateSessionRequest",
@@ -80,6 +82,7 @@
     "UserPublic",
     "UserRole",
     "VariableDB",
+    "VariableFixing",
     "ProblemMetaDataDB",
     "BaseProblemMetaData",
     "ForestProblemMetaData",
@@ -235,6 +238,8 @@
 )
 from .problem import (
     ConstantDB,
+    ConstrainedVariantRequest,
+    ConstrainedVariantResponse,
     ConstraintDB,
     DiscreteRepresentationDB,
     ExtraFunctionDB,
@@ -255,6 +260,7 @@
     TensorConstantDB,
     TensorVariableDB,
     VariableDB,
+    VariableFixing,
 )
 from .reference_point_method import RPMSolveRequest
 from .session import (
diff --git a/desdeo/api/models/problem.py b/desdeo/api/models/problem.py
index 08b8245bd..d7bff1fb8 100644
--- a/desdeo/api/models/problem.py
+++ b/desdeo/api/models/problem.py
@@ -67,6 +67,32 @@ class ProblemAddFromJSONRequest(SQLModel):
     json_file: UploadFile
 
 
+class VariableFixing(BaseModel):
+    """Fix a single variable to a specific value via an EQ constraint."""
+
+    variable_symbol: str
+    fixed_value: float
+    constraint_name: str | None = None
+
+
+class ConstrainedVariantRequest(BaseModel):
+    """Request to create a derived problem with additional EQ constraints fixing variables."""
+
+    variable_fixings: list[VariableFixing]
+    name: str | None = None
+    is_temporary: bool = True
+
+
+class ConstrainedVariantResponse(BaseModel):
+    """Response after creating a constrained variant."""
+
+    problem_id: int
+    parent_problem_id: int
+    name: str
+    is_temporary: bool
+    n_constraints_added: int
+
+
 class ProblemInfo(ProblemBase):
     """Problem info request return data."""
 
@@ -130,6 +156,10 @@ class ProblemDB(ProblemBase, table=True):
     scenario_keys: list[str] | None = Field(sa_column=Column(JSON, nullable=True), default=None)
     variable_domain: VariableDomainTypeEnum = Field()
 
+    # Variant tracking
+    is_temporary: bool = Field(default=False)
+    parent_problem_id: int | None = Field(default=None, foreign_key="problemdb.id")
+
     # Back populates
     user: "User" = Relationship(back_populates="problems")
     solutions: list["UserSavedSolutionDB"] = Relationship(back_populates="problem", cascade_delete=True)
diff --git a/desdeo/api/routers/problem.py b/desdeo/api/routers/problem.py
index 8d6d09ff3..41748ed59 100644
--- a/desdeo/api/routers/problem.py
+++ b/desdeo/api/routers/problem.py
@@ -8,6 +8,8 @@
 from sqlmodel import Session
 
 from desdeo.api.models import (
+    ConstrainedVariantRequest,
+    ConstrainedVariantResponse,
     ForestProblemMetaData,
     ProblemDB,
     ProblemInfo,
@@ -28,6 +30,7 @@
 )
 from desdeo.api.routers.user_authentication import get_current_user
 from desdeo.problem import Problem
+from desdeo.problem.schema import Constraint, ConstraintTypeEnum
 from desdeo.tools.utils import available_solvers
 
 from .utils import ContextField, SessionContext, SessionContextGuard
@@ -455,7 +458,11 @@ def delete_problem(
     problem_id: int,
     context: Annotated[SessionContext, Depends(SessionContextGuard())],
 ):
-    """Delete a problem by its ID."""
+    """Delete a problem by its ID.
+
+    Temporary problems (is_temporary=True) can be deleted by their owner.
+    Non-temporary problems can only be deleted by admin users.
+    """
     db_session: Session = context.db_session
     user = context.user
 
@@ -464,7 +471,7 @@ def delete_problem(
         raise HTTPException(status_code=404, detail=f"Problem with ID {problem_id} not found.")
 
     if problem_db.user_id != user.id:
-        raise HTTPException(status_code=401, detail="Unauthorized user.")
+        raise HTTPException(status_code=403, detail="You do not own this problem.")
 
     db_session.delete(problem_db)
     db_session.commit()
@@ -488,3 +495,63 @@ def get_problem_json(
 
     problem = Problem.from_problemdb(problem_db)
     return JSONResponse(content=json.loads(problem.model_dump_json()), status_code=status.HTTP_200_OK)
+
+
+@router.post("/{problem_id}/constrained_variant")
+def create_constrained_variant(
+    problem_id: int,
+    request: ConstrainedVariantRequest,
+    context: Annotated[SessionContext, Depends(SessionContextGuard(require=[ContextField.PROBLEM]))],
+) -> ConstrainedVariantResponse:
+    """Create a derived problem with additional EQ constraints fixing variables to specific values.
+
+    The original problem is not modified. The variant is stored as a new ProblemDB row
+    with parent_problem_id set to the original.
+    """
+    db_session: Session = context.db_session
+    user = context.user
+    problem_db = context.problem_db
+
+    # Reconstruct in-memory Problem
+    problem = Problem.from_problemdb(problem_db)
+
+    # Validate variable symbols and build constraints
+    all_var_symbols = [v.symbol for v in problem.variables]
+    new_constraints = []
+    for i, fixing in enumerate(request.variable_fixings):
+        if fixing.variable_symbol not in all_var_symbols:
+            raise HTTPException(
+                status_code=422,
+                detail=f"Variable symbol '{fixing.variable_symbol}' not found in problem. Available: {all_var_symbols}",
+            )
+        new_constraints.append(
+            Constraint(
+                name=fixing.constraint_name or f"fix_{fixing.variable_symbol}_to_{fixing.fixed_value}",
+                symbol=f"_fix_{i}",
+                cons_type=ConstraintTypeEnum.EQ,
+                func=["Add", fixing.variable_symbol, -fixing.fixed_value],
+                is_linear=True,
+            )
+        )
+
+    # Create the variant (immutable copy with added constraints)
+    variant = problem.add_constraints(new_constraints)
+    variant_name = request.name or f"{problem_db.name} [variant]"
+    # Update the name on the frozen model
+    variant = variant.model_copy(update={"name": variant_name})
+
+    # Persist
+    variant_db = ProblemDB.from_problem(variant, user=user)
+    variant_db.is_temporary = request.is_temporary
+    variant_db.parent_problem_id = problem_id
+    db_session.add(variant_db)
+    db_session.commit()
+    db_session.refresh(variant_db)
+
+    return ConstrainedVariantResponse(
+        problem_id=variant_db.id,
+        parent_problem_id=problem_id,
+        name=variant_name,
+        is_temporary=variant_db.is_temporary,
+        n_constraints_added=len(new_constraints),
+    )
diff --git a/desdeo/api/tests/test_constraint_variant.py b/desdeo/api/tests/test_constraint_variant.py
new file mode 100644
index 000000000..90a361f5e
--- /dev/null
+++ b/desdeo/api/tests/test_constraint_variant.py
@@ -0,0 +1,259 @@
+"""Tests for the constrained variant endpoint and DELETE problem behavior."""
+
+from fastapi.testclient import TestClient
+from sqlmodel import Session, select
+
+from desdeo.api.models import (
+    ProblemDB,
+    User,
+    UserRole,
+)
+from desdeo.api.models.problem import (
+    ConstrainedVariantRequest,
+    VariableFixing,
+)
+from desdeo.api.routers.user_authentication import get_password_hash
+from desdeo.problem.testproblems import river_pollution_problem
+
+from .conftest import login, post_json
+
+
+def test_variable_fixing_valid():
+    """Create a VariableFixing and verify fields."""
+    fixing = VariableFixing(variable_symbol="x_1", fixed_value=3.14, constraint_name="lock_x1")
+    assert fixing.variable_symbol == "x_1"
+    assert fixing.fixed_value == 3.14
+    assert fixing.constraint_name == "lock_x1"
+
+
+def test_constrained_variant_request_defaults():
+    """Verify is_temporary defaults to True and name defaults to None."""
+    req = ConstrainedVariantRequest(variable_fixings=[VariableFixing(variable_symbol="x_1", fixed_value=1.0)])
+    assert req.is_temporary is True
+    assert req.name is None
+
+
+def test_constrained_variant_success(client: TestClient, session_and_user: dict):
+    """POST valid fixings for an owned problem returns 200 with correct response."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    # Use the river pollution problem (has variables x_1, x_2)
+    problem = session.exec(select(ProblemDB).where(ProblemDB.name == "The river pollution problem")).first()
+
+    payload = {
+        "variable_fixings": [
+            {"variable_symbol": "x_1", "fixed_value": 0.5},
+            {"variable_symbol": "x_2", "fixed_value": 0.3},
+        ],
+    }
+
+    response = post_json(client, f"/problem/{problem.id}/constrained_variant", payload, access_token)
+    assert response.status_code == 200
+
+    data = response.json()
+    assert data["n_constraints_added"] == 2
+    assert data["problem_id"] != problem.id
+    assert data["parent_problem_id"] == problem.id
+    assert data["is_temporary"] is True
+    assert "[variant]" in data["name"]
+
+
+def test_constrained_variant_creates_db_record(client: TestClient, session_and_user: dict):
+    """After a successful POST, the new ProblemDB row exists with correct fields."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    problem = session.exec(select(ProblemDB).where(ProblemDB.name == "The river pollution problem")).first()
+
+    payload = {
+        "variable_fixings": [{"variable_symbol": "x_1", "fixed_value": 1.0}],
+        "name": "Test Variant",
+    }
+
+    response = post_json(client, f"/problem/{problem.id}/constrained_variant", payload, access_token)
+    assert response.status_code == 200
+
+    variant_id = response.json()["problem_id"]
+    variant_db = session.get(ProblemDB, variant_id)
+    assert variant_db is not None
+    assert variant_db.is_temporary is True
+    assert variant_db.parent_problem_id == problem.id
+    assert variant_db.name == "Test Variant"
+
+
+def test_constrained_variant_unknown_symbol(client: TestClient, session_and_user: dict):
+    """POST a fixing with a nonexistent variable symbol returns 422."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    problem = session.exec(select(ProblemDB).where(ProblemDB.name == "The river pollution problem")).first()
+
+    payload = {
+        "variable_fixings": [{"variable_symbol": "nonexistent_var", "fixed_value": 1.0}],
+    }
+
+    response = post_json(client, f"/problem/{problem.id}/constrained_variant", payload, access_token)
+    assert response.status_code == 422
+    assert "nonexistent_var" in response.json()["detail"]
+
+
+def test_constrained_variant_wrong_owner(client: TestClient, session_and_user: dict):
+    """POST for a problem owned by a different user returns 403."""
+    session: Session = session_and_user["session"]
+
+    # Create another user and their problem
+    other_user = User(
+        username="other_variant",
+        password_hash=get_password_hash("other_variant"),
+        role=UserRole.analyst,
+        group="test",
+    )
+    session.add(other_user)
+    session.commit()
+    session.refresh(other_user)
+
+    other_problem = ProblemDB.from_problem(river_pollution_problem(), user=other_user)
+    session.add(other_problem)
+    session.commit()
+    session.refresh(other_problem)
+
+    # Login as the original analyst user
+    access_token = login(client)
+
+    payload = {
+        "variable_fixings": [{"variable_symbol": "x_1", "fixed_value": 1.0}],
+    }
+
+    response = post_json(client, f"/problem/{other_problem.id}/constrained_variant", payload, access_token)
+    # SessionContextGuard returns 400 (context missing) when user doesn't own the problem
+    assert response.status_code == 400
+
+
+def test_constrained_variant_not_found(client: TestClient, session_and_user: dict):
+    """POST with a nonexistent problem_id returns 404."""
+    access_token = login(client)
+
+    payload = {
+        "variable_fixings": [{"variable_symbol": "x_1", "fixed_value": 1.0}],
+    }
+
+    response = post_json(client, "/problem/99999/constrained_variant", payload, access_token)
+    # SessionContextGuard returns 400 (context missing) when problem doesn't exist
+    assert response.status_code == 400
+
+
+def test_constrained_variant_preserves_original(client: TestClient, session_and_user: dict):
+    """Creating a variant does not modify the original problem."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    problem = session.exec(select(ProblemDB).where(ProblemDB.name == "The river pollution problem")).first()
+    original_name = problem.name
+    original_constraint_count = len(problem.constraints)
+
+    payload = {
+        "variable_fixings": [
+            {"variable_symbol": "x_1", "fixed_value": 0.5},
+            {"variable_symbol": "x_2", "fixed_value": 0.3},
+        ],
+    }
+
+    response = post_json(client, f"/problem/{problem.id}/constrained_variant", payload, access_token)
+    assert response.status_code == 200
+
+    # Refresh and verify original is unchanged
+    session.refresh(problem)
+    assert problem.name == original_name
+    assert len(problem.constraints) == original_constraint_count
+
+
+# --- Endpoint tests: DELETE /problem/{problem_id} ---
+
+
+def test_delete_temporary_problem_success(client: TestClient, session_and_user: dict):
+    """DELETE a temporary variant returns 204 and removes the DB row."""
+    session: Session = session_and_user["session"]
+    access_token = login(client)
+
+    problem = session.exec(select(ProblemDB).where(ProblemDB.name == "The river pollution problem")).first()
+
+    # Create a temporary variant
+    payload = {
+        "variable_fixings": [{"variable_symbol": "x_1", "fixed_value": 1.0}],
+    }
+    create_resp = post_json(client, f"/problem/{problem.id}/constrained_variant", payload, access_token)
+    assert create_resp.status_code == 200
+    variant_id = create_resp.json()["problem_id"]
+
+    # Delete it
+    response = client.delete(
+        f"/problem/{variant_id}",
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == 204
+
+    # Verify gone
+    assert session.get(ProblemDB, variant_id) is None
+
+
+def test_delete_non_temporary_problem_success(client: TestClient, session_and_user: dict):
+    """DELETE a non-temporary problem owned by the user returns 204."""
+    session: Session = session_and_user["session"]
+    user = session_and_user["user"]
+    access_token = login(client)
+
+    # Create a fresh non-temporary problem to delete (don't destroy shared fixtures)
+    problem = ProblemDB.from_problem(river_pollution_problem(), user=user)
+    session.add(problem)
+    session.commit()
+    session.refresh(problem)
+    assert not problem.is_temporary
+
+    response = client.delete(
+        f"/problem/{problem.id}",
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == 204
+    assert session.get(ProblemDB, problem.id) is None
+
+
+def test_delete_wrong_owner(client: TestClient, session_and_user: dict):
+    """DELETE a problem owned by a different user returns 403."""
+    session: Session = session_and_user["session"]
+
+    other_user = User(
+        username="other_delete",
+        password_hash=get_password_hash("other_delete"),
+        role=UserRole.analyst,
+        group="test",
+    )
+    session.add(other_user)
+    session.commit()
+    session.refresh(other_user)
+
+    other_problem = ProblemDB.from_problem(river_pollution_problem(), user=other_user)
+    other_problem.is_temporary = True
+    session.add(other_problem)
+    session.commit()
+    session.refresh(other_problem)
+
+    # Login as the original analyst
+    access_token = login(client)
+
+    response = client.delete(
+        f"/problem/{other_problem.id}",
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == 403
+
+
+def test_delete_not_found(client: TestClient, session_and_user: dict):
+    """DELETE a nonexistent problem returns 404."""
+    access_token = login(client)
+
+    response = client.delete(
+        "/problem/99999",
+        headers={"Authorization": f"Bearer {access_token}"},
+    )
+    assert response.status_code == 404

From 003d5e890978c2adb2e467f37b65ce2d4f5eb2d5 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 19 Mar 2026 10:53:55 +0200
Subject: [PATCH 06/24] Web-GUI

- Regenerated Orval clients
---
 webui/src/lib/gen/endpoints/DESDEOFastAPI.ts  | 57 +++++++++++++++++++
 .../src/lib/gen/endpoints/DESDEOFastAPIzod.ts | 44 ++++++++++++++
 .../gen/models/ConstrainedVariantRequest.ts   | 17 ++++++
 .../gen/models/ConstrainedVariantResponse.ts  | 18 ++++++
 webui/src/lib/gen/models/VariableFixing.ts    | 16 ++++++
 webui/src/lib/gen/models/index.ts             |  3 +
 6 files changed, 155 insertions(+)
 create mode 100644 webui/src/lib/gen/models/ConstrainedVariantRequest.ts
 create mode 100644 webui/src/lib/gen/models/ConstrainedVariantResponse.ts
 create mode 100644 webui/src/lib/gen/models/VariableFixing.ts

diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
index 4f5becf6b..d12c2e2eb 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
@@ -13,6 +13,8 @@ import type {
 	BodyAddProblemJsonProblemAddJsonPost,
 	BodyLoginLoginPost,
 	ConfigureGdmGdmScoreBandsConfigurePostParams,
+	ConstrainedVariantRequest,
+	ConstrainedVariantResponse,
 	CreateNewSessionSessionNewPostParams,
 	CreateSessionRequest,
 	DeleteRepresentativeSolutionSetProblemRepresentativeSolutionSetSetIdDeleteParams,
@@ -579,6 +581,9 @@ export const getProblemProblemProblemIdGet = async (
 
 /**
  * Delete a problem by its ID.
+
+Temporary problems (is_temporary=True) can be deleted by their owner.
+Non-temporary problems can only be deleted by admin users.
  * @summary Delete Problem
  */
 export type deleteProblemProblemProblemIdDeleteResponse204 = {
@@ -1271,6 +1276,58 @@ export const getProblemJsonProblemProblemIdJsonGet = async (
 	);
 };
 
+/**
+ * Create a derived problem with additional EQ constraints fixing variables to specific values.
+
+The original problem is not modified. The variant is stored as a new ProblemDB row
+with parent_problem_id set to the original.
+ * @summary Create Constrained Variant
+ */
+export type createConstrainedVariantProblemProblemIdConstrainedVariantPostResponse200 = {
+	data: ConstrainedVariantResponse;
+	status: 200;
+};
+
+export type createConstrainedVariantProblemProblemIdConstrainedVariantPostResponse422 = {
+	data: HTTPValidationError;
+	status: 422;
+};
+
+export type createConstrainedVariantProblemProblemIdConstrainedVariantPostResponseSuccess =
+	createConstrainedVariantProblemProblemIdConstrainedVariantPostResponse200 & {
+		headers: Headers;
+	};
+export type createConstrainedVariantProblemProblemIdConstrainedVariantPostResponseError =
+	createConstrainedVariantProblemProblemIdConstrainedVariantPostResponse422 & {
+		headers: Headers;
+	};
+
+export type createConstrainedVariantProblemProblemIdConstrainedVariantPostResponse =
+	| createConstrainedVariantProblemProblemIdConstrainedVariantPostResponseSuccess
+	| createConstrainedVariantProblemProblemIdConstrainedVariantPostResponseError;
+
+export const getCreateConstrainedVariantProblemProblemIdConstrainedVariantPostUrl = (
+	problemId: number | null
+) => {
+	return `http://localhost:8000/problem/${problemId}/constrained_variant`;
+};
+
+export const createConstrainedVariantProblemProblemIdConstrainedVariantPost = async (
+	problemId: number | null,
+	constrainedVariantRequest: ConstrainedVariantRequest,
+	options?: RequestInit
+): Promise<createConstrainedVariantProblemProblemIdConstrainedVariantPostResponse> => {
+	return customFetch<createConstrainedVariantProblemProblemIdConstrainedVariantPostResponse>(
+		getCreateConstrainedVariantProblemProblemIdConstrainedVariantPostUrl(problemId),
+		{
+			...options,
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json', ...options?.headers },
+			body: JSON.stringify(constrainedVariantRequest)
+		}
+	);
+};
+
 /**
  * Creates a new interactive session.
  * @summary Create New Session
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
index aeff63b07..465d7c62d 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
@@ -1586,6 +1586,9 @@ export const GetProblemProblemProblemIdGetResponse = zod
 
 /**
  * Delete a problem by its ID.
+
+Temporary problems (is_temporary=True) can be deleted by their owner.
+Non-temporary problems can only be deleted by admin users.
  * @summary Delete Problem
  */
 export const DeleteProblemProblemProblemIdDeleteParams = zod.object({
@@ -3583,6 +3586,47 @@ export const GetProblemJsonProblemProblemIdJsonGetBody = zod.union([
 
 export const GetProblemJsonProblemProblemIdJsonGetResponse = zod.unknown();
 
+/**
+ * Create a derived problem with additional EQ constraints fixing variables to specific values.
+
+The original problem is not modified. The variant is stored as a new ProblemDB row
+with parent_problem_id set to the original.
+ * @summary Create Constrained Variant
+ */
+export const CreateConstrainedVariantProblemProblemIdConstrainedVariantPostParams = zod.object({
+	problem_id: zod.union([zod.number(), zod.null()])
+});
+
+export const createConstrainedVariantProblemProblemIdConstrainedVariantPostBodyIsTemporaryDefault = true;
+
+export const CreateConstrainedVariantProblemProblemIdConstrainedVariantPostBody = zod
+	.object({
+		variable_fixings: zod.array(
+			zod
+				.object({
+					variable_symbol: zod.string(),
+					fixed_value: zod.number(),
+					constraint_name: zod.union([zod.string(), zod.null()]).optional()
+				})
+				.describe('Fix a single variable to a specific value via an EQ constraint.')
+		),
+		name: zod.union([zod.string(), zod.null()]).optional(),
+		is_temporary: zod
+			.boolean()
+			.default(createConstrainedVariantProblemProblemIdConstrainedVariantPostBodyIsTemporaryDefault)
+	})
+	.describe('Request to create a derived problem with additional EQ constraints fixing variables.');
+
+export const CreateConstrainedVariantProblemProblemIdConstrainedVariantPostResponse = zod
+	.object({
+		problem_id: zod.number(),
+		parent_problem_id: zod.number(),
+		name: zod.string(),
+		is_temporary: zod.boolean(),
+		n_constraints_added: zod.number()
+	})
+	.describe('Response after creating a constrained variant.');
+
 /**
  * Creates a new interactive session.
  * @summary Create New Session
diff --git a/webui/src/lib/gen/models/ConstrainedVariantRequest.ts b/webui/src/lib/gen/models/ConstrainedVariantRequest.ts
new file mode 100644
index 000000000..4766e4001
--- /dev/null
+++ b/webui/src/lib/gen/models/ConstrainedVariantRequest.ts
@@ -0,0 +1,17 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+import type { VariableFixing } from './VariableFixing';
+
+/**
+ * Request to create a derived problem with additional EQ constraints fixing variables.
+ */
+export interface ConstrainedVariantRequest {
+	variable_fixings: VariableFixing[];
+	name?: string | null;
+	is_temporary?: boolean;
+}
diff --git a/webui/src/lib/gen/models/ConstrainedVariantResponse.ts b/webui/src/lib/gen/models/ConstrainedVariantResponse.ts
new file mode 100644
index 000000000..bbe72ddff
--- /dev/null
+++ b/webui/src/lib/gen/models/ConstrainedVariantResponse.ts
@@ -0,0 +1,18 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * Response after creating a constrained variant.
+ */
+export interface ConstrainedVariantResponse {
+	problem_id: number;
+	parent_problem_id: number;
+	name: string;
+	is_temporary: boolean;
+	n_constraints_added: number;
+}
diff --git a/webui/src/lib/gen/models/VariableFixing.ts b/webui/src/lib/gen/models/VariableFixing.ts
new file mode 100644
index 000000000..eed02ee2e
--- /dev/null
+++ b/webui/src/lib/gen/models/VariableFixing.ts
@@ -0,0 +1,16 @@
+/**
+ * Generated by orval v8.0.2 🍺
+ * Do not edit manually.
+ * DESDEO (fast)API
+ * A rest API for the DESDEO framework.
+ * OpenAPI spec version: 0.1.0
+ */
+
+/**
+ * Fix a single variable to a specific value via an EQ constraint.
+ */
+export interface VariableFixing {
+	variable_symbol: string;
+	fixed_value: number;
+	constraint_name?: string | null;
+}
diff --git a/webui/src/lib/gen/models/index.ts b/webui/src/lib/gen/models/index.ts
index b73e9e2f8..e84c86ce1 100644
--- a/webui/src/lib/gen/models/index.ts
+++ b/webui/src/lib/gen/models/index.ts
@@ -14,6 +14,8 @@ export * from './BodyAddProblemJsonProblemAddJsonPost';
 export * from './BodyLoginLoginPost';
 export * from './ConfigureGdmGdmScoreBandsConfigurePostParams';
 export * from './ConstantDB';
+export * from './ConstrainedVariantRequest';
+export * from './ConstrainedVariantResponse';
 export * from './ConstraintDB';
 export * from './ConstraintTypeEnum';
 export * from './CreateNewSessionSessionNewPostParams';
@@ -210,6 +212,7 @@ export * from './UtopiaResponseOptions';
 export * from './ValidationError';
 export * from './VariableDB';
 export * from './VariableDomainTypeEnum';
+export * from './VariableFixing';
 export * from './VariableTypeEnum';
 export * from './VotingPreference';
 export * from './VotingPreferenceSetPreferences';

From 2f20ccefcfab451a9e017eae94be51d845961027 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 19 Mar 2026 11:07:42 +0200
Subject: [PATCH 07/24] Web-API

- Fix SessionContextGuard HTTP status codes: 404 for missing resources,
  403 for ownership failures (was 400 for both)
- Update fetch_user_problem to query by ID first, then check ownership
  separately
- Update test_delete_problem.py: unauthorized deletion now correctly
  expects 403 instead of 401
- Update test_constraint_variant.py: wrong_owner expects 403, not_found
  expects 404
---
 desdeo/api/routers/utils.py                 | 27 ++++++++++++++-------
 desdeo/api/tests/test_constraint_variant.py |  6 ++---
 desdeo/api/tests/test_delete_problem.py     |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/desdeo/api/routers/utils.py b/desdeo/api/routers/utils.py
index af490e892..0e360663e 100644
--- a/desdeo/api/routers/utils.py
+++ b/desdeo/api/routers/utils.py
@@ -89,19 +89,28 @@ def fetch_user_problem(user: User, request: RequestType, session: Session) -> Pr
         session (Session): the database session from which to fetch the problem.
 
     Raises:
-        HTTPException: a problem with the given id (`request.problem_id`) could not be found (404).
+        HTTPException: 404 if the problem does not exist, 403 if it belongs to another user.
 
     Returns:
-        Problem: the instance of `ProblemDB` with the given id.
+        ProblemDB | None: the instance of `ProblemDB` with the given id, or None if no problem_id was given.
     """
     if request.problem_id is None:
         return None
 
-    statement = select(ProblemDB).where(
-        ProblemDB.user_id == user.id,
-        ProblemDB.id == request.problem_id,
-    )
-    return session.exec(statement).first()
+    problem_db = session.get(ProblemDB, request.problem_id)
+    if problem_db is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Problem with ID {request.problem_id} not found.",
+        )
+
+    if problem_db.user_id != user.id:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail=f"Access to problem with ID {request.problem_id} denied.",
+        )
+
+    return problem_db
 
 
 def fetch_parent_state(
@@ -265,6 +274,6 @@ def _validate(self, context: SessionContext) -> None:
         for field in self.require:
             if getattr(context, field.value) is None:
                 raise HTTPException(
-                    status_code=status.HTTP_400_BAD_REQUEST,
-                    detail=f"{field} context missing.",
+                    status_code=status.HTTP_404_NOT_FOUND,
+                    detail=f"{field} not found or not provided.",
                 )
diff --git a/desdeo/api/tests/test_constraint_variant.py b/desdeo/api/tests/test_constraint_variant.py
index 90a361f5e..c29727e35 100644
--- a/desdeo/api/tests/test_constraint_variant.py
+++ b/desdeo/api/tests/test_constraint_variant.py
@@ -126,8 +126,7 @@ def test_constrained_variant_wrong_owner(client: TestClient, session_and_user: d
     }
 
     response = post_json(client, f"/problem/{other_problem.id}/constrained_variant", payload, access_token)
-    # SessionContextGuard returns 400 (context missing) when user doesn't own the problem
-    assert response.status_code == 400
+    assert response.status_code == 403
 
 
 def test_constrained_variant_not_found(client: TestClient, session_and_user: dict):
@@ -139,8 +138,7 @@ def test_constrained_variant_not_found(client: TestClient, session_and_user: dic
     }
 
     response = post_json(client, "/problem/99999/constrained_variant", payload, access_token)
-    # SessionContextGuard returns 400 (context missing) when problem doesn't exist
-    assert response.status_code == 400
+    assert response.status_code == 404
 
 
 def test_constrained_variant_preserves_original(client: TestClient, session_and_user: dict):
diff --git a/desdeo/api/tests/test_delete_problem.py b/desdeo/api/tests/test_delete_problem.py
index 20ddda0d0..bc7123eff 100644
--- a/desdeo/api/tests/test_delete_problem.py
+++ b/desdeo/api/tests/test_delete_problem.py
@@ -126,7 +126,7 @@ def test_delete_problem_unauthorized(client: TestClient, session_and_user: dict)
         headers={"Authorization": f"Bearer {other_token}"},
     )
 
-    assert response.status_code == status.HTTP_401_UNAUTHORIZED
+    assert response.status_code == status.HTTP_403_FORBIDDEN
 
     # Problem should still exist
     assert session.get(ProblemDB, problem_id) is not None

From 1ae2a6346a85a033b8d5ff14fcc5cb893b4a27eb Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 19 Mar 2026 16:07:38 +0200
Subject: [PATCH 08/24] Web-API, Web-UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add map interaction: click site markers to cycle free → restricted →
  forced
- Multiple sites per city node are constrained together
- Re-solve with RPM using E-NAUTILUS final objectives as aspiration
  levels
- Constrained variant inherits parent problem's solver metadata
  (pyomo_cbc)
- Fix tensor variable indexing in constraints: use ["At", symbol,
  ...indices] for Pyomo compatibility
- Unroll tensor variables in RPM results for frontend compatibility (sv
  → sv_1..sv_60)
- Return site_variable_symbols and site_node_names from
  /site-selection/map endpoint
- Add comparison bottom panel with tabbed Parallel Coordinates /
  Comparison Table views
- Solution tab shows constrained solution with original as dashed
  comparison line
- "Use this solution" accepts constrained result, "Reset" reverts to
  original
- Clear constraint markers after successful re-solve to show natural
  solution colors
- Cleanup temporary problem variants on reset, navigation, and re-solve
---
 desdeo/api/routers/problem.py                 |  48 +++-
 desdeo/api/routers/site_selection.py          |  10 +-
 .../site-selection-map.svelte                 | 150 ++++++++++--
 .../src/lib/gen/endpoints/DESDEOFastAPIzod.ts |   4 +-
 .../gen/models/SiteSelectionMapResponse.ts    |   2 +
 .../E-NAUTILUS/+page.svelte                   | 227 +++++++++++++++++-
 .../interactive_methods/E-NAUTILUS/handler.ts |  94 +++++++-
 7 files changed, 500 insertions(+), 35 deletions(-)

diff --git a/desdeo/api/routers/problem.py b/desdeo/api/routers/problem.py
index 41748ed59..2661868dc 100644
--- a/desdeo/api/routers/problem.py
+++ b/desdeo/api/routers/problem.py
@@ -30,7 +30,7 @@
 )
 from desdeo.api.routers.user_authentication import get_current_user
 from desdeo.problem import Problem
-from desdeo.problem.schema import Constraint, ConstraintTypeEnum
+from desdeo.problem.schema import Constraint, ConstraintTypeEnum, TensorVariable
 from desdeo.tools.utils import available_solvers
 
 from .utils import ContextField, SessionContext, SessionContextGuard
@@ -515,21 +515,39 @@ def create_constrained_variant(
     # Reconstruct in-memory Problem
     problem = Problem.from_problemdb(problem_db)
 
-    # Validate variable symbols and build constraints
-    all_var_symbols = [v.symbol for v in problem.variables]
+    # Build a mapping from valid variable symbols to their MathJSON reference expression.
+    # Scalar variables: "x" → "x" (plain symbol in MathJSON).
+    # Tensor variables: unrolled names like "sv_5" → ["At", "sv", 5, 1] (indexed access).
+    # Pyomo creates tensor variables with index sets for each dimension of the shape,
+    # so shape [60, 1] needs a 2D index (i, 1). Shape [3, 4] would enumerate all 12
+    # elements as sv_1..sv_12 in row-major order with 1-based Pyomo indices.
+    import itertools
+
+    var_symbol_to_expr: dict[str, str | list] = {}
+    for v in problem.variables:
+        if isinstance(v, TensorVariable):
+            # Enumerate all elements in row-major order (matching solver unrolling convention)
+            ranges = [range(1, dim + 1) for dim in v.shape]
+            for flat_idx, indices in enumerate(itertools.product(*ranges), start=1):
+                var_symbol_to_expr[f"{v.symbol}_{flat_idx}"] = ["At", v.symbol, *indices]
+        else:
+            var_symbol_to_expr[v.symbol] = v.symbol
+
     new_constraints = []
     for i, fixing in enumerate(request.variable_fixings):
-        if fixing.variable_symbol not in all_var_symbols:
+        if fixing.variable_symbol not in var_symbol_to_expr:
             raise HTTPException(
                 status_code=422,
-                detail=f"Variable symbol '{fixing.variable_symbol}' not found in problem. Available: {all_var_symbols}",
+                detail=f"Variable symbol '{fixing.variable_symbol}' not found in problem. "
+                f"Available: {sorted(var_symbol_to_expr.keys())}",
             )
+        var_expr = var_symbol_to_expr[fixing.variable_symbol]
         new_constraints.append(
             Constraint(
                 name=fixing.constraint_name or f"fix_{fixing.variable_symbol}_to_{fixing.fixed_value}",
                 symbol=f"_fix_{i}",
                 cons_type=ConstraintTypeEnum.EQ,
-                func=["Add", fixing.variable_symbol, -fixing.fixed_value],
+                func=["Add", var_expr, -fixing.fixed_value],
                 is_linear=True,
             )
         )
@@ -548,6 +566,24 @@ def create_constrained_variant(
     db_session.commit()
     db_session.refresh(variant_db)
 
+    # Copy solver selection metadata from parent so the variant uses the same solver
+    if problem_db.problem_metadata is not None:
+        parent_solver_meta = [
+            m for m in problem_db.problem_metadata.all_metadata if m.metadata_type == "solver_selection_metadata"
+        ]
+        if parent_solver_meta:
+            variant_metadata = ProblemMetaDataDB(problem_id=variant_db.id)
+            db_session.add(variant_metadata)
+            db_session.commit()
+            db_session.refresh(variant_metadata)
+
+            variant_solver = SolverSelectionMetadata(
+                metadata_id=variant_metadata.id,
+                solver_string_representation=parent_solver_meta[-1].solver_string_representation,
+            )
+            db_session.add(variant_solver)
+            db_session.commit()
+
     return ConstrainedVariantResponse(
         problem_id=variant_db.id,
         parent_problem_id=problem_id,
diff --git a/desdeo/api/routers/site_selection.py b/desdeo/api/routers/site_selection.py
index ab2ad5166..51732b090 100644
--- a/desdeo/api/routers/site_selection.py
+++ b/desdeo/api/routers/site_selection.py
@@ -68,6 +68,8 @@ class SiteSelectionMapResponse(BaseModel):
     nodes: list[SiteSelectionMapNode]
     edges: list[SiteSelectionMapEdge]
     center: list[float]
+    site_variable_symbols: list[str]
+    site_node_names: list[str]
 
 
 # --- Endpoints ---
@@ -261,4 +263,10 @@ def build_map(
     avg_lat = sum(n.lat for n in nodes_out) / len(nodes_out)
     avg_lon = sum(n.lon for n in nodes_out) / len(nodes_out)
 
-    return SiteSelectionMapResponse(nodes=nodes_out, edges=edges, center=[avg_lat, avg_lon])
+    return SiteSelectionMapResponse(
+        nodes=nodes_out,
+        edges=edges,
+        center=[avg_lat, avg_lon],
+        site_variable_symbols=meta.site_variable_symbols,
+        site_node_names=[s["node"] for s in sites],
+    )
diff --git a/webui/src/lib/components/custom/site-selection-map/site-selection-map.svelte b/webui/src/lib/components/custom/site-selection-map/site-selection-map.svelte
index e119b353f..6cbc7761f 100644
--- a/webui/src/lib/components/custom/site-selection-map/site-selection-map.svelte
+++ b/webui/src/lib/components/custom/site-selection-map/site-selection-map.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import type { SolverResults } from '$lib/gen/models';
+	import type { SolverResults, VariableFixing } from '$lib/gen/models';
 	import { buildMapSiteSelectionMapPost } from '$lib/gen/endpoints/DESDEOFastAPI';
 
 	interface SiteSelectionMapNode {
@@ -23,19 +23,72 @@
 		nodes: SiteSelectionMapNode[];
 		edges: SiteSelectionMapEdge[];
 		center: [number, number];
+		site_variable_symbols?: string[];
+		site_node_names?: string[];
 	}
 
+	type ConstraintState = 'free' | 'restricted' | 'forced';
+
 	interface Props {
 		problem_id: number;
 		solution: SolverResults;
+		on_constraints_changed?: (fixings: VariableFixing[]) => void;
 	}
 
-	let { problem_id, solution }: Props = $props();
+	let { problem_id, solution, on_constraints_changed }: Props = $props();
 
 	let mapContainer = $state<HTMLDivElement>();
 	let map: L.Map | null = null;
 	let loading = $state(true);
 	let error = $state<string | null>(null);
+	let mapData = $state<SiteSelectionMapResponse | null>(null);
+	let constraintStates = $state<Map<string, ConstraintState>>(new Map());
+	let markerLayer: L.LayerGroup | null = null;
+
+	const COLOR_RESTRICTED = '#EF4444';
+	const COLOR_FORCED = '#22C55E';
+
+	let fixings = $derived.by(() => {
+		const result: VariableFixing[] = [];
+		for (const [symbol, state] of constraintStates) {
+			if (state === 'restricted') {
+				result.push({ variable_symbol: symbol, fixed_value: 0 });
+			} else if (state === 'forced') {
+				result.push({ variable_symbol: symbol, fixed_value: 1 });
+			}
+		}
+		return result;
+	});
+
+	$effect(() => {
+		if (on_constraints_changed) {
+			on_constraints_changed(fixings);
+		}
+	});
+
+	function cycleConstraint(symbols: string[]) {
+		// All symbols for a node cycle together; use the first symbol's state as reference
+		const current = constraintStates.get(symbols[0]) ?? 'free';
+		const next: ConstraintState = current === 'free' ? 'restricted' : current === 'restricted' ? 'forced' : 'free';
+		const newMap = new Map(constraintStates);
+		for (const sym of symbols) {
+			if (next === 'free') {
+				newMap.delete(sym);
+			} else {
+				newMap.set(sym, next);
+			}
+		}
+		constraintStates = newMap;
+	}
+
+	function getMarkerStyle(node: SiteSelectionMapNode, symbols: string[]): { fillColor: string; html: string } {
+		if (symbols.length === 0) return { fillColor: node.color, html: '' };
+		// Use the first symbol's state as the display state (all should be in sync)
+		const state = constraintStates.get(symbols[0]);
+		if (state === 'restricted') return { fillColor: COLOR_RESTRICTED, html: '✕' };
+		if (state === 'forced') return { fillColor: COLOR_FORCED, html: '✓' };
+		return { fillColor: node.color, html: '' };
+	}
 
 	async function fetchMapData(): Promise<SiteSelectionMapResponse> {
 		const res = await buildMapSiteSelectionMapPost({
@@ -51,6 +104,22 @@
 		return res.data as SiteSelectionMapResponse;
 	}
 
+	function buildNodeToSymbols(data: SiteSelectionMapResponse): Map<string, string[]> {
+		const map = new Map<string, string[]>();
+		if (data.site_variable_symbols && data.site_node_names) {
+			for (let i = 0; i < data.site_variable_symbols.length; i++) {
+				const nodeName = data.site_node_names[i];
+				const existing = map.get(nodeName);
+				if (existing) {
+					existing.push(data.site_variable_symbols[i]);
+				} else {
+					map.set(nodeName, [data.site_variable_symbols[i]]);
+				}
+			}
+		}
+		return map;
+	}
+
 	async function renderMap(data: SiteSelectionMapResponse) {
 		const L = await import('leaflet');
 
@@ -82,21 +151,11 @@
 			).addTo(map);
 		}
 
-		// Draw node markers
-		const bounds: L.LatLngExpression[] = [];
-		for (const node of data.nodes) {
-			const marker = L.circleMarker([node.lat, node.lon], {
-				radius: node.size,
-				color: 'black',
-				weight: 1,
-				fillColor: node.color,
-				fillOpacity: 0.7
-			}).addTo(map);
-
-			marker.bindTooltip(node.tooltip, { direction: 'top', offset: [0, -5] });
-			bounds.push([node.lat, node.lon]);
-		}
+		markerLayer = L.layerGroup().addTo(map);
+		updateMarkers(data, L);
 
+		// Fit bounds
+		const bounds: L.LatLngExpression[] = data.nodes.map(n => [n.lat, n.lon]);
 		if (bounds.length > 0) {
 			map.fitBounds(L.latLngBounds(bounds), { padding: [20, 20] });
 		}
@@ -111,6 +170,8 @@
 					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:#FFA500;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Has active sites</div>
 					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:#FFFF00;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Covered by nearby sites</div>
 					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:#808080;border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Not covered</div>
+					<div style="margin-top:4px;"><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:${COLOR_RESTRICTED};border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Restricted (forced out)</div>
+					<div><span style="display:inline-block;width:12px;height:12px;border-radius:50%;background:${COLOR_FORCED};border:1px solid black;vertical-align:middle;margin-right:6px;"></span>Forced (forced in)</div>
 					<div style="margin-top:4px;"><span style="display:inline-block;width:20px;height:2px;background:black;vertical-align:middle;margin-right:6px;"></span>Coverage link</div>
 				</div>`;
 			return div;
@@ -118,11 +179,63 @@
 		legend.addTo(map);
 	}
 
+	function updateMarkers(data: SiteSelectionMapResponse, L: typeof import('leaflet')) {
+		if (!markerLayer) return;
+		markerLayer.clearLayers();
+
+		const nodeToSymbols = buildNodeToSymbols(data);
+
+		for (const node of data.nodes) {
+			const symbols = nodeToSymbols.get(node.name) ?? [];
+			const style = getMarkerStyle(node, symbols);
+
+			const marker = L.circleMarker([node.lat, node.lon], {
+				radius: node.size,
+				color: 'black',
+				weight: 1,
+				fillColor: style.fillColor,
+				fillOpacity: 0.7
+			});
+
+			// Add constraint icon as a DivIcon overlay if constrained
+			if (style.html) {
+				const icon = L.divIcon({
+					className: 'constraint-icon',
+					html: `<span style="font-size:14px;font-weight:bold;color:white;text-shadow:0 0 3px black;">${style.html}</span>`,
+					iconSize: [20, 20],
+					iconAnchor: [10, 10],
+				});
+				L.marker([node.lat, node.lon], { icon, interactive: false }).addTo(markerLayer!);
+			}
+
+			const state = symbols.length > 0 ? (constraintStates.get(symbols[0]) ?? 'free') : undefined;
+			const stateLabel = state === 'restricted' ? ' [RESTRICTED]' : state === 'forced' ? ' [FORCED]' : '';
+			marker.bindTooltip(node.tooltip + (stateLabel ? `<br><b>${stateLabel}</b>` : ''), { direction: 'top', offset: [0, -5] });
+
+			if (symbols.length > 0) {
+				marker.on('click', () => cycleConstraint(symbols));
+				marker.getElement?.()?.style.setProperty('cursor', 'pointer');
+			}
+
+			marker.addTo(markerLayer!);
+		}
+	}
+
+	// Re-render markers when constraint states change
+	$effect(() => {
+		// Read constraintStates to create dependency
+		const _states = constraintStates;
+		if (mapData && markerLayer) {
+			import('leaflet').then(L => updateMarkers(mapData!, L));
+		}
+	});
+
 	async function loadMap() {
 		loading = true;
 		error = null;
 		try {
 			const data = await fetchMapData();
+			mapData = data;
 			await renderMap(data);
 		} catch (e) {
 			error = e instanceof Error ? e.message : String(e);
@@ -143,11 +256,14 @@
 	});
 
 	$effect(() => {
-		// Re-render when solution changes (after initial mount)
 		if (solution && mapContainer) {
 			loadMap();
 		}
 	});
+
+	export function clearConstraints() {
+		constraintStates = new Map();
+	}
 </script>
 
 <svelte:head>
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
index 465d7c62d..20e067b6a 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
@@ -6736,7 +6736,9 @@ export const BuildMapSiteSelectionMapPostResponse = zod
 				})
 				.describe('A coverage connection edge between two nodes.')
 		),
-		center: zod.array(zod.number())
+		center: zod.array(zod.number()),
+		site_variable_symbols: zod.array(zod.string()),
+		site_node_names: zod.array(zod.string())
 	})
 	.describe('Response body for the site selection map endpoint.');
 
diff --git a/webui/src/lib/gen/models/SiteSelectionMapResponse.ts b/webui/src/lib/gen/models/SiteSelectionMapResponse.ts
index 231123d74..2ab425fe4 100644
--- a/webui/src/lib/gen/models/SiteSelectionMapResponse.ts
+++ b/webui/src/lib/gen/models/SiteSelectionMapResponse.ts
@@ -15,4 +15,6 @@ export interface SiteSelectionMapResponse {
 	nodes: SiteSelectionMapNode[];
 	edges: SiteSelectionMapEdge[];
 	center: number[];
+	site_variable_symbols: string[];
+	site_node_names: string[];
 }
diff --git a/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte b/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
index 1e48e3502..6e981262c 100644
--- a/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
+++ b/webui/src/routes/interactive_methods/E-NAUTILUS/+page.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
+	import { onMount, onDestroy } from 'svelte';
 	import { methodSelection } from '../../../stores/methodSelection';
 	import type { MethodSelectionState } from '../../../stores/methodSelection';
 	import { type ENautilusRepresentativeSolutionsResponse, type InteractiveSessionBase, type SolverResults } from '$lib/gen/models';
+	import type { VariableFixing, RPMState } from '$lib/gen/models';
 	import { isLoading, errorMessage } from '../../../stores/uiState';
 
 	import BaseLayout from '$lib/components/custom/method_layout/base-layout.svelte';
@@ -31,7 +32,10 @@
 		fetch_representative_solutions,
 		fetch_session_tree,
 		fetch_sessions,
-		create_session
+		create_session,
+		resolveWithSiteConstraints,
+		cleanupConstrainedVariant,
+		unrollTensorVariables,
 	} from './handler';
 
 	import {
@@ -57,6 +61,8 @@
 	type FinalView = "visualization" | "journey" | "map";
 	let mode = $state<ENautilusMode>("iterate");
 	let finalView = $state<FinalView>("visualization");
+	type ComparisonTab = "chart" | "table";
+	let comparisonTab = $state<ComparisonTab>("chart");
 	let representative = $state<ENautilusRepresentativeSolutionsResponse | null>(null);
 	let final_selected_index = $state<number>(0);
 	let adoptedSolution = $state<SolverResults | null>(null);
@@ -80,6 +86,13 @@
 	let initSessionTree = $state<ENautilusSessionTreeResponse | null>(null);
 	let selectedRepSetId = $state<number | null>(null);
 
+	// Map re-solve state
+	let siteFixings = $state<VariableFixing[]>([]);
+	let constrainedProblemId = $state<number | null>(null);
+	let rpmResult = $state<RPMState | null>(null);
+	let resolving = $state(false);
+	let resolveError = $state<string | null>(null);
+
 	let repSolutionSets = $derived(
 		problem_info?.problem_metadata?.representative_nd_metadata?.filter(s => s.id != null) ?? []
 	);
@@ -175,10 +188,14 @@
 		return representative.solutions.map((sol) => objective_keys.map((k) => (sol.optimal_objectives as any)[k] as number));
 	});
 
-	let finalSolution = $derived.by(() => {
-		if (adoptedSolution) return adoptedSolution;
+	let originalFinalSolution = $derived.by(() => {
 		if (!representative) return null;
 		return representative.solutions[final_selected_index] ?? null;
+	});
+
+	let finalSolution = $derived.by(() => {
+		if (adoptedSolution) return adoptedSolution;
+		return originalFinalSolution;
 	})
 
 	// SolverResults values may be number | number[]; unwrap arrays to plain numbers.
@@ -195,6 +212,94 @@
 		finalView = 'visualization';
 	}
 
+	let constraintSummary = $derived.by(() => {
+		const restricted = siteFixings.filter(f => f.fixed_value === 0).length;
+		const forced = siteFixings.filter(f => f.fixed_value === 1).length;
+		if (restricted === 0 && forced === 0) return null;
+		const parts: string[] = [];
+		if (restricted > 0) parts.push(`${restricted} restricted`);
+		if (forced > 0) parts.push(`${forced} forced`);
+		return parts.join(', ');
+	});
+
+	function handleConstraintsChanged(fixings: VariableFixing[]) {
+		siteFixings = fixings;
+		resolveError = null;
+	}
+
+	async function handleResolve() {
+		if (!finalSolution || !selection.selectedProblemId || siteFixings.length === 0) return;
+
+		resolving = true;
+		resolveError = null;
+
+		// Cleanup previous variant if any
+		if (constrainedProblemId != null) {
+			cleanupConstrainedVariant(constrainedProblemId);
+			constrainedProblemId = null;
+		}
+
+		// Build reference point from final solution objectives
+		const refPoint: Record<string, number> = {};
+		for (const [k, v] of Object.entries(finalSolution.optimal_objectives)) {
+			refPoint[k] = Array.isArray(v) ? v[0] : (v as number);
+		}
+
+		try {
+			const result = await resolveWithSiteConstraints(
+				selection.selectedProblemId,
+				siteFixings,
+				refPoint,
+			);
+
+			if (result && result.rpm_result.solver_results.length > 0) {
+				constrainedProblemId = result.constrained_problem_id;
+				rpmResult = result.rpm_result;
+				const rawSol = result.rpm_result.solver_results[0];
+				adoptedSolution = {
+					...rawSol,
+					optimal_variables: unrollTensorVariables(rawSol.optimal_variables as Record<string, unknown>),
+				};
+				// Clear constraint markers so the map shows the new solution's natural colors
+				siteFixings = [];
+				mapRef?.clearConstraints();
+			} else {
+				resolveError = 'No feasible solution exists with the current site constraints.';
+			}
+		} catch (e) {
+			resolveError = e instanceof Error ? e.message : String(e);
+		} finally {
+			resolving = false;
+		}
+	}
+
+	let mapRef = $state<{ clearConstraints: () => void } | undefined>();
+
+	function handleUseSolution() {
+		// Keep the adopted solution, clear constraints and comparison UI
+		rpmResult = null;
+		resolveError = null;
+		siteFixings = [];
+		if (constrainedProblemId != null) {
+			cleanupConstrainedVariant(constrainedProblemId);
+			constrainedProblemId = null;
+		}
+		mapRef?.clearConstraints();
+	}
+
+	function handleReset() {
+		// Revert to original E-NAUTILUS solution and clear everything
+		adoptedSolution = null;
+		rpmResult = null;
+		resolveError = null;
+		siteFixings = [];
+		if (constrainedProblemId != null) {
+			cleanupConstrainedVariant(constrainedProblemId);
+			constrainedProblemId = null;
+		}
+		mapRef?.clearConstraints();
+	}
+
 	let finalTableData = $derived.by(() => {
 		const sol = finalSolution;
 		if (!sol) return [];
@@ -608,6 +713,12 @@
 			refreshTree();
 		}
 	});
+
+	onDestroy(() => {
+		if (constrainedProblemId != null) {
+			cleanupConstrainedVariant(constrainedProblemId);
+		}
+	});
 </script>
 
 {#snippet ColumnHeader({ column, title, colorIdx }: { column: Column<IntermediatePoint>; title: string; colorIdx?: number })}
@@ -708,7 +819,47 @@
 					{/if}
 					{#if finalView === 'map'}
 						{#if finalSolution}
-							<SiteSelectionMap problem_id={selection.selectedProblemId} solution={finalSolution} />
+							<div class="flex h-full flex-col">
+								<div class="flex-1 min-h-0">
+									<SiteSelectionMap
+										bind:this={mapRef}
+										problem_id={selection.selectedProblemId}
+										solution={finalSolution}
+										on_constraints_changed={handleConstraintsChanged}
+									/>
+								</div>
+								{#if constraintSummary || rpmResult || resolveError}
+									<div class="border-t bg-white p-3 space-y-2">
+										<div class="flex items-center gap-3 flex-wrap">
+											{#if constraintSummary}
+												<span class="text-sm text-gray-600">Site constraints: <span class="font-semibold">{constraintSummary}</span></span>
+											{/if}
+											{#if siteFixings.length > 0}
+												<button
+													class="rounded bg-blue-600 px-3 py-1 text-xs text-white hover:bg-blue-700 disabled:opacity-50"
+													disabled={resolving}
+													onclick={handleResolve}
+												>{resolving ? 'Solving...' : 'Re-solve with site constraints'}</button>
+											{/if}
+											{#if rpmResult}
+												<button
+													class="rounded bg-green-600 px-3 py-1 text-xs text-white hover:bg-green-700"
+													onclick={handleUseSolution}
+												>Use this solution</button>
+											{/if}
+											{#if rpmResult || siteFixings.length > 0}
+												<button
+													class="text-xs text-red-600 hover:text-red-800 underline"
+													onclick={handleReset}
+												>Reset</button>
+											{/if}
+										</div>
+										{#if resolveError}
+											<div class="text-sm text-red-600">{resolveError}</div>
+										{/if}
+									</div>
+								{/if}
+							</div>
 						{:else}
 							<div class="flex h-full items-center justify-center text-sm text-gray-400">
 								No solution available for map.
@@ -735,8 +886,8 @@
 							currentPreferenceValues={[]}
 							previousPreferenceType={''}
 							currentPreferenceType={''}
-							solutionsObjectiveValues={representativeObjectiveValues.length > 0 ? [representativeObjectiveValues[final_selected_index]] : []}
-							previousObjectiveValues={[]}
+							solutionsObjectiveValues={finalSolution ? [objective_keys.map(k => { const v = finalSolution.optimal_objectives[k]; return Array.isArray(v) ? v[0] : v as number; })] : []}
+							previousObjectiveValues={adoptedSolution && originalFinalSolution ? [objective_keys.map(k => { const v = originalFinalSolution.optimal_objectives[k]; return Array.isArray(v) ? v[0] : v as number; })] : []}
 							externalSelectedIndexes={[0]}
 						/>
 					{/if}
@@ -753,9 +904,69 @@
 				<EndStateView
 					problem={problem_info}
 					tableData={finalTableData}
-					showVariables={true}
 					title="Representative solution"
 				/>
+			{:else if finalView === 'map' && rpmResult && rpmResult.solver_results.length > 0 && problem_info && originalFinalSolution}
+				<div class="h-full flex flex-col">
+					<div class="flex gap-1 border-b px-2 pt-1">
+						<button
+							class="px-3 py-1 text-xs rounded-t {comparisonTab === 'chart' ? 'bg-white border border-b-white font-semibold -mb-px' : 'text-gray-500 hover:text-gray-700'}"
+							onclick={() => comparisonTab = 'chart'}
+						>Parallel Coordinates</button>
+						<button
+							class="px-3 py-1 text-xs rounded-t {comparisonTab === 'table' ? 'bg-white border border-b-white font-semibold -mb-px' : 'text-gray-500 hover:text-gray-700'}"
+							onclick={() => comparisonTab = 'table'}
+						>Comparison Table</button>
+					</div>
+					<div class="flex-1 min-h-0 p-2">
+						{#if comparisonTab === 'chart'}
+							<div class="h-full">
+								<VisualizationsPanel
+									problem={problem_info}
+									previousPreferenceValues={[]}
+									currentPreferenceValues={[]}
+									previousPreferenceType={''}
+									currentPreferenceType={''}
+									solutionsObjectiveValues={[objective_keys.map(k => { const v = rpmResult.solver_results[0].optimal_objectives[k]; return Array.isArray(v) ? v[0] : v as number; })]}
+									previousObjectiveValues={[objective_keys.map(k => { const v = originalFinalSolution.optimal_objectives[k]; return Array.isArray(v) ? v[0] : v as number; })]}
+									externalSelectedIndexes={[0]}
+									referenceDataLabels={{ previousSolutionLabels: ['Original E-NAUTILUS'] }}
+									lineLabels={{ '0': 'Constrained' }}
+								/>
+							</div>
+						{:else}
+							<div class="overflow-y-auto">
+								<table class="w-full text-sm">
+									<thead>
+										<tr class="border-b">
+											<th class="py-1 pr-4 text-left font-semibold">Objective</th>
+											<th class="py-1 pr-4 text-right font-semibold">Original</th>
+											<th class="py-1 pr-4 text-right font-semibold">Constrained</th>
+											<th class="py-1 text-right font-semibold">Δ</th>
+										</tr>
+									</thead>
+									<tbody>
+										{#each problem_info.objectives as obj, i}
+											{@const origVal = Array.isArray(originalFinalSolution.optimal_objectives[obj.symbol]) ? originalFinalSolution.optimal_objectives[obj.symbol][0] : originalFinalSolution.optimal_objectives[obj.symbol]}
+											{@const newVal = Array.isArray(rpmResult.solver_results[0].optimal_objectives[obj.symbol]) ? rpmResult.solver_results[0].optimal_objectives[obj.symbol][0] : rpmResult.solver_results[0].optimal_objectives[obj.symbol]}
+											{@const delta = (newVal as number) - (origVal as number)}
+											{@const improved = obj.maximize ? delta > 0 : delta < 0}
+											<tr class="border-b border-gray-100">
+												<td class="py-1 pr-4" style="color: {COLOR_PALETTE[i % COLOR_PALETTE.length]}">{obj.name}</td>
+												<td class="py-1 pr-4 text-right font-mono">{formatNumber(origVal as number, 2)}</td>
+												<td class="py-1 pr-4 text-right font-mono">{formatNumber(newVal as number, 2)}</td>
+												<td class="py-1 text-right font-mono {improved ? 'text-green-600' : delta === 0 ? 'text-gray-400' : 'text-red-600'}">
+													{delta > 0 ? '+' : ''}{formatNumber(delta, 2)}
+													{improved ? '↑' : delta === 0 ? '' : '↓'}
+												</td>
+											</tr>
+										{/each}
+									</tbody>
+								</table>
+							</div>
+						{/if}
+					</div>
+				</div>
 			{/if}
 		{/snippet}
 	</BaseLayout>
diff --git a/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts b/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
index ffebd2159..e8483c2cd 100644
--- a/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
+++ b/webui/src/routes/interactive_methods/E-NAUTILUS/handler.ts
@@ -1,6 +1,6 @@
-import type { ENautilusRepresentativeSolutionsResponse, ENautilusSessionTreeResponse, ENautilusSimulateResponse, ENautilusStateResponse, ENautilusStepRequest, ENautilusStepResponse, ProblemInfo } from "$lib/gen/models";
+import type { ENautilusRepresentativeSolutionsResponse, ENautilusSessionTreeResponse, ENautilusSimulateResponse, ENautilusStateResponse, ENautilusStepRequest, ENautilusStepResponse, ProblemInfo, VariableFixing, RPMState } from "$lib/gen/models";
 import type { getRepresentativeMethodEnautilusGetRepresentativeStateIdGetResponse, getSessionTreeMethodEnautilusSessionTreeSessionIdGetResponse, getStateMethodEnautilusGetStateStateIdGetResponse, simulateMethodEnautilusSimulatePostResponse, stepMethodEnautilusStepPostResponse } from "$lib/gen/endpoints/DESDEOFastAPI";
-import { stepMethodEnautilusStepPost, getProblemProblemProblemIdGet, getStateMethodEnautilusGetStateStateIdGet, getRepresentativeMethodEnautilusGetRepresentativeStateIdGet, getSessionTreeMethodEnautilusSessionTreeSessionIdGet, simulateMethodEnautilusSimulatePost } from "$lib/gen/endpoints/DESDEOFastAPI";
+import { stepMethodEnautilusStepPost, getProblemProblemProblemIdGet, getStateMethodEnautilusGetStateStateIdGet, getRepresentativeMethodEnautilusGetRepresentativeStateIdGet, getSessionTreeMethodEnautilusSessionTreeSessionIdGet, simulateMethodEnautilusSimulatePost, createConstrainedVariantProblemProblemIdConstrainedVariantPost, solveSolutionsMethodRpmSolvePost, deleteProblemProblemProblemIdDelete } from "$lib/gen/endpoints/DESDEOFastAPI";
 import type { getProblemProblemProblemIdGetResponse } from "$lib/gen/endpoints/DESDEOFastAPI";
 import { fetch_sessions, create_session } from '../../methods/sessions/handler';
 export { fetch_sessions, create_session };
@@ -134,3 +134,93 @@ export async function simulate_enautilus(
 
     return response.data;
 }
+
+export async function resolveWithSiteConstraints(
+    problem_id: number,
+    fixings: VariableFixing[],
+    reference_point: Record<string, number>,
+    solver?: string,
+): Promise<{ constrained_problem_id: number; rpm_result: RPMState } | null> {
+    // Step 1: Create constrained variant
+    const variantResp = await createConstrainedVariantProblemProblemIdConstrainedVariantPost(
+        problem_id,
+        { variable_fixings: fixings }
+    );
+
+    if (variantResp.status !== 200) {
+        console.error("Failed to create constrained variant:", variantResp.status);
+        return null;
+    }
+
+    const constrained_problem_id = variantResp.data.problem_id;
+
+    // Step 2: Solve with RPM using E-NAUTILUS final objectives as reference point
+    try {
+        const rpmResp = await solveSolutionsMethodRpmSolvePost({
+            problem_id: constrained_problem_id,
+            preference: {
+                preference_type: "reference_point",
+                aspiration_levels: reference_point,
+            },
+            solver: solver ?? undefined,
+        });
+
+        if (rpmResp.status !== 200) {
+            console.error("RPM solve failed:", rpmResp.status);
+            // Cleanup on failure
+            await cleanupConstrainedVariant(constrained_problem_id);
+            return null;
+        }
+
+        return {
+            constrained_problem_id,
+            rpm_result: rpmResp.data,
+        };
+    } catch (e) {
+        // Cleanup on error
+        await cleanupConstrainedVariant(constrained_problem_id);
+        throw e;
+    }
+}
+
+/**
+ * Unroll tensor variables in a SolverResults object.
+ * RPM returns tensor variables as e.g. {"sv": [[v1], [v2], ...]} for shape [N, 1].
+ * The map and other components expect unrolled names: {"sv_1": v1, "sv_2": v2, ...}.
+ * Scalar values and already-unrolled variables are passed through unchanged.
+ */
+export function unrollTensorVariables(
+    variables: Record<string, unknown>
+): Record<string, unknown> {
+    const result: Record<string, unknown> = {};
+    for (const [key, value] of Object.entries(variables)) {
+        if (Array.isArray(value) && value.length > 0 && Array.isArray(value[0])) {
+            // Nested list (tensor variable) — flatten with 1-based indexing
+            let flatIdx = 1;
+            const flatten = (arr: unknown[]): void => {
+                for (const el of arr) {
+                    if (Array.isArray(el)) {
+                        flatten(el);
+                    } else {
+                        result[`${key}_${flatIdx}`] = el;
+                        flatIdx++;
+                    }
+                }
+            };
+            flatten(value);
+        } else {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+
+export async function cleanupConstrainedVariant(constrained_problem_id: number): Promise<void> {
+    try {
+        await deleteProblemProblemProblemIdDelete(constrained_problem_id);
+    } catch (e) {
+        console.warn("Failed to clean up constrained variant:", e);
+    }
+}
+
+export type { VariableFixing };

From e99678d16989551fa3e168d0d9af068bcbc08631 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 26 Mar 2026 16:57:48 +0200
Subject: [PATCH 09/24] Rahti deployment testing.

---
 .s2i/bin/assemble             | 110 +++++++-----------------------
 .s2i/environment              |  24 ++++++-
 deploy/api-buildconfig.yaml   |  85 +++++++++++++++++++++++
 deploy/api-deployment.yaml    | 124 ++++++++++++++++++++++++++++++++++
 deploy/api-imagestream.yaml   |  18 +++++
 deploy/db-init-job.yaml       |  63 +++++++++++++++++
 deploy/postgres.yaml          | 108 +++++++++++++++++++++++++++++
 deploy/secrets-template.yaml  |  56 +++++++++++++++
 deploy/webui-buildconfig.yaml |  62 +++++++++++++++++
 deploy/webui-deployment.yaml  |  98 +++++++++++++++++++++++++++
 deploy/webui-imagestream.yaml |  11 +++
 desdeo/api/app.py             |   6 ++
 desdeo/api/db_init_prod.py    |  84 +++++++++++++++++++++++
 webui/Dockerfile              |  71 +++++++++++++++++++
 14 files changed, 833 insertions(+), 87 deletions(-)
 create mode 100644 deploy/api-buildconfig.yaml
 create mode 100644 deploy/api-deployment.yaml
 create mode 100644 deploy/api-imagestream.yaml
 create mode 100644 deploy/db-init-job.yaml
 create mode 100644 deploy/postgres.yaml
 create mode 100644 deploy/secrets-template.yaml
 create mode 100644 deploy/webui-buildconfig.yaml
 create mode 100644 deploy/webui-deployment.yaml
 create mode 100644 deploy/webui-imagestream.yaml
 create mode 100644 desdeo/api/db_init_prod.py
 create mode 100644 webui/Dockerfile

diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
index d6d56e973..7acaa3c6c 100644
--- a/.s2i/bin/assemble
+++ b/.s2i/bin/assemble
@@ -1,98 +1,36 @@
 #!/bin/bash
-
-function is_django_installed() {
-  python -c "import django" &>/dev/null
-}
-
-function should_collectstatic() {
-  is_django_installed && [[ -z "$DISABLE_COLLECTSTATIC" ]]
-}
-
-function virtualenv_bin() {
-    # New versions of Python (>3.6) should use venv module
-    # from stdlib instead of virtualenv package
-    python3.12 -m venv $1
-}
-
-# Install pipenv or micropipenv to the separate virtualenv to isolate it
-# from system Python packages and packages in the main
-# virtualenv. Executable is simlinked into ~/.local/bin
-# to be accessible. This approach is inspired by pipsi
-# (pip script installer).
-function install_tool() {
-  echo "---> Installing $1 packaging tool ..."
-  VENV_DIR=$HOME/.local/venvs/$1
-  virtualenv_bin "$VENV_DIR"
-  # First, try to install the tool without --isolated which means that if you
-  # have your own PyPI mirror, it will take it from there. If this try fails, try it
-  # again with --isolated which ignores external pip settings (env vars, config file)
-  # and installs the tool from PyPI (needs internet connetion).
-  # $1$2 combines package name with [extras] or version specifier if is defined as $2```
-  if ! $VENV_DIR/bin/pip install -U $1$2; then
-    echo "WARNING: Installation of $1 failed, trying again from official PyPI with pip --isolated install"
-    $VENV_DIR/bin/pip install --isolated -U $1$2  # Combines package name with [extras] or version specifier if is defined as $2```
-  fi
-  mkdir -p $HOME/.local/bin
-  ln -s $VENV_DIR/bin/$1 $HOME/.local/bin/$1
-}
-
+# S2I assemble script for DESDEO API (FastAPI / gunicorn + uvicorn).
+#
+# Key differences from the original script:
+#   - Uses uv instead of pip for dependency installation.
+#   - UV_PROJECT_ENVIRONMENT points uv at the S2I-managed virtualenv
+#     (/opt/app-root) so it does NOT create a separate .venv directory.
+#   - --frozen  → reproduces exactly what is pinned in uv.lock.
+#   - --no-dev  → skips dev-only deps (pytest, ruff, etc.).
+#   - --group web --group server → pulls in FastAPI, gunicorn, uvicorn, etc.
+#   - Django collectstatic block removed (not applicable here).
+#
 set -e
-
-# First of all, check that we don't have disallowed combination of ENVs
-if [[ ! -z "$ENABLE_PIPENV" && ! -z "$ENABLE_MICROPIPENV" ]]; then
-  echo "ERROR: Pipenv and micropipenv cannot be enabled at the same time!"
-  # podman/buildah does not relay this exit code but it will be fixed hopefuly
-  # https://github.com/containers/buildah/issues/2305
-  exit 3
-fi
-
 shopt -s dotglob
+
 echo "---> Installing application source ..."
 mv /tmp/src/* "$HOME"
 
-# set permissions for any installed artifacts
+# Restore permissions after source injection.
 fix-permissions /opt/app-root -P
 
+echo "---> Installing uv ..."
+pip install -q --upgrade pip
+pip install -q uv
 
-if [[ ! -z "$UPGRADE_PIP_TO_LATEST" ]]; then
-  echo "---> Upgrading pip, setuptools and wheel to latest version ..."
-  if ! pip install -U pip setuptools wheel; then
-    echo "WARNING: Installation of the latest pip, setuptools and wheel failed, trying again from official PyPI with pip --isolated install"
-    pip install --isolated -U pip setuptools wheel
-  fi
-fi
-
-pip install $DESDEO_INSTALL
-
-
-if should_collectstatic; then
-  (
-    echo "---> Collecting Django static files ..."
-
-    APP_HOME=$(readlink -f "${APP_HOME:-.}")
-    # Change the working directory to APP_HOME
-    PYTHONPATH="$(pwd)${PYTHONPATH:+:$PYTHONPATH}"
-    cd "$APP_HOME"
-
-    # Look for 'manage.py' in the current directory
-    manage_file=./manage.py
-
-    if [[ ! -f "$manage_file" ]]; then
-      echo "WARNING: seems that you're using Django, but we could not find a 'manage.py' file."
-      echo "'manage.py collectstatic' ignored."
-      exit
-    fi
-
-    if ! python $manage_file collectstatic --dry-run --noinput &> /dev/null; then
-      echo "WARNING: could not run 'manage.py collectstatic'. To debug, run:"
-      echo "    $ python $manage_file collectstatic --noinput"
-      echo "Ignore this warning if you're not serving static files with Django."
-      exit
-    fi
+echo "---> Syncing Python dependencies via uv ..."
+# UV_PROJECT_ENVIRONMENT: use the existing S2I venv instead of creating .venv.
+# UV_PYTHON_PREFERENCE:   do not let uv download its own Python interpreter.
+UV_PROJECT_ENVIRONMENT="${VIRTUAL_ENV:-/opt/app-root}" \
+UV_PYTHON_PREFERENCE=only-system \
+  uv sync --frozen --no-dev --group web --group server
 
-    python $manage_file collectstatic --noinput
-  )
-fi
+echo "---> Dependencies installed."
 
-# set permissions for any installed artifacts
+# Restore permissions for any artifacts written during install.
 fix-permissions /opt/app-root -P
diff --git a/.s2i/environment b/.s2i/environment
index 30e018bca..96b178108 100644
--- a/.s2i/environment
+++ b/.s2i/environment
@@ -1,5 +1,27 @@
+# S2I environment variables for the DESDEO API build and runtime.
+# These are read both during the S2I *build* (assemble) and at *runtime*.
+#
+# UPGRADE_PIP_TO_LATEST is no longer needed because the assemble script
+# upgrades pip explicitly before installing uv. Kept here as a no-op for
+# compatibility with any base-image hooks that check for it.
 UPGRADE_PIP_TO_LATEST=1
+
+# Entry point: Gunicorn loads the FastAPI app from this module path.
 APP_MODULE=desdeo.api.app:app
+
+# Gunicorn flags.
+#   --workers=1          Single worker is safe for the current single-pod setup.
+#                        Increase to 2-4 if the pod gets >1 CPU allocated.
+#   --worker-class       uvicorn.workers.UvicornWorker gives async support.
+#   --bind               Must be 0.0.0.0:8080 to match the Service targetPort.
+#   --access-logfile -   Log to stdout so OpenShift can capture it.
 GUNICORN_CMD_ARGS=--bind=0.0.0.0:8080 --workers=1 --access-logfile=- --worker-class uvicorn.workers.UvicornWorker
-DESDEO_INSTALL=. --group web --group server
+
+# Passed to `uv sync` in the assemble script.
+# Format: flags passed after the implicit project root (.).
+# --group web --group server: include the FastAPI/gunicorn/uvicorn dependency groups.
+# NOTE: This variable is used in assemble, not by pip directly.
+DESDEO_INSTALL=--group web --group server
+
+# Runtime default; override via Deployment env or Secret.
 DEBUG=false
diff --git a/deploy/api-buildconfig.yaml b/deploy/api-buildconfig.yaml
new file mode 100644
index 000000000..7e70ba950
--- /dev/null
+++ b/deploy/api-buildconfig.yaml
@@ -0,0 +1,85 @@
+# deploy/api-buildconfig.yaml
+#
+# BuildConfig for the DESDEO API using OpenShift S2I strategy.
+#
+# Builder image: python:3.12-ubi9 from the shared 'openshift' namespace.
+# The custom .s2i/bin/assemble script in the repository overrides the default
+# assemble behaviour and uses uv to install dependencies.
+#
+# Triggers:
+#   - GitHub webhook (push to DEPLOY_BRANCH)  ← main CI/CD trigger
+#   - ImageChange on the builder image         ← rebuilds on Python security patches
+#
+# To get the webhook URL after applying:
+#   oc describe bc/desdeo-api | grep -A2 Webhook
+---
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: desdeo-api
+  labels:
+    app: desdeo-api
+spec:
+  # ── Source ───────────────────────────────────────────────────────────────
+  source:
+    type: Git
+    git:
+      uri: https://github.com/industrial-optimization-group/DESDEO.git
+      # Replace with the branch you want to track (e.g. master, deploy, main).
+      ref: <DEPLOY_BRANCH>
+    # No contextDir: the pyproject.toml and .s2i/ are at the repo root.
+
+  # ── Build strategy ───────────────────────────────────────────────────────
+  strategy:
+    type: Source
+    sourceStrategy:
+      # Python 3.12 UBI9 S2I builder available in every Rahti project via the
+      # shared 'openshift' ImageStream.  Verify with:
+      #   oc get is python -n openshift
+      from:
+        kind: ImageStreamTag
+        name: python:3.12-ubi9
+        namespace: openshift
+      # Environment variables available during the S2I *build* (assemble).
+      # Runtime env vars go in the Deployment, not here.
+      env:
+      - name: UPGRADE_PIP_TO_LATEST
+        value: "1"
+      - name: DESDEO_INSTALL
+        value: "--group web --group server"
+      - name: DEBUG
+        value: "false"
+
+  # ── Output ───────────────────────────────────────────────────────────────
+  output:
+    to:
+      kind: ImageStreamTag
+      name: desdeo-api:latest
+
+  # ── Triggers ─────────────────────────────────────────────────────────────
+  triggers:
+  # Rebuild when the Python builder image is updated (security patches).
+  - type: ImageChange
+    imageChange: {}
+  # GitHub webhook — authenticates with WEBHOOK_SECRET_API from the Secret.
+  - type: GitHub
+    github:
+      secretReference:
+        name: desdeo-secrets
+        # Key in the Secret that holds the webhook secret string.
+        # Note: this uses secretReference (key in existing Secret) rather than
+        # an inline secret so we don't store the value in this manifest.
+  # Manual / API trigger.
+  - type: ConfigChange
+
+  # ── Run policy ───────────────────────────────────────────────────────────
+  runPolicy: Serial
+
+  # ── Resource limits for the build pod ────────────────────────────────────
+  resources:
+    requests:
+      memory: "1Gi"
+      cpu: "500m"
+    limits:
+      memory: "2Gi"
+      cpu: "1"
diff --git a/deploy/api-deployment.yaml b/deploy/api-deployment.yaml
new file mode 100644
index 000000000..1d4cae5e3
--- /dev/null
+++ b/deploy/api-deployment.yaml
@@ -0,0 +1,124 @@
+# deploy/api-deployment.yaml
+#
+# Deployment, Service, and Route for the DESDEO FastAPI backend.
+#
+# The Deployment has an ImageChange trigger: whenever the BuildConfig pushes a
+# new image to the desdeo-api ImageStream, the pod is replaced with a rolling
+# update automatically.
+#
+# All secrets are consumed as environment variables from the desdeo-secrets
+# Secret; no secret values live in this file.
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: desdeo-api
+  labels:
+    app: desdeo-api
+  annotations:
+    # This annotation tells the OpenShift image change controller to update the
+    # Deployment when a new image is pushed to the ImageStream.
+    image.openshift.io/triggers: >
+      [{"from":{"kind":"ImageStreamTag","name":"desdeo-api:latest"},
+        "fieldPath":"spec.template.spec.containers[0].image"}]
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: desdeo-api
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 0     # zero-downtime: new pod must be ready before old is removed
+      maxSurge: 1
+  template:
+    metadata:
+      labels:
+        app: desdeo-api
+    spec:
+      containers:
+      - name: api
+        # Placeholder: the image change annotation above overwrites this on deploy.
+        image: desdeo-api:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8080
+          name: http
+          protocol: TCP
+        env:
+        # ── Pulled from Secret ────────────────────────────────────────────
+        - name: DATABASE_URL
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: DATABASE_URL
+        - name: SECRET_KEY
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: SECRET_KEY
+        # ── Static runtime config ─────────────────────────────────────────
+        - name: DEBUG
+          value: "false"
+        # CORS: allow the public webui origin.
+        - name: ALLOWED_ORIGINS
+          value: "https://gialmisi-desdeo-webui.rahtiapp.fi"
+        # ── Gunicorn (matches .s2i/environment) ───────────────────────────
+        - name: APP_MODULE
+          value: "desdeo.api.app:app"
+        - name: GUNICORN_CMD_ARGS
+          value: "--bind=0.0.0.0:8080 --workers=1 --access-logfile=- --worker-class uvicorn.workers.UvicornWorker"
+        resources:
+          requests:
+            memory: "512Mi"
+            cpu: "250m"
+          limits:
+            memory: "1Gi"
+            cpu: "1"
+        readinessProbe:
+          httpGet:
+            path: /health     # adjust if the FastAPI app exposes a different health endpoint
+            port: 8080
+          initialDelaySeconds: 15
+          periodSeconds: 10
+          failureThreshold: 3
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+          initialDelaySeconds: 30
+          periodSeconds: 20
+          failureThreshold: 3
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: desdeo-api
+  labels:
+    app: desdeo-api
+spec:
+  selector:
+    app: desdeo-api
+  ports:
+  - name: http
+    port: 8080
+    targetPort: 8080
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: desdeo-api
+  labels:
+    app: desdeo-api
+spec:
+  host: gialmisi-desdeo-api.rahtiapp.fi
+  to:
+    kind: Service
+    name: desdeo-api
+  port:
+    targetPort: http
+  tls:
+    # edge: TLS terminated at the Rahti HAProxy; traffic to the pod is plain HTTP.
+    termination: edge
+    # Redirect any accidental HTTP requests to HTTPS.
+    insecureEdgeTerminationPolicy: Redirect
diff --git a/deploy/api-imagestream.yaml b/deploy/api-imagestream.yaml
new file mode 100644
index 000000000..69fdfb647
--- /dev/null
+++ b/deploy/api-imagestream.yaml
@@ -0,0 +1,18 @@
+# deploy/api-imagestream.yaml
+#
+# ImageStream for the DESDEO API container image.
+# The BuildConfig writes new image revisions here; the Deployment reads from here.
+# Separating build output from deployment allows rolling updates to trigger
+# automatically when a new image is pushed.
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: desdeo-api
+  labels:
+    app: desdeo-api
+spec:
+  lookupPolicy:
+    # Allow Deployments in this namespace to reference the image by its
+    # ImageStreamTag name without needing the full registry URL.
+    local: true
diff --git a/deploy/db-init-job.yaml b/deploy/db-init-job.yaml
new file mode 100644
index 000000000..afd9aadc5
--- /dev/null
+++ b/deploy/db-init-job.yaml
@@ -0,0 +1,63 @@
+# deploy/db-init-job.yaml
+#
+# One-shot Kubernetes Job that runs desdeo/api/db_init_prod.py using the API
+# image.  Run this:
+#   - After the very first deployment (creates tables + seeds admin user).
+#   - After a deliberate database wipe (the script is idempotent on re-run).
+#
+# The Job is NOT re-triggered automatically on each new image build.
+# If you add new tables in a later release use a proper migration tool
+# (Alembic) instead of re-running this Job.
+#
+# Usage:
+#   # Replace <IMAGE> with the actual image pullspec, e.g.:
+#   #   image-registry.openshift-image-registry.svc:5000/<project>/desdeo-api:latest
+#   oc create -f deploy/db-init-job.yaml
+#
+#   # Watch it:
+#   oc logs -f job/desdeo-db-init
+#
+#   # Clean up after success:
+#   oc delete job desdeo-db-init
+#
+# If you need to re-run it (e.g. to re-seed after a wipe), delete the old Job
+# first then create it again.
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: desdeo-db-init
+  labels:
+    app: desdeo-api
+    component: db-init
+spec:
+  # Do not restart the pod on success.
+  backoffLimit: 3
+  # Auto-clean completed Job pods after 1 hour.
+  ttlSecondsAfterFinished: 3600
+  template:
+    metadata:
+      labels:
+        app: desdeo-api
+        component: db-init
+    spec:
+      restartPolicy: Never
+      containers:
+      - name: db-init
+        # Use the same image as the API Deployment.
+        # Replace <PROJECT> with your Rahti project name.
+        image: image-registry.openshift-image-registry.svc:5000/<PROJECT>/desdeo-api:latest
+        # Run the production init script.
+        command: ["python", "desdeo/api/db_init_prod.py"]
+        envFrom:
+        # Inject DATABASE_URL, SECRET_KEY, DESDEO_ADMIN_USERNAME,
+        # DESDEO_ADMIN_PASSWORD from the shared Secret.
+        - secretRef:
+            name: desdeo-secrets
+        resources:
+          requests:
+            memory: "256Mi"
+            cpu: "100m"
+          limits:
+            memory: "512Mi"
+            cpu: "500m"
diff --git a/deploy/postgres.yaml b/deploy/postgres.yaml
new file mode 100644
index 000000000..1ed80fea1
--- /dev/null
+++ b/deploy/postgres.yaml
@@ -0,0 +1,108 @@
+# deploy/postgres.yaml
+#
+# In-cluster PostgreSQL using the Bitnami image, which is designed to run
+# as a non-root user and is therefore compatible with OpenShift / Rahti SCCs.
+#
+# Apply with:
+#   oc apply -f deploy/postgres.yaml
+#
+# Bitnami env var names differ from the official postgres image:
+#   POSTGRESQL_USERNAME  →  creates a non-superuser (matches DATABASE_URL user)
+#   POSTGRESQL_PASSWORD  →  password for POSTGRESQL_USERNAME
+#   POSTGRESQL_DATABASE  →  database to create on first start
+#   POSTGRESQL_POSTGRES_PASSWORD  →  password for the postgres superuser
+#
+# Data is persisted in the PVC mounted at /bitnami/postgresql.
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: desdeo-postgres
+  labels:
+    app: desdeo-postgres
+spec:
+  # ClusterIP only — Postgres is not exposed outside the cluster.
+  clusterIP: None          # headless service for StatefulSet DNS
+  selector:
+    app: desdeo-postgres
+  ports:
+  - name: postgres
+    port: 5432
+    targetPort: 5432
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: desdeo-postgres
+  labels:
+    app: desdeo-postgres
+spec:
+  selector:
+    matchLabels:
+      app: desdeo-postgres
+  serviceName: desdeo-postgres
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: desdeo-postgres
+    spec:
+      containers:
+      - name: postgres
+        image: docker.io/bitnami/postgresql:16
+        ports:
+        - containerPort: 5432
+          name: postgres
+        env:
+        - name: POSTGRESQL_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: POSTGRES_USER
+        - name: POSTGRESQL_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: POSTGRES_PASSWORD
+        - name: POSTGRESQL_DATABASE
+          value: desdeo
+        - name: POSTGRESQL_POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: POSTGRES_SUPERUSER_PASSWORD
+        volumeMounts:
+        - name: postgres-data
+          mountPath: /bitnami/postgresql
+        resources:
+          requests:
+            memory: "256Mi"
+            cpu: "100m"
+          limits:
+            memory: "512Mi"
+            cpu: "500m"
+        livenessProbe:
+          exec:
+            command:
+            - /bin/sh
+            - -c
+            - pg_isready -U $POSTGRESQL_USERNAME -d desdeo
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          failureThreshold: 6
+        readinessProbe:
+          exec:
+            command:
+            - /bin/sh
+            - -c
+            - pg_isready -U $POSTGRESQL_USERNAME -d desdeo
+          initialDelaySeconds: 5
+          periodSeconds: 5
+  volumeClaimTemplates:
+  - metadata:
+      name: postgres-data
+    spec:
+      accessModes: ["ReadWriteOnce"]
+      resources:
+        requests:
+          storage: 2Gi
diff --git a/deploy/secrets-template.yaml b/deploy/secrets-template.yaml
new file mode 100644
index 000000000..fa04e0699
--- /dev/null
+++ b/deploy/secrets-template.yaml
@@ -0,0 +1,56 @@
+# deploy/secrets-template.yaml
+#
+# DO NOT commit real values to git.
+#
+# Usage:
+#   1. Copy this file: cp deploy/secrets-template.yaml deploy/secrets.yaml
+#   2. Fill in all <CHANGE_ME> placeholders in deploy/secrets.yaml
+#   3. Apply:  oc apply -f deploy/secrets.yaml
+#   4. Keep deploy/secrets.yaml out of version control.
+#
+# All values must be base64-encoded.  Quick helper:
+#   echo -n 'myvalue' | base64
+#
+# Or use --from-literal to skip manual encoding:
+#   oc create secret generic desdeo-secrets \
+#     --from-literal=POSTGRES_USER=desdeo \
+#     --from-literal=POSTGRES_PASSWORD=<pw> \
+#     --from-literal=POSTGRES_SUPERUSER_PASSWORD=<pw> \
+#     --from-literal=DATABASE_URL='postgresql://desdeo:<pw>@desdeo-postgres:5432/desdeo' \
+#     --from-literal=SECRET_KEY=<random-64-char-hex> \
+#     --from-literal=DESDEO_ADMIN_USERNAME=admin \
+#     --from-literal=DESDEO_ADMIN_PASSWORD=<pw> \
+#     --dry-run=client -o yaml > deploy/secrets.yaml
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: desdeo-secrets
+type: Opaque
+stringData:
+  # ── PostgreSQL ──────────────────────────────────────────────────────────
+  # Application user (non-superuser). Must match DATABASE_URL below.
+  POSTGRES_USER: desdeo
+  POSTGRES_PASSWORD: <CHANGE_ME>
+  # Superuser password (used internally by Bitnami image).
+  POSTGRES_SUPERUSER_PASSWORD: <CHANGE_ME>
+
+  # ── API runtime ─────────────────────────────────────────────────────────
+  # Full DSN consumed by the FastAPI app and db_init_prod.py.
+  # Host must be the Kubernetes Service name defined in postgres.yaml.
+  DATABASE_URL: "postgresql://desdeo:<CHANGE_ME>@desdeo-postgres:5432/desdeo"
+
+  # JWT / session signing key — generate with:
+  #   python -c "import secrets; print(secrets.token_hex(64))"
+  SECRET_KEY: <CHANGE_ME>
+
+  # ── DB init job ─────────────────────────────────────────────────────────
+  # Credentials for the initial analyst user seeded by the db-init Job.
+  DESDEO_ADMIN_USERNAME: admin
+  DESDEO_ADMIN_PASSWORD: <CHANGE_ME>
+
+  # ── Webhook secrets (BuildConfigs) ──────────────────────────────────────
+  # Random strings used to authenticate GitHub webhook payloads.
+  # Generate with:  python -c "import secrets; print(secrets.token_hex(24))"
+  WEBHOOK_SECRET_API: <CHANGE_ME>
+  WEBHOOK_SECRET_WEBUI: <CHANGE_ME>
diff --git a/deploy/webui-buildconfig.yaml b/deploy/webui-buildconfig.yaml
new file mode 100644
index 000000000..0420ce945
--- /dev/null
+++ b/deploy/webui-buildconfig.yaml
@@ -0,0 +1,62 @@
+# deploy/webui-buildconfig.yaml
+#
+# BuildConfig for the DESDEO web UI using Docker build strategy.
+#
+# The Dockerfile lives at webui/Dockerfile in the repository.
+# contextDir: webui  →  all COPY paths in the Dockerfile are relative to webui/.
+#
+# VITE_API_URL is baked into the client-side bundle at build time.
+# It must be the *public* HTTPS URL of the API Route.
+# If you ever change the API hostname, you must trigger a new webui build.
+---
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: desdeo-webui
+  labels:
+    app: desdeo-webui
+spec:
+  # ── Source ───────────────────────────────────────────────────────────────
+  source:
+    type: Git
+    git:
+      uri: https://github.com/industrial-optimization-group/DESDEO.git
+      ref: <DEPLOY_BRANCH>
+    # Only the webui/ subtree is needed as the Docker build context.
+    contextDir: webui
+
+  # ── Build strategy ───────────────────────────────────────────────────────
+  strategy:
+    type: Docker
+    dockerStrategy:
+      dockerfilePath: Dockerfile
+      # Build arguments — passed as ARG to the Dockerfile.
+      buildArgs:
+      - name: VITE_API_URL
+        value: "https://gialmisi-desdeo-api.rahtiapp.fi"
+
+  # ── Output ───────────────────────────────────────────────────────────────
+  output:
+    to:
+      kind: ImageStreamTag
+      name: desdeo-webui:latest
+
+  # ── Triggers ─────────────────────────────────────────────────────────────
+  triggers:
+  - type: GitHub
+    github:
+      secretReference:
+        name: desdeo-secrets
+  - type: ConfigChange
+
+  # ── Build pod resources ───────────────────────────────────────────────────
+  # npm ci + vite build is memory-hungry; 2Gi is usually sufficient.
+  resources:
+    requests:
+      memory: "1Gi"
+      cpu: "500m"
+    limits:
+      memory: "2Gi"
+      cpu: "1"
+
+  runPolicy: Serial
diff --git a/deploy/webui-deployment.yaml b/deploy/webui-deployment.yaml
new file mode 100644
index 000000000..9589327cc
--- /dev/null
+++ b/deploy/webui-deployment.yaml
@@ -0,0 +1,98 @@
+# deploy/webui-deployment.yaml
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: desdeo-webui
+  labels:
+    app: desdeo-webui
+  annotations:
+    image.openshift.io/triggers: >
+      [{"from":{"kind":"ImageStreamTag","name":"desdeo-webui:latest"},
+        "fieldPath":"spec.template.spec.containers[0].image"}]
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: desdeo-webui
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 0
+      maxSurge: 1
+  template:
+    metadata:
+      labels:
+        app: desdeo-webui
+    spec:
+      containers:
+      - name: webui
+        image: desdeo-webui:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 3000
+          name: http
+          protocol: TCP
+        env:
+        # adapter-node reads PORT to know which port to listen on.
+        - name: PORT
+          value: "3000"
+        # Server-side +server.ts proxy routes use this to reach the API
+        # over the internal cluster network (avoids the public ingress).
+        - name: API_URL
+          value: "http://desdeo-api:8080"
+        # ORIGIN is required by SvelteKit for CSRF protection when behind a proxy.
+        - name: ORIGIN
+          value: "https://gialmisi-desdeo-webui.rahtiapp.fi"
+        resources:
+          requests:
+            memory: "128Mi"
+            cpu: "50m"
+          limits:
+            memory: "256Mi"
+            cpu: "500m"
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 3000
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          failureThreshold: 3
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 3000
+          initialDelaySeconds: 20
+          periodSeconds: 20
+          failureThreshold: 3
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: desdeo-webui
+  labels:
+    app: desdeo-webui
+spec:
+  selector:
+    app: desdeo-webui
+  ports:
+  - name: http
+    port: 3000
+    targetPort: 3000
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: desdeo-webui
+  labels:
+    app: desdeo-webui
+spec:
+  host: gialmisi-desdeo-webui.rahtiapp.fi
+  to:
+    kind: Service
+    name: desdeo-webui
+  port:
+    targetPort: http
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect
diff --git a/deploy/webui-imagestream.yaml b/deploy/webui-imagestream.yaml
new file mode 100644
index 000000000..0348a28bc
--- /dev/null
+++ b/deploy/webui-imagestream.yaml
@@ -0,0 +1,11 @@
+# deploy/webui-imagestream.yaml
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: desdeo-webui
+  labels:
+    app: desdeo-webui
+spec:
+  lookupPolicy:
+    local: true
diff --git a/desdeo/api/app.py b/desdeo/api/app.py
index 7b71e1032..8dbf6bf37 100644
--- a/desdeo/api/app.py
+++ b/desdeo/api/app.py
@@ -40,6 +40,12 @@
 app.include_router(enautilus.router)
 app.include_router(gdm_score_bands_routers.router)
 
+
+@app.get("/health")
+def health():
+    return {"status": "ok"}
+
+
 origins = AuthConfig.cors_origins
 
 app.add_middleware(
diff --git a/desdeo/api/db_init_prod.py b/desdeo/api/db_init_prod.py
new file mode 100644
index 000000000..d86126427
--- /dev/null
+++ b/desdeo/api/db_init_prod.py
@@ -0,0 +1,84 @@
+"""Production database initialisation script.
+
+Run once as a Kubernetes Job after the first deployment (or after a full
+database wipe). It is intentionally idempotent: running it multiple times
+against the same database is safe.
+
+What it does
+------------
+1. Creates all SQLModel tables if they do not already exist.
+   (Uses create_all which is a no-op for tables that are present.)
+2. Seeds an initial analyst user whose credentials come from env vars.
+   If the user already exists the step is skipped.
+
+Environment variables required
+-------------------------------
+DATABASE_URL          PostgreSQL DSN, e.g.
+                      postgresql://desdeo:<pw>@desdeo-postgres:5432/desdeo
+DESDEO_ADMIN_USERNAME Username for the seeded analyst account.
+DESDEO_ADMIN_PASSWORD Password for the seeded analyst account.
+
+Optional
+--------
+DESDEO_ADMIN_GROUP    Group name for the seeded user (default: "admin").
+"""
+
+import os
+import sys
+
+from sqlmodel import Session, SQLModel, select
+
+# Import the engine after DATABASE_URL is in the environment so the config
+# module picks it up correctly.
+from desdeo.api.db import engine
+from desdeo.api.models import User, UserRole
+from desdeo.api.routers.user_authentication import get_password_hash
+
+
+def create_tables() -> None:
+    print("[db-init] Creating database tables (create_all is a no-op for existing tables)...")
+    SQLModel.metadata.create_all(engine)
+    print("[db-init] Tables ready.")
+
+
+def seed_admin_user() -> None:
+    username = os.environ.get("DESDEO_ADMIN_USERNAME")
+    password = os.environ.get("DESDEO_ADMIN_PASSWORD")
+    group = os.environ.get("DESDEO_ADMIN_GROUP", "admin")
+
+    if not username or not password:
+        print("[db-init] WARNING: DESDEO_ADMIN_USERNAME or DESDEO_ADMIN_PASSWORD not set — skipping user seed.")
+        return
+
+    with Session(engine) as session:
+        existing = session.exec(select(User).where(User.username == username)).first()
+
+        if existing:
+            print(f"[db-init] User '{username}' already exists — skipping.")
+            return
+
+        user = User(
+            username=username,
+            password_hash=get_password_hash(password),
+            role=UserRole.analyst,
+            group=group,
+        )
+        session.add(user)
+        session.commit()
+        print(f"[db-init] Created user '{username}' (role=analyst, group={group}).")
+
+
+def main() -> None:
+    database_url = os.environ.get("DATABASE_URL")
+    if not database_url:
+        print("[db-init] ERROR: DATABASE_URL is not set.", file=sys.stderr)
+        sys.exit(1)
+
+    print(f"[db-init] Using database: {database_url.split('@')[-1]}")  # hide credentials
+    create_tables()
+    seed_admin_user()
+    print("[db-init] Done.")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/webui/Dockerfile b/webui/Dockerfile
new file mode 100644
index 000000000..aeae76740
--- /dev/null
+++ b/webui/Dockerfile
@@ -0,0 +1,71 @@
+# Multi-stage Dockerfile for the DESDEO web UI.
+# Build context: webui/   (set via BuildConfig contextDir: webui)
+#
+# Two URL variables control how the frontend talks to the backend API:
+#
+#   VITE_API_URL  (build-time ARG / ENV)
+#       Baked into the client-side JavaScript bundle by Vite.
+#       Used by browser code: import.meta.env.VITE_API_URL
+#       Must be the *public* HTTPS route of the API.
+#       Default: https://gialmisi-desdeo-api.rahtiapp.fi
+#
+#   API_URL  (runtime ENV in the container / Deployment env)
+#       Used by SvelteKit server-side route handlers (+server.ts) that
+#       proxy requests to the backend.
+#       Should point to the *internal cluster* service so traffic stays
+#       inside the cluster and avoids the public ingress.
+#       Default here: http://desdeo-api:8080
+#       Override in the Deployment manifest if the service name differs.
+
+# ---------------------------------------------------------------------------
+# Stage 1 – build
+# ---------------------------------------------------------------------------
+FROM node:20-alpine AS build
+
+WORKDIR /app
+
+# Install dependencies first for layer-cache efficiency.
+COPY package*.json ./
+RUN npm ci
+
+# Copy the rest of the source.
+COPY . .
+
+# VITE_API_URL is baked into the bundle at build time.
+ARG VITE_API_URL=https://gialmisi-desdeo-api.rahtiapp.fi
+ENV VITE_API_URL=$VITE_API_URL
+
+# NPM_RUN=start:production makes svelte.config.js select adapter-node.
+RUN NPM_RUN=start:production npm run build
+
+# Prune devDependencies so we can copy node_modules into the runtime stage.
+RUN npm prune --omit=dev
+
+# ---------------------------------------------------------------------------
+# Stage 2 – runtime
+# ---------------------------------------------------------------------------
+FROM node:20-alpine
+
+WORKDIR /app
+
+# Copy the compiled adapter-node output and the pruned dependencies.
+COPY --from=build /app/build           ./build
+COPY --from=build /app/node_modules    ./node_modules
+COPY --from=build /app/package.json    ./package.json
+
+# OpenShift runs containers with an arbitrary UID in GID 0 (root group).
+# Setting group ownership to 0 with group-write allows the process to run
+# under any UID without permission errors.
+RUN chgrp -R 0 /app && chmod -R g=u /app
+
+# adapter-node default port; can be overridden at runtime via PORT env.
+EXPOSE 3000
+ENV PORT=3000
+
+# Server-side proxy routes use this to reach the backend inside the cluster.
+ENV API_URL=http://desdeo-api:8080
+
+# Run as a non-root UID (required by Rahti / OpenShift SCC).
+USER 1001
+
+CMD ["node", "build"]

From e88332ea810410c9a8b697f724c5d7d4e88618a0 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Fri, 27 Mar 2026 09:53:59 +0200
Subject: [PATCH 10/24] Added secrets to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fb17e8ea0..6719b8e2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,3 +161,4 @@ scratch/
 # Surrogate models
 surrogatemodels/
 utopia_forest.json
+deploy/secrets.yaml

From e5c8606b3e68d69cc57a65e48077dec53b323cd3 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Fri, 27 Mar 2026 13:04:19 +0200
Subject: [PATCH 11/24] Updated build and Dockerfiles.

---
 deploy/api-buildconfig.yaml   |  4 ++--
 deploy/postgres.yaml          | 29 ++++++++++++-----------------
 deploy/webui-buildconfig.yaml | 11 +++++++----
 webui/Dockerfile              |  4 ++--
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/deploy/api-buildconfig.yaml b/deploy/api-buildconfig.yaml
index 7e70ba950..6df1242da 100644
--- a/deploy/api-buildconfig.yaml
+++ b/deploy/api-buildconfig.yaml
@@ -24,9 +24,9 @@ spec:
   source:
     type: Git
     git:
-      uri: https://github.com/industrial-optimization-group/DESDEO.git
+      uri: https://github.com/gialmisi/DESDEO.git
       # Replace with the branch you want to track (e.g. master, deploy, main).
-      ref: <DEPLOY_BRANCH>
+      ref: rahti-deploy
     # No contextDir: the pyproject.toml and .s2i/ are at the repo root.
 
   # ── Build strategy ───────────────────────────────────────────────────────
diff --git a/deploy/postgres.yaml b/deploy/postgres.yaml
index 1ed80fea1..795f13874 100644
--- a/deploy/postgres.yaml
+++ b/deploy/postgres.yaml
@@ -21,8 +21,7 @@ metadata:
   labels:
     app: desdeo-postgres
 spec:
-  # ClusterIP only — Postgres is not exposed outside the cluster.
-  clusterIP: None          # headless service for StatefulSet DNS
+  clusterIP: None
   selector:
     app: desdeo-postgres
   ports:
@@ -49,12 +48,12 @@ spec:
     spec:
       containers:
       - name: postgres
-        image: docker.io/bitnami/postgresql:16
+        image: image-registry.openshift-image-registry.svc:5000/openshift/postgresql:16-el10
         ports:
         - containerPort: 5432
           name: postgres
         env:
-        - name: POSTGRESQL_USERNAME
+        - name: POSTGRESQL_USER
           valueFrom:
             secretKeyRef:
               name: desdeo-secrets
@@ -66,14 +65,9 @@ spec:
               key: POSTGRES_PASSWORD
         - name: POSTGRESQL_DATABASE
           value: desdeo
-        - name: POSTGRESQL_POSTGRES_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: POSTGRES_SUPERUSER_PASSWORD
         volumeMounts:
         - name: postgres-data
-          mountPath: /bitnami/postgresql
+          mountPath: /var/lib/pgsql/data
         resources:
           requests:
             memory: "256Mi"
@@ -81,23 +75,24 @@ spec:
           limits:
             memory: "512Mi"
             cpu: "500m"
-        livenessProbe:
+        readinessProbe:
           exec:
             command:
             - /bin/sh
             - -c
-            - pg_isready -U $POSTGRESQL_USERNAME -d desdeo
-          initialDelaySeconds: 30
+            - psql -U $POSTGRESQL_USER -d desdeo -c "SELECT 1"
+          initialDelaySeconds: 15
           periodSeconds: 10
           failureThreshold: 6
-        readinessProbe:
+        livenessProbe:
           exec:
             command:
             - /bin/sh
             - -c
-            - pg_isready -U $POSTGRESQL_USERNAME -d desdeo
-          initialDelaySeconds: 5
-          periodSeconds: 5
+            - psql -U $POSTGRESQL_USER -d desdeo -c "SELECT 1"
+          initialDelaySeconds: 30
+          periodSeconds: 20
+          failureThreshold: 3
   volumeClaimTemplates:
   - metadata:
       name: postgres-data
diff --git a/deploy/webui-buildconfig.yaml b/deploy/webui-buildconfig.yaml
index 0420ce945..fbe83cd56 100644
--- a/deploy/webui-buildconfig.yaml
+++ b/deploy/webui-buildconfig.yaml
@@ -20,8 +20,8 @@ spec:
   source:
     type: Git
     git:
-      uri: https://github.com/industrial-optimization-group/DESDEO.git
-      ref: <DEPLOY_BRANCH>
+      uri: https://github.com/gialmisi/DESDEO.git
+      ref: rahti-deploy
     # Only the webui/ subtree is needed as the Docker build context.
     contextDir: webui
 
@@ -34,6 +34,9 @@ spec:
       buildArgs:
       - name: VITE_API_URL
         value: "https://gialmisi-desdeo-api.rahtiapp.fi"
+      env:
+      - name: NODE_OPTIONS
+        value: "--max-old-space-size=3072"
 
   # ── Output ───────────────────────────────────────────────────────────────
   output:
@@ -53,10 +56,10 @@ spec:
   # npm ci + vite build is memory-hungry; 2Gi is usually sufficient.
   resources:
     requests:
-      memory: "1Gi"
+      memory: "2Gi"
       cpu: "500m"
     limits:
-      memory: "2Gi"
+      memory: "4Gi"
       cpu: "1"
 
   runPolicy: Serial
diff --git a/webui/Dockerfile b/webui/Dockerfile
index aeae76740..7ca72aba3 100644
--- a/webui/Dockerfile
+++ b/webui/Dockerfile
@@ -20,7 +20,7 @@
 # ---------------------------------------------------------------------------
 # Stage 1 – build
 # ---------------------------------------------------------------------------
-FROM node:20-alpine AS build
+FROM node:24-alpine AS build
 
 WORKDIR /app
 
@@ -44,7 +44,7 @@ RUN npm prune --omit=dev
 # ---------------------------------------------------------------------------
 # Stage 2 – runtime
 # ---------------------------------------------------------------------------
-FROM node:20-alpine
+FROM node:24-alpine
 
 WORKDIR /app
 

From 4245365eec0e36e454dcf8b2300f3ae2af965a8c Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Fri, 27 Mar 2026 13:13:10 +0200
Subject: [PATCH 12/24] Changed npm ci to npm install in webui/Dockerfile

---
 webui/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webui/Dockerfile b/webui/Dockerfile
index 7ca72aba3..a8e757c63 100644
--- a/webui/Dockerfile
+++ b/webui/Dockerfile
@@ -26,7 +26,7 @@ WORKDIR /app
 
 # Install dependencies first for layer-cache efficiency.
 COPY package*.json ./
-RUN npm ci
+RUN npm install
 
 # Copy the rest of the source.
 COPY . .

From f88bf154f130abe0f72ae0344bab7843dcf1fc5c Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Fri, 27 Mar 2026 14:01:59 +0200
Subject: [PATCH 13/24] Updated deployment files.

---
 deploy/api-deployment.yaml   | 42 +++++++++++++++++++++++++-----------
 deploy/db-init-job.yaml      |  5 ++++-
 deploy/webui-deployment.yaml |  2 +-
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/deploy/api-deployment.yaml b/deploy/api-deployment.yaml
index 1d4cae5e3..b77ee79a0 100644
--- a/deploy/api-deployment.yaml
+++ b/deploy/api-deployment.yaml
@@ -46,24 +46,42 @@ spec:
           name: http
           protocol: TCP
         env:
-        # ── Pulled from Secret ────────────────────────────────────────────
-        - name: DATABASE_URL
+        - name: DESDEO_PRODUCTION
+          value: "true"
+        - name: AUTHJWT_SECRET
           valueFrom:
             secretKeyRef:
               name: desdeo-secrets
-              key: DATABASE_URL
-        - name: SECRET_KEY
+              key: AUTHJWT_SECRET
+        - name: DB_HOST
           valueFrom:
             secretKeyRef:
               name: desdeo-secrets
-              key: SECRET_KEY
-        # ── Static runtime config ─────────────────────────────────────────
-        - name: DEBUG
-          value: "false"
-        # CORS: allow the public webui origin.
-        - name: ALLOWED_ORIGINS
-          value: "https://gialmisi-desdeo-webui.rahtiapp.fi"
-        # ── Gunicorn (matches .s2i/environment) ───────────────────────────
+              key: DB_HOST
+        - name: DB_PORT
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: DB_PORT
+        - name: DB_NAME
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: DB_NAME
+        - name: DB_USER
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: DB_USER
+        - name: DB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: desdeo-secrets
+              key: DB_PASSWORD
+        - name: CORS_ORIGINS
+          value: '["https://gialmisi-desdeo-webui.rahtiapp.fi"]'
+        - name: COOKIE_DOMAIN
+          value: "rahtiapp.fi"
         - name: APP_MODULE
           value: "desdeo.api.app:app"
         - name: GUNICORN_CMD_ARGS
diff --git a/deploy/db-init-job.yaml b/deploy/db-init-job.yaml
index afd9aadc5..4e6d96b8e 100644
--- a/deploy/db-init-job.yaml
+++ b/deploy/db-init-job.yaml
@@ -46,9 +46,12 @@ spec:
       - name: db-init
         # Use the same image as the API Deployment.
         # Replace <PROJECT> with your Rahti project name.
-        image: image-registry.openshift-image-registry.svc:5000/<PROJECT>/desdeo-api:latest
+        image: image-registry.openshift-image-registry.svc:5000/gialmisi-desdeo/desdeo-api:latest
         # Run the production init script.
         command: ["python", "desdeo/api/db_init_prod.py"]
+        end:
+        - name: DESDEO_PRODUCTION
+          value: "true"
         envFrom:
         # Inject DATABASE_URL, SECRET_KEY, DESDEO_ADMIN_USERNAME,
         # DESDEO_ADMIN_PASSWORD from the shared Secret.
diff --git a/deploy/webui-deployment.yaml b/deploy/webui-deployment.yaml
index 9589327cc..884bd255e 100644
--- a/deploy/webui-deployment.yaml
+++ b/deploy/webui-deployment.yaml
@@ -47,7 +47,7 @@ spec:
         resources:
           requests:
             memory: "128Mi"
-            cpu: "50m"
+            cpu: "100m"
           limits:
             memory: "256Mi"
             cpu: "500m"

From af2e7e5e73943e3a290b880c62a9fdc584ee968f Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Fri, 27 Mar 2026 14:47:06 +0200
Subject: [PATCH 14/24] Web-GUI

- Updated api client to use correct url's for api calls in debug/deploy.
---
 webui/src/lib/api/new-client.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/webui/src/lib/api/new-client.ts b/webui/src/lib/api/new-client.ts
index 3e8f365c0..de8c3879c 100644
--- a/webui/src/lib/api/new-client.ts
+++ b/webui/src/lib/api/new-client.ts
@@ -21,16 +21,21 @@ const getBody = async <T>(c: Response | Request): Promise<T> => {
   return (c as Response).text() as Promise<T>;
 };
 
-// NOTE: Update just base url
 const getUrl = (contextUrl: string): string => {
   const url = new URL(contextUrl);
-  const origin = url.origin;
   const pathname = url.pathname;
   const search = url.search;
 
-  const requestUrl = new URL(`${origin}${pathname}${search}`);
+  const base =
+    typeof process !== 'undefined' && process.env?.API_BASE_URL
+      ? process.env.API_BASE_URL
+      : (import.meta.env.VITE_API_URL ?? 'http://localhost:8000');
 
-  return requestUrl.toString();
+  // base may be a relative path (e.g. '/api' in local dev via Vite proxy)
+  // in that case, fall back to localhost as the origin
+  const absoluteBase = base.startsWith('http') ? base : `http://localhost:8000`;
+
+  return new URL(`${absoluteBase}${pathname}${search}`).toString();
 };
 
 const getHeaders = (headers?: HeadersInit): HeadersInit => {

From 5324b5b66932129dd97a96218fd980c955466f91 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Fri, 27 Mar 2026 15:16:39 +0200
Subject: [PATCH 15/24] Web-GUI

- Fixed some URL resolving issues and passing access token cookies
  correctly in the UI (mostly affecting deployment).
---
 deploy/webui-deployment.yaml |  2 +-
 webui/src/hooks.server.ts    | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/deploy/webui-deployment.yaml b/deploy/webui-deployment.yaml
index 884bd255e..ed2f4bf54 100644
--- a/deploy/webui-deployment.yaml
+++ b/deploy/webui-deployment.yaml
@@ -39,7 +39,7 @@ spec:
           value: "3000"
         # Server-side +server.ts proxy routes use this to reach the API
         # over the internal cluster network (avoids the public ingress).
-        - name: API_URL
+        - name: API_BASE_URL
           value: "http://desdeo-api:8080"
         # ORIGIN is required by SvelteKit for CSRF protection when behind a proxy.
         - name: ORIGIN
diff --git a/webui/src/hooks.server.ts b/webui/src/hooks.server.ts
index a214db051..1f5b957b8 100644
--- a/webui/src/hooks.server.ts
+++ b/webui/src/hooks.server.ts
@@ -5,7 +5,17 @@ import { dev } from '$app/environment';
 // const API = process.env.API_BASE_URL ?? '/';
 
 export const handleFetch: HandleFetch = async ({ event, request, fetch }) => {
-  // TODO: check that the request originates from our app, instead of being a third party
+  // Forward access_token cookie to all API requests
+  const accessToken = event.cookies.get("access_token");
+  if (accessToken) {
+    request = new Request(request, {
+      headers: new Headers({
+        ...Object.fromEntries(request.headers.entries()),
+        cookie: `access_token=${accessToken}`,
+      }),
+    });
+  }
+
   const originalRequest = request.clone();
   let res = await fetch(request);
 

From 92ddc5c9836b9ba56b0eb19a63a4de5e9cbfcd45 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Fri, 27 Mar 2026 15:59:04 +0200
Subject: [PATCH 16/24] Web-UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add catch-all proxy route /api/[...path] that forwards browser API calls
  to the upstream API using event.fetch, so handleFetch intercepts for
  cookie injection and 401/token-refresh handling
- Fix getUrl to return relative /api/<path> on the browser side instead of
  a direct cross-origin URL, routing all browser traffic through the proxy
- Switch server-side detection in getUrl from process.env check to
  typeof window === 'undefined' with http://localhost:8000 fallback
- Remove client-side 401 retry logic from customFetch — now handled
  server-side by handleFetch via the proxy
- Remove dead Vite /api proxy config from vite.config.ts
---
 webui/src/lib/api/new-client.ts           | 33 ++++++--------------
 webui/src/routes/api/[...path]/+server.ts | 38 +++++++++++++++++++++++
 webui/vite.config.ts                      | 12 +------
 3 files changed, 48 insertions(+), 35 deletions(-)
 create mode 100644 webui/src/routes/api/[...path]/+server.ts

diff --git a/webui/src/lib/api/new-client.ts b/webui/src/lib/api/new-client.ts
index de8c3879c..54b4b3ba1 100644
--- a/webui/src/lib/api/new-client.ts
+++ b/webui/src/lib/api/new-client.ts
@@ -26,16 +26,15 @@ const getUrl = (contextUrl: string): string => {
   const pathname = url.pathname;
   const search = url.search;
 
-  const base =
-    typeof process !== 'undefined' && process.env?.API_BASE_URL
-      ? process.env.API_BASE_URL
-      : (import.meta.env.VITE_API_URL ?? 'http://localhost:8000');
-
-  // base may be a relative path (e.g. '/api' in local dev via Vite proxy)
-  // in that case, fall back to localhost as the origin
-  const absoluteBase = base.startsWith('http') ? base : `http://localhost:8000`;
+  // Server-side (Node.js): call API directly. Falls back to localhost if
+  // API_BASE_URL is not in process.env (Vite dev doesn't populate it automatically).
+  if (typeof window === 'undefined') {
+    const base = process.env.API_BASE_URL ?? 'http://localhost:8000';
+    return new URL(`${base}${pathname}${search}`).toString();
+  }
 
-  return new URL(`${absoluteBase}${pathname}${search}`).toString();
+  // Browser-side: route through the SvelteKit proxy so cookies stay on one domain
+  return `/api${pathname}${search}`;
 };
 
 const getHeaders = (headers?: HeadersInit): HeadersInit => {
@@ -61,22 +60,8 @@ export const customFetch = async <T>(
   };
 
   const request = new Request(requestUrl, requestInit);
-  const retryRequest = request.clone();
-
-  let response = await f(request);
-
-  if (response.status === 401) {
-    const refreshUrl = new URL("/refresh", requestUrl).toString();
-    const refreshResponse = await f(refreshUrl, {
-      method: "POST",
-      credentials: "include",
-    });
-
-    if (refreshResponse.ok) {
-      response = await f(retryRequest);
-    }
-  }
 
+  const response = await f(request);
   const data = await getBody<T>(response);
 
   return { status: response.status, data, headers: response.headers } as T;
diff --git a/webui/src/routes/api/[...path]/+server.ts b/webui/src/routes/api/[...path]/+server.ts
new file mode 100644
index 000000000..b1554751d
--- /dev/null
+++ b/webui/src/routes/api/[...path]/+server.ts
@@ -0,0 +1,38 @@
+import type { RequestHandler } from './$types';
+
+const API_BASE_URL = process.env.API_BASE_URL ?? 'http://localhost:8000';
+
+const handler: RequestHandler = async ({ request, params, fetch }) => {
+	const path = params.path;
+	const search = new URL(request.url).search;
+	const upstreamUrl = `${API_BASE_URL}/${path}${search}`;
+
+	const headers = new Headers(request.headers);
+	headers.delete('host');
+
+	const upstreamRequest = new Request(upstreamUrl, {
+		method: request.method,
+		headers,
+		body: ['GET', 'HEAD'].includes(request.method) ? undefined : request.body,
+		// @ts-expect-error — duplex is required for streaming bodies in Node 18+
+		duplex: 'half',
+	});
+
+	// Use event.fetch (not global fetch) so handleFetch intercepts for 401/refresh
+	const response = await fetch(upstreamRequest);
+
+	// Forward response headers so getBody can detect content-type correctly
+	const responseHeaders = new Headers(response.headers);
+	responseHeaders.delete('set-cookie'); // SvelteKit manages cookies separately
+
+	return new Response(response.body, {
+		status: response.status,
+		headers: responseHeaders,
+	});
+};
+
+export const GET = handler;
+export const POST = handler;
+export const PUT = handler;
+export const PATCH = handler;
+export const DELETE = handler;
diff --git a/webui/vite.config.ts b/webui/vite.config.ts
index c800a69cd..3356e81f0 100644
--- a/webui/vite.config.ts
+++ b/webui/vite.config.ts
@@ -13,15 +13,5 @@ export default defineConfig({
   },
   optimizeDeps: {
     exclude: ['mathlive']
-  },
-  server: {
-    proxy: {
-      '/api': {
-        target: 'http://127.0.0.1:8000',
-        changeOrigin: true,
-        secure: false,
-        rewrite: (path) => path.replace(/^\/api/, '')
-      }
-    }
   }
-});
\ No newline at end of file
+});

From fef36bf6fc57e970dacd1031885505c4931bb68f Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Fri, 27 Mar 2026 17:39:21 +0200
Subject: [PATCH 17/24] Docs and deploy

- Updated docs to include guide on how to setup fullstack on OpenShift
  using the oc tool from a terminal.
- Polished deployment files.
---
 deploy/api-buildconfig.yaml                |  73 ++--
 deploy/api-deployment.yaml                 | 148 ++++----
 deploy/builder-buildconfig.yaml            |  61 ++++
 deploy/builder-imagestream.yaml            |  19 +
 deploy/postgres.yaml                       | 118 +++----
 deploy/secrets-template.yaml               |   4 -
 deploy/webui-buildconfig.yaml              |  25 +-
 docs/howtoguides/deploying_on_openshift.md | 387 +++++++++++++++++++++
 docs/howtoguides/index.md                  |   1 +
 mkdocs.yml                                 |   1 +
 10 files changed, 643 insertions(+), 194 deletions(-)
 create mode 100644 deploy/builder-buildconfig.yaml
 create mode 100644 deploy/builder-imagestream.yaml
 create mode 100644 docs/howtoguides/deploying_on_openshift.md

diff --git a/deploy/api-buildconfig.yaml b/deploy/api-buildconfig.yaml
index 6df1242da..88f2f6b88 100644
--- a/deploy/api-buildconfig.yaml
+++ b/deploy/api-buildconfig.yaml
@@ -2,16 +2,21 @@
 #
 # BuildConfig for the DESDEO API using OpenShift S2I strategy.
 #
-# Builder image: python:3.12-ubi9 from the shared 'openshift' namespace.
-# The custom .s2i/bin/assemble script in the repository overrides the default
-# assemble behaviour and uses uv to install dependencies.
+# Builder image: desdeo-builder ImageStream (custom image built from
+# desdeo-s2i-buildimage.Dockerfile). This includes Python 3.12 on UBI8
+# plus COIN-OR solvers (bonmin, ipopt, cbc) and ca-certificates.
 #
-# Triggers:
-#   - GitHub webhook (push to DEPLOY_BRANCH)  ← main CI/CD trigger
-#   - ImageChange on the builder image         ← rebuilds on Python security patches
+# To use the base Python image without solvers instead,
+# replace the sourceStrategy.from block with:
+#   from:
+#     kind: ImageStreamTag
+#     name: python:3.12-ubi9
+#     namespace: openshift
 #
-# To get the webhook URL after applying:
-#   oc describe bc/desdeo-api | grep -A2 Webhook
+# Triggers:
+#   - ImageChange on desdeo-builder -> rebuilds API when builder is updated
+#   - GitHub webhook (push to DEPLOY_BRANCH) <- main CI/CD trigger
+#   - ConfigChange
 ---
 apiVersion: build.openshift.io/v1
 kind: BuildConfig
@@ -20,62 +25,46 @@ metadata:
   labels:
     app: desdeo-api
 spec:
-  # ── Source ───────────────────────────────────────────────────────────────
   source:
     type: Git
     git:
       uri: https://github.com/gialmisi/DESDEO.git
-      # Replace with the branch you want to track (e.g. master, deploy, main).
       ref: rahti-deploy
-    # No contextDir: the pyproject.toml and .s2i/ are at the repo root.
 
-  # ── Build strategy ───────────────────────────────────────────────────────
   strategy:
     type: Source
     sourceStrategy:
-      # Python 3.12 UBI9 S2I builder available in every Rahti project via the
-      # shared 'openshift' ImageStream.  Verify with:
-      #   oc get is python -n openshift
+      # Reference the custom builder ImageStream produced by builder-buildconfig.yaml.
+      # This image has Python 3.12 + COIN-OR solvers pre-installed.
       from:
         kind: ImageStreamTag
-        name: python:3.12-ubi9
-        namespace: openshift
-      # Environment variables available during the S2I *build* (assemble).
-      # Runtime env vars go in the Deployment, not here.
+        name: desdeo-builder:latest
       env:
-      - name: UPGRADE_PIP_TO_LATEST
-        value: "1"
-      - name: DESDEO_INSTALL
-        value: "--group web --group server"
-      - name: DEBUG
-        value: "false"
+        - name: UPGRADE_PIP_TO_LATEST
+          value: "1"
+        - name: DESDEO_INSTALL
+          value: "--group web --group server"
+        - name: DEBUG
+          value: "false"
 
-  # ── Output ───────────────────────────────────────────────────────────────
   output:
     to:
       kind: ImageStreamTag
       name: desdeo-api:latest
 
-  # ── Triggers ─────────────────────────────────────────────────────────────
   triggers:
-  # Rebuild when the Python builder image is updated (security patches).
-  - type: ImageChange
-    imageChange: {}
-  # GitHub webhook — authenticates with WEBHOOK_SECRET_API from the Secret.
-  - type: GitHub
-    github:
-      secretReference:
-        name: desdeo-secrets
-        # Key in the Secret that holds the webhook secret string.
-        # Note: this uses secretReference (key in existing Secret) rather than
-        # an inline secret so we don't store the value in this manifest.
-  # Manual / API trigger.
-  - type: ConfigChange
+    # Rebuild API when the builder image is updated (solver or base OS updates).
+    - type: ImageChange
+      imageChange: {}
+    # GitHub webhook, push to DEPLOY_BRANCH triggers a new API build.
+    - type: GitHub
+      github:
+        secretReference:
+          name: desdeo-secrets
+    - type: ConfigChange
 
-  # ── Run policy ───────────────────────────────────────────────────────────
   runPolicy: Serial
 
-  # ── Resource limits for the build pod ────────────────────────────────────
   resources:
     requests:
       memory: "1Gi"
diff --git a/deploy/api-deployment.yaml b/deploy/api-deployment.yaml
index b77ee79a0..8b55d5eab 100644
--- a/deploy/api-deployment.yaml
+++ b/deploy/api-deployment.yaml
@@ -29,7 +29,7 @@ spec:
   strategy:
     type: RollingUpdate
     rollingUpdate:
-      maxUnavailable: 0     # zero-downtime: new pod must be ready before old is removed
+      maxUnavailable: 0
       maxSurge: 1
   template:
     metadata:
@@ -37,76 +37,76 @@ spec:
         app: desdeo-api
     spec:
       containers:
-      - name: api
-        # Placeholder: the image change annotation above overwrites this on deploy.
-        image: desdeo-api:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-          name: http
-          protocol: TCP
-        env:
-        - name: DESDEO_PRODUCTION
-          value: "true"
-        - name: AUTHJWT_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: AUTHJWT_SECRET
-        - name: DB_HOST
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: DB_HOST
-        - name: DB_PORT
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: DB_PORT
-        - name: DB_NAME
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: DB_NAME
-        - name: DB_USER
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: DB_USER
-        - name: DB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: DB_PASSWORD
-        - name: CORS_ORIGINS
-          value: '["https://gialmisi-desdeo-webui.rahtiapp.fi"]'
-        - name: COOKIE_DOMAIN
-          value: "rahtiapp.fi"
-        - name: APP_MODULE
-          value: "desdeo.api.app:app"
-        - name: GUNICORN_CMD_ARGS
-          value: "--bind=0.0.0.0:8080 --workers=1 --access-logfile=- --worker-class uvicorn.workers.UvicornWorker"
-        resources:
-          requests:
-            memory: "512Mi"
-            cpu: "250m"
-          limits:
-            memory: "1Gi"
-            cpu: "1"
-        readinessProbe:
-          httpGet:
-            path: /health     # adjust if the FastAPI app exposes a different health endpoint
-            port: 8080
-          initialDelaySeconds: 15
-          periodSeconds: 10
-          failureThreshold: 3
-        livenessProbe:
-          httpGet:
-            path: /health
-            port: 8080
-          initialDelaySeconds: 30
-          periodSeconds: 20
-          failureThreshold: 3
+        - name: api
+          # Placeholder: the image change annotation above overwrites this on deploy.
+          image: desdeo-api:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8080
+              name: http
+              protocol: TCP
+          env:
+            - name: DESDEO_PRODUCTION
+              value: "true"
+            - name: AUTHJWT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: desdeo-secrets
+                  key: AUTHJWT_SECRET
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: desdeo-secrets
+                  key: DB_HOST
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: desdeo-secrets
+                  key: DB_PORT
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: desdeo-secrets
+                  key: DB_NAME
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: desdeo-secrets
+                  key: DB_USER
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: desdeo-secrets
+                  key: DB_PASSWORD
+            - name: CORS_ORIGINS
+              value: '["https://gialmisi-desdeo-webui.rahtiapp.fi"]'
+            - name: COOKIE_DOMAIN
+              value: "rahtiapp.fi"
+            - name: APP_MODULE
+              value: "desdeo.api.app:app"
+            - name: GUNICORN_CMD_ARGS
+              value: "--bind=0.0.0.0:8080 --workers=1 --access-logfile=- --worker-class uvicorn.workers.UvicornWorker"
+          resources:
+            requests:
+              memory: "512Mi"
+              cpu: "250m"
+            limits:
+              memory: "1Gi"
+              cpu: "1"
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 15
+            periodSeconds: 10
+            failureThreshold: 3
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 30
+            periodSeconds: 20
+            failureThreshold: 3
 ---
 apiVersion: v1
 kind: Service
@@ -118,9 +118,9 @@ spec:
   selector:
     app: desdeo-api
   ports:
-  - name: http
-    port: 8080
-    targetPort: 8080
+    - name: http
+      port: 8080
+      targetPort: 8080
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
diff --git a/deploy/builder-buildconfig.yaml b/deploy/builder-buildconfig.yaml
new file mode 100644
index 000000000..fe58d7727
--- /dev/null
+++ b/deploy/builder-buildconfig.yaml
@@ -0,0 +1,61 @@
+# deploy/builder-buildconfig.yaml
+#
+# BuildConfig that produces the custom DESDEO S2I builder image.
+# Uses Docker strategy to build desdeo-s2i-buildimage.Dockerfile
+# from the repository root.
+#
+# This only needs to be (re)built when:
+#   - The Dockerfile changes
+#   - The solver binaries release is updated
+#   - The base UBI8 image receives a security update (ImageChange trigger)
+#
+# To trigger a manual rebuild:
+#   oc start-build desdeo-builder --follow
+#
+# The output image is stored in the desdeo-builder ImageStream and
+# referenced by the api-buildconfig.yaml as the S2I builder.
+---
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: desdeo-builder
+  labels:
+    app: desdeo-api
+    component: builder-image
+spec:
+  source:
+    type: Git
+    git:
+      uri: https://github.com/gialmisi/DESDEO.git
+      ref: rahti-deploy
+
+  strategy:
+    type: Docker
+    dockerStrategy:
+      dockerfilePath: desdeo-s2i-buildimage.Dockerfile
+      # The Dockerfile temporarily switches to root to install packages,
+      # then switches back to UID 1001. This is expected and required.
+      noCache: false
+
+  output:
+    to:
+      kind: ImageStreamTag
+      name: desdeo-builder:latest
+
+  triggers:
+    # Rebuild when the base UBI8 image receives updates (security patches).
+    - type: ImageChange
+      imageChange: {}
+    # Manual / API trigger.
+    - type: ConfigChange
+
+  # The builder image download includes solver binaries (~100MB).
+  resources:
+    requests:
+      memory: "512Mi"
+      cpu: "250m"
+    limits:
+      memory: "1Gi"
+      cpu: "1"
+
+  runPolicy: Serial
diff --git a/deploy/builder-imagestream.yaml b/deploy/builder-imagestream.yaml
new file mode 100644
index 000000000..6fb5c7ffc
--- /dev/null
+++ b/deploy/builder-imagestream.yaml
@@ -0,0 +1,19 @@
+# deploy/builder-imagestream.yaml
+#
+# ImageStream for the custom DESDEO S2I builder image.
+# This image extends the base Python 3.12 UBI8 image with:
+#   - COIN-OR solvers (bonmin, ipopt, cbc) from a GitHub release
+#   - ca-certificates for managing Gurobi licences
+#
+# The API BuildConfig references this stream as its S2I builder,
+# so whenever this image is updated the API is automatically rebuilt.
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: desdeo-builder
+  labels:
+    app: desdeo-api
+spec:
+  lookupPolicy:
+    local: true
diff --git a/deploy/postgres.yaml b/deploy/postgres.yaml
index 795f13874..5378696fc 100644
--- a/deploy/postgres.yaml
+++ b/deploy/postgres.yaml
@@ -7,10 +7,10 @@
 #   oc apply -f deploy/postgres.yaml
 #
 # Bitnami env var names differ from the official postgres image:
-#   POSTGRESQL_USERNAME  →  creates a non-superuser (matches DATABASE_URL user)
-#   POSTGRESQL_PASSWORD  →  password for POSTGRESQL_USERNAME
-#   POSTGRESQL_DATABASE  →  database to create on first start
-#   POSTGRESQL_POSTGRES_PASSWORD  →  password for the postgres superuser
+#   POSTGRESQL_USERNAME: creates a non-superuser (matches DATABASE_URL user)
+#   POSTGRESQL_PASSWORD: password for POSTGRESQL_USERNAME
+#   POSTGRESQL_DATABASE: database to create on first start
+#   POSTGRESQL_POSTGRES_PASSWORD: password for the postgres superuser
 #
 # Data is persisted in the PVC mounted at /bitnami/postgresql.
 ---
@@ -25,9 +25,9 @@ spec:
   selector:
     app: desdeo-postgres
   ports:
-  - name: postgres
-    port: 5432
-    targetPort: 5432
+    - name: postgres
+      port: 5432
+      targetPort: 5432
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -47,57 +47,57 @@ spec:
         app: desdeo-postgres
     spec:
       containers:
-      - name: postgres
-        image: image-registry.openshift-image-registry.svc:5000/openshift/postgresql:16-el10
-        ports:
-        - containerPort: 5432
-          name: postgres
-        env:
-        - name: POSTGRESQL_USER
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: POSTGRES_USER
-        - name: POSTGRESQL_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: desdeo-secrets
-              key: POSTGRES_PASSWORD
-        - name: POSTGRESQL_DATABASE
-          value: desdeo
-        volumeMounts:
-        - name: postgres-data
-          mountPath: /var/lib/pgsql/data
+        - name: postgres
+          image: image-registry.openshift-image-registry.svc:5000/openshift/postgresql:16-el10
+          ports:
+            - containerPort: 5432
+              name: postgres
+          env:
+            - name: POSTGRESQL_USER
+              valueFrom:
+                secretKeyRef:
+                  name: desdeo-secrets
+                  key: POSTGRES_USER
+            - name: POSTGRESQL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: desdeo-secrets
+                  key: POSTGRES_PASSWORD
+            - name: POSTGRESQL_DATABASE
+              value: desdeo
+          volumeMounts:
+            - name: postgres-data
+              mountPath: /var/lib/pgsql/data
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "100m"
+            limits:
+              memory: "512Mi"
+              cpu: "500m"
+          readinessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - psql -U $POSTGRESQL_USER -d desdeo -c "SELECT 1"
+            initialDelaySeconds: 15
+            periodSeconds: 10
+            failureThreshold: 6
+          livenessProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - psql -U $POSTGRESQL_USER -d desdeo -c "SELECT 1"
+            initialDelaySeconds: 30
+            periodSeconds: 20
+            failureThreshold: 3
+  volumeClaimTemplates:
+    - metadata:
+        name: postgres-data
+      spec:
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
-            memory: "256Mi"
-            cpu: "100m"
-          limits:
-            memory: "512Mi"
-            cpu: "500m"
-        readinessProbe:
-          exec:
-            command:
-            - /bin/sh
-            - -c
-            - psql -U $POSTGRESQL_USER -d desdeo -c "SELECT 1"
-          initialDelaySeconds: 15
-          periodSeconds: 10
-          failureThreshold: 6
-        livenessProbe:
-          exec:
-            command:
-            - /bin/sh
-            - -c
-            - psql -U $POSTGRESQL_USER -d desdeo -c "SELECT 1"
-          initialDelaySeconds: 30
-          periodSeconds: 20
-          failureThreshold: 3
-  volumeClaimTemplates:
-  - metadata:
-      name: postgres-data
-    spec:
-      accessModes: ["ReadWriteOnce"]
-      resources:
-        requests:
-          storage: 2Gi
+            storage: 2Gi
diff --git a/deploy/secrets-template.yaml b/deploy/secrets-template.yaml
index fa04e0699..cd1a37493 100644
--- a/deploy/secrets-template.yaml
+++ b/deploy/secrets-template.yaml
@@ -28,14 +28,12 @@ metadata:
   name: desdeo-secrets
 type: Opaque
 stringData:
-  # ── PostgreSQL ──────────────────────────────────────────────────────────
   # Application user (non-superuser). Must match DATABASE_URL below.
   POSTGRES_USER: desdeo
   POSTGRES_PASSWORD: <CHANGE_ME>
   # Superuser password (used internally by Bitnami image).
   POSTGRES_SUPERUSER_PASSWORD: <CHANGE_ME>
 
-  # ── API runtime ─────────────────────────────────────────────────────────
   # Full DSN consumed by the FastAPI app and db_init_prod.py.
   # Host must be the Kubernetes Service name defined in postgres.yaml.
   DATABASE_URL: "postgresql://desdeo:<CHANGE_ME>@desdeo-postgres:5432/desdeo"
@@ -44,12 +42,10 @@ stringData:
   #   python -c "import secrets; print(secrets.token_hex(64))"
   SECRET_KEY: <CHANGE_ME>
 
-  # ── DB init job ─────────────────────────────────────────────────────────
   # Credentials for the initial analyst user seeded by the db-init Job.
   DESDEO_ADMIN_USERNAME: admin
   DESDEO_ADMIN_PASSWORD: <CHANGE_ME>
 
-  # ── Webhook secrets (BuildConfigs) ──────────────────────────────────────
   # Random strings used to authenticate GitHub webhook payloads.
   # Generate with:  python -c "import secrets; print(secrets.token_hex(24))"
   WEBHOOK_SECRET_API: <CHANGE_ME>
diff --git a/deploy/webui-buildconfig.yaml b/deploy/webui-buildconfig.yaml
index fbe83cd56..1e1e15c93 100644
--- a/deploy/webui-buildconfig.yaml
+++ b/deploy/webui-buildconfig.yaml
@@ -16,7 +16,6 @@ metadata:
   labels:
     app: desdeo-webui
 spec:
-  # ── Source ───────────────────────────────────────────────────────────────
   source:
     type: Git
     git:
@@ -25,35 +24,31 @@ spec:
     # Only the webui/ subtree is needed as the Docker build context.
     contextDir: webui
 
-  # ── Build strategy ───────────────────────────────────────────────────────
   strategy:
     type: Docker
     dockerStrategy:
       dockerfilePath: Dockerfile
       # Build arguments — passed as ARG to the Dockerfile.
       buildArgs:
-      - name: VITE_API_URL
-        value: "https://gialmisi-desdeo-api.rahtiapp.fi"
+        - name: VITE_API_URL
+          value: "https://gialmisi-desdeo-api.rahtiapp.fi"
       env:
-      - name: NODE_OPTIONS
-        value: "--max-old-space-size=3072"
+        - name: NODE_OPTIONS
+          value: "--max-old-space-size=3072"
 
-  # ── Output ───────────────────────────────────────────────────────────────
   output:
     to:
       kind: ImageStreamTag
       name: desdeo-webui:latest
 
-  # ── Triggers ─────────────────────────────────────────────────────────────
   triggers:
-  - type: GitHub
-    github:
-      secretReference:
-        name: desdeo-secrets
-  - type: ConfigChange
+    - type: GitHub
+      github:
+        secretReference:
+          name: desdeo-secrets
+    - type: ConfigChange
 
-  # ── Build pod resources ───────────────────────────────────────────────────
-  # npm ci + vite build is memory-hungry; 2Gi is usually sufficient.
+  # npm install + vite build is memory-hungry; 2Gi is usually sufficient.
   resources:
     requests:
       memory: "2Gi"
diff --git a/docs/howtoguides/deploying_on_openshift.md b/docs/howtoguides/deploying_on_openshift.md
new file mode 100644
index 000000000..5a7d503ef
--- /dev/null
+++ b/docs/howtoguides/deploying_on_openshift.md
@@ -0,0 +1,387 @@
+# How to deploy DESDEO on OpenShift
+
+## Overview
+
+This guide walks through deploying the full DESDEO stack: FastAPI backend,
+SvelteKit web UI, and PostgreSQL, on an OpenShift/OKD cluster. [CSC
+Rahti](https://rahti.csc.fi/) is used as the concrete example throughout; values
+specific to Rahti (hostnames, API endpoint, image registry URL) are marked so
+readers on other OpenShift clusters can substitute their own.
+
+This guide uses YAML manifests and the `oc` CLI exclusively. Every deployment
+step is reproducible and version-controlled. OpenShift is a Kubernetes
+distribution with extra features layered on top, this guide uses
+OpenShift-specific objects (BuildConfig, ImageStream, Route) that do not exist
+in vanilla Kubernetes. If you are deploying on plain Kubernetes, consult your
+platform's CI/CD documentation instead.
+
+The files you will work with live in two places in the DESDEO repository:
+
+- `deploy/`: all OpenShift manifests (ImageStreams, BuildConfigs, Deployments,
+  StatefulSet, Routes, Job).
+- Several application-level files added or modified to support production
+  deployment, described under [Repository preparation](#repository-preparation)
+
+## Prerequisites
+
+- A CSC account with an active Rahti project (see [Rahti access](https://docs.csc.fi/cloud/rahti/access/))
+- `oc` CLI installed (see [Using the Rahti CLI](https://docs.csc.fi/cloud/rahti/usage/cli/))
+- Logged in to the cluster:
+  ```bash
+  oc login https://api.2.rahti.csc.fi:6443 --token=<token>
+  ```
+- Switched to your project:
+  ```bash
+  oc project <your-project>
+  ```
+- A fork or branch of the [DESDEO
+  repository](https://github.com/industrial-optimization-group/DESDEO) with the
+  `deploy/` files committed and pushed
+
+## Architecture
+
+Four components are deployed and wired together:
+
+1. `desdeo-api` Deployment: FastAPI served by gunicorn+uvicorn, listening on
+    port 8080. Built in-cluster using OpenShift's Source-to-Image (S2I) strategy
+    from a Python builder image.
+
+2. `desdeo-webui` Deployment: SvelteKit with adapter-node, listening on port 3000.
+    Built using the Docker strategy from `webui/Dockerfile`. All browser API
+    calls are routed through a `/api/[...path]` proxy route baked into the
+    SvelteKit app, this keeps cookies same-origin and avoids CORS complications.
+
+3. `desdeo-postgres` StatefulSet: PostgreSQL running on the built-in Rahti image,
+    backed by a PersistentVolumeClaim.
+
+4. OpenShift Routes: TLS-terminated at Rahti's HAProxy ingress. Certificates for
+   `*.rahtiapp.fi` are provisioned automatically.
+
+### URL environment variables
+
+Two env vars control how the API is reached, and they intentionally point to different targets:
+
+| Variable | Value | Used by |
+|---|---|---|
+| `VITE_API_URL` | `/api` | Baked into the client-side JS bundle at build time. Browser requests go to `<webui-host>/api/...`, which the SvelteKit proxy handles. |
+| `API_BASE_URL` | `http://desdeo-api:8080` | Set at runtime on the webui pod. SvelteKit's server-side proxy uses the internal cluster DNS name to reach the API, never exposed to the browser. |
+
+Do not set `VITE_API_URL` to the API's external Route URL. The proxy architecture means the browser never talks directly to the API.
+
+## Repository preparation
+
+The following files must be present in the repository before deploying. All manifests live under `deploy/`.
+These ar provided in the master branch.
+
+| File | Purpose |
+|---|---|
+| `deploy/postgres.yaml` | StatefulSet, Service, and PVC for PostgreSQL |
+| `deploy/builder-imagestream.yaml` | ImageStream that tracks the custom S2I builder image |
+| `deploy/builder-buildconfig.yaml` | BuildConfig — Docker strategy, builds the solver-enabled S2I builder image |
+| `deploy/api-imagestream.yaml` | ImageStream that tracks built API images |
+| `deploy/webui-imagestream.yaml` | ImageStream that tracks built webui images |
+| `deploy/api-buildconfig.yaml` | BuildConfig: S2I using `desdeo-builder:latest`, GitHub webhook trigger |
+| `deploy/webui-buildconfig.yaml` | BuildConfig: Docker strategy, GitHub webhook trigger |
+| `deploy/api-deployment.yaml` | Deployment, Service, and Route for the API |
+| `deploy/webui-deployment.yaml` | Deployment, Service, and Route for the web UI |
+| `deploy/db-init-job.yaml` | One-shot Job that creates tables and seeds the initial user |
+
+In addition, several non-manifest files are required:
+
+- `.s2i/bin/assemble`: Custom S2I assemble script that uses `uv sync --frozen`.
+
+- `.s2i/environment`: Sets S2I environment variables such as `APP_MODULE`, `GUNICORN_CMD_ARGS`, and the port.
+
+- `desdeo/api/db_init_prod.py`: Production database initialization script. The
+  `db_init.py` debug branch is a no-no in production mode; this separate script
+  creates all SQLModel tables and seeds the initial analyst user.
+
+- `webui/Dockerfile`: Multi-stage Node 24 build. The `NPM_RUN=start:production`
+  build arg selects the adapter-node start script.
+
+- `webui/src/routes/api/[...path]/+server.ts`: The SvelteKit proxy route. It
+  forwards all `/api/*` requests to the API using `event.fetch`, so the
+  `handleFetch` hook in `hooks.server.ts` can intercept 401 responses and handle
+  token refresh transparently.
+
+- `desdeo-s2i-buildimage.Dockerfile`: Builds the custom S2I builder image that
+  extends the Python 3.12 UBI8 base with COIN-OR solvers (`bonmin`, `ipopt`, `cbc`).
+
+## Step 1: Prepare secrets
+
+All credentials are stored in a single Secret named `desdeo-secrets` (NOT under
+version control). Create it with `oc create secret generic` rather than from a
+YAML file. This avoids ever writing credentials to disk or committing them to
+the repository.
+
+```bash
+oc create secret generic desdeo-secrets \
+  --from-literal=POSTGRES_USER=desdeo \
+  --from-literal=POSTGRES_PASSWORD=<password> \
+  --from-literal=DB_HOST=desdeo-postgres \
+  --from-literal=DB_PORT=5432 \
+  --from-literal=DB_NAME=desdeo \
+  --from-literal=DB_USER=desdeo \
+  --from-literal=DB_PASSWORD=<password> \
+  --from-literal=AUTHJWT_SECRET=$(python3 -c "import secrets; print(secrets.token_hex(64))") \
+  --from-literal=DESDEO_ADMIN_USERNAME=admin \
+  --from-literal=DESDEO_ADMIN_PASSWORD=<admin-password> \
+  --from-literal=WEBHOOK_SECRET_API=$(python3 -c "import secrets; print(secrets.token_hex(24))") \
+  --from-literal=WEBHOOK_SECRET_WEBUI=$(python3 -c "import secrets; print(secrets.token_hex(24))")
+```
+
+Key reference:
+
+| Key | Description |
+|---|---|
+| `POSTGRES_USER` / `DB_USER` | PostgreSQL application user name |
+| `POSTGRES_PASSWORD` / `DB_PASSWORD` | Password for the above |
+| `DB_HOST` | Kubernetes Service name, always `desdeo-postgres` |
+| `DB_PORT` | `5432` |
+| `DB_NAME` | Database name |
+| `AUTHJWT_SECRET` | JWT signing key, generate a fresh value, never reuse |
+| `DESDEO_ADMIN_USERNAME` | Initial analyst account username |
+| `DESDEO_ADMIN_PASSWORD` | Initial analyst account password |
+| `WEBHOOK_SECRET_API` | GitHub webhook secret for the API BuildConfig |
+| `WEBHOOK_SECRET_WEBUI` | GitHub webhook secret for the webui BuildConfig |
+
+!!! note
+    `DESDEO_PRODUCTION=true` is set directly in the Deployment manifest, not in
+    this Secret, because it is not sensitive.
+
+## Step 2: Deploy PostgreSQL
+
+```bash
+oc apply -f deploy/postgres.yaml
+oc rollout status statefulset/desdeo-postgres
+```
+
+The StatefulSet uses the built-in Rahti PostgreSQL image:
+
+```
+image-registry.openshift-image-registry.svc:5000/openshift/postgresql:16-el10
+```
+
+To check which tags are available on your cluster:
+
+```bash
+oc get is postgresql -n openshift -o jsonpath='{.spec.tags[*].name}'
+```
+
+Data is stored at `/var/lib/pgsql/data` in the PVC.
+
+!!! note
+    The env vars that initialize the database are `POSTGRESQL_USER`,
+    `POSTGRESQL_PASSWORD`, and `POSTGRESQL_DATABASE` (the `POSTGRESQL_` prefix,
+    not `POSTGRES_`). The manifests map these from the Secret keys `DB_USER`,
+    `DB_PASSWORD`, and `DB_NAME`.
+
+!!! note
+    An alternative to in-cluster PostgreSQL is [CSC Pukki
+    DBaaS](https://docs.csc.fi/cloud/dbaas/), a managed PostgreSQL service.
+    Pukki removes the operational overhead of managing the database yourself but
+    adds setup steps not covered in this guide.
+
+## Step 3: Create ImageStreams and BuildConfigs
+
+An ImageStream is an OpenShift object that tracks versions of a container image.
+When a BuildConfig pushes a new image to an ImageStream, any Deployment watching
+that stream automatically triggers a rolling update, no external registry or CI
+system required.
+
+Apply the ImageStreams first:
+
+```bash
+oc apply -f deploy/builder-imagestream.yaml
+oc apply -f deploy/api-imagestream.yaml
+oc apply -f deploy/webui-imagestream.yaml
+```
+
+Before applying the BuildConfigs, open each file and substitute the placeholder
+`<DEPLOY_BRANCH>` with the branch you want to build from (e.g. `master`). Ensure
+the git URI uses HTTPS, not SSH, the build pod does not have SSH credentials.
+
+The API BuildConfig uses the S2I strategy with `desdeo-builder:latest` as its
+builder image — the custom image built from `desdeo-s2i-buildimage.Dockerfile`
+that includes COIN-OR solvers. The webui BuildConfig uses the Docker strategy
+with `webui/Dockerfile`. The build arg `VITE_API_URL=/api` is passed explicitly,
+this is intentional, as browser requests go through the SvelteKit proxy rather
+than directly to the API.
+
+```bash
+oc apply -f deploy/builder-buildconfig.yaml
+oc apply -f deploy/api-buildconfig.yaml
+oc apply -f deploy/webui-buildconfig.yaml
+```
+
+## Step 4: Trigger first builds
+
+The builder image must be ready before the API build can start, as
+`api-buildconfig.yaml` references `desdeo-builder:latest` as its S2I base.
+
+```bash
+# Build the solver-enabled builder image first
+oc start-build desdeo-builder --follow
+
+# Then build the API and webui (can run in parallel once the builder is done)
+oc start-build desdeo-api --follow
+oc start-build desdeo-webui --follow
+```
+
+The first build takes longer than subsequent ones because there is no layer
+cache. Expect roughly 6 minutes for the builder, 4 minutes for the API, and
+5 minutes for the webui.
+
+Once the API pod is running, verify the solvers are present:
+
+```bash
+oc exec deployment/desdeo-api -- which bonmin ipopt cbc
+```
+
+All three should return paths under `/opt/solver_binaries/`.
+
+!!! warning
+    If the webui build fails with `exit status 137`, the build pod ran out of memory. Increase the build pod memory limit in `webui-buildconfig.yaml`:
+    ```yaml
+    spec:
+      resources:
+        limits:
+          memory: 4Gi
+    ```
+    Also add `NODE_OPTIONS=--max-old-space-size=3072` to `dockerStrategy.env` in the same file, then re-apply and re-trigger the build.
+---
+
+## Step 5: Deploy API and web UI
+
+```bash
+oc apply -f deploy/api-deployment.yaml
+oc apply -f deploy/webui-deployment.yaml
+oc rollout status deployment/desdeo-api
+oc rollout status deployment/desdeo-webui
+```
+
+!!! warning
+    Rahti enforces a maximum CPU limit-to-request ratio of 5:1. If your
+    `resources.limits.cpu` divided by `resources.requests.cpu` exceeds this, the
+    ReplicaSet will silently fail to create pods. The error does not appear
+    in pod logs, look in the ReplicaSet events:
+    ```bash
+    oc describe replicaset <name>
+    ```
+    The manifests in `deploy/` are set within the allowed ratio. If you
+    customize resource settings, check the ratio before applying.
+
+The following env vars must be present on the API pod at runtime (sourced from `desdeo-secrets` via `secretKeyRef` in the Deployment):
+
+| Variable | Source |
+|---|---|
+| `DESDEO_PRODUCTION` | Set to `true` directly in the Deployment manifest |
+| `DB_HOST`, `DB_PORT`, `DB_NAME`, `DB_USER`, `DB_PASSWORD` | From `desdeo-secrets` |
+| `AUTHJWT_SECRET` | From `desdeo-secrets` |
+| `CORS_ORIGINS` | Set in the Deployment to `["https://your-webui.rahtiapp.fi"]` |
+
+!!! note
+    With the SvelteKit proxy architecture, `COOKIE_DOMAIN` on the API is
+    irrelevant. Cookies are owned by the webui host and forwarded server-side.
+    Leave `COOKIE_DOMAIN` unset.
+
+## Step 6: Initialize the database
+
+`db_init_prod.py` creates all SQLModel tables and seeds the initial analyst user
+defined by `DESDEO_ADMIN_USERNAME` and `DESDEO_ADMIN_PASSWORD`. Safe to re-run if needed.
+
+The script runs as a one-shot Kubernetes Job using the API image. Before
+applying, open `deploy/db-init-job.yaml` and replace `<PROJECT>` with your Rahti
+project name (used to construct the image pull reference).
+
+```bash
+oc apply -f deploy/db-init-job.yaml
+oc logs -f job/desdeo-db-init
+```
+
+Expected output:
+
+```
+[db-init] Tables ready.
+[db-init] Created user 'admin' (role=analyst, group=admin).
+[db-init] Done.
+```
+
+Once the job completes successfully, delete it:
+
+```bash
+oc delete job desdeo-db-init
+```
+
+
+## Step 7: Verify
+
+```bash
+curl https://your-api.rahtiapp.fi/health
+# → {"status":"ok"}
+
+curl -I https://your-webui.rahtiapp.fi/
+# → HTTP/2 200
+# (a 307 redirect to /home is also normal)
+```
+
+Routes are TLS-terminated at Rahti's HAProxy ingress. Certificates for
+`*.rahtiapp.fi` are provisioned automatically, no manual certificate work is
+required.
+
+## Step 8: Set up GitHub webhooks
+
+BuildConfigs include GitHub webhook triggers. Once configured, every push to the
+deploy branch triggers a rebuild of the affected component, which then rolls out
+automatically via the ImageStream trigger on the Deployment.
+
+Retrieve the webhook URLs. The webhook secret is embedded in the URL itself,
+the GitHub "Secret" field should be left blank:
+
+```bash
+oc get bc/desdeo-api -o jsonpath='{.spec.triggers}' | python3 -m json.tool
+```
+
+Find the `github` trigger entry and copy the `secret` value. Then construct the
+full webhook URL:
+
+```
+https://api.2.rahti.csc.fi:6443/apis/build.openshift.io/v1/namespaces/<project>/buildconfigs/desdeo-api/webhooks/<secret>/github
+```
+
+In GitHub, go to your fork: **Settings → Webhooks → Add webhook**
+
+- Payload URL: the URL constructed above
+- Content type: `application/json`, this is required; the default `x-www-form-urlencoded` will be rejected by OpenShift
+- Secret: leave blank
+- Events: Just the push event
+
+Repeat for `desdeo-webui` using `bc/desdeo-webui`.
+
+!!! note
+    `oc describe bc/desdeo-api` always shows `<secret>` as a placeholder in the
+    webhook URL regardless of how the secret is stored, this is a display-only
+    mask. Always use `oc get bc -o jsonpath` as shown above to retrieve the
+    actual secret value.
+
+## Troubleshooting
+
+| Symptom | Cause | Fix |
+|---|---|---|
+| API pod crashes on startup with `ValidationError: authjwt_secret_key` | `AUTHJWT_SECRET` env var missing or key name wrong | Verify the key name in the Secret matches exactly what the Deployment references |
+| API pod crashes with DB connection error | `DB_HOST`, `DB_PORT`, `DB_NAME`, `DB_USER`, or `DB_PASSWORD` missing or incorrect | Run `oc describe secret desdeo-secrets` and compare key names with the Deployment's `secretKeyRef` fields |
+| Webui pod never starts; `FailedCreate` in ReplicaSet events | CPU limit-to-request ratio exceeds 5:1 | Adjust `resources.requests.cpu` so that `limits.cpu / requests.cpu ≤ 5` |
+| Login returns 500; logs show `TypeError: Invalid URL` | `API_BASE_URL` env var not set on the webui pod | Set `API_BASE_URL=http://desdeo-api:8080` in the webui Deployment |
+| Build fails with `exit status 137` | Build pod out of memory | Set `spec.resources.limits.memory: 4Gi` in the BuildConfig and add `NODE_OPTIONS=--max-old-space-size=3072` to `dockerStrategy.env` |
+| Build fails with `pip install --group` error | Default S2I assemble script used instead of the custom one | Ensure `.s2i/bin/assemble` is present in the repo and uses `uv sync --frozen` |
+| `uv sync` fails with lockfile conflict | `uv.lock` is out of sync with `pyproject.toml` | Run `uv lock` locally and commit the updated lockfile |
+| Database init job fails with import errors | `DESDEO_PRODUCTION` not set, API falls back to SQLite debug mode | Ensure `DESDEO_PRODUCTION=true` is set in the Job's env spec |
+| GitHub webhook returns 401 | Content type set to `application/x-www-form-urlencoded` | Change content type to `application/json` in the GitHub webhook settings |
+
+
+## Known limitations
+
+Schema migrations:`db_init_prod.py` uses `SQLModel.metadata.create_all`,
+which creates missing tables but does not ALTER existing ones. If the data
+model changes in a later release, tables must be migrated manually or via, e.g.,
+Alembic before redeploying.
diff --git a/docs/howtoguides/index.md b/docs/howtoguides/index.md
index f366caa71..3653ca79d 100644
--- a/docs/howtoguides/index.md
+++ b/docs/howtoguides/index.md
@@ -33,4 +33,5 @@ Guides are goal-oriented and are meant to direct users towards specific goals wh
 
 - **[Running the web-API and web-GUI](api_and_gui.md):** How to run the web-API and web-GUI
 - **[Hosting on Kubernetes](kubernetes.md):** How to host a DESDEO web application on Kubernetes
+- **[Deploying on OpenShift](deploying_on_openshift.md):** How to deploy DESDEO on OpenShift/OKD using `oc` CLI and YAML manifests (Rahti example)
 - **[Implementing method interfaces](implementing_method_interfaces.md):** How to implement new interactive method interfaces in the Web-GUI
diff --git a/mkdocs.yml b/mkdocs.yml
index ff05c53c8..4b2483e4d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -36,6 +36,7 @@ nav:
       - "How to define multiobjective optimization problems": "howtoguides/problem.md"
       - "How to define a multiobjective optimization problem": "howtoguides/how_to_define_a_problem.ipynb"
       - "How to host a DESDEO web application on Kubernetes": "howtoguides/kubernetes.md"
+      - "How to deploy DESDEO on OpenShift": "howtoguides/deploying_on_openshift.md"
       - "How to run DESDEO's web-API and web-GUI": "howtoguides/api_and_gui.md"
       - "How to implement method interfaces in the Web-GUI": "howtoguides/implementing_method_interfaces.md"
       - "How to utilize 'MCDM' methods": "howtoguides/how_to_utilize_mcdm_methods.ipynb"

From 5ea4719a37c41aa47c09f659e64f1255cfffa76f Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Wed, 1 Apr 2026 09:18:27 +0300
Subject: [PATCH 18/24] Updated the webui README

---
 webui/README.md | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/webui/README.md b/webui/README.md
index 37e96b0c7..5a69afda1 100644
--- a/webui/README.md
+++ b/webui/README.md
@@ -2,37 +2,34 @@
 
 ## Environment variables
 
-For the frontend to work correctly, there are some environmental variables
-that should be set in an`.env` file at the root level. These variables are:
+For the frontend to work correctly, there are some environment variables that
+should be set in a `.env` file at the root of the `webui/` directory. These
+variables are:
 
-- `VITE_API_URL` which should be defined to be '/api' for the proxy to work correctly. I.e.:
+- `VITE_API_URL` — set to `"/api"` so that client-side code routes requests
+  through the SvelteKit catch-all proxy at `src/routes/api/[...path]/+server.ts`:
 
 ```bash
 VITE_API_URL="/api"
 ```
 
-- `API_URL` which should be defined to be 'http://localhost:8000 or the path of the server'
+- `API_BASE_URL` — the URL of the running DESDEO web-API, used by server-side
+  route handlers and by `orval.config.mjs` when generating the OpenAPI client:
 
 ```bash
-API_URL=http://localhost:8000
+API_BASE_URL=http://localhost:8000
 ```
 
-Check also the file `vite.config.ts`, where in the server setting
-
-```toml
-	server: {
-		proxy: {
-			'/api': {
-				target: 'http://127.0.0.1:8000',
-				changeOrigin: true,
-				secure: false,
-				rewrite: (path) => path.replace(/^\/api/, '')
-			}
-		}
-	}
+A minimal `.env` for local development therefore looks like:
+
+```bash
+API_BASE_URL="http://localhost:8000"
+VITE_API_URL="/api"
 ```
 
-the `target` should point to the local URL that can be used to access the DESDEO web-API.
+> **Note:** `VITE_API_URL` is baked into the client bundle at build time by
+> Vite, so changing it after a build has no effect. `API_BASE_URL` is read at
+> runtime by the Node.js server process.
 
 ## Installing
 
@@ -92,8 +89,10 @@ npm run dev -- --open
 
 When the web-API is updated, it is important to update the OpenAPI clients,
 which automatically use the schemas defined in the web-API on the GUI side. To
-generate them, make sure the web-API is running on the URL defined in `OPENAPI_URL` in the file
-`orval.config.mjs`, and issue the command:
+generate them, make sure the web-API is running at the URL defined in
+`OPENAPI_URL` inside `orval.config.mjs` (defaults to
+`http://localhost:8000/openapi.json`), and that `API_BASE_URL` is set in your
+`.env` file, then run:
 
 ```bash
 npm run generate:client

From 774eb8d17ef20a0cdc08dc8427119687bd0156a3 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Wed, 1 Apr 2026 14:30:31 +0300
Subject: [PATCH 19/24] Web-API, Web-GUI

- Add /manage-users page for analysts and admins to create DM and
  analyst accounts.
- Guard the route server-side; restrict POST /add_new_dm API endpoint to
  analyst/admin (was public)
- Populate auth store on topbar mount via /user_info to enable
  role-based nav visibility
- Enable Orval Zod body schema generation and regenerate client
- Fix API_BASE_URL in webui README
---
 desdeo/api/routers/user_authentication.py     |  13 +-
 webui/orval.config.mjs                        |  11 ++
 .../lib/components/ui/topbar/topbar.svelte    |  29 +++-
 webui/src/lib/gen/endpoints/DESDEOFastAPI.ts  |  24 +++
 .../src/lib/gen/endpoints/DESDEOFastAPIzod.ts |   5 +
 webui/src/routes/manage-users/+layout.svelte  |  10 ++
 webui/src/routes/manage-users/+page.server.ts |  26 +++
 webui/src/routes/manage-users/+page.svelte    | 159 ++++++++++++++++++
 webui/src/routes/manage-users/handler.ts      |  53 ++++++
 webui/src/routes/manage-users/userSchema.ts   |  13 ++
 10 files changed, 340 insertions(+), 3 deletions(-)
 create mode 100644 webui/src/routes/manage-users/+layout.svelte
 create mode 100644 webui/src/routes/manage-users/+page.server.ts
 create mode 100644 webui/src/routes/manage-users/+page.svelte
 create mode 100644 webui/src/routes/manage-users/handler.ts
 create mode 100644 webui/src/routes/manage-users/userSchema.ts

diff --git a/desdeo/api/routers/user_authentication.py b/desdeo/api/routers/user_authentication.py
index f2a0402f4..f9cb3f5c1 100644
--- a/desdeo/api/routers/user_authentication.py
+++ b/desdeo/api/routers/user_authentication.py
@@ -475,12 +475,14 @@ def refresh_access_token(
 
 @router.post("/add_new_dm")
 def add_new_dm(
+    user: Annotated[User, Depends(get_current_user)],
     form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
     session: Annotated[Session, Depends(get_session)],
 ) -> JSONResponse:
-    """Add a new user of the role Decision Maker to the database. Requires no login.
+    """Add a new user of the role Decision Maker to the database. Requires a logged in analyst or an admin.
 
     Args:
+        user: Annotated[User, Depends(get_current_user)]: Logged in user with the role "analyst" or "admin".
         form_data (Annotated[OAuth2PasswordRequestForm, Depends()]): The user credentials to add to the database.
         session (Annotated[Session, Depends(get_session)]): the database session.
 
@@ -488,8 +490,15 @@ def add_new_dm(
         JSONResponse: A JSON response
 
     Raises:
-        HTTPException: if username is already in use or if saving to the database fails for some reason.
+        HTTPException: if the logged in user is not an analyst or an admin or if
+        username is already in use or if saving to the database fails for some reason.
     """
+    if user.role not in (UserRole.analyst, UserRole.admin):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Logged in user has insufficient rights.",
+        )
+
     add_user_to_database(
         form_data=form_data,
         role=UserRole.dm,
diff --git a/webui/orval.config.mjs b/webui/orval.config.mjs
index 2b9466487..09533549d 100644
--- a/webui/orval.config.mjs
+++ b/webui/orval.config.mjs
@@ -36,6 +36,17 @@ export default defineConfig({
             target: 'src/lib/gen/endpoints',
 	    namingConvention: "PascalCase",
             fileExtension: 'zod.ts',
+            override: {
+                zod: {
+                    generate: {
+                        body: true,
+                        param: true,
+                        query: true,
+                        header: true,
+                        response: true,
+                    },
+                },
+            },
         },
         hooks: {
             afterAllFilesWrite: 'prettier --write',
diff --git a/webui/src/lib/components/ui/topbar/topbar.svelte b/webui/src/lib/components/ui/topbar/topbar.svelte
index 498291397..9a6c9a432 100644
--- a/webui/src/lib/components/ui/topbar/topbar.svelte
+++ b/webui/src/lib/components/ui/topbar/topbar.svelte
@@ -21,11 +21,15 @@
 	import Problem from '@lucide/svelte/icons/puzzle';
 	import Archive from '@lucide/svelte/icons/archive';
 	import HelpCircle from '@lucide/svelte/icons/circle-help';
-	import { Button } from '$lib/components/ui/button/index.js';
+	import UserPlus from '@lucide/svelte/icons/user-plus';
+
 	import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
 	import { goto } from '$app/navigation';
+	import { onMount } from 'svelte';
+	import { get } from 'svelte/store';
 	import { auth } from '../../../../stores/auth';
 	import { derived } from 'svelte/store';
+	import { getCurrentUserInfoUserInfoGet } from '$lib/gen/endpoints/DESDEOFastAPI';
 	import desdeo_logo from '$lib/assets/desdeo_logo.svg';
 
 	async function logout() {
@@ -43,12 +47,25 @@
 		goto('/home');
 	}
 
+	onMount(async () => {
+		if (!get(auth).user) {
+			const response = await getCurrentUserInfoUserInfoGet();
+			if (response.status === 200) {
+				auth.setAuth('authenticated', response.data);
+			}
+		}
+	});
+
 	const userDisplay = derived(auth, ($auth) => {
 		if ($auth.user) {
 			return `${$auth.user.username} (${$auth.user.role})`;
 		}
 		return '';
 	});
+
+	const canManageUsers = derived(auth, ($auth) =>
+		$auth.user?.role === 'analyst' || $auth.user?.role === 'admin'
+	);
 </script>
 
 <header class="bg-primary sticky top-0 flex h-12 items-center gap-4 border-b px-4 md:px-6">
@@ -89,6 +106,16 @@
 			</DropdownMenu.Content>
 		</DropdownMenu.Root>
 
+		{#if $canManageUsers}
+			<a
+				href="/manage-users"
+				class="text-primary-foreground hover:text-secondary flex items-center gap-1 transition-colors"
+			>
+				<UserPlus class="h-4 w-4" />
+				Users
+			</a>
+		{/if}
+
 		<DropdownMenu.Root>
 			<DropdownMenu.Trigger>
 				<span
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
index 82d2fb416..69f8a97a6 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
@@ -5705,3 +5705,27 @@ export const configureGdmGdmScoreBandsConfigurePost = async (
 		}
 	);
 };
+
+/**
+ * @summary Health
+ */
+export type healthHealthGetResponse200 = {
+	data: unknown;
+	status: 200;
+};
+
+export type healthHealthGetResponseSuccess = healthHealthGetResponse200 & {
+	headers: Headers;
+};
+export type healthHealthGetResponse = healthHealthGetResponseSuccess;
+
+export const getHealthHealthGetUrl = () => {
+	return `http://localhost:8000/health`;
+};
+
+export const healthHealthGet = async (options?: RequestInit): Promise<healthHealthGetResponse> => {
+	return customFetch<healthHealthGetResponse>(getHealthHealthGetUrl(), {
+		...options,
+		method: 'GET'
+	});
+};
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
index 94d5381c0..ad16a2a94 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
@@ -8006,3 +8006,8 @@ export const ConfigureGdmGdmScoreBandsConfigurePostBody = zod
 	.describe('Configuration for the SCORE bands based GDM.');
 
 export const ConfigureGdmGdmScoreBandsConfigurePostResponse = zod.unknown();
+
+/**
+ * @summary Health
+ */
+export const HealthHealthGetResponse = zod.unknown();
diff --git a/webui/src/routes/manage-users/+layout.svelte b/webui/src/routes/manage-users/+layout.svelte
new file mode 100644
index 000000000..6fd05e623
--- /dev/null
+++ b/webui/src/routes/manage-users/+layout.svelte
@@ -0,0 +1,10 @@
+<script lang="ts">
+	import Topbar from '$lib/components/ui/topbar/topbar.svelte';
+	import Dialogs from '$lib/components/custom/dialogs/Dialogs.svelte';
+</script>
+
+<div class="flex min-h-screen flex-col">
+	<Topbar />
+	<slot />
+</div>
+<Dialogs />
diff --git a/webui/src/routes/manage-users/+page.server.ts b/webui/src/routes/manage-users/+page.server.ts
new file mode 100644
index 000000000..a974e54d3
--- /dev/null
+++ b/webui/src/routes/manage-users/+page.server.ts
@@ -0,0 +1,26 @@
+import { redirect } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+import { getCurrentUserInfoUserInfoGet } from '$lib/gen/endpoints/DESDEOFastAPI';
+
+export const load: PageServerLoad = async ({ cookies }) => {
+    const refreshToken = cookies.get('refresh_token');
+    if (!refreshToken) {
+        return redirect(307, '/home');
+    }
+
+    const accessToken = cookies.get('access_token');
+    const response = await getCurrentUserInfoUserInfoGet({
+        headers: { Authorization: `Bearer ${accessToken}` },
+    });
+
+    if (response.status !== 200) {
+        return redirect(307, '/home');
+    }
+
+    const role = response.data.role;
+    if (role !== 'analyst' && role !== 'admin') {
+        return redirect(307, '/dashboard');
+    }
+
+    return {};
+};
diff --git a/webui/src/routes/manage-users/+page.svelte b/webui/src/routes/manage-users/+page.svelte
new file mode 100644
index 000000000..d5b5ece5b
--- /dev/null
+++ b/webui/src/routes/manage-users/+page.svelte
@@ -0,0 +1,159 @@
+<script lang="ts">
+	import { Label } from '$lib/components/ui/label/index.js';
+	import { Input } from '$lib/components/ui/input/index.js';
+	import { Button } from '$lib/components/ui/button/index.js';
+	import * as Card from '$lib/components/ui/card/index.js';
+	import LoadingSpinner from '$lib/components/custom/notifications/loading-spinner.svelte';
+	import { auth } from '../../stores/auth';
+	import { addDm, addAnalyst } from './handler';
+	import type { UserCreateResult } from './handler';
+
+	const isAnalystOrAdmin = $derived(
+		$auth.user?.role === 'analyst' || $auth.user?.role === 'admin'
+	);
+
+	let dmUsername = $state('');
+	let dmPassword = $state('');
+	let dmLoading = $state(false);
+	let dmResult = $state<UserCreateResult | null>(null);
+
+	let analystUsername = $state('');
+	let analystPassword = $state('');
+	let analystLoading = $state(false);
+	let analystResult = $state<UserCreateResult | null>(null);
+
+	async function handleAddDm(e: Event) {
+		e.preventDefault();
+		dmLoading = true;
+		dmResult = null;
+		dmResult = await addDm(dmUsername, dmPassword);
+		if (dmResult.success) {
+			dmUsername = '';
+			dmPassword = '';
+		}
+		dmLoading = false;
+	}
+
+	async function handleAddAnalyst(e: Event) {
+		e.preventDefault();
+		analystLoading = true;
+		analystResult = null;
+		analystResult = await addAnalyst(analystUsername, analystPassword);
+		if (analystResult.success) {
+			analystUsername = '';
+			analystPassword = '';
+		}
+		analystLoading = false;
+	}
+</script>
+
+<svelte:head>
+	<title>Manage Users | DESDEO</title>
+</svelte:head>
+
+<main class="container mx-auto px-4 py-8">
+	<h1 class="mb-1 text-2xl font-bold">Manage Users</h1>
+	<p class="text-muted-foreground mb-8 text-sm">Create new user accounts.</p>
+
+	<div class="grid grid-cols-1 gap-6 md:grid-cols-2">
+		<!-- Add Decision Maker -->
+		<Card.Root>
+			<Card.Header>
+				<Card.Title>Add Decision Maker</Card.Title>
+				<Card.Description>Create a new decision maker account.</Card.Description>
+			</Card.Header>
+			<Card.Content>
+				<form onsubmit={handleAddDm} class="flex flex-col gap-4">
+					<div class="grid gap-2">
+						<Label for="dm-username">Username<span class="text-red-500">*</span></Label>
+						<Input
+							id="dm-username"
+							name="username"
+							placeholder="Enter username"
+							bind:value={dmUsername}
+							required
+						/>
+					</div>
+					<div class="grid gap-2">
+						<Label for="dm-password">Password<span class="text-red-500">*</span></Label>
+						<Input
+							id="dm-password"
+							name="password"
+							type="password"
+							placeholder="Enter password"
+							bind:value={dmPassword}
+							required
+						/>
+					</div>
+					<Button type="submit" disabled={dmLoading}>
+						{#if dmLoading}
+							<LoadingSpinner />
+							Creating...
+						{:else}
+							Create decision maker
+						{/if}
+					</Button>
+					{#if dmResult}
+						<p class={dmResult.success ? 'text-sm text-green-600' : 'text-sm text-red-500'}>
+							{dmResult.message}
+						</p>
+					{/if}
+				</form>
+			</Card.Content>
+		</Card.Root>
+
+		<!-- Add Analyst (analyst and admin only) -->
+		{#if isAnalystOrAdmin}
+			<Card.Root>
+				<Card.Header>
+					<Card.Title>Add Analyst</Card.Title>
+					<Card.Description>Create a new analyst account.</Card.Description>
+				</Card.Header>
+				<Card.Content>
+					<form onsubmit={handleAddAnalyst} class="flex flex-col gap-4">
+						<div class="grid gap-2">
+							<Label for="analyst-username"
+								>Username<span class="text-red-500">*</span></Label
+							>
+							<Input
+								id="analyst-username"
+								name="username"
+								placeholder="Enter username"
+								bind:value={analystUsername}
+								required
+							/>
+						</div>
+						<div class="grid gap-2">
+							<Label for="analyst-password"
+								>Password<span class="text-red-500">*</span></Label
+							>
+							<Input
+								id="analyst-password"
+								name="password"
+								type="password"
+								placeholder="Enter password"
+								bind:value={analystPassword}
+								required
+							/>
+						</div>
+						<Button type="submit" disabled={analystLoading}>
+							{#if analystLoading}
+								<LoadingSpinner />
+								Creating...
+							{:else}
+								Create analyst
+							{/if}
+						</Button>
+						{#if analystResult}
+							<p
+								class={analystResult.success ? 'text-sm text-green-600' : 'text-sm text-red-500'}
+							>
+								{analystResult.message}
+							</p>
+						{/if}
+					</form>
+				</Card.Content>
+			</Card.Root>
+		{/if}
+	</div>
+</main>
diff --git a/webui/src/routes/manage-users/handler.ts b/webui/src/routes/manage-users/handler.ts
new file mode 100644
index 000000000..b706ad9bb
--- /dev/null
+++ b/webui/src/routes/manage-users/handler.ts
@@ -0,0 +1,53 @@
+import {
+    addNewDmAddNewDmPost,
+    addNewAnalystAddNewAnalystPost,
+} from '$lib/gen/endpoints/DESDEOFastAPI';
+import type {
+    BodyAddNewDmAddNewDmPost,
+    BodyAddNewAnalystAddNewAnalystPost,
+} from '$lib/gen/endpoints/DESDEOFastAPI';
+
+export type UserCreateResult = { success: boolean; message: string };
+
+// Note: /add_new_dm and /add_new_analyst use FastAPI's OAuth2PasswordRequestForm
+// (application/x-www-form-urlencoded). Authentication for the analyst endpoint is
+// handled transparently by the SvelteKit proxy and hooks.server.ts, which attach
+// the access_token cookie to outgoing requests — no manual token passing needed here.
+
+export async function addDm(username: string, password: string): Promise<UserCreateResult> {
+    const body: BodyAddNewDmAddNewDmPost = { username, password, scope: '' };
+    const response = await addNewDmAddNewDmPost(body);
+    const status = response.status as number;
+
+    if (status === 401) {
+        return { success: false, message: 'Unauthorized: analyst or admin role required.' };
+    }
+    if (status === 409) {
+        return { success: false, message: 'A user with that username already exists.' };
+    }
+    if (status !== 201) {
+        console.error('addDm failed.', status);
+        return { success: false, message: 'Failed to create user. Please try again.' };
+    }
+
+    return { success: true, message: 'Decision maker created successfully.' };
+}
+
+export async function addAnalyst(username: string, password: string): Promise<UserCreateResult> {
+    const body: BodyAddNewAnalystAddNewAnalystPost = { username, password, scope: '' };
+    const response = await addNewAnalystAddNewAnalystPost(body);
+    const status = response.status as number;
+
+    if (status === 401) {
+        return { success: false, message: 'Unauthorized: analyst or admin role required.' };
+    }
+    if (status === 409) {
+        return { success: false, message: 'A user with that username already exists.' };
+    }
+    if (status !== 201) {
+        console.error('addAnalyst failed.', status);
+        return { success: false, message: 'Failed to create analyst. Please try again.' };
+    }
+
+    return { success: true, message: 'Analyst created successfully.' };
+}
diff --git a/webui/src/routes/manage-users/userSchema.ts b/webui/src/routes/manage-users/userSchema.ts
new file mode 100644
index 000000000..7ca19df06
--- /dev/null
+++ b/webui/src/routes/manage-users/userSchema.ts
@@ -0,0 +1,13 @@
+import { z } from "zod";
+
+// The /add_new_dm and /add_new_analyst endpoints use FastAPI's OAuth2PasswordRequestForm,
+// which sends data as application/x-www-form-urlencoded — not a JSON body. Orval does not
+// generate Zod schemas for form-encoded request bodies, so this schema is defined manually.
+// The generated TypeScript interfaces (BodyAddNewDmAddNewDmPost, BodyAddNewAnalystAddNewAnalystPost)
+// are still used when constructing the actual API call body.
+export const newUserSchema = z.object({
+    username: z.string().min(1, "Username is required"),
+    password: z.string().min(1, "Password is required"),
+});
+
+export type FormMessage = { success: boolean; text: string };

From 6ed3f018b3034cefe173ed8cb84bb9fe1fef83a1 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Wed, 1 Apr 2026 15:06:59 +0300
Subject: [PATCH 20/24] Web-API

- Added endpoint to get a list of DM users.
- Modified endpoints for adding problems so that admin and analyst users
  may add problems for other users.
- Tested the new and modified endpoints.
---
 desdeo/api/routers/problem.py              |  38 ++++-
 desdeo/api/routers/user_authentication.py  |  26 ++++
 desdeo/api/tests/test_problem_on_behalf.py | 164 +++++++++++++++++++++
 desdeo/api/tests/test_routes.py            |  16 +-
 uv.lock                                    |   2 +-
 5 files changed, 238 insertions(+), 8 deletions(-)
 create mode 100644 desdeo/api/tests/test_problem_on_behalf.py

diff --git a/desdeo/api/routers/problem.py b/desdeo/api/routers/problem.py
index b1924fe61..df74cc542 100644
--- a/desdeo/api/routers/problem.py
+++ b/desdeo/api/routers/problem.py
@@ -116,12 +116,15 @@ def get_problem(
 def add_problem(
     request: Annotated[Problem, Depends(parse_problem_json)],
     context: Annotated[SessionContext, Depends(SessionContextGuard().post)],
+    target_user_id: int | None = None,
 ) -> ProblemInfo:
     """Add a newly defined problem to the database.
 
     Args:
         request (Problem): the JSON representation of the problem.
         context (Annotated[SessionContext, Depends): the session context.
+        target_user_id (int | None): if provided, assign the problem to this user instead of
+            the caller. Only analysts and admins may use this parameter.
 
     Note:
         Users with the role 'guest' may not add new problems.
@@ -141,8 +144,22 @@ def add_problem(
             detail="Guest users are not allowed to add new problems.",
         )
 
+    effective_user = user
+    if target_user_id is not None:
+        if user.role not in (UserRole.analyst, UserRole.admin):
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail="Only analysts and admins can add problems on behalf of other users.",
+            )
+        effective_user = db_session.get(User, target_user_id)
+        if effective_user is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"User with id={target_user_id} not found.",
+            )
+
     try:
-        problem_db = ProblemDB.from_problem(request, user=user)
+        problem_db = ProblemDB.from_problem(request, user=effective_user)
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
@@ -160,12 +177,15 @@ def add_problem(
 def add_problem_json(
     json_file: UploadFile,
     context: Annotated[SessionContext, Depends(SessionContextGuard().post)],
+    target_user_id: int | None = None,
 ) -> ProblemInfo:
     """Adds a problem to the database based on its JSON definition.
 
     Args:
         json_file (UploadFile): a file in JSON format describing the problem.
         context (Annotated[SessionContext, Depends): the session context.
+        target_user_id (int | None): if provided, assign the problem to this user instead of
+            the caller. Only analysts and admins may use this parameter.
 
     Raises:
         HTTPException: if the provided `json_file` is empty.
@@ -177,6 +197,20 @@ def add_problem_json(
     user = context.user
     db_session = context.db_session
 
+    effective_user = user
+    if target_user_id is not None:
+        if user.role not in (UserRole.analyst, UserRole.admin):
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail="Only analysts and admins can add problems on behalf of other users.",
+            )
+        effective_user = db_session.get(User, target_user_id)
+        if effective_user is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"User with id={target_user_id} not found.",
+            )
+
     raw = json_file.file.read()
 
     if not raw:
@@ -188,7 +222,7 @@ def add_problem_json(
         raise HTTPException(status_code=400, detail="Invalid JSON.") from e
 
     problem = Problem.model_validate_json(raw, by_name=True)
-    problem_db = ProblemDB.from_problem(problem, user=user)
+    problem_db = ProblemDB.from_problem(problem, user=effective_user)
 
     db_session.add(problem_db)
     db_session.commit()
diff --git a/desdeo/api/routers/user_authentication.py b/desdeo/api/routers/user_authentication.py
index f9cb3f5c1..dcaa7941b 100644
--- a/desdeo/api/routers/user_authentication.py
+++ b/desdeo/api/routers/user_authentication.py
@@ -335,6 +335,32 @@ def add_user_to_database(
         )
 
 
+@router.get("/users/dms")
+def get_dm_users(
+    user: Annotated[User, Depends(get_current_user)],
+    session: Annotated[Session, Depends(get_session)],
+) -> list[UserPublic]:
+    """Return all users with the decision maker role. Requires analyst or admin.
+
+    Args:
+        user (Annotated[User, Depends]): the current user.
+        session (Annotated[Session, Depends]): the database session.
+
+    Returns:
+        list[UserPublic]: public information for all DM users.
+
+    Raises:
+        HTTPException: if the current user is not an analyst or admin.
+    """
+    if user.role not in (UserRole.analyst, UserRole.admin):
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail="Only analysts and admins can list users.",
+        )
+    statement = select(User).where(User.role == UserRole.dm)
+    return list(session.exec(statement).all())
+
+
 @router.get("/user_info")
 def get_current_user_info(user: Annotated[User, Depends(get_current_user)]) -> UserPublic:
     """Return information about the current user.
diff --git a/desdeo/api/tests/test_problem_on_behalf.py b/desdeo/api/tests/test_problem_on_behalf.py
new file mode 100644
index 000000000..85ecdb308
--- /dev/null
+++ b/desdeo/api/tests/test_problem_on_behalf.py
@@ -0,0 +1,164 @@
+"""Tests for analyst adding problems on behalf of decision makers."""
+
+from fastapi import status
+from fastapi.testclient import TestClient
+
+from desdeo.api.models import ProblemInfo, UserPublic, UserRole
+from desdeo.problem.testproblems import simple_knapsack_vectors
+
+from .conftest import get_json, login, post_file_multipart, post_json
+
+
+def _add_dm(client: TestClient, analyst_token: str, username: str, password: str) -> None:
+    """Helper: create a DM user via the API."""
+    response = client.post(
+        "/add_new_dm",
+        data={"username": username, "password": password, "grant_type": "password"},
+        headers={"Authorization": f"Bearer {analyst_token}", "content-type": "application/x-www-form-urlencoded"},
+    )
+    assert response.status_code == status.HTTP_201_CREATED
+
+
+def test_list_dms_as_analyst(client: TestClient):
+    """Analyst can retrieve the list of DM users."""
+    analyst_token = login(client)
+
+    # No DMs yet — list should be empty
+    response = get_json(client, "/users/dms", analyst_token)
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json() == []
+
+    # Create two DM users
+    _add_dm(client, analyst_token, "dm_one", "dm_one")
+    _add_dm(client, analyst_token, "dm_two", "dm_two")
+
+    response = get_json(client, "/users/dms", analyst_token)
+    assert response.status_code == status.HTTP_200_OK
+
+    dms = [UserPublic.model_validate(u) for u in response.json()]
+    usernames = {dm.username for dm in dms}
+    assert usernames == {"dm_one", "dm_two"}
+    assert all(dm.role == UserRole.dm for dm in dms)
+
+
+def test_list_dms_as_dm_forbidden(client: TestClient):
+    """DM users cannot list other DM users."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_user", "dm_user")
+
+    dm_token = login(client, username="dm_user", password="dm_user")  # noqa: S106
+    response = get_json(client, "/users/dms", dm_token)
+    assert response.status_code == status.HTTP_403_FORBIDDEN
+
+
+def test_list_dms_unauthenticated(client: TestClient):
+    """Unauthenticated requests to /users/dms are rejected."""
+    response = client.get("/users/dms")
+    assert response.status_code == status.HTTP_401_UNAUTHORIZED
+
+
+def test_add_problem_for_dm_as_analyst(client: TestClient, session_and_user: dict):
+    """Analyst can add a problem that is owned by a DM."""
+    analyst_token = login(client)
+
+    # Create a DM
+    _add_dm(client, analyst_token, "target_dm", "target_dm")
+    dm_token = login(client, username="target_dm", password="target_dm")  # noqa: S106
+
+    # Fetch DM id from /users/dms
+    dms = get_json(client, "/users/dms", analyst_token).json()
+    dm_id = next(u["id"] for u in dms if u["username"] == "target_dm")
+
+    # Analyst submits a problem on behalf of the DM
+    problem = simple_knapsack_vectors()
+    response = post_json(client, f"/problem/add?target_user_id={dm_id}", problem.model_dump(), analyst_token)
+    assert response.status_code == status.HTTP_200_OK
+
+    info = ProblemInfo.model_validate(response.json())
+    assert info.name == "Simple two-objective Knapsack problem"
+
+    # DM should now own the problem
+    dm_problems = get_json(client, "/problem/all", dm_token).json()
+    assert any(p["name"] == "Simple two-objective Knapsack problem" for p in dm_problems)
+
+    # Analyst should NOT own the problem
+    analyst_problems = get_json(client, "/problem/all", analyst_token).json()
+    assert not any(p["name"] == "Simple two-objective Knapsack problem" for p in analyst_problems)
+
+
+def test_add_problem_for_dm_as_dm_forbidden(client: TestClient):
+    """A DM cannot add a problem on behalf of another user."""
+    analyst_token = login(client)
+
+    # Create two DMs
+    _add_dm(client, analyst_token, "dm_a", "dm_a")
+    _add_dm(client, analyst_token, "dm_b", "dm_b")
+
+    # Fetch dm_b's id
+    dms = get_json(client, "/users/dms", analyst_token).json()
+    dm_b_id = next(u["id"] for u in dms if u["username"] == "dm_b")
+
+    # dm_a tries to add a problem for dm_b — should be forbidden
+    dm_a_token = login(client, username="dm_a", password="dm_a")  # noqa: S106
+    problem = simple_knapsack_vectors()
+    response = post_json(client, f"/problem/add?target_user_id={dm_b_id}", problem.model_dump(), dm_a_token)
+    assert response.status_code == status.HTTP_403_FORBIDDEN
+
+
+def test_add_problem_for_nonexistent_user(client: TestClient):
+    """Adding a problem for a non-existent target_user_id returns 404."""
+    analyst_token = login(client)
+    problem = simple_knapsack_vectors()
+    response = post_json(client, "/problem/add?target_user_id=99999", problem.model_dump(), analyst_token)
+    assert response.status_code == status.HTTP_404_NOT_FOUND
+
+
+def test_add_problem_json_for_dm_as_analyst(client: TestClient):
+    """Analyst can upload a JSON problem file on behalf of a DM."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "json_dm", "json_dm")
+    dm_token = login(client, username="json_dm", password="json_dm")  # noqa: S106
+
+    dms = get_json(client, "/users/dms", analyst_token).json()
+    dm_id = next(u["id"] for u in dms if u["username"] == "json_dm")
+
+    # Serialize a problem to JSON bytes
+    problem = simple_knapsack_vectors()
+    problem_bytes = problem.model_dump_json(by_alias=True).encode()
+
+    response = post_file_multipart(
+        client,
+        f"/problem/add_json?target_user_id={dm_id}",
+        problem_bytes,
+        analyst_token,
+    )
+    assert response.status_code == status.HTTP_200_OK
+
+    info = ProblemInfo.model_validate(response.json())
+    assert info.name == "Simple two-objective Knapsack problem"
+
+    # DM should own the problem
+    dm_problems = get_json(client, "/problem/all", dm_token).json()
+    assert any(p["name"] == "Simple two-objective Knapsack problem" for p in dm_problems)
+
+
+def test_add_problem_json_for_dm_as_dm_forbidden(client: TestClient):
+    """A DM cannot upload a JSON problem on behalf of another user."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "jdm_a", "jdm_a")
+    _add_dm(client, analyst_token, "jdm_b", "jdm_b")
+
+    dms = get_json(client, "/users/dms", analyst_token).json()
+    jdm_b_id = next(u["id"] for u in dms if u["username"] == "jdm_b")
+
+    jdm_a_token = login(client, username="jdm_a", password="jdm_a")  # noqa: S106
+    problem = simple_knapsack_vectors()
+    problem_bytes = problem.model_dump_json(by_alias=True).encode()
+
+    response = post_file_multipart(
+        client,
+        f"/problem/add_json?target_user_id={jdm_b_id}",
+        problem_bytes,
+        jdm_a_token,
+    )
+    assert response.status_code == status.HTTP_403_FORBIDDEN
diff --git a/desdeo/api/tests/test_routes.py b/desdeo/api/tests/test_routes.py
index 74df63135..70fbbd1ec 100644
--- a/desdeo/api/tests/test_routes.py
+++ b/desdeo/api/tests/test_routes.py
@@ -683,11 +683,13 @@ def test_nimbus_save_and_delete_save(client: TestClient):
 
 def test_add_new_dm(client: TestClient):
     """Test that adding a decision maker works."""
+    access_token = login(client)
+
     # Create a new user to the database
     good_response = client.post(
         "/add_new_dm",
         data={"username": "new_dm", "password": "new_dm", "grant_type": "password"},
-        headers={"content-type": "application/x-www-form-urlencoded"},
+        headers={"Authorization": f"Bearer {access_token}", "content-type": "application/x-www-form-urlencoded"},
     )
     assert good_response.status_code == status.HTTP_201_CREATED
 
@@ -695,7 +697,7 @@ def test_add_new_dm(client: TestClient):
     bad_response = client.post(
         "/add_new_dm",
         data={"username": "new_dm", "password": "new_dm", "grant_type": "password"},
-        headers={"content-type": "application/x-www-form-urlencoded"},
+        headers={"Authorization": f"Bearer {access_token}", "content-type": "application/x-www-form-urlencoded"},
     )
     assert bad_response.status_code == status.HTTP_409_CONFLICT
 
@@ -713,10 +715,14 @@ def test_add_new_analyst(client: TestClient):
     assert nologin_response.status_code == status.HTTP_401_UNAUTHORIZED
 
     # Try to create an analyst using a dm account.
+    analyst_token_for_setup = login(client)
     response = client.post(
         "/add_new_dm",
         data={"username": "new_dm", "password": "new_dm", "grant_type": "password"},
-        headers={"content-type": "application/x-www-form-urlencoded"},
+        headers={
+            "Authorization": f"Bearer {analyst_token_for_setup}",
+            "content-type": "application/x-www-form-urlencoded",
+        },
     )
     assert response.status_code == status.HTTP_201_CREATED
 
@@ -836,7 +842,7 @@ def get_user_info(token: str):
     response = client.post(
         "/add_new_dm",
         data={"username": "new_dm", "password": "new_dm", "grant_type": "password"},
-        headers={"content-type": "application/x-www-form-urlencoded"},
+        headers={"Authorization": f"Bearer {access_token}", "content-type": "application/x-www-form-urlencoded"},
     )
     assert response.status_code == status.HTTP_201_CREATED
 
@@ -1047,7 +1053,7 @@ def test_gdm_score_bands(client: TestClient):
     response = client.post(
         "/add_new_dm",
         data={"username": "dm", "password": "dm", "grant_type": "password"},
-        headers={"content-type": "application/x-www-form-urlencoded"},
+        headers={"Authorization": f"Bearer {access_token}", "content-type": "application/x-www-form-urlencoded"},
     )
     assert response.status_code == 201
 
diff --git a/uv.lock b/uv.lock
index ed589fa76..c7b8be916 100644
--- a/uv.lock
+++ b/uv.lock
@@ -694,7 +694,7 @@ wheels = [
 
 [[package]]
 name = "desdeo"
-version = "2.2.2"
+version = "2.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "bayesian-optimization" },

From 59c89e80ec27046e53788d13b6f947660d80e969 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Wed, 1 Apr 2026 15:58:13 +0300
Subject: [PATCH 21/24] Web-API, Web-GUI

- Analysts and admins can view, delete, and manage all users' problems
- Added fetch_problem_with_role_check helper in utils.py (role-aware
  ownership bypass)
- Problem listing endpoints return all problems for analysts, own only
  for DMs
- Problem action endpoints (delete, solver, JSON, repr sets) allow
  analyst access to any problem
- Problems UI: user filter dropdown (default "Myself"), Owner field in
  detail panel
- Problems define page: DM selector for analyst to assign problem to a
  DM on creation
- Fixed test_delete_problem_unauthorized (analyst role changed to DM)
- Regenerated orval client with new DM users endpoint and target_user_id
  params
---
 desdeo/api/routers/problem.py                 |  56 ++++++---
 desdeo/api/routers/utils.py                   |  54 ++++----
 desdeo/api/tests/test_delete_problem.py       |   6 +-
 desdeo/api/tests/test_problem_on_behalf.py    | 119 +++++++++++++++++-
 webui/src/lib/gen/endpoints/DESDEOFastAPI.ts  |  59 ++++++++-
 .../src/lib/gen/endpoints/DESDEOFastAPIzod.ts |  46 ++++++-
 webui/src/routes/problems/+page.svelte        |  76 ++++++++++-
 webui/src/routes/problems/+page.ts            |  15 ++-
 webui/src/routes/problems/define/+page.svelte |  40 +++++-
 webui/src/routes/problems/define/handler.ts   |  14 ++-
 10 files changed, 407 insertions(+), 78 deletions(-)

diff --git a/desdeo/api/routers/problem.py b/desdeo/api/routers/problem.py
index df74cc542..5222d309a 100644
--- a/desdeo/api/routers/problem.py
+++ b/desdeo/api/routers/problem.py
@@ -5,8 +5,9 @@
 
 from fastapi import APIRouter, Depends, HTTPException, Request, UploadFile, status
 from fastapi.responses import JSONResponse
-from sqlmodel import Session
+from sqlmodel import Session, select
 
+from desdeo.api.db import get_session
 from desdeo.api.models import (
     ForestProblemMetaData,
     ProblemDB,
@@ -64,28 +65,40 @@ async def parse_problem_json(request: Request) -> Problem:
 
 
 @router.get("/all")
-def get_problems(user: Annotated[User, Depends(get_current_user)]) -> list[ProblemInfoSmall]:
-    """Get information on all the current user's problems.
+def get_problems(
+    user: Annotated[User, Depends(get_current_user)],
+    db_session: Annotated[Session, Depends(get_session)],
+) -> list[ProblemInfoSmall]:
+    """Get information on problems. Analysts and admins see all users' problems.
 
     Args:
         user (Annotated[User, Depends): the current user.
+        db_session (Annotated[Session, Depends]): the database session.
 
     Returns:
-        list[ProblemInfoSmall]: a list of information on all the problems.
+        list[ProblemInfoSmall]: a list of information on the problems.
     """
+    if user.role in (UserRole.analyst, UserRole.admin):
+        return list(db_session.exec(select(ProblemDB)).all())
     return user.problems
 
 
 @router.get("/all_info")
-def get_problems_info(user: Annotated[User, Depends(get_current_user)]) -> list[ProblemInfo]:
-    """Get detailed information on all the current user's problems.
+def get_problems_info(
+    user: Annotated[User, Depends(get_current_user)],
+    db_session: Annotated[Session, Depends(get_session)],
+) -> list[ProblemInfo]:
+    """Get detailed information on problems. Analysts and admins see all users' problems.
 
     Args:
         user (Annotated[User, Depends): the current user.
+        db_session (Annotated[Session, Depends]): the database session.
 
     Returns:
-        list[ProblemInfo]: a list of the detailed information on all the problems.
+        list[ProblemInfo]: a list of the detailed information on the problems.
     """
+    if user.role in (UserRole.analyst, UserRole.admin):
+        return list(db_session.exec(select(ProblemDB)).all())
     return user.problems
 
 
@@ -299,10 +312,10 @@ def select_solver(
         )
 
     # Auth the user
-    if user.id != problem_db.user_id:
+    if user.role not in (UserRole.analyst, UserRole.admin) and user.id != problem_db.user_id:
         raise HTTPException(
             detail="Unauthorized user!",
-            status_code=status.HTTP_401_UNAUTHORIZED,
+            status_code=status.HTTP_403_FORBIDDEN,
         )
 
     # All good, get on with it.
@@ -406,8 +419,8 @@ def get_all_representative_solution_sets(
         raise HTTPException(status_code=404, detail=f"Problem with ID {problem_id} not found.")
 
     # Check the user
-    if problem_db.user_id != user.id:
-        raise HTTPException(status_code=401, detail="Unauthorized user.")
+    if user.role not in (UserRole.analyst, UserRole.admin) and problem_db.user_id != user.id:
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Unauthorized user.")
 
     # Fetch metadata
     problem_metadata = problem_db.problem_metadata
@@ -442,8 +455,11 @@ def get_representative_solution_set(
         raise HTTPException(status_code=404, detail=f"Representative set with ID {set_id} not found.")
 
     # Check the user
-    if repr_set.metadata_instance.problem.user_id != context.user.id:
-        raise HTTPException(status_code=401, detail="Unauthorized user.")
+    if (
+        context.user.role not in (UserRole.analyst, UserRole.admin)
+        and repr_set.metadata_instance.problem.user_id != context.user.id
+    ):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Unauthorized user.")
 
     # Return all fields as a dict
     return RepresentativeSolutionSetFull(
@@ -471,10 +487,10 @@ def delete_representative_solution_set(
     if repr_metadata is None:
         raise HTTPException(status_code=404, detail=f"Representative solution set with ID {set_id} not found.")
 
-    # Ensure the user owns the problem this set belongs to
+    # Ensure the user owns the problem this set belongs to (analysts/admins are exempt)
     problem_metadata = repr_metadata.metadata_instance
-    if problem_metadata.problem.user_id != user.id:
-        raise HTTPException(status_code=401, detail="Unauthorized user.")
+    if user.role not in (UserRole.analyst, UserRole.admin) and problem_metadata.problem.user_id != user.id:
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Unauthorized user.")
 
     # Delete the set
     db_session.delete(repr_metadata)
@@ -494,8 +510,8 @@ def delete_problem(
     if problem_db is None:
         raise HTTPException(status_code=404, detail=f"Problem with ID {problem_id} not found.")
 
-    if problem_db.user_id != user.id:
-        raise HTTPException(status_code=401, detail="Unauthorized user.")
+    if user.role not in (UserRole.analyst, UserRole.admin) and problem_db.user_id != user.id:
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Unauthorized user.")
 
     db_session.delete(problem_db)
     db_session.commit()
@@ -514,8 +530,8 @@ def get_problem_json(
     if problem_db is None:
         raise HTTPException(status_code=404, detail=f"Problem with ID {problem_id} not found.")
 
-    if problem_db.user_id != user.id:
-        raise HTTPException(status_code=401, detail="Unauthorized user.")
+    if user.role not in (UserRole.analyst, UserRole.admin) and problem_db.user_id != user.id:
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Unauthorized user.")
 
     problem = Problem.from_problemdb(problem_db)
     return JSONResponse(content=json.loads(problem.model_dump_json()), status_code=status.HTTP_200_OK)
diff --git a/desdeo/api/routers/utils.py b/desdeo/api/routers/utils.py
index 7f2caba46..e8cb6db44 100644
--- a/desdeo/api/routers/utils.py
+++ b/desdeo/api/routers/utils.py
@@ -19,6 +19,7 @@
     RPMSolveRequest,
     StateDB,
     User,
+    UserRole,
 )
 from desdeo.api.models.session import CreateSessionRequest
 from desdeo.api.routers.user_authentication import get_current_user
@@ -26,6 +27,27 @@
 RequestType = RPMSolveRequest | ENautilusStepRequest | CreateSessionRequest
 
 
+def fetch_problem_with_role_check(user: User, problem_id: int, session: Session) -> ProblemDB | None:
+    """Fetch a ProblemDB by id, bypassing ownership for analysts and admins.
+
+    Args:
+        user (User): the requesting user.
+        problem_id (int): id of the problem to fetch.
+        session (Session): the database session.
+
+    Returns:
+        ProblemDB | None: the matching problem, or None if not found.
+    """
+    if user.role in (UserRole.analyst, UserRole.admin):
+        statement = select(ProblemDB).where(ProblemDB.id == problem_id)
+    else:
+        statement = select(ProblemDB).where(
+            ProblemDB.user_id == user.id,
+            ProblemDB.id == problem_id,
+        )
+    return session.exec(statement).first()
+
+
 def fetch_interactive_session(
     user: User,
     session: Session,
@@ -218,18 +240,11 @@ def post(
         parent_state = None
 
         if request is not None:
-            if hasattr(request, "problem_id"):
-                problem_db = fetch_user_problem(user, request, db_session)
+            if hasattr(request, "problem_id") and request.problem_id is not None:
+                problem_db = fetch_problem_with_role_check(user, request.problem_id, db_session)
 
             if problem_db is None and problem_id is not None:
-
-                class _ProblemOnly:
-                    def __init__(self, problem_id: int):
-                        self.problem_id = problem_id
-                        self.session_id = None
-                        self.parent_state_id = None
-
-                problem_db = fetch_user_problem(user, _ProblemOnly(problem_id), db_session)
+                problem_db = fetch_problem_with_role_check(user, problem_id, db_session)
 
             if hasattr(request, "interactive_session_id") or hasattr(request, "problem_id"):
                 interactive_session = fetch_interactive_session(user, db_session, request)
@@ -242,15 +257,7 @@ def __init__(self, problem_id: int):
                     interactive_session=interactive_session,
                 )
         elif problem_id is not None:
-
-            class _ProblemOnly:
-                def __init__(self, problem_id: int):
-                    self.problem_id = problem_id
-                    self.session_id = None
-                    self.parent_state_id = None
-
-            pseudo_request = _ProblemOnly(problem_id)
-            problem_db = fetch_user_problem(user, pseudo_request, db_session)
+            problem_db = fetch_problem_with_role_check(user, problem_id, db_session)
 
         context = SessionContext(
             user=user,
@@ -275,14 +282,7 @@ def get(
         interactive_session = None
 
         if problem_id is not None:
-
-            class _ProblemOnly:
-                def __init__(self, problem_id: int):
-                    self.problem_id = problem_id
-                    self.session_id = None
-                    self.parent_state_id = None
-
-            problem_db = fetch_user_problem(user, _ProblemOnly(problem_id), db_session)
+            problem_db = fetch_problem_with_role_check(user, problem_id, db_session)
 
         if session_id is not None or (problem_id is not None):
             interactive_session = fetch_interactive_session(
diff --git a/desdeo/api/tests/test_delete_problem.py b/desdeo/api/tests/test_delete_problem.py
index 20ddda0d0..99c723e60 100644
--- a/desdeo/api/tests/test_delete_problem.py
+++ b/desdeo/api/tests/test_delete_problem.py
@@ -100,11 +100,11 @@ def test_delete_problem_unauthorized(client: TestClient, session_and_user: dict)
     session: Session = session_and_user["session"]
     user: User = session_and_user["user"]
 
-    # Create a second user
+    # Create a second user (DM — cannot delete other users' problems)
     other_user = User(
         username="other",
         password_hash=get_password_hash("other"),
-        role=UserRole.analyst,
+        role=UserRole.dm,
         group="test",
     )
     session.add(other_user)
@@ -126,7 +126,7 @@ def test_delete_problem_unauthorized(client: TestClient, session_and_user: dict)
         headers={"Authorization": f"Bearer {other_token}"},
     )
 
-    assert response.status_code == status.HTTP_401_UNAUTHORIZED
+    assert response.status_code == status.HTTP_403_FORBIDDEN
 
     # Problem should still exist
     assert session.get(ProblemDB, problem_id) is not None
diff --git a/desdeo/api/tests/test_problem_on_behalf.py b/desdeo/api/tests/test_problem_on_behalf.py
index 85ecdb308..cc65753b3 100644
--- a/desdeo/api/tests/test_problem_on_behalf.py
+++ b/desdeo/api/tests/test_problem_on_behalf.py
@@ -81,9 +81,10 @@ def test_add_problem_for_dm_as_analyst(client: TestClient, session_and_user: dic
     dm_problems = get_json(client, "/problem/all", dm_token).json()
     assert any(p["name"] == "Simple two-objective Knapsack problem" for p in dm_problems)
 
-    # Analyst should NOT own the problem
-    analyst_problems = get_json(client, "/problem/all", analyst_token).json()
-    assert not any(p["name"] == "Simple two-objective Knapsack problem" for p in analyst_problems)
+    # Analyst sees all problems (including the DM's), but user_id must belong to the DM
+    all_problems = get_json(client, "/problem/all_info", analyst_token).json()
+    created = next(p for p in all_problems if p["name"] == "Simple two-objective Knapsack problem")
+    assert created["user_id"] == dm_id
 
 
 def test_add_problem_for_dm_as_dm_forbidden(client: TestClient):
@@ -162,3 +163,115 @@ def test_add_problem_json_for_dm_as_dm_forbidden(client: TestClient):
         jdm_a_token,
     )
     assert response.status_code == status.HTTP_403_FORBIDDEN
+
+
+def _add_problem_as_dm(client: TestClient, dm_token: str) -> int:
+    """Helper: DM adds a problem and returns its id."""
+    problem = simple_knapsack_vectors()
+    response = post_json(client, "/problem/add", problem.model_dump(), dm_token)
+    assert response.status_code == status.HTTP_200_OK
+    return response.json()["id"]
+
+
+def test_analyst_sees_all_problems(client: TestClient):
+    """Analyst sees problems from all users in GET /problem/all_info."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "vis_dm", "vis_dm")
+    dm_token = login(client, username="vis_dm", password="vis_dm")  # noqa: S106
+
+    dm_problem_id = _add_problem_as_dm(client, dm_token)
+
+    response = get_json(client, "/problem/all_info", analyst_token)
+    assert response.status_code == status.HTTP_200_OK
+    ids = [p["id"] for p in response.json()]
+    assert dm_problem_id in ids
+
+
+def test_dm_only_sees_own_problems(client: TestClient):
+    """A DM cannot see another DM's problems in GET /problem/all_info."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_x", "dm_x")
+    _add_dm(client, analyst_token, "dm_y", "dm_y")
+
+    dm_x_token = login(client, username="dm_x", password="dm_x")  # noqa: S106
+    dm_y_token = login(client, username="dm_y", password="dm_y")  # noqa: S106
+
+    dm_x_problem_id = _add_problem_as_dm(client, dm_x_token)
+
+    # dm_y lists problems — must not see dm_x's problem
+    response = get_json(client, "/problem/all_info", dm_y_token)
+    assert response.status_code == status.HTTP_200_OK
+    ids = [p["id"] for p in response.json()]
+    assert dm_x_problem_id not in ids
+
+
+def test_analyst_can_get_problem_json_for_dm(client: TestClient):
+    """Analyst can download a DM's problem as JSON."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "json_owner", "json_owner")
+    dm_token = login(client, username="json_owner", password="json_owner")  # noqa: S106
+
+    dm_problem_id = _add_problem_as_dm(client, dm_token)
+
+    response = get_json(client, f"/problem/{dm_problem_id}/json", analyst_token)
+    assert response.status_code == status.HTTP_200_OK
+
+
+def test_dm_cannot_get_problem_json_of_other_dm(client: TestClient):
+    """A DM cannot download another DM's problem JSON."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "owner_dm", "owner_dm")
+    _add_dm(client, analyst_token, "thief_dm", "thief_dm")
+
+    owner_token = login(client, username="owner_dm", password="owner_dm")  # noqa: S106
+    thief_token = login(client, username="thief_dm", password="thief_dm")  # noqa: S106
+
+    owner_problem_id = _add_problem_as_dm(client, owner_token)
+
+    response = get_json(client, f"/problem/{owner_problem_id}/json", thief_token)
+    assert response.status_code == status.HTTP_403_FORBIDDEN
+
+
+def test_analyst_can_delete_dm_problem(client: TestClient):
+    """Analyst can delete a DM's problem."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "del_dm", "del_dm")
+    dm_token = login(client, username="del_dm", password="del_dm")  # noqa: S106
+
+    dm_problem_id = _add_problem_as_dm(client, dm_token)
+
+    response = client.delete(
+        f"/problem/{dm_problem_id}",
+        headers={"Authorization": f"Bearer {analyst_token}"},
+    )
+    assert response.status_code == status.HTTP_204_NO_CONTENT
+
+
+def test_analyst_can_assign_solver_for_dm_problem(client: TestClient):
+    """Analyst can assign a solver to a DM's problem."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "solver_dm", "solver_dm")
+    dm_token = login(client, username="solver_dm", password="solver_dm")  # noqa: S106
+
+    dm_problem_id = _add_problem_as_dm(client, dm_token)
+
+    response = post_json(
+        client,
+        "/problem/assign_solver",
+        {"problem_id": dm_problem_id, "solver_string_representation": "scipy_minimize"},
+        analyst_token,
+    )
+    assert response.status_code == status.HTTP_200_OK
+
+
+def test_analyst_can_get_repr_solution_sets_for_dm(client: TestClient):
+    """Analyst can list representative solution sets for a DM's problem."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "repr_dm", "repr_dm")
+    dm_token = login(client, username="repr_dm", password="repr_dm")  # noqa: S106
+
+    dm_problem_id = _add_problem_as_dm(client, dm_token)
+
+    response = get_json(client, f"/problem/{dm_problem_id}/all_representative_solution_sets", analyst_token)
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json() == []
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
index 69f8a97a6..6c8cb020b 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
@@ -1715,10 +1715,12 @@ export type DeleteProblemProblemProblemIdDeleteParams = {
 };
 
 export type AddProblemProblemAddPostParams = {
+	target_user_id?: number | null;
 	problem_id?: number | null;
 };
 
 export type AddProblemJsonProblemAddJsonPostParams = {
+	target_user_id?: number | null;
 	problem_id?: number | null;
 };
 
@@ -1845,6 +1847,43 @@ export type ConfigureGdmGdmScoreBandsConfigurePostParams = {
 	group_id: number;
 };
 
+/**
+ * Return all users with the decision maker role. Requires analyst or admin.
+
+Args:
+    user (Annotated[User, Depends]): the current user.
+    session (Annotated[Session, Depends]): the database session.
+
+Returns:
+    list[UserPublic]: public information for all DM users.
+
+Raises:
+    HTTPException: if the current user is not an analyst or admin.
+ * @summary Get Dm Users
+ */
+export type getDmUsersUsersDmsGetResponse200 = {
+	data: UserPublic[];
+	status: 200;
+};
+
+export type getDmUsersUsersDmsGetResponseSuccess = getDmUsersUsersDmsGetResponse200 & {
+	headers: Headers;
+};
+export type getDmUsersUsersDmsGetResponse = getDmUsersUsersDmsGetResponseSuccess;
+
+export const getGetDmUsersUsersDmsGetUrl = () => {
+	return `http://localhost:8000/users/dms`;
+};
+
+export const getDmUsersUsersDmsGet = async (
+	options?: RequestInit
+): Promise<getDmUsersUsersDmsGetResponse> => {
+	return customFetch<getDmUsersUsersDmsGetResponse>(getGetDmUsersUsersDmsGetUrl(), {
+		...options,
+		method: 'GET'
+	});
+};
+
 /**
  * Return information about the current user.
 
@@ -2038,9 +2077,10 @@ export const refreshAccessTokenRefreshPost = async (
 };
 
 /**
- * Add a new user of the role Decision Maker to the database. Requires no login.
+ * Add a new user of the role Decision Maker to the database. Requires a logged in analyst or an admin.
 
 Args:
+    user: Annotated[User, Depends(get_current_user)]: Logged in user with the role "analyst" or "admin".
     form_data (Annotated[OAuth2PasswordRequestForm, Depends()]): The user credentials to add to the database.
     session (Annotated[Session, Depends(get_session)]): the database session.
 
@@ -2048,7 +2088,8 @@ Returns:
     JSONResponse: A JSON response
 
 Raises:
-    HTTPException: if username is already in use or if saving to the database fails for some reason.
+    HTTPException: if the logged in user is not an analyst or an admin or if
+    username is already in use or if saving to the database fails for some reason.
  * @summary Add New Dm
  */
 export type addNewDmAddNewDmPostResponse200 = {
@@ -2197,13 +2238,14 @@ export const addNewAnalystAddNewAnalystPost = async (
 };
 
 /**
- * Get information on all the current user's problems.
+ * Get information on problems. Analysts and admins see all users' problems.
 
 Args:
     user (Annotated[User, Depends): the current user.
+    db_session (Annotated[Session, Depends]): the database session.
 
 Returns:
-    list[ProblemInfoSmall]: a list of information on all the problems.
+    list[ProblemInfoSmall]: a list of information on the problems.
  * @summary Get Problems
  */
 export type getProblemsProblemAllGetResponse200 = {
@@ -2230,13 +2272,14 @@ export const getProblemsProblemAllGet = async (
 };
 
 /**
- * Get detailed information on all the current user's problems.
+ * Get detailed information on problems. Analysts and admins see all users' problems.
 
 Args:
     user (Annotated[User, Depends): the current user.
+    db_session (Annotated[Session, Depends]): the database session.
 
 Returns:
-    list[ProblemInfo]: a list of the detailed information on all the problems.
+    list[ProblemInfo]: a list of the detailed information on the problems.
  * @summary Get Problems Info
  */
 export type getProblemsInfoProblemAllInfoGetResponse200 = {
@@ -2403,6 +2446,8 @@ export const deleteProblemProblemProblemIdDelete = async (
 Args:
     request (Problem): the JSON representation of the problem.
     context (Annotated[SessionContext, Depends): the session context.
+    target_user_id (int | None): if provided, assign the problem to this user instead of
+        the caller. Only analysts and admins may use this parameter.
 
 Note:
     Users with the role 'guest' may not add new problems.
@@ -2474,6 +2519,8 @@ export const addProblemProblemAddPost = async (
 Args:
     json_file (UploadFile): a file in JSON format describing the problem.
     context (Annotated[SessionContext, Depends): the session context.
+    target_user_id (int | None): if provided, assign the problem to this user instead of
+        the caller. Only analysts and admins may use this parameter.
 
 Raises:
     HTTPException: if the provided `json_file` is empty.
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
index ad16a2a94..e8b5e8f29 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
@@ -7,6 +7,30 @@
  */
 import * as zod from 'zod';
 
+/**
+ * Return all users with the decision maker role. Requires analyst or admin.
+
+Args:
+    user (Annotated[User, Depends]): the current user.
+    session (Annotated[Session, Depends]): the database session.
+
+Returns:
+    list[UserPublic]: public information for all DM users.
+
+Raises:
+    HTTPException: if the current user is not an analyst or admin.
+ * @summary Get Dm Users
+ */
+export const GetDmUsersUsersDmsGetResponseItem = zod
+	.object({
+		username: zod.string(),
+		id: zod.number(),
+		role: zod.enum(['guest', 'dm', 'analyst', 'admin']).describe('Possible user roles.'),
+		group_ids: zod.union([zod.array(zod.number()), zod.null()])
+	})
+	.describe('The object to handle public user information.');
+export const GetDmUsersUsersDmsGetResponse = zod.array(GetDmUsersUsersDmsGetResponseItem);
+
 /**
  * Return information about the current user.
 
@@ -80,9 +104,10 @@ Returns:
 export const RefreshAccessTokenRefreshPostResponse = zod.unknown();
 
 /**
- * Add a new user of the role Decision Maker to the database. Requires no login.
+ * Add a new user of the role Decision Maker to the database. Requires a logged in analyst or an admin.
 
 Args:
+    user: Annotated[User, Depends(get_current_user)]: Logged in user with the role "analyst" or "admin".
     form_data (Annotated[OAuth2PasswordRequestForm, Depends()]): The user credentials to add to the database.
     session (Annotated[Session, Depends(get_session)]): the database session.
 
@@ -90,7 +115,8 @@ Returns:
     JSONResponse: A JSON response
 
 Raises:
-    HTTPException: if username is already in use or if saving to the database fails for some reason.
+    HTTPException: if the logged in user is not an analyst or an admin or if
+    username is already in use or if saving to the database fails for some reason.
  * @summary Add New Dm
  */
 export const AddNewDmAddNewDmPostResponse = zod.unknown();
@@ -114,13 +140,14 @@ Raises:
 export const AddNewAnalystAddNewAnalystPostResponse = zod.unknown();
 
 /**
- * Get information on all the current user's problems.
+ * Get information on problems. Analysts and admins see all users' problems.
 
 Args:
     user (Annotated[User, Depends): the current user.
+    db_session (Annotated[Session, Depends]): the database session.
 
 Returns:
-    list[ProblemInfoSmall]: a list of information on all the problems.
+    list[ProblemInfoSmall]: a list of information on the problems.
  * @summary Get Problems
  */
 export const getProblemsProblemAllGetResponseProblemMetadataOneForestMetadataOneItemMetadataTypeDefault = `forest_problem_metadata`;
@@ -209,13 +236,14 @@ export const GetProblemsProblemAllGetResponseItem = zod
 export const GetProblemsProblemAllGetResponse = zod.array(GetProblemsProblemAllGetResponseItem);
 
 /**
- * Get detailed information on all the current user's problems.
+ * Get detailed information on problems. Analysts and admins see all users' problems.
 
 Args:
     user (Annotated[User, Depends): the current user.
+    db_session (Annotated[Session, Depends]): the database session.
 
 Returns:
-    list[ProblemInfo]: a list of the detailed information on all the problems.
+    list[ProblemInfo]: a list of the detailed information on the problems.
  * @summary Get Problems Info
  */
 export const getProblemsInfoProblemAllInfoGetResponseObjectivesItemMaximizeDefault = false;
@@ -1417,6 +1445,8 @@ export const DeleteProblemProblemProblemIdDeleteQueryParams = zod.object({
 Args:
     request (Problem): the JSON representation of the problem.
     context (Annotated[SessionContext, Depends): the session context.
+    target_user_id (int | None): if provided, assign the problem to this user instead of
+        the caller. Only analysts and admins may use this parameter.
 
 Note:
     Users with the role 'guest' may not add new problems.
@@ -1429,6 +1459,7 @@ Returns:
  * @summary Add Problem
  */
 export const AddProblemProblemAddPostQueryParams = zod.object({
+	target_user_id: zod.union([zod.number(), zod.null()]).optional(),
 	problem_id: zod.union([zod.number(), zod.null()]).optional()
 });
 
@@ -2073,6 +2104,8 @@ export const AddProblemProblemAddPostResponse = zod
 Args:
     json_file (UploadFile): a file in JSON format describing the problem.
     context (Annotated[SessionContext, Depends): the session context.
+    target_user_id (int | None): if provided, assign the problem to this user instead of
+        the caller. Only analysts and admins may use this parameter.
 
 Raises:
     HTTPException: if the provided `json_file` is empty.
@@ -2083,6 +2116,7 @@ Returns:
  * @summary Add Problem Json
  */
 export const AddProblemJsonProblemAddJsonPostQueryParams = zod.object({
+	target_user_id: zod.union([zod.number(), zod.null()]).optional(),
 	problem_id: zod.union([zod.number(), zod.null()]).optional()
 });
 
diff --git a/webui/src/routes/problems/+page.svelte b/webui/src/routes/problems/+page.svelte
index 9afbb683e..e89a44db5 100644
--- a/webui/src/routes/problems/+page.svelte
+++ b/webui/src/routes/problems/+page.svelte
@@ -43,7 +43,8 @@
 	import * as Tabs from '$lib/components/ui/tabs';
 	import * as Table from '$lib/components/ui/table/index.js';
 	import { Button } from '$lib/components/ui/button';
-	import type { ProblemInfo } from '$lib/gen/endpoints/DESDEOFastAPI';
+	import type { ProblemInfo, UserPublic } from '$lib/gen/endpoints/DESDEOFastAPI';
+	import { auth } from '../../stores/auth';
 	import { methodSelection } from '../../stores/methodSelection';
 	import { invalidateAll } from '$app/navigation';
 	import { deleteProblem, downloadProblemJson, getAssignedSolver, getAvailableSolvers, assignSolver, addRepresentativeSolutionSet } from './handler';
@@ -58,6 +59,41 @@
 
 	let { data }: PageProps = $props();
 	let problemList = $derived(data.problemList);
+	let dmUsers = $derived(data.dmUsers as UserPublic[]);
+
+	const isAnalystOrAdmin = $derived(
+		$auth.user?.role === 'analyst' || $auth.user?.role === 'admin'
+	);
+
+	const ownerMap = $derived(
+		Object.fromEntries(dmUsers.map((u: UserPublic) => [u.id, u.username]))
+	);
+
+	function getOwnerLabel(userId: number): string {
+		if (userId === $auth.user?.id) return $auth.user?.username ?? String(userId);
+		return ownerMap[userId] ?? `User #${userId}`;
+	}
+
+	// Unique users that have at least one problem in the list (for the filter dropdown)
+	const usersWithProblems = $derived(
+		isAnalystOrAdmin
+			? [...new Map(problemList.map((p: ProblemInfo) => [p.user_id, p.user_id])).keys()].map((id) => ({
+					id,
+					label: getOwnerLabel(id)
+				}))
+			: []
+	);
+
+	// 'me' = current user, 'all' = everyone, '<id>' = specific user id
+	let selectedFilter = $state('me');
+
+	const filteredProblemList = $derived(
+		selectedFilter === 'all'
+			? problemList
+			: selectedFilter === 'me'
+				? problemList.filter((p: ProblemInfo) => p.user_id === $auth.user?.id)
+				: problemList.filter((p: ProblemInfo) => p.user_id === Number(selectedFilter))
+	);
 	let selectedProblem = $state<ProblemInfo | undefined>(undefined);
 	let expandedObjectives = $state(new Set<number>());
 	let expandedConstraints = $state(new Set<number>());
@@ -263,12 +299,39 @@
 		of preferences you want to utilize.
 	</p>
 	{#if problemList.length === 0}
-		<p class="text-gray-600">You have not defined any problems yet.</p>
+		<p class="text-gray-600">
+			{isAnalystOrAdmin ? 'No problems have been defined yet.' : 'You have not defined any problems yet.'}
+		</p>
 	{:else}
+		{#if isAnalystOrAdmin && usersWithProblems.length > 1}
+			<div class="mt-4 flex items-center gap-3">
+				<Label for="user-filter" class="shrink-0 text-sm font-medium">Show problems for</Label>
+				<Select.Root
+					type="single"
+					value={selectedFilter}
+					onValueChange={(v) => {
+						selectedFilter = v || 'me';
+						selectedProblem = undefined;
+					}}
+				>
+					<Select.Trigger id="user-filter" class="w-56">
+						{selectedFilter === 'me' ? ($auth.user?.username ?? 'Myself') : selectedFilter === 'all' ? 'All users' : getOwnerLabel(Number(selectedFilter))}
+					</Select.Trigger>
+					<Select.Content>
+						<Select.Item value="me">{$auth.user?.username ?? 'Myself'}</Select.Item>
+						<Select.Item value="all">All users</Select.Item>
+						{#each usersWithProblems.filter((u) => u.id !== $auth.user?.id) as u}
+							<Select.Item value={String(u.id)}>{u.label}</Select.Item>
+						{/each}
+					</Select.Content>
+				</Select.Root>
+			</div>
+		{/if}
+
 		<div class="mt-4 grid grid-cols-2 gap-8 sm:grid-cols-1 lg:grid-cols-2">
 			<div class="w-full">
 				<DataTable
-					data={problemList}
+					data={filteredProblemList}
 					onSelect={(e: ProblemInfo) => {
 						selectedProblem = e;
 						console.log('Selected problem:', selectedProblem.id);
@@ -337,6 +400,13 @@
 											{/if}
 										</div>
 									</div>
+									{#if isAnalystOrAdmin}
+										<div class="col-span-2 border-b border-gray-300"></div>
+										<div class="col-span-2 flex items-center">
+											<div class="w-40 font-semibold">Owner</div>
+											<div class="flex-1">{getOwnerLabel(selectedProblem.user_id)}</div>
+										</div>
+									{/if}
 									<div class="col-span-2 border-b border-gray-300"></div>
 								</div>
 							</div>
diff --git a/webui/src/routes/problems/+page.ts b/webui/src/routes/problems/+page.ts
index c788907c3..e22e3dd21 100644
--- a/webui/src/routes/problems/+page.ts
+++ b/webui/src/routes/problems/+page.ts
@@ -1,14 +1,21 @@
 import type { PageLoad } from './$types';
-import { getProblemsInfoProblemAllInfoGet } from '$lib/gen/endpoints/DESDEOFastAPI';
+import { getDmUsersUsersDmsGet, getProblemsInfoProblemAllInfoGet } from '$lib/gen/endpoints/DESDEOFastAPI';
+import type { UserPublic } from '$lib/gen/endpoints/DESDEOFastAPI';
 
 export const load: PageLoad = async () => {
-	const res = await getProblemsInfoProblemAllInfoGet();
+	const [problemsRes, dmsRes] = await Promise.all([
+		getProblemsInfoProblemAllInfoGet(),
+		getDmUsersUsersDmsGet().catch(() => null)
+	]);
 
-	if (res.status !== 200) {
+	if (problemsRes.status !== 200) {
 		throw new Error('Failed to fetch problems');
 	}
 
+	const dmUsers: UserPublic[] = dmsRes?.status === 200 ? (dmsRes.data as UserPublic[]) : [];
+
 	return {
-		problemList: res.data
+		problemList: problemsRes.data,
+		dmUsers
 	};
 };
diff --git a/webui/src/routes/problems/define/+page.svelte b/webui/src/routes/problems/define/+page.svelte
index 4b33d2b0f..c88ba3587 100644
--- a/webui/src/routes/problems/define/+page.svelte
+++ b/webui/src/routes/problems/define/+page.svelte
@@ -17,6 +17,9 @@
 		VariableTypeEnum
 	} from '$lib/gen/endpoints/DESDEOFastAPI';
 	import { createProblem, fetchProblem, type ProblemPayload, uploadProblemJson } from './handler';
+	import { getDmUsersUsersDmsGet } from '$lib/gen/endpoints/DESDEOFastAPI';
+	import type { UserPublic } from '$lib/gen/endpoints/DESDEOFastAPI';
+	import { auth } from '../../../stores/auth';
 
 	type VariableForm = {
 		name: string;
@@ -135,6 +138,13 @@
 
 	let jsonFile = $state<File | null>(null);
 
+	let dms = $state<UserPublic[]>([]);
+	let selectedDmId = $state<string>('');
+	const isAnalystOrAdmin = $derived(
+		$auth.user?.role === 'analyst' || $auth.user?.role === 'admin'
+	);
+	const targetUserId = $derived(selectedDmId ? Number(selectedDmId) : null);
+
 	const parseNumber = (value: string): number | null => {
 		if (value.trim() === '') return null;
 		const parsed = Number(value);
@@ -354,7 +364,7 @@
 		}
 
 		isSubmitting = true;
-		const response = await createProblem(buildPayload());
+		const response = await createProblem(buildPayload(), targetUserId);
 		isSubmitting = false;
 
 		if (!response.ok) {
@@ -378,7 +388,7 @@
 		}
 
 		isSubmitting = true;
-		const response = await uploadProblemJson({ json_file: jsonFile });
+		const response = await uploadProblemJson({ json_file: jsonFile }, targetUserId);
 		isSubmitting = false;
 
 		if (!response.ok) {
@@ -513,6 +523,13 @@
 	};
 
 	onMount(async () => {
+		if ($auth.user?.role === 'analyst' || $auth.user?.role === 'admin') {
+			const dmResponse = await getDmUsersUsersDmsGet();
+			if (dmResponse.status === 200) {
+				dms = dmResponse.data;
+			}
+		}
+
 		const editId = page.url.searchParams.get('edit');
 		if (!editId) return;
 
@@ -538,6 +555,25 @@
 	<div class="m-6 mx-auto max-w-6xl">
 		<h1 class="mt-10 text-center text-2xl font-semibold">Problem Definition</h1>
 
+		{#if isAnalystOrAdmin && dms.length > 0}
+			<div class="mt-6 grid max-w-sm gap-2">
+				<Label for="assign-to-user">Assign to user</Label>
+				<Select.Root type="single" bind:value={selectedDmId}>
+					<Select.Trigger id="assign-to-user">
+						{selectedDmId
+							? (dms.find((dm) => String(dm.id) === selectedDmId)?.username ?? 'Unknown')
+							: 'Myself (default)'}
+					</Select.Trigger>
+					<Select.Content>
+						<Select.Item value="">Myself (default)</Select.Item>
+						{#each dms as dm}
+							<Select.Item value={String(dm.id)}>{dm.username}</Select.Item>
+						{/each}
+					</Select.Content>
+				</Select.Root>
+			</div>
+		{/if}
+
 		<Tabs.Root value={mode} class="mt-6 w-full" onValueChange={(value) => (mode = value)}>
 			<Tabs.List class="w-full">
 				<Tabs.Trigger value="form">Define via Form</Tabs.Trigger>
diff --git a/webui/src/routes/problems/define/handler.ts b/webui/src/routes/problems/define/handler.ts
index 6ba39d8e2..a453c3101 100644
--- a/webui/src/routes/problems/define/handler.ts
+++ b/webui/src/routes/problems/define/handler.ts
@@ -33,9 +33,13 @@ export type ProblemResponse =
 	| { ok: true; data: ProblemInfo }
 	| { ok: false; error: string; status?: number };
 
-export async function createProblem(payload: ProblemPayload): Promise<ProblemResponse> {
+export async function createProblem(
+	payload: ProblemPayload,
+	targetUserId?: number | null
+): Promise<ProblemResponse> {
 	try {
-		const response = await addProblemProblemAddPost(payload as any);
+		const params = targetUserId != null ? { target_user_id: targetUserId } : undefined;
+		const response = await addProblemProblemAddPost(payload as any, params);
 
 		if (response.status !== 200) {
 			return { ok: false, error: 'Failed to create problem.', status: response.status };
@@ -49,10 +53,12 @@ export async function createProblem(payload: ProblemPayload): Promise<ProblemRes
 }
 
 export async function uploadProblemJson(
-	body: BodyAddProblemJsonProblemAddJsonPost
+	body: BodyAddProblemJsonProblemAddJsonPost,
+	targetUserId?: number | null
 ): Promise<ProblemResponse> {
 	try {
-		const response = await addProblemJsonProblemAddJsonPost(body);
+		const params = targetUserId != null ? { target_user_id: targetUserId } : undefined;
+		const response = await addProblemJsonProblemAddJsonPost(body, params);
 
 		if (response.status !== 200) {
 			return { ok: false, error: 'Failed to upload problem JSON.', status: response.status };

From d4845b0bf8d8f5309ac7714368a02645bd695907 Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Wed, 1 Apr 2026 16:31:00 +0300
Subject: [PATCH 22/24] Web-API, Web-GUI

- Analysts and admins can view, create, and delete interactive sessions
  for any user
- Added fetch_interactive_session_with_role_check helper in utils.py
  (role-aware ownership bypass)
- Session listing returns all sessions for analysts, own only for DMs;
  empty list returns 200+[] instead of 404
- POST /session/new accepts ?target_user_id= for analysts to create
  sessions on behalf of DMs
- GET /session/get/{id} and DELETE /session/{id} now enforce ownership
  for DMs (fixes latent security bug)
- Fixed InteractiveSessionBase missing from_attributes=True (POST
  /session/new was returning {})
- Sessions UI: user filter dropdown (default "Myself"), Owner column,
  "Create for" DM selector
- Regenerated orval client with new session endpoint params
---
 desdeo/api/models/session.py                  |   3 +
 desdeo/api/routers/session.py                 |  62 ++++--
 desdeo/api/routers/utils.py                   |  30 +++
 desdeo/api/tests/test_routes.py               |   7 +-
 desdeo/api/tests/test_session_management.py   | 184 ++++++++++++++++++
 webui/src/lib/gen/endpoints/DESDEOFastAPI.ts  |  10 +-
 .../src/lib/gen/endpoints/DESDEOFastAPIzod.ts |  10 +-
 .../src/routes/methods/sessions/+page.svelte  | 117 +++++++++--
 webui/src/routes/methods/sessions/handler.ts  |  10 +-
 9 files changed, 391 insertions(+), 42 deletions(-)
 create mode 100644 desdeo/api/tests/test_session_management.py

diff --git a/desdeo/api/models/session.py b/desdeo/api/models/session.py
index f8386baad..a999e80d4 100644
--- a/desdeo/api/models/session.py
+++ b/desdeo/api/models/session.py
@@ -2,6 +2,7 @@
 
 from typing import TYPE_CHECKING
 
+from pydantic import ConfigDict
 from sqlmodel import Field, Relationship, SQLModel
 
 if TYPE_CHECKING:
@@ -18,6 +19,8 @@ class CreateSessionRequest(SQLModel):
 class InteractiveSessionBase(SQLModel):
     """The base model for representing interactive sessions."""
 
+    model_config = ConfigDict(from_attributes=True)
+
     id: int | None
     user_id: int | None
 
diff --git a/desdeo/api/routers/session.py b/desdeo/api/routers/session.py
index 5b4a5e757..baf3d7b0f 100644
--- a/desdeo/api/routers/session.py
+++ b/desdeo/api/routers/session.py
@@ -11,9 +11,14 @@
     InteractiveSessionDB,
     InteractiveSessionInfo,
     User,
+    UserRole,
 )
 from desdeo.api.routers.user_authentication import get_current_user
-from desdeo.api.routers.utils import SessionContext, SessionContextGuard, fetch_interactive_session
+from desdeo.api.routers.utils import (
+    SessionContext,
+    SessionContextGuard,
+    fetch_interactive_session_with_role_check,
+)
 
 router = APIRouter(prefix="/session")
 
@@ -22,13 +27,34 @@
 def create_new_session(
     request: CreateSessionRequest,
     context: Annotated[SessionContext, Depends(SessionContextGuard().post)],
+    target_user_id: int | None = None,
 ) -> InteractiveSessionInfo:
-    """Creates a new interactive session."""
+    """Creates a new interactive session.
+
+    If ``target_user_id`` is provided, the session is created on behalf of that user.
+    Only analysts and admins may use this parameter.
+    """
     user = context.user
     db_session = context.db_session
 
+    if target_user_id is not None:
+        if user.role not in (UserRole.analyst, UserRole.admin):
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail="Only analysts and admins may create sessions for other users.",
+            )
+        target_user = db_session.get(User, target_user_id)
+        if target_user is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"User with id={target_user_id} not found.",
+            )
+        owner = target_user
+    else:
+        owner = user
+
     interactive_session = InteractiveSessionDB(
-        user_id=user.id,
+        user_id=owner.id,
         info=request.info,
     )
 
@@ -36,12 +62,12 @@ def create_new_session(
     db_session.commit()
     db_session.refresh(interactive_session)
 
-    user.active_session_id = interactive_session.id
+    owner.active_session_id = interactive_session.id
 
-    db_session.add(user)
+    db_session.add(owner)
     db_session.commit()
 
-    return interactive_session
+    return InteractiveSessionInfo.model_validate(interactive_session)
 
 
 @router.get("/get/{session_id}")
@@ -50,8 +76,8 @@ def get_session(
     user: Annotated[User, Depends(get_current_user)],
     session: Annotated[Session, Depends(get_db_session)],
 ) -> InteractiveSessionInfo:
-    """Return an interactive session with a current user."""
-    return fetch_interactive_session(
+    """Return an interactive session. Analysts and admins may access any session."""
+    return fetch_interactive_session_with_role_check(
         user=user,
         session_id=session_id,
         session=session,
@@ -63,17 +89,13 @@ def get_all_sessions(
     user: Annotated[User, Depends(get_current_user)],
     session: Annotated[Session, Depends(get_db_session)],
 ) -> list[InteractiveSessionInfo]:
-    """Return all interactive sessions of the current user."""
-    statement = select(InteractiveSessionDB).where(InteractiveSessionDB.user_id == user.id)
-    result = session.exec(statement).all()
-
-    if not result:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="No interactive sessions found for the user.",
-        )
+    """Return interactive sessions. Analysts and admins see all users' sessions; others see only their own."""
+    if user.role in (UserRole.analyst, UserRole.admin):
+        statement = select(InteractiveSessionDB)
+    else:
+        statement = select(InteractiveSessionDB).where(InteractiveSessionDB.user_id == user.id)
 
-    return result
+    return list(session.exec(statement).all())
 
 
 @router.delete("/{session_id}", status_code=status.HTTP_204_NO_CONTENT)
@@ -82,8 +104,8 @@ def delete_session(
     user: Annotated[User, Depends(get_current_user)],
     session: Annotated[Session, Depends(get_db_session)],
 ) -> None:
-    """Delete an interactive session and all its related states."""
-    interactive_session = fetch_interactive_session(
+    """Delete an interactive session and all its related states. Analysts and admins may delete any session."""
+    interactive_session = fetch_interactive_session_with_role_check(
         user=user,
         session_id=session_id,
         session=session,
diff --git a/desdeo/api/routers/utils.py b/desdeo/api/routers/utils.py
index e8cb6db44..868e44c89 100644
--- a/desdeo/api/routers/utils.py
+++ b/desdeo/api/routers/utils.py
@@ -48,6 +48,36 @@ def fetch_problem_with_role_check(user: User, problem_id: int, session: Session)
     return session.exec(statement).first()
 
 
+def fetch_interactive_session_with_role_check(user: User, session_id: int, session: Session) -> InteractiveSessionDB:
+    """Fetch an InteractiveSessionDB by id, bypassing ownership for analysts and admins.
+
+    Args:
+        user (User): the requesting user.
+        session_id (int): id of the interactive session to fetch.
+        session (Session): the database session.
+
+    Raises:
+        HTTPException: when the session is not found (or not owned by the user for non-analysts).
+
+    Returns:
+        InteractiveSessionDB: the matching session.
+    """
+    if user.role in (UserRole.analyst, UserRole.admin):
+        statement = select(InteractiveSessionDB).where(InteractiveSessionDB.id == session_id)
+    else:
+        statement = select(InteractiveSessionDB).where(
+            InteractiveSessionDB.id == session_id,
+            InteractiveSessionDB.user_id == user.id,
+        )
+    result = session.exec(statement).first()
+    if result is None:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Could not find interactive session with id={session_id}.",
+        )
+    return result
+
+
 def fetch_interactive_session(
     user: User,
     session: Session,
diff --git a/desdeo/api/tests/test_routes.py b/desdeo/api/tests/test_routes.py
index 70fbbd1ec..a60168ff2 100644
--- a/desdeo/api/tests/test_routes.py
+++ b/desdeo/api/tests/test_routes.py
@@ -264,8 +264,8 @@ def test_get_all_sessions_success(client: TestClient, session_and_user: dict):
     assert len(data) == 2
 
 
-def test_get_all_sessions_not_found(client: TestClient, session_and_user: dict):
-    """Test get_all returns 404 if user has no sessions."""
+def test_get_all_sessions_empty(client: TestClient, session_and_user: dict):
+    """Test get_all returns 200 + empty list if user has no sessions."""
     access_token = login(client)
 
     response = client.get(
@@ -273,7 +273,8 @@ def test_get_all_sessions_not_found(client: TestClient, session_and_user: dict):
         headers={"Authorization": f"Bearer {access_token}"},
     )
 
-    assert response.status_code == status.HTTP_404_NOT_FOUND
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json() == []
 
 
 def test_delete_session_success(client: TestClient, session_and_user: dict):
diff --git a/desdeo/api/tests/test_session_management.py b/desdeo/api/tests/test_session_management.py
new file mode 100644
index 000000000..82450a7cb
--- /dev/null
+++ b/desdeo/api/tests/test_session_management.py
@@ -0,0 +1,184 @@
+"""Tests for analyst/admin management of other users' interactive sessions."""
+
+from fastapi import status
+from fastapi.testclient import TestClient
+
+from .conftest import get_json, login, post_json
+
+
+def _add_dm(client: TestClient, analyst_token: str, username: str, password: str) -> None:
+    """Helper: create a DM user via the API."""
+    response = client.post(
+        "/add_new_dm",
+        data={"username": username, "password": password, "grant_type": "password"},
+        headers={"Authorization": f"Bearer {analyst_token}", "content-type": "application/x-www-form-urlencoded"},
+    )
+    assert response.status_code == status.HTTP_201_CREATED
+
+
+def _create_session(client: TestClient, token: str, info: str | None = None) -> int:
+    """Helper: create a session and return its id."""
+    response = post_json(client, "/session/new", {"info": info}, token)
+    assert response.status_code == status.HTTP_200_OK
+    return response.json()["id"]
+
+
+def test_analyst_sees_all_sessions(client: TestClient):
+    """Analyst's GET /session/get_all includes sessions from DM users."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_list", "dm_list")
+    dm_token = login(client, username="dm_list", password="dm_list")  # noqa: S106
+
+    dm_session_id = _create_session(client, dm_token, "DM's session")
+
+    response = get_json(client, "/session/get_all", analyst_token)
+    assert response.status_code == status.HTTP_200_OK
+    ids = [s["id"] for s in response.json()]
+    assert dm_session_id in ids
+
+
+def test_dm_sees_only_own_sessions(client: TestClient):
+    """DM cannot see another DM's sessions in GET /session/get_all."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_x", "dm_x")
+    _add_dm(client, analyst_token, "dm_y", "dm_y")
+
+    dm_x_token = login(client, username="dm_x", password="dm_x")  # noqa: S106
+    dm_y_token = login(client, username="dm_y", password="dm_y")  # noqa: S106
+
+    dm_x_session_id = _create_session(client, dm_x_token)
+
+    response = get_json(client, "/session/get_all", dm_y_token)
+    assert response.status_code == status.HTTP_200_OK
+    ids = [s["id"] for s in response.json()]
+    assert dm_x_session_id not in ids
+
+
+def test_empty_session_list_returns_ok(client: TestClient):
+    """GET /session/get_all returns 200 + empty list when user has no sessions."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_empty", "dm_empty")
+    dm_token = login(client, username="dm_empty", password="dm_empty")  # noqa: S106
+
+    response = get_json(client, "/session/get_all", dm_token)
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json() == []
+
+
+def test_analyst_creates_session_for_dm(client: TestClient):
+    """Analyst can create a session owned by a DM via ?target_user_id=."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_target", "dm_target")
+    dm_token = login(client, username="dm_target", password="dm_target")  # noqa: S106
+
+    dms = get_json(client, "/users/dms", analyst_token).json()
+    dm_id = next(u["id"] for u in dms if u["username"] == "dm_target")
+
+    response = post_json(
+        client,
+        f"/session/new?target_user_id={dm_id}",
+        {"info": "created by analyst"},
+        analyst_token,
+    )
+    assert response.status_code == status.HTTP_200_OK
+    session_data = response.json()
+    assert session_data["user_id"] == dm_id
+
+    # DM should see it in their own listing
+    dm_sessions = get_json(client, "/session/get_all", dm_token).json()
+    assert any(s["id"] == session_data["id"] for s in dm_sessions)
+
+
+def test_dm_cannot_create_for_other_dm(client: TestClient):
+    """DM cannot create a session for another user via ?target_user_id=."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_a", "dm_a")
+    _add_dm(client, analyst_token, "dm_b", "dm_b")
+
+    dms = get_json(client, "/users/dms", analyst_token).json()
+    dm_b_id = next(u["id"] for u in dms if u["username"] == "dm_b")
+
+    dm_a_token = login(client, username="dm_a", password="dm_a")  # noqa: S106
+    response = post_json(
+        client,
+        f"/session/new?target_user_id={dm_b_id}",
+        {"info": "should fail"},
+        dm_a_token,
+    )
+    assert response.status_code == status.HTTP_403_FORBIDDEN
+
+
+def test_create_session_for_nonexistent_user(client: TestClient):
+    """Creating a session with a nonexistent target_user_id returns 404."""
+    analyst_token = login(client)
+    response = post_json(client, "/session/new?target_user_id=99999", {"info": None}, analyst_token)
+    assert response.status_code == status.HTTP_404_NOT_FOUND
+
+
+def test_analyst_can_get_dm_session_by_id(client: TestClient):
+    """Analyst can GET a DM's session by its ID."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_get", "dm_get")
+    dm_token = login(client, username="dm_get", password="dm_get")  # noqa: S106
+
+    dm_session_id = _create_session(client, dm_token)
+
+    response = get_json(client, f"/session/get/{dm_session_id}", analyst_token)
+    assert response.status_code == status.HTTP_200_OK
+    assert response.json()["id"] == dm_session_id
+
+
+def test_dm_cannot_get_other_dm_session_by_id(client: TestClient):
+    """DM cannot GET another DM's session by ID."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_owner", "dm_owner")
+    _add_dm(client, analyst_token, "dm_thief", "dm_thief")
+
+    owner_token = login(client, username="dm_owner", password="dm_owner")  # noqa: S106
+    thief_token = login(client, username="dm_thief", password="dm_thief")  # noqa: S106
+
+    owner_session_id = _create_session(client, owner_token)
+
+    response = get_json(client, f"/session/get/{owner_session_id}", thief_token)
+    assert response.status_code == status.HTTP_404_NOT_FOUND
+
+
+def test_analyst_can_delete_dm_session(client: TestClient):
+    """Analyst can delete a DM's session."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_del", "dm_del")
+    dm_token = login(client, username="dm_del", password="dm_del")  # noqa: S106
+
+    dm_session_id = _create_session(client, dm_token)
+
+    response = client.delete(
+        f"/session/{dm_session_id}",
+        headers={"Authorization": f"Bearer {analyst_token}"},
+    )
+    assert response.status_code == status.HTTP_204_NO_CONTENT
+
+    # Confirm it's gone
+    response = get_json(client, f"/session/get/{dm_session_id}", analyst_token)
+    assert response.status_code == status.HTTP_404_NOT_FOUND
+
+
+def test_dm_cannot_delete_other_dm_session(client: TestClient):
+    """DM cannot delete another DM's session (regression: latent ownership bug)."""
+    analyst_token = login(client)
+    _add_dm(client, analyst_token, "dm_keep", "dm_keep")
+    _add_dm(client, analyst_token, "dm_attacker", "dm_attacker")
+
+    keep_token = login(client, username="dm_keep", password="dm_keep")  # noqa: S106
+    attacker_token = login(client, username="dm_attacker", password="dm_attacker")  # noqa: S106
+
+    target_session_id = _create_session(client, keep_token)
+
+    response = client.delete(
+        f"/session/{target_session_id}",
+        headers={"Authorization": f"Bearer {attacker_token}"},
+    )
+    assert response.status_code == status.HTTP_404_NOT_FOUND
+
+    # Session should still exist
+    response = get_json(client, f"/session/get/{target_session_id}", analyst_token)
+    assert response.status_code == status.HTTP_200_OK
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
index 6c8cb020b..0db0a6f75 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPI.ts
@@ -1752,6 +1752,7 @@ export type GetProblemJsonProblemProblemIdJsonGetParams = {
 };
 
 export type CreateNewSessionSessionNewPostParams = {
+	target_user_id?: number | null;
 	problem_id?: number | null;
 };
 
@@ -3089,6 +3090,9 @@ export const getProblemJsonProblemProblemIdJsonGet = async (
 
 /**
  * Creates a new interactive session.
+
+If ``target_user_id`` is provided, the session is created on behalf of that user.
+Only analysts and admins may use this parameter.
  * @summary Create New Session
  */
 export type createNewSessionSessionNewPostResponse200 = {
@@ -3149,7 +3153,7 @@ export const createNewSessionSessionNewPost = async (
 };
 
 /**
- * Return an interactive session with a current user.
+ * Return an interactive session. Analysts and admins may access any session.
  * @summary Get Session
  */
 export type getSessionSessionGetSessionIdGetResponse200 = {
@@ -3193,7 +3197,7 @@ export const getSessionSessionGetSessionIdGet = async (
 };
 
 /**
- * Return all interactive sessions of the current user.
+ * Return interactive sessions. Analysts and admins see all users' sessions; others see only their own.
  * @summary Get All Sessions
  */
 export type getAllSessionsSessionGetAllGetResponse200 = {
@@ -3224,7 +3228,7 @@ export const getAllSessionsSessionGetAllGet = async (
 };
 
 /**
- * Delete an interactive session and all its related states.
+ * Delete an interactive session and all its related states. Analysts and admins may delete any session.
  * @summary Delete Session
  */
 export type deleteSessionSessionSessionIdDeleteResponse204 = {
diff --git a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
index e8b5e8f29..7f1252f4e 100644
--- a/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
+++ b/webui/src/lib/gen/endpoints/DESDEOFastAPIzod.ts
@@ -3003,9 +3003,13 @@ export const GetProblemJsonProblemProblemIdJsonGetResponse = zod.unknown();
 
 /**
  * Creates a new interactive session.
+
+If ``target_user_id`` is provided, the session is created on behalf of that user.
+Only analysts and admins may use this parameter.
  * @summary Create New Session
  */
 export const CreateNewSessionSessionNewPostQueryParams = zod.object({
+	target_user_id: zod.union([zod.number(), zod.null()]).optional(),
 	problem_id: zod.union([zod.number(), zod.null()]).optional()
 });
 
@@ -3024,7 +3028,7 @@ export const CreateNewSessionSessionNewPostResponse = zod
 	.describe('The base model for representing interactive sessions.');
 
 /**
- * Return an interactive session with a current user.
+ * Return an interactive session. Analysts and admins may access any session.
  * @summary Get Session
  */
 export const GetSessionSessionGetSessionIdGetParams = zod.object({
@@ -3040,7 +3044,7 @@ export const GetSessionSessionGetSessionIdGetResponse = zod
 	.describe('The base model for representing interactive sessions.');
 
 /**
- * Return all interactive sessions of the current user.
+ * Return interactive sessions. Analysts and admins see all users' sessions; others see only their own.
  * @summary Get All Sessions
  */
 export const GetAllSessionsSessionGetAllGetResponseItem = zod
@@ -3055,7 +3059,7 @@ export const GetAllSessionsSessionGetAllGetResponse = zod.array(
 );
 
 /**
- * Delete an interactive session and all its related states.
+ * Delete an interactive session and all its related states. Analysts and admins may delete any session.
  * @summary Delete Session
  */
 export const DeleteSessionSessionSessionIdDeleteParams = zod.object({
diff --git a/webui/src/routes/methods/sessions/+page.svelte b/webui/src/routes/methods/sessions/+page.svelte
index cdcd18582..caf9d623b 100644
--- a/webui/src/routes/methods/sessions/+page.svelte
+++ b/webui/src/routes/methods/sessions/+page.svelte
@@ -1,16 +1,20 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import { isLoading, errorMessage } from '../../../stores/uiState';
-	import type { InteractiveSessionBase } from '$lib/gen/endpoints/DESDEOFastAPI';
+	import type { InteractiveSessionBase, UserPublic } from '$lib/gen/endpoints/DESDEOFastAPI';
+	import { getDmUsersUsersDmsGet } from '$lib/gen/endpoints/DESDEOFastAPI';
 
 	import { Button } from '$lib/components/ui/button';
 	import * as Card from '$lib/components/ui/card/index.js';
 	import * as Table from '$lib/components/ui/table/index.js';
+	import * as Select from '$lib/components/ui/select/index.js';
+	import { Label } from '$lib/components/ui/label/index.js';
 	import Trash2 from '@lucide/svelte/icons/trash-2';
 	import RefreshCw from '@lucide/svelte/icons/refresh-cw';
 
 	import { goto } from '$app/navigation';
 	import { methodSelection } from '../../../stores/methodSelection';
+	import { auth } from '../../../stores/auth';
 	import Check from '@lucide/svelte/icons/check';
 
 	import { create_session, delete_session, fetch_sessions } from './handler';
@@ -18,6 +22,42 @@
 	let sessions = $state<InteractiveSessionBase[]>([]);
 	let newInfo = $state<string>('');
 	let deletingId = $state<number | null>(null);
+	let dms = $state<UserPublic[]>([]);
+
+	const isAnalystOrAdmin = $derived(
+		$auth.user?.role === 'analyst' || $auth.user?.role === 'admin'
+	);
+	const ownerMap = $derived(Object.fromEntries(dms.map((u: UserPublic) => [u.id, u.username])));
+
+	function getOwnerLabel(userId: number | null | undefined): string {
+		if (userId == null) return '—';
+		if (userId === $auth.user?.id) return $auth.user?.username ?? String(userId);
+		return ownerMap[userId] ?? `User #${userId}`;
+	}
+
+	// 'me' | 'all' | '<user-id>'
+	let selectedFilter = $state('me');
+
+	const filteredSessions = $derived(
+		selectedFilter === 'all'
+			? sessions
+			: selectedFilter === 'me'
+				? sessions.filter((s) => s.user_id === $auth.user?.id)
+				: sessions.filter((s) => s.user_id === Number(selectedFilter))
+	);
+
+	const usersWithSessions = $derived(
+		isAnalystOrAdmin
+			? [...new Map(sessions.map((s) => [s.user_id, s.user_id])).keys()].map((id) => ({
+					id,
+					label: getOwnerLabel(id)
+				}))
+			: []
+	);
+
+	// "Create for" selector: '' = myself, '<id>' = specific DM
+	let selectedTargetDmId = $state<string>('');
+	const targetUserId = $derived(selectedTargetDmId ? Number(selectedTargetDmId) : null);
 
 	async function refresh() {
 		try {
@@ -40,7 +80,7 @@
 			errorMessage.set(null);
 
 			const trimmed = newInfo.trim();
-			const created = await create_session(trimmed.length > 0 ? trimmed : null);
+			const created = await create_session(trimmed.length > 0 ? trimmed : null, targetUserId);
 
 			if (!created) {
 				errorMessage.set('Failed to create session.');
@@ -86,8 +126,12 @@
 		}
 	}
 
-	onMount(() => {
-		refresh();
+	onMount(async () => {
+		await refresh();
+		if (isAnalystOrAdmin) {
+			const res = await getDmUsersUsersDmsGet().catch(() => null);
+			if (res?.status === 200) dms = res.data as UserPublic[];
+		}
 	});
 </script>
 
@@ -125,11 +169,29 @@
 	<Card.Root class="mb-8">
 		<Card.Header>
 			<Card.Title>Create a new session</Card.Title>
-			<Card.Description>
-				Optional info/label.
-			</Card.Description>
+			<Card.Description>Optional info/label.</Card.Description>
 		</Card.Header>
 		<Card.Content>
+			{#if isAnalystOrAdmin && dms.length > 0}
+				<div class="mb-3 flex items-center gap-3">
+					<Label for="create-for" class="shrink-0 text-sm font-medium">Create for</Label>
+					<Select.Root
+						type="single"
+						value={selectedTargetDmId}
+						onValueChange={(v) => (selectedTargetDmId = v)}
+					>
+						<Select.Trigger id="create-for" class="w-48">
+							{selectedTargetDmId ? getOwnerLabel(Number(selectedTargetDmId)) : ($auth.user?.username ?? 'Myself')}
+						</Select.Trigger>
+						<Select.Content>
+							<Select.Item value="">{$auth.user?.username ?? 'Myself'}</Select.Item>
+							{#each dms as dm}
+								<Select.Item value={String(dm.id)}>{dm.username}</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+			{/if}
 			<form class="flex flex-col gap-3 sm:flex-row sm:items-center" onsubmit={handleCreate}>
 				<input
 					class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2"
@@ -145,11 +207,38 @@
 		<Card.Header>
 			<Card.Title>Existing sessions</Card.Title>
 			<Card.Description>
-				These are your current interactive sessions. Deleting a session deletes the session and its related states.
+				{isAnalystOrAdmin
+					? 'All interactive sessions. Deleting a session removes it and its related states.'
+					: 'Your interactive sessions. Deleting a session removes it and its related states.'}
 			</Card.Description>
 		</Card.Header>
 		<Card.Content>
-			{#if sessions.length === 0}
+			{#if isAnalystOrAdmin && usersWithSessions.length > 1}
+				<div class="mb-4 flex items-center gap-3">
+					<Label for="session-filter" class="shrink-0 text-sm font-medium">Show sessions for</Label>
+					<Select.Root
+						type="single"
+						value={selectedFilter}
+						onValueChange={(v) => (selectedFilter = v || 'me')}
+					>
+						<Select.Trigger id="session-filter" class="w-48">
+							{selectedFilter === 'me'
+								? ($auth.user?.username ?? 'Myself')
+								: selectedFilter === 'all'
+									? 'All users'
+									: getOwnerLabel(Number(selectedFilter))}
+						</Select.Trigger>
+						<Select.Content>
+							<Select.Item value="me">{$auth.user?.username ?? 'Myself'}</Select.Item>
+							<Select.Item value="all">All users</Select.Item>
+							{#each usersWithSessions.filter((u) => u.id !== $auth.user?.id) as u}
+								<Select.Item value={String(u.id)}>{u.label}</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+			{/if}
+			{#if filteredSessions.length === 0}
 				<div class="text-muted-foreground text-sm">No sessions found. Create one above.</div>
 			{:else}
 				<Table.Root>
@@ -157,14 +246,20 @@
 						<Table.Row>
 							<Table.Head class="w-[120px]">ID</Table.Head>
 							<Table.Head>Info</Table.Head>
+							{#if isAnalystOrAdmin}
+								<Table.Head>Owner</Table.Head>
+							{/if}
 							<Table.Head class="w-[140px] text-right">Actions</Table.Head>
 						</Table.Row>
 					</Table.Header>
 					<Table.Body>
-						{#each sessions as s (s.id)}
+						{#each filteredSessions as s (s.id)}
 							<Table.Row>
 								<Table.Cell class="font-mono text-sm">{s.id}</Table.Cell>
-								<Table.Cell class="max-w-[720px] truncate">{s.info ?? '—'}</Table.Cell>
+								<Table.Cell class="max-w-[480px] truncate">{s.info ?? '—'}</Table.Cell>
+								{#if isAnalystOrAdmin}
+									<Table.Cell>{getOwnerLabel(s.user_id)}</Table.Cell>
+								{/if}
 
 								<Table.Cell class="text-right">
 									<div class="flex justify-end gap-1">
diff --git a/webui/src/routes/methods/sessions/handler.ts b/webui/src/routes/methods/sessions/handler.ts
index 28f3a657b..7b24dea6b 100644
--- a/webui/src/routes/methods/sessions/handler.ts
+++ b/webui/src/routes/methods/sessions/handler.ts
@@ -22,9 +22,15 @@ export async function fetch_sessions(): Promise<InteractiveSessionBase[] | null>
 	return response.data;
 }
 
-export async function create_session(info: string | null): Promise<InteractiveSessionBase | null> {
+export async function create_session(
+	info: string | null,
+	targetUserId?: number | null
+): Promise<InteractiveSessionBase | null> {
 	const payload: CreateSessionRequest = { info: info ?? null };
-	const response: createNewSessionSessionNewPostResponse = await createNewSessionSessionNewPost(payload);
+	const response: createNewSessionSessionNewPostResponse = await createNewSessionSessionNewPost(
+		payload,
+		targetUserId != null ? { target_user_id: targetUserId } : undefined
+	);
 
 	if (response.status !== 200) {
 		console.error('create_session failed.', response.status);

From 3cda67694b0e1bf644b164e9bb4224730fa7594c Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 2 Apr 2026 10:40:47 +0300
Subject: [PATCH 23/24] Deployment

- Updated config files.
---
 deploy/api-buildconfig.yaml   |  3 +-
 deploy/api-deployment.yaml    |  8 +++-
 deploy/db-init-job.yaml       | 30 ++++++--------
 deploy/postgres.yaml          | 21 ++++++----
 deploy/secrets-template.yaml  | 76 ++++++++++++++++++++++++++---------
 deploy/webui-buildconfig.yaml | 16 +++++---
 6 files changed, 99 insertions(+), 55 deletions(-)

diff --git a/deploy/api-buildconfig.yaml b/deploy/api-buildconfig.yaml
index 88f2f6b88..23abe9b9a 100644
--- a/deploy/api-buildconfig.yaml
+++ b/deploy/api-buildconfig.yaml
@@ -28,6 +28,7 @@ spec:
   source:
     type: Git
     git:
+      # Github repo and deploy branch
       uri: https://github.com/gialmisi/DESDEO.git
       ref: rahti-deploy
 
@@ -60,7 +61,7 @@ spec:
     - type: GitHub
       github:
         secretReference:
-          name: desdeo-secrets
+          name: desdeo-webhook-api
     - type: ConfigChange
 
   runPolicy: Serial
diff --git a/deploy/api-deployment.yaml b/deploy/api-deployment.yaml
index 8b55d5eab..6ab48e36e 100644
--- a/deploy/api-deployment.yaml
+++ b/deploy/api-deployment.yaml
@@ -78,10 +78,14 @@ spec:
                 secretKeyRef:
                   name: desdeo-secrets
                   key: DB_PASSWORD
+            # CORS: allow requests from the webui Route.
+            # Update this if the webui hostname changes.
             - name: CORS_ORIGINS
               value: '["https://gialmisi-desdeo-webui.rahtiapp.fi"]'
-            - name: COOKIE_DOMAIN
-              value: "rahtiapp.fi"
+            # COOKIE_DOMAIN is intentionally not set.
+            # With the SvelteKit proxy architecture, cookies are owned by the
+            # webui host and forwarded server-side. Setting a shared domain here
+            # is unnecessary and can cause authentication issues.
             - name: APP_MODULE
               value: "desdeo.api.app:app"
             - name: GUNICORN_CMD_ARGS
diff --git a/deploy/db-init-job.yaml b/deploy/db-init-job.yaml
index 4e6d96b8e..ec6b063b7 100644
--- a/deploy/db-init-job.yaml
+++ b/deploy/db-init-job.yaml
@@ -1,27 +1,23 @@
 # deploy/db-init-job.yaml
 #
 # One-shot Kubernetes Job that runs desdeo/api/db_init_prod.py using the API
-# image.  Run this:
+# image. Run this:
 #   - After the very first deployment (creates tables + seeds admin user).
 #   - After a deliberate database wipe (the script is idempotent on re-run).
 #
 # The Job is NOT re-triggered automatically on each new image build.
-# If you add new tables in a later release use a proper migration tool
+# If you add new tables in a later release, use a proper migration tool
 # (Alembic) instead of re-running this Job.
 #
 # Usage:
-#   # Replace <IMAGE> with the actual image pullspec, e.g.:
-#   #   image-registry.openshift-image-registry.svc:5000/<project>/desdeo-api:latest
-#   oc create -f deploy/db-init-job.yaml
-#
-#   # Watch it:
+#   # Replace <PROJECT> with your Rahti project name before applying.
+#   oc apply -f deploy/db-init-job.yaml
 #   oc logs -f job/desdeo-db-init
-#
-#   # Clean up after success:
 #   oc delete job desdeo-db-init
 #
-# If you need to re-run it (e.g. to re-seed after a wipe), delete the old Job
-# first then create it again.
+# To re-run after a database wipe, delete the old Job first:
+#   oc delete job desdeo-db-init
+#   oc apply -f deploy/db-init-job.yaml
 ---
 apiVersion: batch/v1
 kind: Job
@@ -31,7 +27,6 @@ metadata:
     app: desdeo-api
     component: db-init
 spec:
-  # Do not restart the pod on success.
   backoffLimit: 3
   # Auto-clean completed Job pods after 1 hour.
   ttlSecondsAfterFinished: 3600
@@ -44,17 +39,16 @@ spec:
       restartPolicy: Never
       containers:
       - name: db-init
-        # Use the same image as the API Deployment.
         # Replace <PROJECT> with your Rahti project name.
-        image: image-registry.openshift-image-registry.svc:5000/gialmisi-desdeo/desdeo-api:latest
-        # Run the production init script.
+        image: image-registry.openshift-image-registry.svc:5000/<PROJECT>/desdeo-api:latest
         command: ["python", "desdeo/api/db_init_prod.py"]
-        end:
+        env:
         - name: DESDEO_PRODUCTION
           value: "true"
         envFrom:
-        # Inject DATABASE_URL, SECRET_KEY, DESDEO_ADMIN_USERNAME,
-        # DESDEO_ADMIN_PASSWORD from the shared Secret.
+        # Injects DB_HOST, DB_PORT, DB_NAME, DB_USER, DB_PASSWORD,
+        # AUTHJWT_SECRET, DESDEO_ADMIN_USERNAME, DESDEO_ADMIN_PASSWORD
+        # from the shared Secret.
         - secretRef:
             name: desdeo-secrets
         resources:
diff --git a/deploy/postgres.yaml b/deploy/postgres.yaml
index 5378696fc..690690b4f 100644
--- a/deploy/postgres.yaml
+++ b/deploy/postgres.yaml
@@ -1,18 +1,23 @@
 # deploy/postgres.yaml
 #
-# In-cluster PostgreSQL using the Bitnami image, which is designed to run
-# as a non-root user and is therefore compatible with OpenShift / Rahti SCCs.
+# In-cluster PostgreSQL using the OpenShift built-in image.
 #
 # Apply with:
 #   oc apply -f deploy/postgres.yaml
 #
-# Bitnami env var names differ from the official postgres image:
-#   POSTGRESQL_USERNAME: creates a non-superuser (matches DATABASE_URL user)
-#   POSTGRESQL_PASSWORD: password for POSTGRESQL_USERNAME
-#   POSTGRESQL_DATABASE: database to create on first start
-#   POSTGRESQL_POSTGRES_PASSWORD: password for the postgres superuser
+# The OpenShift PostgreSQL image uses these env var names:
+#   POSTGRESQL_USER      — creates a non-superuser application account
+#   POSTGRESQL_PASSWORD  — password for POSTGRESQL_USER
+#   POSTGRESQL_DATABASE  — database to create on first start
 #
-# Data is persisted in the PVC mounted at /bitnami/postgresql.
+# These are sourced from desdeo-secrets (keys POSTGRES_USER and POSTGRES_PASSWORD).
+# The database name is hardcoded to 'desdeo' here; change it if needed and update
+# DB_NAME in the secret accordingly.
+#
+# Data is persisted in the PVC mounted at /var/lib/pgsql/data.
+#
+# To check available image tags on your cluster:
+#   oc get is postgresql -n openshift -o jsonpath='{.spec.tags[*].name}'
 ---
 apiVersion: v1
 kind: Service
diff --git a/deploy/secrets-template.yaml b/deploy/secrets-template.yaml
index cd1a37493..9759df4a9 100644
--- a/deploy/secrets-template.yaml
+++ b/deploy/secrets-template.yaml
@@ -5,22 +5,34 @@
 # Usage:
 #   1. Copy this file: cp deploy/secrets-template.yaml deploy/secrets.yaml
 #   2. Fill in all <CHANGE_ME> placeholders in deploy/secrets.yaml
-#   3. Apply:  oc apply -f deploy/secrets.yaml
+#   3. Apply: oc apply -f deploy/secrets.yaml
 #   4. Keep deploy/secrets.yaml out of version control.
 #
-# All values must be base64-encoded.  Quick helper:
-#   echo -n 'myvalue' | base64
+# Generate passwords and keys:
+#   python -c "import secrets; print(secrets.token_hex(32))"   # password
+#   python -c "import secrets; print(secrets.token_hex(64))"   # JWT key
+#   python -c "import secrets; print(secrets.token_hex(24))"   # webhook secret
 #
-# Or use --from-literal to skip manual encoding:
+# Or create the main secret directly without a file:
 #   oc create secret generic desdeo-secrets \
 #     --from-literal=POSTGRES_USER=desdeo \
 #     --from-literal=POSTGRES_PASSWORD=<pw> \
-#     --from-literal=POSTGRES_SUPERUSER_PASSWORD=<pw> \
-#     --from-literal=DATABASE_URL='postgresql://desdeo:<pw>@desdeo-postgres:5432/desdeo' \
-#     --from-literal=SECRET_KEY=<random-64-char-hex> \
+#     --from-literal=DB_HOST=desdeo-postgres \
+#     --from-literal=DB_PORT=5432 \
+#     --from-literal=DB_NAME=desdeo \
+#     --from-literal=DB_USER=desdeo \
+#     --from-literal=DB_PASSWORD=<pw> \
+#     --from-literal=AUTHJWT_SECRET=<64-char-hex> \
 #     --from-literal=DESDEO_ADMIN_USERNAME=admin \
 #     --from-literal=DESDEO_ADMIN_PASSWORD=<pw> \
-#     --dry-run=client -o yaml > deploy/secrets.yaml
+#     --from-literal=WEBHOOK_SECRET_API=<24-char-hex> \
+#     --from-literal=WEBHOOK_SECRET_WEBUI=<24-char-hex>
+#
+# Then create the webhook secrets separately:
+#   oc create secret generic desdeo-webhook-api \
+#     --from-literal=WebHookSecretKey=<same value as WEBHOOK_SECRET_API>
+#   oc create secret generic desdeo-webhook-webui \
+#     --from-literal=WebHookSecretKey=<same value as WEBHOOK_SECRET_WEBUI>
 ---
 apiVersion: v1
 kind: Secret
@@ -28,25 +40,49 @@ metadata:
   name: desdeo-secrets
 type: Opaque
 stringData:
-  # Application user (non-superuser). Must match DATABASE_URL below.
+  # Application user created by the OpenShift PostgreSQL image on first start.
   POSTGRES_USER: desdeo
   POSTGRES_PASSWORD: <CHANGE_ME>
-  # Superuser password (used internally by Bitnami image).
-  POSTGRES_SUPERUSER_PASSWORD: <CHANGE_ME>
 
-  # Full DSN consumed by the FastAPI app and db_init_prod.py.
-  # Host must be the Kubernetes Service name defined in postgres.yaml.
-  DATABASE_URL: "postgresql://desdeo:<CHANGE_ME>@desdeo-postgres:5432/desdeo"
+  # These are read individually by desdeo/api/config.py in production mode.
+  # DB_HOST must match the Kubernetes Service name in postgres.yaml.
+  DB_HOST: desdeo-postgres
+  DB_PORT: "5432"
+  DB_NAME: desdeo
+  DB_USER: desdeo
+  DB_PASSWORD: <CHANGE_ME> # same value as POSTGRES_PASSWORD above
 
-  # JWT / session signing key — generate with:
-  #   python -c "import secrets; print(secrets.token_hex(64))"
-  SECRET_KEY: <CHANGE_ME>
+  # Generate with: python -c "import secrets; print(secrets.token_hex(64))"
+  # Never reuse across deployments.
+  AUTHJWT_SECRET: <CHANGE_ME>
 
-  # Credentials for the initial analyst user seeded by the db-init Job.
+  # Seeded by the db-init Job. Can be changed after first login.
   DESDEO_ADMIN_USERNAME: admin
   DESDEO_ADMIN_PASSWORD: <CHANGE_ME>
 
-  # Random strings used to authenticate GitHub webhook payloads.
-  # Generate with:  python -c "import secrets; print(secrets.token_hex(24))"
+  # Generate with: python -c "import secrets; print(secrets.token_hex(24))"
+  # Use different values for API and webui.
+  # IMPORTANT: copy the same values into desdeo-webhook-api and
+  # desdeo-webhook-webui below — YAML does not support variable references.
   WEBHOOK_SECRET_API: <CHANGE_ME>
   WEBHOOK_SECRET_WEBUI: <CHANGE_ME>
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: desdeo-webhook-api
+type: Opaque
+stringData:
+  # OpenShift's secretReference looks for exactly this key name.
+  # Must be the same value as WEBHOOK_SECRET_API above.
+  WebHookSecretKey: <CHANGE_ME>
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: desdeo-webhook-webui
+type: Opaque
+stringData:
+  # OpenShift's secretReference looks for exactly this key name.
+  # Must be the same value as WEBHOOK_SECRET_WEBUI above.
+  WebHookSecretKey: <CHANGE_ME>
diff --git a/deploy/webui-buildconfig.yaml b/deploy/webui-buildconfig.yaml
index 1e1e15c93..55497d61e 100644
--- a/deploy/webui-buildconfig.yaml
+++ b/deploy/webui-buildconfig.yaml
@@ -6,8 +6,11 @@
 # contextDir: webui  →  all COPY paths in the Dockerfile are relative to webui/.
 #
 # VITE_API_URL is baked into the client-side bundle at build time.
-# It must be the *public* HTTPS URL of the API Route.
-# If you ever change the API hostname, you must trigger a new webui build.
+# It is set to '/api' so that browser requests go to the SvelteKit
+# proxy route at /api/[...path], which forwards them to the API
+# over the internal cluster network. Do NOT set this to the API's
+# public Route URL, the proxy architecture means the browser never
+# talks directly to the API.
 ---
 apiVersion: build.openshift.io/v1
 kind: BuildConfig
@@ -28,10 +31,11 @@ spec:
     type: Docker
     dockerStrategy:
       dockerfilePath: Dockerfile
-      # Build arguments — passed as ARG to the Dockerfile.
       buildArgs:
+        # '/api' routes browser requests through the SvelteKit server-side proxy.
+        # See webui/src/routes/api/[...path]/+server.ts.
         - name: VITE_API_URL
-          value: "https://gialmisi-desdeo-api.rahtiapp.fi"
+          value: "/api"
       env:
         - name: NODE_OPTIONS
           value: "--max-old-space-size=3072"
@@ -45,10 +49,10 @@ spec:
     - type: GitHub
       github:
         secretReference:
-          name: desdeo-secrets
+          name: desdeo-webhook-webui
     - type: ConfigChange
 
-  # npm install + vite build is memory-hungry; 2Gi is usually sufficient.
+  # npm install + vite build is memory-hungry; 4Gi is usually sufficient.
   resources:
     requests:
       memory: "2Gi"

From c3e02c203e8279fa44e8ece0e6373f1ca48bc17c Mon Sep 17 00:00:00 2001
From: Giovanni Misitano <giovanni.a.misitano@jyu.fi>
Date: Thu, 2 Apr 2026 15:48:50 +0300
Subject: [PATCH 24/24] Docs

- Updated docs on how to deploy on Openshift
---
 docs/howtoguides/deploying_on_openshift.md | 465 +++++++++++++++------
 docs/howtoguides/index.md                  |   4 +-
 2 files changed, 342 insertions(+), 127 deletions(-)

diff --git a/docs/howtoguides/deploying_on_openshift.md b/docs/howtoguides/deploying_on_openshift.md
index 5a7d503ef..4924984b7 100644
--- a/docs/howtoguides/deploying_on_openshift.md
+++ b/docs/howtoguides/deploying_on_openshift.md
@@ -1,31 +1,45 @@
-# How to deploy DESDEO on OpenShift
+# How to deploy DESDEO on OpenShift (Kubernetes)
 
 ## Overview
 
-This guide walks through deploying the full DESDEO stack: FastAPI backend,
-SvelteKit web UI, and PostgreSQL, on an OpenShift/OKD cluster. [CSC
+This guide walks through deploying the full DESDEO stack, FastAPI backend,
+SvelteKit web UI, and PostgreSQL database, on an OpenShift/OKD cluster. [CSC
 Rahti](https://rahti.csc.fi/) is used as the concrete example throughout; values
 specific to Rahti (hostnames, API endpoint, image registry URL) are marked so
 readers on other OpenShift clusters can substitute their own.
 
-This guide uses YAML manifests and the `oc` CLI exclusively. Every deployment
-step is reproducible and version-controlled. OpenShift is a Kubernetes
-distribution with extra features layered on top, this guide uses
-OpenShift-specific objects (BuildConfig, ImageStream, Route) that do not exist
-in vanilla Kubernetes. If you are deploying on plain Kubernetes, consult your
-platform's CI/CD documentation instead.
+Two approaches are documented:
+
+- **CLI approach**: uses YAML manifests and the `oc` CLI (command-line interface)
+  exclusively. Every step is reproducible and version-controlled. The bulk of
+  this guide follows this approach.
+- **Web console approach**: uses the Rahti web interface. Described under
+  [Alternative web console approach](#web-console-approach) for
+  users who prefer a graphical interface.
+
+OpenShift is a Kubernetes distribution with extra features layered on top. This
+guide uses OpenShift-specific objects (BuildConfig, ImageStream, Route) that do
+not exist in vanilla Kubernetes. If you are deploying on plain Kubernetes,
+consult your platform's documentation instead.
 
 The files you will work with live in two places in the DESDEO repository:
 
 - `deploy/`: all OpenShift manifests (ImageStreams, BuildConfigs, Deployments,
   StatefulSet, Routes, Job).
 - Several application-level files added or modified to support production
-  deployment, described under [Repository preparation](#repository-preparation)
+  deployment, described under [Repository preparation](#repository-preparation).
 
 ## Prerequisites
 
-- A CSC account with an active Rahti project (see [Rahti access](https://docs.csc.fi/cloud/rahti/access/))
-- `oc` CLI installed (see [Using the Rahti CLI](https://docs.csc.fi/cloud/rahti/usage/cli/))
+- A CSC account with an active computing project.
+- Rahti access enabled for that project. Apply via
+  [MyCSC](https://my.csc.fi) -> your project -> Services -> Rahti -> Apply for
+  access. See [Rahti access](https://docs.csc.fi/cloud/rahti/access/) for
+  details.
+- A Rahti project created in the [Rahti web console](https://console-openshift-console.apps.2.rahti.csc.fi/).
+  When creating the project, include your CSC computing project number in the
+  description field using the format `csc_project:#######`.
+- `oc` CLI installed (see [Using the Rahti CLI](https://docs.csc.fi/cloud/rahti/usage/cli/)).
 - Logged in to the cluster:
   ```bash
   oc login https://api.2.rahti.csc.fi:6443 --token=<token>
@@ -34,50 +48,60 @@ The files you will work with live in two places in the DESDEO repository:
   ```bash
   oc project <your-project>
   ```
-- A fork or branch of the [DESDEO
-  repository](https://github.com/industrial-optimization-group/DESDEO) with the
-  `deploy/` files committed and pushed
+- A fork or branch of the [DESDEO repository](https://github.com/industrial-optimization-group/DESDEO)
+  with the `deploy/` files committed and pushed.
+
+!!! note
+    Newly created CSC computing projects can take some time to become visible
+    to Rahti. If project creation fails with an error, wait a few minutes and
+    try again.
 
 ## Architecture
 
 Four components are deployed and wired together:
 
-1. `desdeo-api` Deployment: FastAPI served by gunicorn+uvicorn, listening on
-    port 8080. Built in-cluster using OpenShift's Source-to-Image (S2I) strategy
-    from a Python builder image.
+1. **`desdeo-api` Deployment**: FastAPI served by gunicorn+uvicorn, listening on
+   port 8080. Built in-cluster using OpenShift's Source-to-Image (S2I) strategy
+   from a custom Python builder image that includes COIN-OR solvers.
 
-2. `desdeo-webui` Deployment: SvelteKit with adapter-node, listening on port 3000.
-    Built using the Docker strategy from `webui/Dockerfile`. All browser API
-    calls are routed through a `/api/[...path]` proxy route baked into the
-    SvelteKit app, this keeps cookies same-origin and avoids CORS complications.
+2. **`desdeo-webui` Deployment**: SvelteKit with adapter-node, listening on port
+   3000. Built using the Docker strategy from `webui/Dockerfile`. All browser API
+   calls are routed through a `/api/[...path]` proxy route baked into the
+   SvelteKit app. This keeps cookies same-origin and avoids CORS complications.
 
-3. `desdeo-postgres` StatefulSet: PostgreSQL running on the built-in Rahti image,
-    backed by a PersistentVolumeClaim.
+3. **`desdeo-postgres` StatefulSet**: PostgreSQL running on the built-in OpenShift
+   image, backed by a PersistentVolumeClaim. Alternatively, [CSC Pukki DBaaS](#option-b-pukki-dbaas)
+   can be used instead.
 
-4. OpenShift Routes: TLS-terminated at Rahti's HAProxy ingress. Certificates for
-   `*.rahtiapp.fi` are provisioned automatically.
+4. **OpenShift Routes**: TLS-terminated at Rahti's HAProxy ingress. Certificates
+   for `*.rahtiapp.fi` are provisioned automatically.
 
 ### URL environment variables
 
-Two env vars control how the API is reached, and they intentionally point to different targets:
+Two env vars control how the API is reached, and they intentionally point to
+different targets:
 
 | Variable | Value | Used by |
 |---|---|---|
-| `VITE_API_URL` | `/api` | Baked into the client-side JS bundle at build time. Browser requests go to `<webui-host>/api/...`, which the SvelteKit proxy handles. |
+| `VITE_API_URL` | `/api` | Baked into the client-side Javascript bundle at build time. Browser requests go to `<webui-host>/api/...`, which the SvelteKit proxy handles. |
 | `API_BASE_URL` | `http://desdeo-api:8080` | Set at runtime on the webui pod. SvelteKit's server-side proxy uses the internal cluster DNS name to reach the API, never exposed to the browser. |
 
-Do not set `VITE_API_URL` to the API's external Route URL. The proxy architecture means the browser never talks directly to the API.
+!!! warning
+    Do not set `VITE_API_URL` to the API's external Route URL. The proxy
+    architecture means the browser never talks directly to the API. Doing so
+    causes cross-origin cookie issues that prevent authentication from working.
 
 ## Repository preparation
 
-The following files must be present in the repository before deploying. All manifests live under `deploy/`.
-These ar provided in the master branch.
+The following files must be present in the repository before deploying. All
+manifests live under `deploy/`.
 
 | File | Purpose |
 |---|---|
+| `deploy/secrets-template.yaml` | Template for creating credentials (never commit real values) |
 | `deploy/postgres.yaml` | StatefulSet, Service, and PVC for PostgreSQL |
 | `deploy/builder-imagestream.yaml` | ImageStream that tracks the custom S2I builder image |
-| `deploy/builder-buildconfig.yaml` | BuildConfig — Docker strategy, builds the solver-enabled S2I builder image |
+| `deploy/builder-buildconfig.yaml` | BuildConfig: Docker strategy, builds the solver-enabled S2I builder image |
 | `deploy/api-imagestream.yaml` | ImageStream that tracks built API images |
 | `deploy/webui-imagestream.yaml` | ImageStream that tracks built webui images |
 | `deploy/api-buildconfig.yaml` | BuildConfig: S2I using `desdeo-builder:latest`, GitHub webhook trigger |
@@ -86,18 +110,21 @@ These ar provided in the master branch.
 | `deploy/webui-deployment.yaml` | Deployment, Service, and Route for the web UI |
 | `deploy/db-init-job.yaml` | One-shot Job that creates tables and seeds the initial user |
 
-In addition, several non-manifest files are required:
+In addition, several application-level files are required:
 
-- `.s2i/bin/assemble`: Custom S2I assemble script that uses `uv sync --frozen`.
+- `.s2i/bin/assemble`: Custom S2I assemble script that uses `uv sync --frozen`
+  to install Python dependencies. The default assemble script uses pip, which
+  does not understand uv's `--group` flag.
 
-- `.s2i/environment`: Sets S2I environment variables such as `APP_MODULE`, `GUNICORN_CMD_ARGS`, and the port.
+- `.s2i/environment`: Sets S2I environment variables such as `APP_MODULE`,
+  `GUNICORN_CMD_ARGS`, and the port.
 
-- `desdeo/api/db_init_prod.py`: Production database initialization script. The
-  `db_init.py` debug branch is a no-no in production mode; this separate script
+- `desdeo/api/db_init_prod.py`: Production database initialisation script. The
+  `db_init.py` debug branch does nothing in production mode; this separate script
   creates all SQLModel tables and seeds the initial analyst user.
 
 - `webui/Dockerfile`: Multi-stage Node 24 build. The `NPM_RUN=start:production`
-  build arg selects the adapter-node start script.
+  env var selects the adapter-node start script via `svelte.config.js`.
 
 - `webui/src/routes/api/[...path]/+server.ts`: The SvelteKit proxy route. It
   forwards all `/api/*` requests to the API using `event.fetch`, so the
@@ -105,16 +132,52 @@ In addition, several non-manifest files are required:
   token refresh transparently.
 
 - `desdeo-s2i-buildimage.Dockerfile`: Builds the custom S2I builder image that
-  extends the Python 3.12 UBI8 base with COIN-OR solvers (`bonmin`, `ipopt`, `cbc`).
+  extends the Python 3.12 UBI8 base with COIN-OR solvers (`bonmin`, `ipopt`,
+  `cbc`).
 
 ## Step 1: Prepare secrets
 
-All credentials are stored in a single Secret named `desdeo-secrets` (NOT under
-version control). Create it with `oc create secret generic` rather than from a
-YAML file. This avoids ever writing credentials to disk or committing them to
-the repository.
+All credentials are stored in a Secret named `desdeo-secrets`.
+Two options are available, choose one and skip the other.
+
+Key reference of the stored secrets:
+
+| Key | Description |
+|---|---|
+| `POSTGRES_USER` / `DB_USER` | PostgreSQL application user name |
+| `POSTGRES_PASSWORD` / `DB_PASSWORD` | Password for the above (same value) |
+| `DB_HOST` | Kubernetes Service name: `desdeo-postgres` (or Pukki hostname) |
+| `DB_PORT` | `5432` |
+| `DB_NAME` | Database name |
+| `AUTHJWT_SECRET` | JWT signing key, generate fresh, never reuse between deployments|
+| `DESDEO_ADMIN_USERNAME` | Initial analyst account username |
+| `DESDEO_ADMIN_PASSWORD` | Initial analyst account password |
+| `WEBHOOK_SECRET_API` | GitHub webhook secret for the API BuildConfig |
+| `WEBHOOK_SECRET_WEBUI` | GitHub webhook secret for the webui BuildConfig |
+
+!!! note
+    `DESDEO_PRODUCTION=true` is set directly in the Deployment manifest, not
+    as a Secret, because it is not sensitive.
+
+### Options A: From `secrets.yaml`
+
+Copy the template, fill in the values, then apply it:
+
+```bash
+cp deploy/secrets-template.yaml deploy/secrets.yaml
+# Edit deploy/secrets.yaml, replace every <CHANGE_ME> accordingly
+oc apply -f deploy/secrets.yaml
+```
+
+!!! warning
+    Make __absolutely sure__ that the file `secrets.yaml` is __never__ committed to git!
+
+### Option B: From literals
+Create the secret and the two dedicated webhook secrets using `oc create secret
+generic`:
 
 ```bash
+# Main application secret
 oc create secret generic desdeo-secrets \
   --from-literal=POSTGRES_USER=desdeo \
   --from-literal=POSTGRES_PASSWORD=<password> \
@@ -128,41 +191,28 @@ oc create secret generic desdeo-secrets \
   --from-literal=DESDEO_ADMIN_PASSWORD=<admin-password> \
   --from-literal=WEBHOOK_SECRET_API=$(python3 -c "import secrets; print(secrets.token_hex(24))") \
   --from-literal=WEBHOOK_SECRET_WEBUI=$(python3 -c "import secrets; print(secrets.token_hex(24))")
-```
 
-Key reference:
+# Dedicated webhook secrets. OpenShift's secretReference requires the key
+# to be named exactly 'WebHookSecretKey'. Use the same values as above.
+oc create secret generic desdeo-webhook-api \
+  --from-literal=WebHookSecretKey=<same value as WEBHOOK_SECRET_API>
+oc create secret generic desdeo-webhook-webui \
+  --from-literal=WebHookSecretKey=<same value as WEBHOOK_SECRET_WEBUI>
+```
 
-| Key | Description |
-|---|---|
-| `POSTGRES_USER` / `DB_USER` | PostgreSQL application user name |
-| `POSTGRES_PASSWORD` / `DB_PASSWORD` | Password for the above |
-| `DB_HOST` | Kubernetes Service name, always `desdeo-postgres` |
-| `DB_PORT` | `5432` |
-| `DB_NAME` | Database name |
-| `AUTHJWT_SECRET` | JWT signing key, generate a fresh value, never reuse |
-| `DESDEO_ADMIN_USERNAME` | Initial analyst account username |
-| `DESDEO_ADMIN_PASSWORD` | Initial analyst account password |
-| `WEBHOOK_SECRET_API` | GitHub webhook secret for the API BuildConfig |
-| `WEBHOOK_SECRET_WEBUI` | GitHub webhook secret for the webui BuildConfig |
+## Step 2: Deploy PostgreSQL
 
-!!! note
-    `DESDEO_PRODUCTION=true` is set directly in the Deployment manifest, not in
-    this Secret, because it is not sensitive.
+Two options are available. Choose one and skip the other.
 
-## Step 2: Deploy PostgreSQL
+### Option A: In-cluster PostgreSQL (default)
 
 ```bash
 oc apply -f deploy/postgres.yaml
 oc rollout status statefulset/desdeo-postgres
 ```
 
-The StatefulSet uses the built-in Rahti PostgreSQL image:
-
-```
-image-registry.openshift-image-registry.svc:5000/openshift/postgresql:16-el10
-```
-
-To check which tags are available on your cluster:
+The StatefulSet uses the built-in Rahti PostgreSQL image. To check available
+tags on your cluster:
 
 ```bash
 oc get is postgresql -n openshift -o jsonpath='{.spec.tags[*].name}'
@@ -172,15 +222,47 @@ Data is stored at `/var/lib/pgsql/data` in the PVC.
 
 !!! note
     The env vars that initialize the database are `POSTGRESQL_USER`,
-    `POSTGRESQL_PASSWORD`, and `POSTGRESQL_DATABASE` (the `POSTGRESQL_` prefix,
-    not `POSTGRES_`). The manifests map these from the Secret keys `DB_USER`,
-    `DB_PASSWORD`, and `DB_NAME`.
+    `POSTGRESQL_PASSWORD`, and `POSTGRESQL_DATABASE` (note the `POSTGRESQL_`
+    prefix). The manifests map these from the Secret keys `POSTGRES_USER`,
+    `POSTGRES_PASSWORD`, and the hardcoded value `desdeo`.
 
-!!! note
-    An alternative to in-cluster PostgreSQL is [CSC Pukki
-    DBaaS](https://docs.csc.fi/cloud/dbaas/), a managed PostgreSQL service.
-    Pukki removes the operational overhead of managing the database yourself but
-    adds setup steps not covered in this guide.
+### Option B: Pukki DBaaS
+
+[Pukki](https://pukki.dbaas.csc.fi) is CSC's managed PostgreSQL service. It
+removes the need to deploy `deploy/postgres.yaml` entirely — skip that step if
+using Pukki.
+
+**Prerequisites**: add the Pukki service to your CSC computing project via
+MyCSC → your project → Services → Pukki → Apply for access.
+
+**Setup:**
+
+1. Log in to [pukki.dbaas.csc.fi](https://pukki.dbaas.csc.fi).
+2. Click **Launch Instance**. Give it a name. Default Volume Size, Datastore,
+   and Flavor settings are fine for most deployments.
+3. Under **Database Access**, add the Rahti egress IP: `86.50.229.150/32`.
+4. Under **Initialize Databases**, create a database (e.g. `desdeo`) and set
+   an admin username and password. These become `DB_USER`, `DB_PASSWORD`, and
+   `DB_NAME` in the Secret.
+5. Once the instance is running, copy the hostname from the Pukki dashboard.
+   This becomes `DB_HOST` in the Secret instead of `desdeo-postgres`.
+
+Update the secret with the Pukki hostname:
+
+```bash
+oc create secret generic desdeo-secrets \
+  ... \
+  --from-literal=DB_HOST=<pukki-hostname> \
+  ...
+```
+
+Skip `oc apply -f deploy/postgres.yaml`. All subsequent steps are identical
+regardless of which option you chose.
+
+!!! warning
+    The Rahti egress IP `86.50.229.150/32` must be added to the Pukki access
+    list before deploying. Without it the API pod cannot reach the database and
+    will crash on startup.
 
 ## Step 3: Create ImageStreams and BuildConfigs
 
@@ -197,15 +279,15 @@ oc apply -f deploy/api-imagestream.yaml
 oc apply -f deploy/webui-imagestream.yaml
 ```
 
-Before applying the BuildConfigs, open each file and substitute the placeholder
-`<DEPLOY_BRANCH>` with the branch you want to build from (e.g. `master`). Ensure
-the git URI uses HTTPS, not SSH, the build pod does not have SSH credentials.
+Before applying the BuildConfigs, open each file and substitute `<DEPLOY_BRANCH>`
+with the branch you want to build from (e.g. `master`). Ensure the git URI uses
+HTTPS, not SSH, because build pods do not have SSH credentials.
 
 The API BuildConfig uses the S2I strategy with `desdeo-builder:latest` as its
-builder image — the custom image built from `desdeo-s2i-buildimage.Dockerfile`
+builder image, the custom image built from `desdeo-s2i-buildimage.Dockerfile`
 that includes COIN-OR solvers. The webui BuildConfig uses the Docker strategy
-with `webui/Dockerfile`. The build arg `VITE_API_URL=/api` is passed explicitly,
-this is intentional, as browser requests go through the SvelteKit proxy rather
+with `webui/Dockerfile`. The build arg `VITE_API_URL=/api` is passed explicitly.
+This is intentional, as browser requests go through the SvelteKit proxy rather
 than directly to the API.
 
 ```bash
@@ -220,7 +302,9 @@ The builder image must be ready before the API build can start, as
 `api-buildconfig.yaml` references `desdeo-builder:latest` as its S2I base.
 
 ```bash
-# Build the solver-enabled builder image first
+# Build the solver-enabled builder image first (takes a few minutes).
+# --follow does not always work, Rahti's web-based interface can also be
+# used for monitoring progress.
 oc start-build desdeo-builder --follow
 
 # Then build the API and webui (can run in parallel once the builder is done)
@@ -229,8 +313,8 @@ oc start-build desdeo-webui --follow
 ```
 
 The first build takes longer than subsequent ones because there is no layer
-cache. Expect roughly 6 minutes for the builder, 4 minutes for the API, and
-5 minutes for the webui.
+cache. Expect roughly a few minutes for the builder, and anther few minutes for
+both the API and the webui.
 
 Once the API pod is running, verify the solvers are present:
 
@@ -241,15 +325,16 @@ oc exec deployment/desdeo-api -- which bonmin ipopt cbc
 All three should return paths under `/opt/solver_binaries/`.
 
 !!! warning
-    If the webui build fails with `exit status 137`, the build pod ran out of memory. Increase the build pod memory limit in `webui-buildconfig.yaml`:
+    If the webui build fails with `exit status 137`, the build pod ran out of
+    memory. Increase the build pod memory limit in `webui-buildconfig.yaml`:
     ```yaml
     spec:
       resources:
         limits:
           memory: 4Gi
     ```
-    Also add `NODE_OPTIONS=--max-old-space-size=3072` to `dockerStrategy.env` in the same file, then re-apply and re-trigger the build.
----
+    Also ensure `NODE_OPTIONS=--max-old-space-size=3072` is set in
+    `dockerStrategy.env`, then re-apply and re-trigger the build.
 
 ## Step 5: Deploy API and web UI
 
@@ -261,9 +346,9 @@ oc rollout status deployment/desdeo-webui
 ```
 
 !!! warning
-    Rahti enforces a maximum CPU limit-to-request ratio of 5:1. If your
-    `resources.limits.cpu` divided by `resources.requests.cpu` exceeds this, the
-    ReplicaSet will silently fail to create pods. The error does not appear
+    Rahti enforces a maximum CPU limit-to-request ratio of 5:1. If
+    `resources.limits.cpu` divided by `resources.requests.cpu` exceeds this,
+    the ReplicaSet will silently fail to create pods. The error does not appear
     in pod logs, look in the ReplicaSet events:
     ```bash
     oc describe replicaset <name>
@@ -271,7 +356,7 @@ oc rollout status deployment/desdeo-webui
     The manifests in `deploy/` are set within the allowed ratio. If you
     customize resource settings, check the ratio before applying.
 
-The following env vars must be present on the API pod at runtime (sourced from `desdeo-secrets` via `secretKeyRef` in the Deployment):
+The following env vars must be present on the API pod at runtime:
 
 | Variable | Source |
 |---|---|
@@ -281,18 +366,18 @@ The following env vars must be present on the API pod at runtime (sourced from `
 | `CORS_ORIGINS` | Set in the Deployment to `["https://your-webui.rahtiapp.fi"]` |
 
 !!! note
-    With the SvelteKit proxy architecture, `COOKIE_DOMAIN` on the API is
-    irrelevant. Cookies are owned by the webui host and forwarded server-side.
-    Leave `COOKIE_DOMAIN` unset.
+    `COOKIE_DOMAIN` is intentionally not set. With the SvelteKit proxy
+    architecture, cookies are owned by the webui host and forwarded
+    server-side — the API does not need to set a shared cookie domain.
 
 ## Step 6: Initialize the database
 
-`db_init_prod.py` creates all SQLModel tables and seeds the initial analyst user
-defined by `DESDEO_ADMIN_USERNAME` and `DESDEO_ADMIN_PASSWORD`. Safe to re-run if needed.
+`db_init_prod.py` creates all SQLModel tables and seeds the initial analyst
+user defined by `DESDEO_ADMIN_USERNAME` and `DESDEO_ADMIN_PASSWORD`. It is
+safe to re-run — tables that already exist are not touched.
 
-The script runs as a one-shot Kubernetes Job using the API image. Before
-applying, open `deploy/db-init-job.yaml` and replace `<PROJECT>` with your Rahti
-project name (used to construct the image pull reference).
+Before applying, open `deploy/db-init-job.yaml` and replace `<PROJECT>` with
+your Rahti project name.
 
 ```bash
 oc apply -f deploy/db-init-job.yaml
@@ -313,15 +398,41 @@ Once the job completes successfully, delete it:
 oc delete job desdeo-db-init
 ```
 
+!!! note
+    Warnings about missing solvers (`bonmin`, `cbc`, `ipopt`) in the init job
+    logs are harmless if the solver builder image has not been used. Once the
+    API is rebuilt using `desdeo-builder:latest`, the warnings will disappear.
+
+### Resetting the database
+
+To re-run the init job on an existing database (e.g. after adding new tables
+in a release), simply apply the job again. Existing data is not affected.
+
+To wipe the database entirely and start fresh, **all users, problems, and
+session data will be permanently deleted**:
+
+```bash
+# Drop and recreate the public schema
+oc exec -it statefulset/desdeo-postgres -- \
+  psql -U desdeo -d desdeo -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"
+
+# Re-run the init job
+oc apply -f deploy/db-init-job.yaml
+oc logs -f job/desdeo-db-init
+oc delete job desdeo-db-init
+```
+
+!!! warning
+    The schema drop is irreversible. All data will be permanently lost.
 
 ## Step 7: Verify
 
 ```bash
 curl https://your-api.rahtiapp.fi/health
-# → {"status":"ok"}
+# -> {"status":"ok"}
 
 curl -I https://your-webui.rahtiapp.fi/
-# → HTTP/2 200
+# -> HTTP/2 200
 # (a 307 redirect to /home is also normal)
 ```
 
@@ -335,53 +446,157 @@ BuildConfigs include GitHub webhook triggers. Once configured, every push to the
 deploy branch triggers a rebuild of the affected component, which then rolls out
 automatically via the ImageStream trigger on the Deployment.
 
-Retrieve the webhook URLs. The webhook secret is embedded in the URL itself,
-the GitHub "Secret" field should be left blank:
+Retrieve the webhook secret values from the dedicated webhook secrets:
 
 ```bash
-oc get bc/desdeo-api -o jsonpath='{.spec.triggers}' | python3 -m json.tool
+oc get secret desdeo-webhook-api -o jsonpath='{.data.WebHookSecretKey}' | base64 -d
+oc get secret desdeo-webhook-webui -o jsonpath='{.data.WebHookSecretKey}' | base64 -d
 ```
 
-Find the `github` trigger entry and copy the `secret` value. Then construct the
-full webhook URL:
+Construct the webhook URLs:
 
 ```
 https://api.2.rahti.csc.fi:6443/apis/build.openshift.io/v1/namespaces/<project>/buildconfigs/desdeo-api/webhooks/<secret>/github
+https://api.2.rahti.csc.fi:6443/apis/build.openshift.io/v1/namespaces/<project>/buildconfigs/desdeo-webui/webhooks/<secret>/github
 ```
 
-In GitHub, go to your fork: **Settings → Webhooks → Add webhook**
+In GitHub, go to your repository: **Settings -> Webhooks -> Add webhook**
 
 - Payload URL: the URL constructed above
-- Content type: `application/json`, this is required; the default `x-www-form-urlencoded` will be rejected by OpenShift
-- Secret: leave blank
+- Content type: `application/json`: required; `x-www-form-urlencoded` will be rejected
+- Secret: leave blank (the secret is embedded in the URL)
 - Events: Just the push event
 
-Repeat for `desdeo-webui` using `bc/desdeo-webui`.
+Add one webhook per BuildConfig.
 
 !!! note
-    `oc describe bc/desdeo-api` always shows `<secret>` as a placeholder in the
-    webhook URL regardless of how the secret is stored, this is a display-only
-    mask. Always use `oc get bc -o jsonpath` as shown above to retrieve the
-    actual secret value.
+    `oc describe bc/desdeo-api` always shows `<secret>` as a placeholder in
+    the webhook URL, this is a display-only mask. Always retrieve the actual
+    secret value from the Secret object as shown above.
+
+At this point, the desdei web-API and webui should be running on Rahti, and they should automatically
+update when new commits are pushed to the deployment branch.
 
 ## Troubleshooting
 
 | Symptom | Cause | Fix |
 |---|---|---|
-| API pod crashes on startup with `ValidationError: authjwt_secret_key` | `AUTHJWT_SECRET` env var missing or key name wrong | Verify the key name in the Secret matches exactly what the Deployment references |
-| API pod crashes with DB connection error | `DB_HOST`, `DB_PORT`, `DB_NAME`, `DB_USER`, or `DB_PASSWORD` missing or incorrect | Run `oc describe secret desdeo-secrets` and compare key names with the Deployment's `secretKeyRef` fields |
+| API pod crashes with `ValidationError: authjwt_secret_key` | `AUTHJWT_SECRET` env var missing or key name wrong | Verify key names in the Secret match the Deployment's `secretKeyRef` fields |
+| API pod crashes with DB connection error | `DB_HOST`, `DB_PORT`, `DB_NAME`, `DB_USER`, or `DB_PASSWORD` missing or incorrect | Run `oc describe secret desdeo-secrets` and compare key names |
+| API pod crashes with connection timeout to Pukki | Rahti egress IP not whitelisted in Pukki access list | Add `86.50.229.150/32` to the Pukki instance's Database Access settings |
 | Webui pod never starts; `FailedCreate` in ReplicaSet events | CPU limit-to-request ratio exceeds 5:1 | Adjust `resources.requests.cpu` so that `limits.cpu / requests.cpu ≤ 5` |
 | Login returns 500; logs show `TypeError: Invalid URL` | `API_BASE_URL` env var not set on the webui pod | Set `API_BASE_URL=http://desdeo-api:8080` in the webui Deployment |
-| Build fails with `exit status 137` | Build pod out of memory | Set `spec.resources.limits.memory: 4Gi` in the BuildConfig and add `NODE_OPTIONS=--max-old-space-size=3072` to `dockerStrategy.env` |
+| Build fails with `exit status 137` | Build pod out of memory | Set `spec.resources.limits.memory: 4Gi` in the BuildConfig |
 | Build fails with `pip install --group` error | Default S2I assemble script used instead of the custom one | Ensure `.s2i/bin/assemble` is present in the repo and uses `uv sync --frozen` |
 | `uv sync` fails with lockfile conflict | `uv.lock` is out of sync with `pyproject.toml` | Run `uv lock` locally and commit the updated lockfile |
-| Database init job fails with import errors | `DESDEO_PRODUCTION` not set, API falls back to SQLite debug mode | Ensure `DESDEO_PRODUCTION=true` is set in the Job's env spec |
-| GitHub webhook returns 401 | Content type set to `application/x-www-form-urlencoded` | Change content type to `application/json` in the GitHub webhook settings |
-
+| Database init job fails with import errors | `DESDEO_PRODUCTION` not set; API falls back to SQLite mode | Ensure `DESDEO_PRODUCTION=true` is set in the Job env |
+| GitHub webhook returns 401 | Wrong content type or secret mismatch | Set content type to `application/json`; verify webhook secret matches `WebHookSecretKey` in the dedicated Secret |
 
 ## Known limitations
 
-Schema migrations:`db_init_prod.py` uses `SQLModel.metadata.create_all`,
-which creates missing tables but does not ALTER existing ones. If the data
-model changes in a later release, tables must be migrated manually or via, e.g.,
-Alembic before redeploying.
+- **Schema migrations**: `db_init_prod.py` uses `SQLModel.metadata.create_all`,
+  which creates missing tables but does not ALTER existing ones. If the data
+  model changes in a later release, tables must be migrated manually or via,
+  e.g., Alembic, before redeploying.
+
+- **WebSocket connections**: The GDM-SCORE-bands and GNIMBUS features use
+  `VITE_API_URL` directly for `ws://` connections and are not proxied through
+  the SvelteKit `/api` route. These require separate handling not covered in
+  this guide.
+
+---
+
+## Web console approach
+
+The steps above use the `oc` CLI and YAML manifests. Rahti also provides a web
+console at [console-openshift-console.apps.2.rahti.csc.fi](https://console-openshift-console.apps.2.rahti.csc.fi/)
+that lets you accomplish the same tasks through a graphical interface. This
+section documents the web console approach as an alternative.
+
+!!! note
+    The web console approach is less reproducible than the CLI approach and
+    requires more manual steps on each redeployment. It is recommended for
+    one-shot deploymnets or first-time exploration, not for ongoing deployments.
+
+### Getting started
+
+Log in to the Rahti web console. Look for the **Create Project** button (you
+may need to switch to the Administrator perspective to see it). Fill in the
+project name and description. Include your CSC computing project number in the
+description in the format `csc_project:#######`.
+
+### Deploying the API
+
+Navigate to **+Add -> Import from Git**. Enter the repository URL and branch
+under **Show advanced Git options -> Git reference**.
+
+Under **Build**, add the following environment variables:
+
+```
+DESDEO_PRODUCTION = true
+DB_HOST            = <database hostname or service name>
+DB_PORT            = 5432
+DB_NAME            = desdeo
+DB_USER            = <db username>
+DB_PASSWORD        = <db password>
+AUTHJWT_SECRET     = <64-char hex>
+CORS_ORIGINS       = ["https://your-webui.rahtiapp.fi"]
+```
+
+The builder image should be set to `python:3.12-ubi9`. The S2I assemble script
+(`.s2i/bin/assemble`) uses `uv sync --frozen` to install dependencies.
+
+Store sensitive values in an OpenShift Secret and reference them in the Build
+configuration rather than entering them as plain text.
+
+### Deploying the web UI
+
+Add another resource via **+Add -> Import from Git** using the same repository
+and branch. Under **Advanced Git Options**, set the **Context Dir** to `/webui`.
+
+Select **Docker build** as the build strategy (not S2I). The `webui/Dockerfile`
+handles the Node 24 build internally.
+
+Set these build arguments and environment variables:
+
+```
+VITE_API_URL  = /api
+API_BASE_URL  = http://<api-service-name>:8080
+```
+
+!!! warning
+    Do not set `VITE_API_URL` to the API's public Route URL. Browser requests
+    must go through the SvelteKit `/api` proxy, not directly to the API.
+
+If the build fails with `exit status 137`, increase the build memory limit in
+the BuildConfig YAML:
+
+```yaml
+spec:
+  resources:
+    limits:
+      memory: 4000Mi
+```
+
+### PostgreSQL
+
+Use either Pukki DBaaS or a PostgreSQL image from the Rahti developer catalog.
+
+For Pukki, see [Option B: Pukki DBaaS](#option-b-pukki-dbaas) above,
+the setup steps are the same regardless of whether you use the CLI or web console.
+
+For in-cluster PostgreSQL, navigate to **+Add -> Developer Catalog** and find
+the PostgreSQL template. The correct env var names for the OpenShift image are
+`POSTGRESQL_USER`, `POSTGRESQL_PASSWORD`, and `POSTGRESQL_DATABASE`.
+
+### Database initialization
+
+Once the API is running, use `db_init_prod.py` to create tables and seed the
+initial user. The recommended approach is to run it as a Kubernetes Job using
+the manifest in `deploy/db-init-job.yaml` (see [Step 6](#step-6-initialize-the-database)).
+
+Alternatively, you can exec into the API pod directly:
+
+```bash
+oc exec -it deployment/desdeo-api -- python desdeo/api/db_init_prod.py
+```
diff --git a/docs/howtoguides/index.md b/docs/howtoguides/index.md
index 3653ca79d..9112bf050 100644
--- a/docs/howtoguides/index.md
+++ b/docs/howtoguides/index.md
@@ -32,6 +32,6 @@ Guides are goal-oriented and are meant to direct users towards specific goals wh
 ## Web-API and Web-GUI
 
 - **[Running the web-API and web-GUI](api_and_gui.md):** How to run the web-API and web-GUI
-- **[Hosting on Kubernetes](kubernetes.md):** How to host a DESDEO web application on Kubernetes
-- **[Deploying on OpenShift](deploying_on_openshift.md):** How to deploy DESDEO on OpenShift/OKD using `oc` CLI and YAML manifests (Rahti example)
+- **[Hosting on Kubernetes (old)](kubernetes.md):** How to host a DESDEO web application on Kubernetes
+- **[Deploying on OpenShift](deploying_on_openshift.md):** How to deploy DESDEO on OpenShift/Kubernetes (Rahti example)
 - **[Implementing method interfaces](implementing_method_interfaces.md):** How to implement new interactive method interfaces in the Web-GUI