Use panimg models package (#4543)

See DIAGNijmegen/rse-cloud-infrastructure#212

Author: jmsmkn

app/grandchallenge/cases/models.py

@@ -27,16 +27,12 @@
 from django_deprecate_fields import deprecate_field
 from grand_challenge_dicom_de_identifier.deidentifier import DicomDeidentifier
 from guardian.shortcuts import assign_perm, get_groups_with_perms, remove_perm
+from panimg_models import MAXIMUM_SEGMENTS_LENGTH, ColorSpace, ImageType
 from pydantic import ConfigDict, Field, field_validator
 from pydantic.alias_generators import to_camel
 from pydantic.dataclasses import dataclass
 from storages.utils import clean_name
 
-from grandchallenge.cases.panimg_models import (
-    MAXIMUM_SEGMENTS_LENGTH,
-    ColorSpace,
-    ImageType,
-)
 from grandchallenge.core.error_handlers import (
     DICOMImageSetUploadErrorHandler,
     RawImageUploadSessionErrorHandler,

app/grandchallenge/cases/panimg.py

@@ -3,14 +3,13 @@
 from pathlib import Path
 
 from django.utils._os import safe_join
-from pydantic import TypeAdapter
-
-from grandchallenge.cases.panimg_models import (
+from panimg_models import (
     PanImgFile,
     PanImgResult,
     PostProcessorOptions,
     PostProcessorResult,
 )
+from pydantic import TypeAdapter
 
 
 def convert(*, input_directory, output_directory, builders):

app/grandchallenge/cases/panimg_models.py

@@ -23,6 +23,7 @@
 from grand_challenge_dicom_de_identifier.exceptions import (
     RejectedDICOMFileError,
 )
+from panimg_models import ImageBuilderOptions, PanImgResult
 
 from grandchallenge.cases.models import (
     DICOMImageSetUpload,
@@ -34,10 +35,6 @@
     RawImageUploadSession,
 )
 from grandchallenge.cases.panimg import convert, post_process
-from grandchallenge.cases.panimg_models import (
-    ImageBuilderOptions,
-    PanImgResult,
-)
 from grandchallenge.components.backends.exceptions import RetryStep
 from grandchallenge.components.backends.utils import UUID4_REGEX, safe_extract
 from grandchallenge.components.models import ComponentInterface

app/grandchallenge/cases/tasks.py

@@ -31,10 +31,10 @@
 from django.db import transaction
 from django.utils._os import safe_join
 from django.utils.functional import cached_property
+from panimg_models import ImageBuilderOptions
 from pydantic import BaseModel, ConfigDict
 from pydantic_core import to_json
 
-from grandchallenge.cases.panimg_models import ImageBuilderOptions
 from grandchallenge.cases.tasks import import_images
 from grandchallenge.components.backends.exceptions import (
     ComponentException,

app/grandchallenge/components/backends/base.py

@@ -34,6 +34,7 @@
 from django.utils.translation import gettext_lazy as _
 from django_deprecate_fields import deprecate_field
 from django_extensions.db.fields import AutoSlugField
+from panimg_models import MAXIMUM_SEGMENTS_LENGTH
 from pydantic_core import MISSING
 
 from grandchallenge.cases.models import (
@@ -42,7 +43,6 @@
     ImageFile,
     RawImageUploadSession,
 )
-from grandchallenge.cases.panimg_models import MAXIMUM_SEGMENTS_LENGTH
 from grandchallenge.charts.specs import components_line
 from grandchallenge.components.backends.exceptions import (
     CIVNotEditableException,

app/grandchallenge/components/models.py

@@ -9,8 +9,8 @@
 from django.db.models import PositiveSmallIntegerField
 from django_extensions.db.models import TitleSlugDescriptionModel
 from guardian.shortcuts import assign_perm
+from panimg_models import MAXIMUM_SEGMENTS_LENGTH
 
-from grandchallenge.cases.panimg_models import MAXIMUM_SEGMENTS_LENGTH
 from grandchallenge.core.fields import HexColorField
 from grandchallenge.core.guardian import (
     GroupObjectPermissionBase,

app/grandchallenge/workstation_configs/models.py

@@ -9,6 +9,7 @@
 from grand_challenge_dicom_de_identifier.exceptions import (
     RejectedDICOMFileError,
 )
+from panimg_models import ImageType, PanImgFile, PostProcessorResult
 
 from grandchallenge.cases.models import (
     DICOMImageSetUpload,
@@ -19,11 +20,6 @@
     PostProcessImageTask,
     PostProcessImageTaskStatusChoices,
 )
-from grandchallenge.cases.panimg_models import (
-    ImageType,
-    PanImgFile,
-    PostProcessorResult,
-)
 from grandchallenge.cases.tasks import (
     _check_post_processor_result,
     execute_post_process_image_task,

app/tests/cases_tests/test_tasks.py

@@ -8,10 +8,10 @@
 from billiard.exceptions import SoftTimeLimitExceeded, TimeLimitExceeded
 from django.core.exceptions import MultipleObjectsReturned, ValidationError
 from django.core.files.base import ContentFile
+from panimg_models import MAXIMUM_SEGMENTS_LENGTH
 
 from grandchallenge.algorithms.models import AlgorithmImage, Job
 from grandchallenge.cases.models import Image
-from grandchallenge.cases.panimg_models import MAXIMUM_SEGMENTS_LENGTH
 from grandchallenge.cases.widgets import DICOMUploadWithName
 from grandchallenge.components.models import (
     INTERFACE_KIND_JSON_EXAMPLES,

app/tests/components_tests/test_models.py

@@ -64,6 +64,7 @@ dependencies = [
     # Requirements for forge
     "black",
     "isort",
+    "panimg-models",
 ]
 name = "grand-challenge.org"
 version = "0.1.0"