Merge branch 'staging' into dev_roiset_coco

model_server/base/validators.py

@@ -4,7 +4,7 @@ from .session import session
 
 def validate_workflow_inputs(model_ids, inpaths):
     for mid in model_ids:
-        if mid not in session.describe_loaded_models().keys():
+        if mid and mid not in session.describe_loaded_models().keys():
             raise HTTPException(
                 status_code=409,
                 detail=f'Model {mid} has not been loaded'

model_server/extensions/ilastik/workflows.py

@@ -2,7 +2,7 @@
 Implementation of image analysis work behind API endpoints, without knowledge of persistent data in server session.
 """
 from pathlib import Path
-from typing import Dict
+from typing import Dict, Union
 
 from pydantic import BaseModel
 
@@ -12,7 +12,7 @@ from ...base.workflows import Timer
 
 class WorkflowRunRecord(BaseModel):
     pixel_model_id: str
-    object_model_id: str
+    object_model_id: Union[str, None] = None
     input_filepath: str
     pixel_map_filepath: str
     object_map_filepath: str

model_server/scripts/run_server.py

@@ -6,7 +6,7 @@ from urllib3 import Retry
 import uvicorn
 import webbrowser
 
-from conf.defaults import server_conf
+from ..conf.defaults import server_conf
 
 def parse_args():
     parser = argparse.ArgumentParser(