Skip to content

Commit 5d34500

Browse files
committed
fix: api/runtime and api/modules return an object with a results array
After discussion, the endpoints return: { results: [ <modules> or <runtimes> ], count: N, start: 0 }
1 parent 3f4a609 commit 5d34500

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

orchestrator/views.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ def list_runtimes(request):
3737
-------
3838
::
3939
40-
[
40+
{
41+
count: 1,
42+
start: 0,
43+
"results": [
4144
{
4245
"uuid": "02d1991b-6951-4137-8b54-312998ffeb4c",
4346
"name": "test",
@@ -51,7 +54,8 @@ def list_runtimes(request):
5154
}
5255
]
5356
}
54-
]
57+
]
58+
}
5559
5660
"""
5761
runtimes = {rt["uuid"]: rt for rt in _serialize(Runtime)}
@@ -66,10 +70,8 @@ def list_runtimes(request):
6670
except KeyError:
6771
pass
6872

69-
return JsonResponse(list(runtimes.values()), safe=False)
70-
71-
72-
73+
rt_list = list(runtimes.values())
74+
return JsonResponse({"count": len(rt_list), "start": 0, "results": rt_list })
7375

7476
def list_modules(request):
7577
"""List all modules; returns only some fields.
@@ -82,19 +84,22 @@ def list_modules(request):
8284
-------
8385
::
8486
85-
[
87+
{
88+
count: 1,
89+
start: 0,
90+
"modules": [
8691
{
8792
"uuid": "54c0d836-a23f-4ef7-8c64-4b6f5082b7a7",
8893
"name": "module",
8994
"parent": "43a664a6-5c99-4b08-9d00-eeabc0d1f7f7",
9095
"filename": "wasm/polybench/2mm_s.wasm"
9196
}
92-
]
93-
97+
]
98+
}
9499
95100
"""
96-
return JsonResponse(_serialize(Module), safe=False)
97-
101+
mod_list = _serialize(Module)
102+
return JsonResponse({"count": len(mod_list), "start": 0, "results": mod_list})
98103

99104
def _lookup(model, query):
100105
"""Lookup runtime / module."""
@@ -171,6 +176,7 @@ def search_runtime(request, query):
171176
return HttpResponseNotFound()
172177

173178
children = Module.objects.filter(parent=runtime['uuid'])
179+
174180
runtime['children'] = [model_to_dict(module) for module in list(children)]
175181

176182
return JsonResponse(runtime)

0 commit comments

Comments
 (0)