diff --git a/net_maestro/core/templates/net_maestro/partials/saved_simulations.html b/net_maestro/core/templates/net_maestro/partials/saved_simulations.html
new file mode 100644
index 0000000..3b260f1
--- /dev/null
+++ b/net_maestro/core/templates/net_maestro/partials/saved_simulations.html
@@ -0,0 +1,136 @@
+
+
+
+
+
+ {% for config in configs %}
+
+
+
+
+
+
+
{{ config.run.name }}
+
{{ config.run.created }}
+
+
+
+ {% comment %}
+ This list only supports PHOLDSimulationConfig today.
+ Update to render the actual model type once saved simulations support other models.
+ {% endcomment %}
+
PHOLD
+
+
+ Clone
+
+
+
+
+
+
+
View details
+
+
+
+
Synchronization Protocol
+
{{ config.get_synch_display }}
+
+
+
AVL Tree Size
+
{{ config.avl_size }}
+
+
+
LPs per Processor
+
{{ config.nlp }}
+
+
+
Remote Event Rate
+
{{ config.remote }}
+
+
+
Mean Timestamp
+
{{ config.mean }}
+
+
+
Memory Multiplier
+
{{ config.mult }}
+
+
+
Lookahead
+
{{ config.lookahead }}
+
+
+
Start Events per LP
+
{{ config.start_events }}
+
+
+
Additional Memory Buffers
+
{{ config.memory }}
+
+
+
Stagger Events
+
{{ config.stagger|yesno:"Yes,No" }}
+
+
+
+
+
+
+ {% empty %}
+
+
+
+
No saved simulations yet
+
+ Configure a PHOLD simulation to save it here for future reference or re-run.
+
+
+ New Simulation
+
+
+
+ {% endfor %}
+
+
+
diff --git a/net_maestro/core/tests/test_simulation_views.py b/net_maestro/core/tests/test_simulation_views.py
index f8da00a..5ca124d 100644
--- a/net_maestro/core/tests/test_simulation_views.py
+++ b/net_maestro/core/tests/test_simulation_views.py
@@ -8,15 +8,16 @@
from __future__ import annotations
+from datetime import timedelta
from typing import TYPE_CHECKING
from unittest import mock
-from django.contrib.auth.models import User
from django.urls import reverse
+from django.utils import timezone
import pytest
from net_maestro.core.constants import RunStatus
-from net_maestro.core.models import Run
+from net_maestro.core.models import PHOLDSimulationConfig, Run
if TYPE_CHECKING:
from django.test import Client
@@ -26,37 +27,31 @@
class TestSimulationView:
"""Test the PHOLD simulation view."""
- @pytest.fixture
- def authenticated_client(self, client: Client) -> Client:
- """Create an authenticated client."""
- User.objects.create_user(username="testuser", password="testpass")
- client.login(username="testuser", password="testpass")
- return client
-
- def test_get_simulation_form(self, authenticated_client: Client) -> None:
+ def test_get_simulation_form(self, client: Client) -> None:
"""Test GET request returns simulation form."""
- response = authenticated_client.get(reverse("simulation-config"))
+ response = client.get(reverse("new-simulation-config"))
assert response.status_code == 200
assert "form" in response.context
assert "net_maestro/index.html" in [t.name for t in response.templates]
- def test_get_simulation_form_htmx(self, authenticated_client: Client) -> None:
+ def test_get_simulation_form_htmx(self, client: Client) -> None:
"""Test HTMX GET request returns partial template."""
- response = authenticated_client.get(
- reverse("simulation-config"),
+ response = client.get(
+ reverse("new-simulation-config"),
HTTP_HX_REQUEST="true",
)
assert response.status_code == 200
- assert "net_maestro/partials/simulation.html" in [t.name for t in response.templates]
+ assert "net_maestro/partials/new_simulation.html" in [t.name for t in response.templates]
@mock.patch("net_maestro.core.views.run_phold_simulation")
- def test_submit_simulation_form(
- self, mock_task: mock.Mock, authenticated_client: Client
+ def test_submit_simulation_form_save_and_run(
+ self, mock_task: mock.Mock, client: Client
) -> None:
- """Test successful form submission creates run with PENDING status."""
+ """Test "Save and Run" submission creates run/config and triggers the task."""
form_data = {
+ "action": "save_and_run",
"run_identifier": "Test Simulation",
"synch": "1",
"avl_size": "18",
@@ -70,16 +65,21 @@ def test_submit_simulation_form(
"stagger": "0",
}
- response = authenticated_client.post(reverse("simulation-config"), data=form_data)
+ response = client.post(reverse("new-simulation-config"), data=form_data)
- # Check redirect
+ # Save & Run redirects to analysis so users can monitor the run immediately.
assert response.status_code == 302
- assert response.url == reverse("analysis-partial") # type: ignore[attr-defined]
+ assert response.headers["Location"] == reverse("analysis-partial")
# Verify run was created with PENDING status
run = Run.objects.get(name="Test Simulation")
assert run.status == RunStatus.PENDING
+ # Verify the configuration was persisted
+ config = PHOLDSimulationConfig.objects.get(run=run)
+ assert config.synch == 1
+ assert config.avl_size == 18
+
# Verify task was called with correct arguments
mock_task.delay.assert_called_once_with(
run_id=run.id,
@@ -95,7 +95,39 @@ def test_submit_simulation_form(
stagger=False,
)
- def test_submit_invalid_form(self, authenticated_client: Client) -> None:
+ @mock.patch("net_maestro.core.views.run_phold_simulation")
+ def test_submit_simulation_form_save_only(self, mock_task: mock.Mock, client: Client) -> None:
+ """Save-only submissions stay on the saved simulations page and skip the task."""
+ form_data = {
+ "action": "save",
+ "run_identifier": "Saved Simulation",
+ "synch": "1",
+ "avl_size": "18",
+ "nlp": "8",
+ "remote": "0.25",
+ "mean": "1.0",
+ "mult": "1.4",
+ "lookahead": "1.0",
+ "start_events": "1",
+ "memory": "100",
+ "stagger": "0",
+ }
+
+ response = client.post(reverse("new-simulation-config"), data=form_data)
+
+ # Check redirect
+ assert response.status_code == 302
+ assert response.headers["Location"] == reverse("simulation-config")
+
+ # Verify run and configuration were created with SAVED status
+ run = Run.objects.get(name="Saved Simulation")
+ assert run.status == RunStatus.SAVED
+ assert PHOLDSimulationConfig.objects.filter(run=run).exists()
+
+ # Verify the task was NOT triggered
+ mock_task.delay.assert_not_called()
+
+ def test_submit_invalid_form(self, client: Client) -> None:
"""Test invalid form submission returns errors."""
form_data = {
"run_identifier": "", # Required field
@@ -111,7 +143,7 @@ def test_submit_invalid_form(self, authenticated_client: Client) -> None:
"stagger": "0",
}
- response = authenticated_client.post(reverse("simulation-config"), data=form_data)
+ response = client.post(reverse("new-simulation-config"), data=form_data)
# Should not redirect
assert response.status_code == 200
@@ -124,8 +156,207 @@ def test_submit_invalid_form(self, authenticated_client: Client) -> None:
def test_unauthenticated_access(self, client: Client) -> None:
"""Test unauthenticated access returns the form (public page)."""
- response = client.get(reverse("simulation-config"))
+ response = client.get(reverse("new-simulation-config"))
- # simulation-config is publicly accessible
+ # new-simulation-config is publicly accessible
assert response.status_code == 200
assert "form" in response.context
+
+
+@pytest.mark.django_db
+class TestSavedSimulationsView:
+ """Test the saved simulations list view."""
+
+ def test_list_empty(self, client: Client) -> None:
+ """Test the list view renders with no saved configurations."""
+ response = client.get(reverse("simulation-config"))
+
+ assert response.status_code == 200
+ assert list(response.context["configs"]) == []
+ assert "net_maestro/index.html" in [t.name for t in response.templates]
+
+ def test_list_htmx(self, client: Client) -> None:
+ """Test HTMX GET request returns the partial template."""
+ response = client.get(
+ reverse("simulation-config"),
+ HTTP_HX_REQUEST="true",
+ )
+
+ assert response.status_code == 200
+ assert "net_maestro/partials/saved_simulations.html" in [t.name for t in response.templates]
+
+ def test_list_shows_saved_configs(self, client: Client) -> None:
+ """Test saved configurations are listed, most recently created first."""
+ older_run = Run.objects.create(name="Older Run", status=RunStatus.PENDING)
+ older_run.created = timezone.now() - timedelta(days=1)
+ older_run.save(update_fields=["created"])
+ PHOLDSimulationConfig.objects.create(run=older_run)
+ newer_run = Run.objects.create(name="Newer Run", status=RunStatus.PENDING)
+ newer_run.created = timezone.now()
+ newer_run.save(update_fields=["created"])
+ PHOLDSimulationConfig.objects.create(run=newer_run)
+
+ response = client.get(reverse("simulation-config"))
+
+ assert response.status_code == 200
+ configs = list(response.context["configs"])
+ assert [config.run_id for config in configs] == [newer_run.id, older_run.id]
+
+
+@pytest.mark.django_db
+class TestEditSimulationView:
+ def _create_config(self) -> PHOLDSimulationConfig:
+ run = Run.objects.create(name="Original Run", status=RunStatus.SAVED)
+ return PHOLDSimulationConfig.objects.create(
+ run=run,
+ synch=3,
+ avl_size=18,
+ nlp=8,
+ remote=0.25,
+ mean=1.0,
+ mult=1.4,
+ lookahead=1.0,
+ start_events=1,
+ memory=100,
+ stagger=False,
+ )
+
+ def test_edit_get_prefills_form(self, client: Client) -> None:
+ config = self._create_config()
+
+ response = client.get(reverse("edit-simulation-config", args=[config.run.id]))
+
+ assert response.status_code == 200
+ form = response.context["form"]
+ assert form["run_identifier"].value() == "Original Run"
+ assert form["avl_size"].value() == 18
+
+ @mock.patch("net_maestro.core.views.run_phold_simulation")
+ def test_edit_save_updates_config(self, mock_task: mock.Mock, client: Client) -> None:
+ config = self._create_config()
+ form_data = {
+ "action": "save",
+ "run_identifier": "Updated Run",
+ "synch": "2",
+ "avl_size": "20",
+ "nlp": "10",
+ "remote": "0.5",
+ "mean": "2.0",
+ "mult": "1.8",
+ "lookahead": "1.2",
+ "start_events": "3",
+ "memory": "200",
+ "stagger": "1",
+ }
+
+ response = client.post(
+ reverse("edit-simulation-config", args=[config.run.id]),
+ data=form_data,
+ )
+
+ assert response.status_code == 302
+ assert response.headers["Location"] == reverse("simulation-config")
+
+ config.refresh_from_db()
+ new_run = Run.objects.get(name="Updated Run")
+ assert new_run.status == RunStatus.SAVED
+ new_config = PHOLDSimulationConfig.objects.get(run=new_run)
+ assert new_config.avl_size == 20
+ assert new_config.stagger is True
+ # Original config remains unchanged
+ config.refresh_from_db()
+ assert config.run.name == "Original Run"
+ assert config.avl_size == 18
+ mock_task.delay.assert_not_called()
+
+ def test_edit_clone_shows_both_runs_in_saved_list(self, client: Client) -> None:
+ config = self._create_config()
+ form_data = {
+ "action": "save",
+ "run_identifier": "Cloned Run",
+ "synch": "2",
+ "avl_size": "20",
+ "nlp": "9",
+ "remote": "0.4",
+ "mean": "1.5",
+ "mult": "1.7",
+ "lookahead": "1.1",
+ "start_events": "2",
+ "memory": "150",
+ "stagger": "0",
+ }
+
+ response = client.post(
+ reverse("edit-simulation-config", args=[config.run.id]),
+ data=form_data,
+ )
+
+ assert response.status_code == 302
+
+ list_response = client.get(reverse("simulation-config"))
+ assert list_response.status_code == 200
+ run_names = [cfg.run.name for cfg in list_response.context["configs"]]
+ assert run_names == ["Cloned Run", "Original Run"]
+
+ @mock.patch("net_maestro.core.views.run_phold_simulation")
+ def test_edit_save_and_run_triggers_task(self, mock_task: mock.Mock, client: Client) -> None:
+ config = self._create_config()
+ form_data = {
+ "action": "save_and_run",
+ "run_identifier": "Run Again",
+ "synch": "3",
+ "avl_size": "18",
+ "nlp": "8",
+ "remote": "0.25",
+ "mean": "1.0",
+ "mult": "1.4",
+ "lookahead": "1.0",
+ "start_events": "1",
+ "memory": "100",
+ "stagger": "0",
+ }
+
+ response = client.post(
+ reverse("edit-simulation-config", args=[config.run.id]),
+ data=form_data,
+ )
+
+ assert response.status_code == 302
+ assert response.headers["Location"] == reverse("analysis-partial")
+
+ new_run = Run.objects.get(name="Run Again")
+ assert new_run.status == RunStatus.PENDING
+ mock_task.delay.assert_called_once()
+
+ @mock.patch("net_maestro.core.views.run_phold_simulation")
+ def test_run_saved_simulation_shortcut(self, mock_task: mock.Mock, client: Client) -> None:
+ config = self._create_config()
+
+ response = client.post(reverse("run-saved-simulation", args=[config.run.id]))
+
+ assert response.status_code == 302
+ assert response.headers["Location"] == reverse("analysis-partial")
+
+ config.run.refresh_from_db()
+ assert config.run.status == RunStatus.PENDING
+ mock_task.delay.assert_called_once()
+
+ @mock.patch("net_maestro.core.views.run_phold_simulation")
+ def test_run_saved_simulation_invalid_config_shows_error(
+ self, mock_task: mock.Mock, client: Client
+ ) -> None:
+ """An invalid saved config surfaces an error message instead of failing silently."""
+ config = self._create_config()
+ config.avl_size = 5 # Below the form/model MinValueValidator(10)
+ config.save(update_fields=["avl_size"])
+
+ response = client.post(reverse("run-saved-simulation", args=[config.run.id]), follow=True)
+
+ assert response.status_code == 200
+ assert response.redirect_chain[-1] == (reverse("simulation-config"), 302)
+ messages = [str(m) for m in response.context["messages"]]
+ assert any("Unable to run" in message for message in messages)
+
+ config.run.refresh_from_db()
+ assert config.run.status == RunStatus.SAVED
+ mock_task.delay.assert_not_called()
diff --git a/net_maestro/core/views.py b/net_maestro/core/views.py
index b1cde6c..10d320f 100644
--- a/net_maestro/core/views.py
+++ b/net_maestro/core/views.py
@@ -6,19 +6,26 @@
from __future__ import annotations
+import logging
from typing import TYPE_CHECKING
-from django.http import HttpResponse
+from django.contrib import messages
+from django.core.exceptions import ValidationError
+from django.db import transaction
+from django.http import Http404, HttpResponse
from django.shortcuts import redirect, render
+from django.views.decorators.http import require_POST
if TYPE_CHECKING:
from django.http import HttpRequest
from .constants import RunStatus
from .forms import PHOLDSimulationForm
-from .models import Run
+from .models import PHOLDSimulationConfig, Run
from .tasks import run_phold_simulation
+logger = logging.getLogger(__name__)
+
def _custom_component_context() -> dict[str, object]:
"""Return custom component context for the configuration page.
@@ -180,14 +187,19 @@ def _filtered_runs(request: HttpRequest) -> dict[str, object]:
"""Return runs queryset filtered by ?status= and ?q= params."""
statuses = request.GET.getlist("status")
search_query = request.GET.get("q", "").strip()
- runs = Run.objects.all()
- if statuses:
- runs = runs.filter(status__in=statuses)
+ runs = (
+ Run.objects.filter(status__in=statuses)
+ if statuses
+ else Run.objects.exclude(status=RunStatus.SAVED)
+ )
if search_query:
runs = runs.filter(name__icontains=search_query)
return {
"runs": runs,
- "status_choices": RunStatus.choices,
+ # SAVED runs have no simulation data to analyze; exclude them from filter options.
+ "status_choices": [
+ (value, label) for value, label in RunStatus.choices if value != RunStatus.SAVED
+ ],
"selected_statuses": statuses,
"search_query": search_query,
}
@@ -294,43 +306,168 @@ def custom_component_delete(_request: HttpRequest, component_id: int) -> HttpRes
return _custom_component_not_implemented(f"delete for component {component_id}")
+def _phold_form_initial_from_config(config: PHOLDSimulationConfig) -> dict[str, object]:
+ return {"run_identifier": config.run.name}
+
+
+def _get_latest_phold_config_or_404(run_id: int) -> PHOLDSimulationConfig:
+ """Return the most recently created PHOLDSimulationConfig for a Run.
+
+ TODO: Revisit this "most recent wins" choice once ensembles need to disambiguate
+ between multiple configs.
+ """
+ config = (
+ PHOLDSimulationConfig.objects.select_related("run")
+ .filter(run_id=run_id)
+ .order_by("-id")
+ .first()
+ )
+ if config is None:
+ raise Http404(f"No PHOLDSimulationConfig found for run {run_id}")
+ return config
+
+
+def _run_phold(run: Run, config: PHOLDSimulationConfig) -> None:
+ run_phold_simulation.delay(
+ run_id=run.id,
+ synch=config.synch,
+ avl_size=config.avl_size,
+ nlp=config.nlp,
+ remote=config.remote,
+ mean=config.mean,
+ mult=config.mult,
+ lookahead=config.lookahead,
+ start_events=config.start_events,
+ memory=config.memory,
+ stagger=config.stagger,
+ )
+
+
+def _create_run_and_config(
+ form: PHOLDSimulationForm, run_status: RunStatus
+) -> tuple[Run, PHOLDSimulationConfig]:
+ """Create a Run and its PHOLDSimulationConfig atomically from validated form data."""
+ with transaction.atomic():
+ run = Run.objects.create(
+ name=form.cleaned_data["run_identifier"],
+ status=run_status,
+ )
+ config = form.save(commit=False)
+ config.run = run
+ config.save()
+ return run, config
+
+
def simulation_config(request: HttpRequest) -> HttpResponse:
"""Render the simulation configuration form and handle submission.
GET: Display the form with PHOLD parameters.
- POST: Create a Run and trigger the simulation task.
+ POST: Create a Run and its configuration. Only triggers a task when "Save and Run"
+ was used; "Save" persists the configuration without running it.
"""
if request.method == "POST":
form = PHOLDSimulationForm(request.POST)
if form.is_valid():
- # Create Run with PENDING status
- run = Run.objects.create(
- name=form.cleaned_data["run_identifier"],
- status=RunStatus.PENDING,
- )
-
- # Trigger Celery task to run PHOLD simulation
- run_phold_simulation.delay(
- run_id=run.id,
- synch=int(form.cleaned_data["synch"]),
- avl_size=form.cleaned_data["avl_size"],
- nlp=form.cleaned_data["nlp"],
- remote=form.cleaned_data["remote"],
- mean=form.cleaned_data["mean"],
- mult=form.cleaned_data["mult"],
- lookahead=form.cleaned_data["lookahead"],
- start_events=form.cleaned_data["start_events"],
- memory=form.cleaned_data["memory"],
- stagger=bool(int(form.cleaned_data["stagger"])),
- )
-
- # Redirect to analysis page
- return redirect("analysis-partial")
+ should_run = request.POST.get("action") == "save_and_run"
+
+ run_status = RunStatus.PENDING if should_run else RunStatus.SAVED
+ run, config = _create_run_and_config(form, run_status)
+
+ if should_run:
+ _run_phold(run, config)
+ # Redirect to the analysis page so the user can watch the run
+ return redirect("analysis-partial")
+
+ # Redirect to the saved simulations list
+ return redirect("simulation-config")
else:
form = PHOLDSimulationForm()
- context: dict[str, object] = {"form": form}
- partial_template = "net_maestro/partials/simulation.html"
+ context: dict[str, object] = {
+ "form": form,
+ "form_action": request.path,
+ "page_heading": "New Simulation",
+ "breadcrumb_label": "New Simulation",
+ }
+ partial_template = "net_maestro/partials/new_simulation.html"
+ if request.headers.get("HX-Request"):
+ return render(request, partial_template, context)
+ context.update({"active_page": "simulation", "partial_template": partial_template})
+ return render(request, "net_maestro/index.html", context)
+
+
+def edit_simulation_config(request: HttpRequest, run_id: int) -> HttpResponse:
+ config = _get_latest_phold_config_or_404(run_id)
+
+ if request.method == "POST":
+ form = PHOLDSimulationForm(request.POST)
+ if form.is_valid():
+ should_run = request.POST.get("action") == "save_and_run"
+ run_status = RunStatus.PENDING if should_run else RunStatus.SAVED
+ # TODO: "Editing" a saved config intentionally clones it into a new Run/config
+ # rather than mutating the original. This is a deliberate safeguard against one
+ # person's edits overwriting another person's saved work.
+ # Revisit once per-user ownership exists and in-place edits are safe to allow.
+ #
+ # TODO: The cloned run/config currently has no explicit linkage to the source run.
+ # Consider associating them so users can trace edit history or re-clone without
+ # guesswork.
+ run, new_config = _create_run_and_config(form, run_status)
+
+ if should_run:
+ _run_phold(run, new_config)
+ return redirect("analysis-partial")
+
+ return redirect("simulation-config")
+ else:
+ form = PHOLDSimulationForm(instance=config, initial=_phold_form_initial_from_config(config))
+
+ context: dict[str, object] = {
+ "form": form,
+ "form_action": request.path,
+ "page_heading": "Clone Simulation",
+ "breadcrumb_label": "Clone Simulation",
+ }
+ partial_template = "net_maestro/partials/new_simulation.html"
+ if request.headers.get("HX-Request"):
+ return render(request, partial_template, context)
+ context.update({"active_page": "simulation", "partial_template": partial_template})
+ return render(request, "net_maestro/index.html", context)
+
+
+@require_POST
+def run_saved_simulation(request: HttpRequest, run_id: int) -> HttpResponse:
+ config = _get_latest_phold_config_or_404(run_id)
+ run = config.run
+
+ try:
+ config.full_clean()
+ except ValidationError as exc:
+ logger.warning(
+ "Saved config for run %s failed re-validation and could not be run: %s",
+ run_id,
+ exc.message_dict,
+ )
+ # TODO: Consider surfacing errors via a toast notification or an HTMX response instead of
+ # a redirect so it's clear to the user what happened and why.
+ messages.error(request, f'Unable to run "{run.name}": saved configuration is invalid.')
+ return redirect("simulation-config")
+ run.status = RunStatus.PENDING
+ run.save(update_fields=["status"])
+ _run_phold(run, config)
+ return redirect("analysis-partial")
+
+
+def saved_simulations(request: HttpRequest) -> HttpResponse:
+ """Render the list of saved PHOLD simulation configurations.
+
+ GET: Display all saved simulation configurations, most recently created first.
+ """
+ # TODO: This list is unbounded and will likely grow over time. Consider pagination once
+ # the number of saved configs makes this a real usability concern.
+ configs = PHOLDSimulationConfig.objects.select_related("run").order_by("-run__created")
+ context: dict[str, object] = {"configs": configs}
+ partial_template = "net_maestro/partials/saved_simulations.html"
if request.headers.get("HX-Request"):
return render(request, partial_template, context)
context.update({"active_page": "simulation", "partial_template": partial_template})
diff --git a/net_maestro/urls.py b/net_maestro/urls.py
index b35b673..43d37ef 100644
--- a/net_maestro/urls.py
+++ b/net_maestro/urls.py
@@ -75,9 +75,24 @@
),
path(
"simulation/config",
- views.simulation_config,
+ views.saved_simulations,
name="simulation-config",
),
+ path(
+ "simulation/new-config",
+ views.simulation_config,
+ name="new-simulation-config",
+ ),
+ path(
+ "simulation/edit-config/
",
+ views.edit_simulation_config,
+ name="edit-simulation-config",
+ ),
+ path(
+ "simulation/run/",
+ views.run_saved_simulation,
+ name="run-saved-simulation",
+ ),
]
if settings.DEBUG: