From cedad96c346e7f344a525b85e6256a91b55fc0e1 Mon Sep 17 00:00:00 2001 From: Viacheslav Kukushkin Date: Mon, 12 Aug 2024 07:08:46 +0300 Subject: [PATCH] Mlcube-as-a-link unified view --- cli/medperf/web_ui/datasets/routes.py | 3 +-- .../web_ui/templates/benchmark_detail.html | 15 +++++++++++---- cli/medperf/web_ui/templates/dataset_detail.html | 5 ++++- cli/medperf/web_ui/templates/mlcube_macros.html | 14 ++++++++++++++ 4 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 cli/medperf/web_ui/templates/mlcube_macros.html diff --git a/cli/medperf/web_ui/datasets/routes.py b/cli/medperf/web_ui/datasets/routes.py index c4931ec9e..cde0d0bb0 100644 --- a/cli/medperf/web_ui/datasets/routes.py +++ b/cli/medperf/web_ui/datasets/routes.py @@ -41,7 +41,6 @@ def dataset_detail_ui(request: Request, dataset_id: int): dataset = Dataset.get(dataset_id) prep_cube = Cube.get(cube_uid=dataset.data_preparation_mlcube) - prep_cube_name = prep_cube.name if prep_cube else "Unknown" benchmark_associations = Dataset.get_benchmarks_associations(dataset_uid=dataset_id) benchmark_associations = sort_associations_display(benchmark_associations) @@ -54,7 +53,7 @@ def dataset_detail_ui(request: Request, dataset_id: int): "request": request, "entity": dataset, "entity_name": dataset.name, - "prep_cube_name": prep_cube_name, + "prep_cube": prep_cube, "benchmark_associations": benchmark_associations, "benchmarks": benchmarks }) diff --git a/cli/medperf/web_ui/templates/benchmark_detail.html b/cli/medperf/web_ui/templates/benchmark_detail.html index b612a720e..c4b12c979 100644 --- a/cli/medperf/web_ui/templates/benchmark_detail.html +++ b/cli/medperf/web_ui/templates/benchmark_detail.html @@ -1,6 +1,7 @@ {% extends "detail_base.html" %} {% import 'association_card_macros.html' as macros %} +{% import 'mlcube_macros.html' as mlcube_macros %} {% block title %}Benchmark Details{% endblock %} @@ -35,10 +36,16 @@
Details
-
-

Data Preparation MLCube: {{ data_preparation_mlcube.name }}

-

Reference Model MLCube: {{ reference_model_mlcube.name }}

-

Metrics MLCube: {{ metrics_mlcube.name }}

+
+

+ Data Preparation MLCube: {{ mlcube_macros.mlcube_link(data_preparation_mlcube) }} +

+

+ Reference Model MLCube: {{ mlcube_macros.mlcube_link(reference_model_mlcube) }} +

+

+ Metrics MLCube: {{ mlcube_macros.mlcube_link(metrics_mlcube) }} +

Owner: {{ entity.owner }}

diff --git a/cli/medperf/web_ui/templates/dataset_detail.html b/cli/medperf/web_ui/templates/dataset_detail.html index 5d0ae75a1..512c518bc 100644 --- a/cli/medperf/web_ui/templates/dataset_detail.html +++ b/cli/medperf/web_ui/templates/dataset_detail.html @@ -1,6 +1,7 @@ {% extends "detail_base.html" %} {% import 'association_card_macros.html' as macros %} +{% import 'mlcube_macros.html' as mlcube_macros %} {% block title %}Dataset Details{% endblock %} @@ -24,7 +25,9 @@
Details

Location: {{ entity.location }}

Input Data Hash: {{ entity.input_data_hash }}

Generated UID: {{ entity.generated_uid }}

-

Data Preparation MLCube: {{ prep_cube_name }}

+

+ Data Preparation MLCube: {{ mlcube_macros.mlcube_link(prep_cube) }} +

diff --git a/cli/medperf/web_ui/templates/mlcube_macros.html b/cli/medperf/web_ui/templates/mlcube_macros.html new file mode 100644 index 000000000..0ccd27885 --- /dev/null +++ b/cli/medperf/web_ui/templates/mlcube_macros.html @@ -0,0 +1,14 @@ + +{% macro mlcube_link(mlcube) %} + + {{ mlcube.name }} + + + {% if mlcube.state == 'OPERATION' %} + + {% else %} + + {% endif %} + + +{% endmacro %} \ No newline at end of file