Skip to content

Commit 33cb365

Browse files
berrydenhartogberrydenhartog
committed
Rename algorithm-system to algorithm
1 parent 83511cb commit 33cb365

31 files changed

+231
-281
lines changed

‎.vscode/launch.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"DEBUG": "True",
2222
"AUTO_CREATE_SCHEMA": "True",
2323
"ENVIRONMENT": "local",
24-
"LOGGING_LEVEL": "DEBUG"
24+
"LOGGING_LEVEL": "DEBUG",
25+
"DISABLE_AUTH": "True"
2526
}
2627
},
2728
{

‎amt/api/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
api_router.include_router(root.router)
77
api_router.include_router(health.router, prefix="/health", tags=["health"])
88
api_router.include_router(pages.router, prefix="/pages", tags=["pages"])
9-
api_router.include_router(algorithms.router, prefix="/algorithm-systems", tags=["algorithm-systems"])
10-
api_router.include_router(algorithm.router, prefix="/algorithm-system", tags=["algorithm-system"])
9+
api_router.include_router(algorithms.router, prefix="/algorithms", tags=["algorithms"])
10+
api_router.include_router(algorithm.router, prefix="/algorithm", tags=["algorithm"])
1111
api_router.include_router(auth.router, prefix="/auth", tags=["auth"])

‎amt/api/navigation.py

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DisplayText(Enum):
2222
ALGORITHM_DETAILS = "algorithm_details"
2323
INFO = "info"
2424
HOME = "home"
25-
ALGORITHMS = "algorithm systems"
25+
ALGORITHMS = "algorithms"
2626
OVERVIEW = "overview"
2727
TASKS = "tasks"
2828
NEW = "new"
@@ -43,7 +43,7 @@ def get_translation(key: DisplayText, translations: NullTranslations) -> str:
4343
# translations are determined at runtime, which is why we use the dictionary below
4444
keys = {
4545
DisplayText.HOME: _("Home"),
46-
DisplayText.ALGORITHMS: _("Algorithm systems"),
46+
DisplayText.ALGORITHMS: _("algorithms"),
4747
DisplayText.OVERVIEW: _("Overview"),
4848
DisplayText.TASKS: _("Tasks"),
4949
DisplayText.NEW: _("New"),
@@ -92,45 +92,41 @@ def get_display_text(self, translations: NullTranslations | None = None) -> str:
9292
class Navigation:
9393
ALGORITHMS_ROOT = BaseNavigationItem(
9494
display_text=DisplayText.ALGORITHMS,
95-
url=["/algorithm-systems/", "/algorithm-system/"],
95+
url=["/algorithms/", "/algorithm/"],
9696
icon="rvo-icon-publicatie",
9797
)
98-
ALGORITHMS_OVERVIEW = BaseNavigationItem(display_text=DisplayText.OVERVIEW, url="/algorithm-systems/")
99-
ALGORITHM_TASKS = BaseNavigationItem(
100-
display_text=DisplayText.TASKS, url="/algorithm-system/{algorithm_id}/details/tasks"
101-
)
98+
ALGORITHMS_OVERVIEW = BaseNavigationItem(display_text=DisplayText.OVERVIEW, url="/algorithms/")
99+
ALGORITHM_TASKS = BaseNavigationItem(display_text=DisplayText.TASKS, url="/algorithm/{algorithm_id}/details/tasks")
102100
ALGORITHM_DETAILS = BaseNavigationItem(
103-
display_text=DisplayText.DETAILS, url="/algorithm-system/{algorithm_id}/details/system_card"
101+
display_text=DisplayText.DETAILS, url="/algorithm/{algorithm_id}/details/system_card"
104102
)
105103
ALGORITHM_MODEL = BaseNavigationItem(
106-
display_text=DisplayText.MODEL, url="/algorithm-system/{algorithm_id}/details/model/inference"
107-
)
108-
ALGORITHM_NEW = BaseNavigationItem(display_text=DisplayText.NEW, url="/algorithm-systems/new")
109-
ALGORITHM_SYSTEM_INFO = BaseNavigationItem(
110-
display_text=DisplayText.INFO, url="/algorithm-system/{algorithm_id}/details"
104+
display_text=DisplayText.MODEL, url="/algorithm/{algorithm_id}/details/model/inference"
111105
)
112-
ALGORITHM_SYSTEM_ALGORITHM_DETAILS = BaseNavigationItem(
113-
display_text=DisplayText.ALGORITHM_DETAILS, url="/algorithm-system/{algorithm_id}/details/system_card"
106+
ALGORITHM_NEW = BaseNavigationItem(display_text=DisplayText.NEW, url="/algorithms/new")
107+
ALGORITHM_INFO = BaseNavigationItem(display_text=DisplayText.INFO, url="/algorithm/{algorithm_id}/details")
108+
ALGORITHM_ALGORITHM_DETAILS = BaseNavigationItem(
109+
display_text=DisplayText.ALGORITHM_DETAILS, url="/algorithm/{algorithm_id}/details/system_card"
114110
)
115111
ALGORITHM_SYSTEM_CARD = BaseNavigationItem(
116-
display_text=DisplayText.SYSTEMCARD, url="/algorithm-system/{algorithm_id}/details/system_card"
112+
display_text=DisplayText.SYSTEMCARD, url="/algorithm/{algorithm_id}/details/system_card"
117113
)
118114
ALGORITHM_DATA_CARD = BaseNavigationItem(
119-
display_text=DisplayText.DATA, url="/algorithm-system/{algorithm_id}/details/system_card/data"
115+
display_text=DisplayText.DATA, url="/algorithm/{algorithm_id}/details/system_card/data"
120116
)
121117
ALGORITHM_MODEL_CARD = BaseNavigationItem(
122118
display_text=DisplayText.MODELCARD,
123-
url="/algorithm-system/{algorithm_id}/details/system_card/models/{model_card}",
119+
url="/algorithm/{algorithm_id}/details/system_card/models/{model_card}",
124120
)
125121
ALGORITHM_ASSESSMENT_CARD = BaseNavigationItem(
126122
display_text=DisplayText.ASSESSMENTCARD,
127-
url="/algorithm-system/{algorithm_id}/details/system_card/assessment/{assessment_card}",
123+
url="/algorithm/{algorithm_id}/details/system_card/assessment/{assessment_card}",
128124
)
129125
ALGORITHM_REQUIREMENTS = BaseNavigationItem(
130-
display_text=DisplayText.REQUIREMENTS, url="/algorithm-system/{algorithm_id}/details/system_card/requirements"
126+
display_text=DisplayText.REQUIREMENTS, url="/algorithm/{algorithm_id}/details/system_card/requirements"
131127
)
132-
ALGORITHM_SYSTEM_INSTRUMENTS = BaseNavigationItem(
133-
display_text=DisplayText.INSTRUMENTS, url="/algorithm-system/{algorithm_id}/details/system_card/instruments"
128+
ALGORITHM_INSTRUMENTS = BaseNavigationItem(
129+
display_text=DisplayText.INSTRUMENTS, url="/algorithm/{algorithm_id}/details/system_card/instruments"
134130
)
135131

136132

‎amt/api/routes/algorithm.py

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ async def get_algorithm_or_error(
7070
def get_algorithm_details_tabs(request: Request) -> list[NavigationItem]:
7171
return resolve_navigation_items(
7272
[
73-
Navigation.ALGORITHM_SYSTEM_INFO,
74-
Navigation.ALGORITHM_SYSTEM_ALGORITHM_DETAILS,
73+
Navigation.ALGORITHM_INFO,
74+
Navigation.ALGORITHM_ALGORITHM_DETAILS,
7575
Navigation.ALGORITHM_MODEL,
7676
Navigation.ALGORITHM_REQUIREMENTS,
7777
Navigation.ALGORITHM_DATA_CARD,
7878
Navigation.ALGORITHM_TASKS,
79-
Navigation.ALGORITHM_SYSTEM_INSTRUMENTS,
79+
Navigation.ALGORITHM_INSTRUMENTS,
8080
],
8181
request,
8282
)
@@ -114,9 +114,7 @@ async def get_tasks(
114114
breadcrumbs = resolve_base_navigation_items(
115115
[
116116
Navigation.ALGORITHMS_ROOT,
117-
BaseNavigationItem(
118-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
119-
),
117+
BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
120118
Navigation.ALGORITHM_TASKS,
121119
],
122120
request,
@@ -193,9 +191,7 @@ async def get_algorithm_details(
193191
breadcrumbs = resolve_base_navigation_items(
194192
[
195193
Navigation.ALGORITHMS_ROOT,
196-
BaseNavigationItem(
197-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
198-
),
194+
BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
199195
Navigation.ALGORITHM_DETAILS,
200196
],
201197
request,
@@ -287,9 +283,7 @@ async def get_system_card(
287283
breadcrumbs = resolve_base_navigation_items(
288284
[
289285
Navigation.ALGORITHMS_ROOT,
290-
BaseNavigationItem(
291-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
292-
),
286+
BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
293287
Navigation.ALGORITHM_SYSTEM_CARD,
294288
],
295289
request,
@@ -319,7 +313,7 @@ async def get_algorithm_inference(
319313
[
320314
Navigation.ALGORITHMS_ROOT,
321315
BaseNavigationItem(
322-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/model/inference"
316+
custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/model/inference"
323317
),
324318
Navigation.ALGORITHM_MODEL,
325319
],
@@ -359,9 +353,7 @@ async def get_system_card_requirements(
359353
breadcrumbs = resolve_base_navigation_items(
360354
[
361355
Navigation.ALGORITHMS_ROOT,
362-
BaseNavigationItem(
363-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
364-
),
356+
BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
365357
Navigation.ALGORITHM_SYSTEM_CARD,
366358
],
367359
request,
@@ -440,7 +432,7 @@ async def delete_algorithm(
440432
algorithms_service: Annotated[AlgorithmsService, Depends(AlgorithmsService)],
441433
) -> HTMLResponse:
442434
await algorithms_service.delete(algorithm_id)
443-
return templates.Redirect(request, "/algorithm-systems/")
435+
return templates.Redirect(request, "/algorithms/")
444436

445437

446438
@router.get("/{algorithm_id}/measure/{measure_urn}")
@@ -505,7 +497,7 @@ async def update_measure_value(
505497

506498
await algorithms_service.update(algorithm)
507499
# TODO: FIX THIS!! The page now reloads at the top, which is annoying
508-
return templates.Redirect(request, f"/algorithm-system/{algorithm_id}/details/system_card/requirements")
500+
return templates.Redirect(request, f"/algorithm/{algorithm_id}/details/system_card/requirements")
509501

510502

511503
# !!!
@@ -528,9 +520,7 @@ async def get_system_card_data_page(
528520
breadcrumbs = resolve_base_navigation_items(
529521
[
530522
Navigation.ALGORITHMS_ROOT,
531-
BaseNavigationItem(
532-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
533-
),
523+
BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
534524
Navigation.ALGORITHM_SYSTEM_CARD,
535525
],
536526
request,
@@ -568,9 +558,7 @@ async def get_system_card_instruments(
568558
breadcrumbs = resolve_base_navigation_items(
569559
[
570560
Navigation.ALGORITHMS_ROOT,
571-
BaseNavigationItem(
572-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
573-
),
561+
BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
574562
Navigation.ALGORITHM_SYSTEM_CARD,
575563
],
576564
request,
@@ -606,9 +594,7 @@ async def get_assessment_card(
606594
breadcrumbs = resolve_base_navigation_items(
607595
[
608596
Navigation.ALGORITHMS_ROOT,
609-
BaseNavigationItem(
610-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
611-
),
597+
BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
612598
Navigation.ALGORITHM_ASSESSMENT_CARD,
613599
],
614600
request,
@@ -657,9 +643,7 @@ async def get_model_card(
657643
breadcrumbs = resolve_base_navigation_items(
658644
[
659645
Navigation.ALGORITHMS_ROOT,
660-
BaseNavigationItem(
661-
custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
662-
),
646+
BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
663647
Navigation.ALGORITHM_MODEL_CARD,
664648
],
665649
request,

‎amt/api/routes/algorithms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ async def get_root(
6969
if display_type == "LIFECYCLE":
7070
algorithms: dict[str, list[Algorithm]] = {}
7171

72-
# When the lifecycle filter is active, only show these algorithm systems
72+
# When the lifecycle filter is active, only show these algorithms
7373
if "lifecycle" in filters:
7474
for lifecycle in Lifecycles:
7575
algorithms[lifecycle.name] = []
@@ -154,5 +154,5 @@ async def post_new(
154154
algorithms_service: Annotated[AlgorithmsService, Depends(AlgorithmsService)],
155155
) -> HTMLResponse:
156156
algorithm = await algorithms_service.create(algorithm_new)
157-
response = templates.Redirect(request, f"/algorithm-system/{algorithm.id}/details/tasks")
157+
response = templates.Redirect(request, f"/algorithm/{algorithm.id}/details/tasks")
158158
return response

‎amt/api/routes/auth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ async def auth_callback(
7272
if user:
7373
request.session["user"] = dict(user) # type: ignore
7474
request.session["id_token"] = token["id_token"] # type: ignore
75-
return RedirectResponse(url="/algorithm-systems/")
75+
return RedirectResponse(url="/algorithms/")
7676

7777

7878
@router.get("/profile", response_class=Response)

0 commit comments

Comments
 (0)