Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
start_extraction_job,
)
from src.visualiser_graph_loader import (
available_visualisations,
extract_path_parts,
load_json_file,
visualiser_graph_file_path,
Expand All @@ -21,7 +22,6 @@

load_dotenv()

# Configure logging
logging.basicConfig(
level=logging.INFO,
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
Expand All @@ -44,6 +44,11 @@ def graph_page():

return render_template("graph.html", source_path=source_path_param or "")

@app.route("/visualisations", methods=["GET"])
def visualisations_page():
"""Serve a page listing all available visualisations."""
return render_template("visualisations.html", visualisations=available_visualisations())

@app.route("/graph-viewmodel", methods=["GET"])
async def graph_viewmodel():
"""Serve the graph data as JSON for the frontend."""
Expand Down
29 changes: 28 additions & 1 deletion src/visualiser_graph_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

ONTOLOGY_RUN_PATH_PATTERN = r"(?P<domain_name>[a-zA-Z0-9_-]+)/(?P<run>run-\d+-\d+)"
S3_BUCKET_NAME = "govuk-ai-accelerator-data-integration"
GRAPH_TOOLS_PATH_S3 = f"{S3_BUCKET_NAME}/graph_tools/"


def load_json_file(file_path: str) -> Dict[str, Any]:
Expand All @@ -21,7 +22,7 @@ def load_json_file(file_path: str) -> Dict[str, Any]:
def visualiser_graph_file_path(source_path: str | None) -> str:
if source_path:
domain_name, run_id = extract_path_parts(source_path)
filename = f"s3://{S3_BUCKET_NAME}/graph_tools/{domain_name}/{run_id}/graphNode.json"
filename = f"s3://{GRAPH_TOOLS_PATH_S3}{domain_name}/{run_id}/graphNode.json"
logger.info(f"Loading graph data from: '{filename}'")
else:
filename = "graph-viewmodel.json"
Expand All @@ -38,3 +39,29 @@ def extract_path_parts(path: str) -> tuple[str, str]:
domain_name = match.group("domain_name")
run_id = match.group("run")
return domain_name, run_id


def available_visualisations():
fs = fsspec.filesystem("s3")
items = []

try:
domain_paths = fs.ls(f"s3://{GRAPH_TOOLS_PATH_S3}", detail=False)

for domain_path in domain_paths:
domain_name = domain_path[len(f"{GRAPH_TOOLS_PATH_S3}") :]

run_paths = fs.ls(f"s3://{GRAPH_TOOLS_PATH_S3}{domain_name}/", detail=False)

for run_path in run_paths:
run_id = run_path[len(f"{GRAPH_TOOLS_PATH_S3}{domain_name}/") :]

if not run_id.startswith("run-"):
continue

source_path = f"{domain_name}/{run_id}"
items.append({"source_path": source_path})
except FileNotFoundError:
logger.exception("Error listing visualisations from S3.")

return items
27 changes: 27 additions & 0 deletions templates/visualisations.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Visualisations</title>
<link rel="stylesheet" href="{{ url_for('static', filename='css/graph.css') }}" />
</head>
<body>
<header>
<h1>Visualisations</h1>
</header>
<main>
{% if visualisations %}
<ul class="visualisation-list">
{% for v in visualisations %}
<li>
<a href="{{ url_for('graph_page', source_path=v.source_path) }}">{{ v.source_path }}</a>
</li>
{% endfor %}
</ul>
{% else %}
<p>There are no visualisations to show</p>
{% endif %}
</main>
</body>
</html>
Loading