Merge branch 'staging' into release-2024.04.19
# Conflicts: # model_server/base/accessors.py # model_server/base/models.py # model_server/base/roiset.py # model_server/extensions/ilastik/models.py # model_server/extensions/ilastik/router.py # model_server/extensions/ilastik/tests/test_ilastik.py # tests/test_accessors.py # tests/test_roiset.py
No related branches found
No related tags found
Showing
- model_server/base/accessors.py 116 additions, 19 deletionsmodel_server/base/accessors.py
- model_server/base/api.py 8 additions, 3 deletionsmodel_server/base/api.py
- model_server/base/models.py 38 additions, 2 deletionsmodel_server/base/models.py
- model_server/base/process.py 12 additions, 1 deletionmodel_server/base/process.py
- model_server/base/roiset.py 247 additions, 101 deletionsmodel_server/base/roiset.py
- model_server/base/workflows.py 2 additions, 1 deletionmodel_server/base/workflows.py
- model_server/clients/imagej/adapter.py 27 additions, 3 deletionsmodel_server/clients/imagej/adapter.py
- model_server/extensions/ilastik/models.py 159 additions, 59 deletionsmodel_server/extensions/ilastik/models.py
- model_server/extensions/ilastik/router.py 4 additions, 7 deletionsmodel_server/extensions/ilastik/router.py
- model_server/extensions/ilastik/tests/test_ilastik.py 111 additions, 24 deletionsmodel_server/extensions/ilastik/tests/test_ilastik.py
- model_server/scripts/run_server.py 7 additions, 1 deletionmodel_server/scripts/run_server.py
- tests/test_accessors.py 73 additions, 10 deletionstests/test_accessors.py
- tests/test_api.py 16 additions, 10 deletionstests/test_api.py
- tests/test_process.py 26 additions, 2 deletionstests/test_process.py
- tests/test_roiset.py 385 additions, 52 deletionstests/test_roiset.py
Loading
Please register or sign in to comment