datamint 2.18.2__tar.gz → 2.18.4__tar.gz

{datamint-2.18.2 → datamint-2.18.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamint
-Version: 2.18.2
+Version: 2.18.4
 Summary: A library for interacting with the Datamint API, designed for efficient data management, processing and Deep Learning workflows.
 Requires-Python: >=3.10
 Classifier: Programming Language :: Python :: 3

{datamint-2.18.2 → datamint-2.18.4}/datamint/entities/resource.py

@@ -17,6 +17,7 @@ from .base_entity import BaseEntity, MISSING_FIELD
 from .cache_manager import CacheManager
 from datamint.api.base_api import BaseApi
 from datamint.types import CacheMode
+from medimgkit.nifti_utils import NIFTI_MIMES
 
 if TYPE_CHECKING:
     from datamint.api.endpoints.resources_api import ResourcesApi
@@ -153,7 +154,7 @@ class BaseResource(BaseEntity, ABC):
         Returns:
             True if the resource is a NIfTI file, False otherwise
         """
-        return self.mimetype in ('application/nifti', 'image/nifti')
+        return self.mimetype in NIFTI_MIMES
 
     def is_video(self) -> bool:
         """Check if the resource is a video file.

{datamint-2.18.2 → datamint-2.18.4}/datamint/entities/resources/dicom_resource.py

@@ -11,8 +11,8 @@ class DICOMResource(VolumeResource):
     resource_kind: ClassVar[str] = 'dicom'
     resource_priority: ClassVar[int] = 50
     storage_aliases: ClassVar[tuple[str, ...]] = ('DicomResource', 'DicomResourceHandler')
-    mimetypes: ClassVar[tuple[str, ...]] = ('application/dicom',)
-    filename_suffixes: ClassVar[tuple[str, ...]] = ('.dcm',)
+    mimetypes: ClassVar[tuple[str, ...]] = ('application/dicom', 'application/x-dicom')
+    filename_suffixes: ClassVar[tuple[str, ...]] = ('.dcm','.dicom')
 
     @property
     def uids(self) -> dict[str, str]:

{datamint-2.18.2 → datamint-2.18.4}/datamint/entities/resources/nifti_resource.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import ClassVar
 
 from .volume_resource import VolumeResource
+from medimgkit.nifti_utils import NIFTI_MIMES
 
 
 class NiftiResource(VolumeResource):
@@ -11,10 +12,10 @@ class NiftiResource(VolumeResource):
     resource_kind: ClassVar[str] = 'nifti'
     resource_priority: ClassVar[int] = 50
     storage_aliases: ClassVar[tuple[str, ...]] = ('NiftiResource', 'NiftiResourceHandler')
-    mimetypes: ClassVar[tuple[str, ...]] = ('application/nifti',)
+    mimetypes: ClassVar[tuple[str, ...]] = tuple(NIFTI_MIMES)
     filename_suffixes: ClassVar[tuple[str, ...]] = ('.nii', '.nii.gz')
 
     @property
     def is_compressed(self) -> bool:
         """Whether the underlying NIfTI file is gzip-compressed."""
-        return self.filename.casefold().endswith('.nii.gz')
+        return self.filename.casefold().endswith('.nii.gz')

{datamint-2.18.2 → datamint-2.18.4}/datamint/mlflow/flavors/datamint_flavor.py

@@ -27,12 +27,15 @@ def _process_signature(signature: ModelSignature | None,
     from mlflow.types import ParamSchema, ParamSpec
     from mlflow.models.signature import _infer_signature_from_type_hints
 
-    # Define inference parameters
-    params_schema = ParamSchema(
-        [
-            ParamSpec("mode", "string", "default"),  # Default mode
-        ]
-    )
+    # Define inference parameters schema for BaseDatamintModel.predict()
+    # - mode (str): prediction mode to dispatch to (e.g. 'default', 'image', 'slice', etc.)
+    # - log_predictions (bool): whether to upload predictions as annotations to Datamint
+    # - model_name (str | None): name of the model used for tagging uploaded predictions
+    params_schema = ParamSchema([
+        ParamSpec("mode", "string", "default"),
+        ParamSpec("log_predictions", "boolean", False),
+        ParamSpec("model_name", "string", None),
+    ])
 
     if signature is None:
         signature = _infer_signature_from_type_hints(
@@ -53,16 +56,26 @@ def _process_signature(signature: ModelSignature | None,
 
 
 def _process_input_example(input_example: ModelInputExample | None) -> tuple[ModelInputExample | None, dict[str, Any]]:
-
-    logger.info('Processing input example is disabled for now')
-    raise NotImplementedError('Processing input example is disabled for now')
-
     datamint_params = {
-        "mode": "default",
+        'mode': 'default',
+        'model_name': 'undefined_model_name',
+        'log_predictions': False
     }
     if input_example is None:
-        from datamint.entities.resource import LocalResource
-        input_resource = LocalResource(raw_data=bytes()).model_dump(mode='json')
+        import datetime
+
+        input_resource = dict(
+            id='model_id',
+            storage='DicomResource',
+            filename='file.dcm',
+            location='private/location',
+            mimetype='application/dicom',
+            size=14724562,
+            status='inbox',
+            created_at=datetime.datetime.now().isoformat(),
+            created_by='user@mail.com',
+            modality='CT'
+        )
         return [input_resource], datamint_params
     if not isinstance(input_example, tuple):
         return (input_example, datamint_params)
@@ -248,15 +261,12 @@ def save_model(datamint_model: BaseDatamintModel,
     if hasattr(datamint_model, '_clear_linked_models_cache'):
         datamint_model._clear_linked_models_cache()
 
-    if signature is not None:
-        signature = _process_signature(signature, datamint_model)
+    # signature = _process_signature(signature, datamint_model)
     try:
         input_example = _process_input_example(input_example)
-    except NotImplementedError:
-        input_example = None
     except Exception as e:
-        logger.warning(f"Failed to process input example. Proceeding without input example. Error: {e}")
-        input_example = None
+        logger.error(f"Failed to process input example. {e}")
+        raise
 
     linked_models = datamint_model._get_linked_models_uri() if hasattr(datamint_model, '_get_linked_models_uri') else {}
     resolved_task_type = task_type or getattr(datamint_model, 'task_type', None)

{datamint-2.18.2 → datamint-2.18.4}/datamint/mlflow/flavors/model.py

@@ -211,7 +211,7 @@ class BaseDatamintModel(PythonModel, ABC):
     ) -> PredictionResult:
         """Main prediction entry point.
 
-        Routes to the appropriate handler based on ``params['mode']``.
+        Routes to the appropriate handlesr based on ``params['mode']``.
         **Do not override** — implement :meth:`predict_default` (or other
         ``predict_*`` hooks) instead.
 

{datamint-2.18.2 → datamint-2.18.4}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "datamint"
 description = "A library for interacting with the Datamint API, designed for efficient data management, processing and Deep Learning workflows."
-version = "2.18.2"
+version = "2.18.4"
 dynamic = ["dependencies"]
 requires-python = ">=3.10"
 readme = "README.md"