supervisely 6.73.333__py3-none-any.whl → 6.73.335__py3-none-any.whl

supervisely/convert/image/medical2d/medical2d_helper.py

@@ -135,6 +135,28 @@ def create_pixel_data_set(dcm: FileDataset, frame_axis: int) -> Tuple[List[np.nd
     list_of_images = np.split(pixel_array, int(dcm.NumberOfFrames), axis=frame_axis)
     return list_of_images, frame_axis
 
+def convert_to_monochrome2(dcm_path: str, dcm: FileDataset) -> FileDataset:
+    if getattr(dcm, "PhotometricInterpretation", None) == "YBR_FULL_422":
+        # * Convert dicom to monochrome
+        if len(dcm.pixel_array.shape) == 4 and dcm.pixel_array.shape[-1] == 3:
+            monochrome = dcm.pixel_array[..., 0].astype(np.uint8)
+        else:
+            logger.warn("Unexpected shape for YBR_FULL_422 data: " + str(dcm.pixel_array.shape))
+
+        try:
+            dcm.SamplesPerPixel = 1
+            dcm.PhotometricInterpretation = "MONOCHROME2"
+            dcm.PlanarConfiguration = 0
+            if len(monochrome.shape) == 3:
+                dcm.NumberOfFrames = str(monochrome.shape[0])
+                dcm.Rows, dcm.Columns = monochrome.shape[1:3]
+            dcm.PixelData = monochrome.tobytes()
+        except AttributeError as ae:
+            logger.error(f"Error occurred while converting dicom to monochrome: {ae}")
+
+        logger.info("Rewriting DICOM file with monochrome2 format")
+        dcm.save_as(dcm_path)
+    return dcm
 
 def convert_dcm_to_nrrd(
     image_path: str, converted_dir: str, group_tag_name: Optional[list] = None
@@ -147,6 +169,13 @@ def convert_dcm_to_nrrd(
     mkdir(curr_convert_dir)
 
     dcm = pydicom.read_file(image_path)
+    try:
+        if dcm.file_meta.TransferSyntaxUID.is_compressed:
+            dcm.decompress()
+    except AttributeError:
+        logger.warn("Couldn't find key 'TransferSyntaxUID' in dicom's metadata.")
+    dcm = convert_to_monochrome2(image_path, dcm)
+
     dcm_meta = get_dcm_meta(dcm)
 
     if group_tag_name is None:

supervisely/nn/inference/inference.py

@@ -710,12 +710,19 @@ class Inference:
         self._deploy_params = deploy_params
         try:
             if self.autorestart is None:
-                logger.debug("Autorestart info is not set. Creating new one.")
                 self.autorestart = AutoRestartInfo(self._deploy_params)
                 self.api.task.set_fields(self._task_id, self.autorestart.generate_fields())
+                logger.debug(
+                    "Created new autorestart info.",
+                    extra=self.autorestart.deploy_params,
+                )
             elif self.autorestart.is_changed(self._deploy_params):
-                logger.debug("Autorestart info is changed. Updating.")
                 self.autorestart.deploy_params.update(self._deploy_params)
+                self.api.task.set_fields(self._task_id, self.autorestart.generate_fields())
+                logger.debug(
+                    "Autorestart info is changed. Parameters have been updated.",
+                    extra=self.autorestart.deploy_params,
+                )
         except Exception as e:
             logger.warning(f"Failed to update autorestart info: {repr(e)}")
         if self.gui is not None:
@@ -2529,13 +2536,12 @@ class Inference:
 
         try:
             if self._task_id is not None:
-                logger.debug("Checking autorestart info...")
                 response = self.api.task.get_fields(
                     self._task_id, [AutoRestartInfo.Fields.AUTO_RESTART_INFO]
                 )
                 self.autorestart = AutoRestartInfo.from_response(response)
                 if self.autorestart is not None:
-                    logger.debug("Autorestart info:", extra=self.autorestart.deploy_params)
+                    logger.debug("Autorestart info is set.", extra=self.autorestart.deploy_params)
                     self._deploy_on_autorestart()
                 else:
                     logger.debug("Autorestart info is not set.")

{supervisely-6.73.333.dist-info → supervisely-6.73.335.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.333
+Version: 6.73.335
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.333.dist-info → supervisely-6.73.335.dist-info}/RECORD

@@ -594,7 +594,7 @@ supervisely/convert/image/masks/image_with_masks_helper.py,sha256=TSHiAIH3qlYdjR
 supervisely/convert/image/masks/images_with_masks_converter.py,sha256=Won5LihYXZZmimgaJHmK0_rVmOadWYk21OHKri21R08,6866
 supervisely/convert/image/medical2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/medical2d/medical2d_converter.py,sha256=cYEaRfr8YFxEG_Pv-_SVMxrqZudi3kWbGQ3aArL2mds,8156
-supervisely/convert/image/medical2d/medical2d_helper.py,sha256=pfLRCSFbFa5EIhmbB7kdmdWRu01OwIEDPXeNHzAeagg,12329
+supervisely/convert/image/medical2d/medical2d_helper.py,sha256=UzZRJHtbTC7Tw-BIXaGrk3FhwPR-gglvHyVv2wio0Uw,13633
 supervisely/convert/image/multi_view/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/multi_view/multi_view.py,sha256=V-6oFN6oDre7UhejfyDkGKAg4rbM3C9JCQ8pHhuUBb8,4436
 supervisely/convert/image/multispectral/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -883,7 +883,7 @@ supervisely/nn/benchmark/visualization/widgets/table/__init__.py,sha256=47DEQpj8
 supervisely/nn/benchmark/visualization/widgets/table/table.py,sha256=atmDnF1Af6qLQBUjLhK18RMDKAYlxnsuVHMSEa5a-e8,4319
 supervisely/nn/inference/__init__.py,sha256=QFukX2ip-U7263aEPCF_UCFwj6EujbMnsgrXp5Bbt8I,1623
 supervisely/nn/inference/cache.py,sha256=LAirR5mFHCtK59EO1lefQ2qhpp0vBvRTH26EVrs13Y0,32073
-supervisely/nn/inference/inference.py,sha256=pIylesTNxmhnJqd3sd5cs9QjAew2wPuqH63KOlimOqA,169495
+supervisely/nn/inference/inference.py,sha256=dzfvHjisVYgsijnHYazb_y0mXYZQJX0E1fEsDY6S5lw,169730
 supervisely/nn/inference/session.py,sha256=jmkkxbe2kH-lEgUU6Afh62jP68dxfhF5v6OGDfLU62E,35757
 supervisely/nn/inference/video_inference.py,sha256=8Bshjr6rDyLay5Za8IB8Dr6FURMO2R_v7aELasO8pR4,5746
 supervisely/nn/inference/gui/__init__.py,sha256=wCxd-lF5Zhcwsis-wScDA8n1Gk_1O00PKgDviUZ3F1U,221
@@ -1082,9 +1082,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
 supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
 supervisely_lib/__init__.py,sha256=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
-supervisely-6.73.333.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.333.dist-info/METADATA,sha256=dYUKmQZXH6UwwNCIKAYsS0ycDRlPKEpcUlBM7q6djPU,33596
-supervisely-6.73.333.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.333.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.333.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.333.dist-info/RECORD,,
+supervisely-6.73.335.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.335.dist-info/METADATA,sha256=-Xv7Subzo7aabPOrXvxNbLXl9oIF6HIKstyMecAGzV0,33596
+supervisely-6.73.335.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.335.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.335.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.335.dist-info/RECORD,,