From 260f9c3a97a6ec647946a2771ab52e5a0e2da8d1 Mon Sep 17 00:00:00 2001
From: Christopher Rhodes <christopher.rhodes@embl.de>
Date: Sun, 10 Nov 2024 07:04:01 +0100
Subject: [PATCH] Cleaned up TODOs, tests pass
---
model_server/base/api.py | 11 +----------
model_server/base/pipelines/roiset_obmap.py | 2 +-
model_server/base/session.py | 1 -
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/model_server/base/api.py b/model_server/base/api.py
index 3ed87ba3..205014b6 100644
--- a/model_server/base/api.py
+++ b/model_server/base/api.py
@@ -131,7 +131,6 @@ def delete_accessor(accessor_id: str):
else:
return _session_accessor(session.del_accessor, accessor_id)
-# TODO: optional lazy loading, so that batch task can be queued before file data is loaded
@app.put('/accessors/read_from_file/{filename}')
def read_accessor_from_file(filename: str, accessor_id: Union[str, None] = None):
fp = session.paths['inbound_images'] / filename
@@ -228,12 +227,4 @@ def get_task(task_id: str) -> TaskInfo:
@app.get('/tasks')
def list_tasks() -> Dict[str, TaskInfo]:
res = session.tasks.list_tasks()
- return res
-
-# TODO: implement
-@app.put('/tasks/run/on_files')
-def task_file_batch():
- # new callable that parameterizes file name to acc_id, then passes this to to /tasks/*/run
- pass
-
-# TODO: tasks to run all enqueued items
\ No newline at end of file
+ return res
\ No newline at end of file
diff --git a/model_server/base/pipelines/roiset_obmap.py b/model_server/base/pipelines/roiset_obmap.py
index 459ed975..74380a02 100644
--- a/model_server/base/pipelines/roiset_obmap.py
+++ b/model_server/base/pipelines/roiset_obmap.py
@@ -58,7 +58,7 @@ class RoiSetObjectMapParams(PipelineParams):
class RoiSetToObjectMapRecord(PipelineRecord):
pass
-# TODO: shorten endpoint name, maybe simplify return typespec
+
@router.put('/roiset_to_obmap/infer')
def roiset_object_map(p: RoiSetObjectMapParams) -> Union[RoiSetToObjectMapRecord, PipelineQueueRecord]:
"""
diff --git a/model_server/base/session.py b/model_server/base/session.py
index cb8a757d..61069b16 100644
--- a/model_server/base/session.py
+++ b/model_server/base/session.py
@@ -147,7 +147,6 @@ class _Session(object):
raise InvalidPathError(f'Could not find {path}')
self.paths[key] = Path(path)
- # TODO: option to automatically write to file e.g. in automated task queue processing
def add_accessor(self, acc: GenericImageDataAccessor, accessor_id: str = None) -> str:
"""
Add an accessor to session context
--
GitLab