From 00c4ad9bf0047d1cc762461395401f7f2467d9da Mon Sep 17 00:00:00 2001
From: Christopher Rhodes <christopher.rhodes@embl.de>
Date: Thu, 15 Aug 2024 15:00:54 +0200
Subject: [PATCH] RoiSet workflows also use hierarchical routing
---
model_server/base/pipelines/__init__.py | 1 -
model_server/base/pipelines/router.py | 2 +-
tests/test_ilastik/test_roiset_workflow.py | 6 +++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/model_server/base/pipelines/__init__.py b/model_server/base/pipelines/__init__.py
index 537a687d..e69de29b 100644
--- a/model_server/base/pipelines/__init__.py
+++ b/model_server/base/pipelines/__init__.py
@@ -1 +0,0 @@
-__all__ = ['roiset_obmap', 'segment', 'segment_zproj']
\ No newline at end of file
diff --git a/model_server/base/pipelines/router.py b/model_server/base/pipelines/router.py
index 3f77fd1d..dc7850da 100644
--- a/model_server/base/pipelines/router.py
+++ b/model_server/base/pipelines/router.py
@@ -6,4 +6,4 @@ router = APIRouter(
)
# this completes routing in individual pipeline modules
-from . import *
\ No newline at end of file
+from . import roiset_obmap, segment, segment_zproj
\ No newline at end of file
diff --git a/tests/test_ilastik/test_roiset_workflow.py b/tests/test_ilastik/test_roiset_workflow.py
index 4d8d4ec3..cd6d2ded 100644
--- a/tests/test_ilastik/test_roiset_workflow.py
+++ b/tests/test_ilastik/test_roiset_workflow.py
@@ -5,10 +5,13 @@ import numpy as np
from model_server.base.accessors import generate_file_accessor
-
+from model_server.base.api import app
import model_server.conf.testing as conf
from model_server.base.pipelines.roiset_obmap import RoiSetObjectMapParams, roiset_object_map_pipeline
import model_server.extensions.ilastik.models as ilm
+from model_server.extensions.ilastik.router import router
+
+app.include_router(router)
data = conf.meta['image_files']
output_path = conf.meta['output_path']
@@ -126,6 +129,7 @@ class TestRoiSetWorkflow(BaseTestRoiSetMonoProducts, unittest.TestCase):
class TestRoiSetWorkflowOverApi(conf.TestServerBaseClass, BaseTestRoiSetMonoProducts):
+ app_name = 'tests.test_ilastik.test_roiset_workflow:app'
input_data = data['multichannel_zstack_raw']
--
GitLab