Refactored etl app API

Author: Ken Lippold

api/urls.py

@@ -19,9 +19,10 @@
     datastream_router,
 )
 from etl.views import (
+    job_router,
     orchestration_system_router,
-    data_source_router,
-    data_archive_router,
+    task_router,
+    task_run_router
 )
 
 
@@ -48,9 +49,22 @@
 api.add_router("processing-levels", processing_level_router)
 api.add_router("result-qualifiers", result_qualifier_router)
 
-api.add_router("orchestration-systems", orchestration_system_router)
-api.add_router("data-sources", data_source_router)
-api.add_router("data-archives", data_archive_router)
+etl_api = NinjaAPI(
+    title="HydroServer ETL API",
+    version=__version__,
+    urls_namespace="etl",
+    docs_decorator=ensure_csrf_cookie,
+    renderer=ORJSONRenderer(),
+    throttle=[
+        AnonRateThrottle("20/s"),
+        AuthRateThrottle("20/s"),
+    ],
+)
+
+etl_api.add_router("jobs", job_router)
+etl_api.add_router("tasks", task_router)
+etl_api.add_router("tasks", task_run_router)
+etl_api.add_router("orchestration-systems", orchestration_system_router)
 
 st_api_1_1 = SensorThingsAPI(
     title="HydroServer SensorThings API",
@@ -67,5 +81,6 @@
 
 urlpatterns = [
     path("data/", api.urls),
+    path("etl/", etl_api.urls),
     path("sensorthings/v1.1/", st_api_1_1.urls),
 ]

etl/admin.py

@@ -1,31 +1,35 @@
 from django.contrib import admin
-from etl.models import OrchestrationSystem, DataSource, DataArchive
+from etl.models import OrchestrationSystem, Job, Task, TaskMapping, TaskMappingPath, TaskRun
 
 
 class OrchestrationSystemAdmin(admin.ModelAdmin):
     list_display = ("id", "name", "orchestration_system_type", "workspace__name")
 
-    def delete_queryset(self, request, queryset):
-        OrchestrationSystem.delete_contents(filter_arg=queryset, filter_suffix="in")
-        queryset.delete()
 
+class JobAdmin(admin.ModelAdmin):
+    list_display = ("id", "name", "job_type", "workspace__name")
 
-class DataSourceAdmin(admin.ModelAdmin):
-    list_display = ("id", "name", "orchestration_system__name", "workspace__name")
 
-    def delete_queryset(self, request, queryset):
-        DataSource.delete_contents(filter_arg=queryset, filter_suffix="in")
-        queryset.delete()
+class TaskAdmin(admin.ModelAdmin):
+    list_display = ("id", "name", "job__name", "orchestration_system__name", "job__workspace__name")
 
 
-class DataArchiveAdmin(admin.ModelAdmin):
-    list_display = ("id", "name", "orchestration_system__name", "workspace__name")
+class TaskMappingAdmin(admin.ModelAdmin):
+    list_display = ("id", "task__name", "source_identifier", "task__job__name", "task__job__workspace__name")
 
-    def delete_queryset(self, request, queryset):
-        DataArchive.delete_contents(filter_arg=queryset, filter_suffix="in")
-        queryset.delete()
+
+class TaskMappingPathAdmin(admin.ModelAdmin):
+    list_display = ("id", "task_mapping__task__name", "target_identifier", "task_mapping__task__job__name",
+                    "task_mapping__task__job__workspace__name")
+
+
+class TaskRunAdmin(admin.ModelAdmin):
+    list_display = ("id", "status", "started_at", "finished_at", "result")
 
 
 admin.site.register(OrchestrationSystem, OrchestrationSystemAdmin)
-admin.site.register(DataSource, DataSourceAdmin)
-admin.site.register(DataArchive, DataArchiveAdmin)
+admin.site.register(Job, JobAdmin)
+admin.site.register(Task, TaskAdmin)
+admin.site.register(TaskMapping, TaskMappingAdmin)
+admin.site.register(TaskMappingPath, TaskMappingPathAdmin)
+admin.site.register(TaskRun, TaskRunAdmin)