# 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

Enforce distinct ilastik object model workflows

See merge request !33

# Conflicts:
#	model_server/extensions/ilastik/models.py

Disabled generation of ilastik object model that receives segmentation masks from one that receives pixel probabilities; this was causing inaccurate results

Report expected class of model, not actual class of shell

See merge request !32

Changes for compatibility with jython script

See merge request !31

Accessor changes to support object classification

See merge request !30

Separate _put arguments for query and JSON-encoded body data in test client; test case showing pydantic model is required for list args

Added option to automatically rotate patches in a nonuniform list such that height is always greater than or equal to width; this is a big data reduction for collections of elongated patches

PatchStack remembers crop boundaries of individual patches if created from list of non-matching patches

Dev multichannel classifiers

See merge request !29