supervisely 6.73.370__py3-none-any.whl → 6.73.372__py3-none-any.whl

supervisely/api/nn/deploy_api.py

@@ -13,10 +13,11 @@ from supervisely._utils import get_valid_kwargs
 from supervisely.api.api import Api
 from supervisely.io.fs import get_file_name_with_ext
 from supervisely.nn.experiments import ExperimentInfo
+from supervisely.nn.utils import RuntimeType
 from supervisely.sly_logger import logger
 
 
-def get_runtime(runtime: str):
+def get_runtime(runtime: Optional[str] = None):
     from supervisely.nn.utils import RuntimeType
 
     if runtime is None:
@@ -554,7 +555,10 @@ class DeployApi:
             exclude=["self", "module_id", "workspace_id", "agent_id"],
         )
         task_info = self._api.task.start(
-            agent_id=agent_id, module_id=module_id, workspace_id=workspace_id, **kwargs
+            agent_id=agent_id,
+            module_id=module_id,
+            workspace_id=workspace_id,
+            **kwargs,
         )
         ready = self._api.app.wait_until_ready_for_api_calls(
             task_info["id"], _attempts, _attempt_delay_sec
@@ -691,7 +695,7 @@ class DeployApi:
         artifacts_dir: str,
         checkpoint_name: str,
         device: str,
-        runtime: str,
+        runtime: Optional[str] = None,
         with_module: bool = True,
     ):
         from supervisely.nn.experiments import get_experiment_info_by_artifacts_dir
@@ -723,10 +727,25 @@ class DeployApi:
 
         checkpoint = None
         if checkpoint_name is not None:
-            for checkpoint_path in experiment_info.checkpoints:
-                if get_file_name_with_ext(checkpoint_path) == checkpoint_name:
-                    checkpoint = get_file_name_with_ext(checkpoint_path)
-                    break
+            if checkpoint_name.endswith(".pt") or checkpoint_name.endswith(".pth"):
+                for checkpoint_path in experiment_info.checkpoints:
+                    if get_file_name_with_ext(checkpoint_path) == checkpoint_name:
+                        checkpoint = get_file_name_with_ext(checkpoint_path)
+                        break
+            elif checkpoint_name.endswith(".onnx"):
+                checkpoint_path = experiment_info.export.get("ONNXRuntime")
+                if checkpoint_path is None:
+                    raise ValueError(f"ONNXRuntime export not found in: '{artifacts_dir}'.")
+            elif checkpoint_name.endswith(".engine"):
+                checkpoint_path = experiment_info.export.get("TensorRT")
+                if checkpoint_path is None:
+                    raise ValueError(f"TensorRT export not found in: '{artifacts_dir}'.")
+            else:
+                raise ValueError(
+                    f"Unknown checkpoint format: '{checkpoint_name}'. Expected formats: '.pt', '.pth', '.onnx' or '.engine'"
+                )
+
+            checkpoint = get_file_name_with_ext(checkpoint_path)
             if checkpoint is None:
                 raise ValueError(f"Provided checkpoint '{checkpoint_name}' not found")
         else:
@@ -736,12 +755,15 @@ class DeployApi:
         model_info_dict = asdict(experiment_info)
         model_info_dict["artifacts_dir"] = artifacts_dir
         checkpoint_name = checkpoint
+        checkpoints_dir = self._get_checkpoints_dir(checkpoint_name)
+        checkpoint_path = f"/{artifacts_dir.strip('/')}/{checkpoints_dir}/{checkpoint_name}"
+        if runtime is None:
+            runtime = self._set_auto_runtime_by_checkpoint(checkpoint_path)
+
         deploy_params = {
             "device": device,
             "model_source": ModelSource.CUSTOM,
-            "model_files": {
-                "checkpoint": f"/{artifacts_dir.strip('/')}/checkpoints/{checkpoint_name}"
-            },
+            "model_files": {"checkpoint": checkpoint_path},
             "model_info": model_info_dict,
             "runtime": runtime,
         }
@@ -752,6 +774,16 @@ class DeployApi:
             logger.debug(f"Config file added: {experiment_info.artifacts_dir}{config}")
         return module_id, serve_app_name, deploy_params
 
+    def _set_auto_runtime_by_checkpoint(self, checkpoint_path: str) -> str:
+        if checkpoint_path.endswith(".pt") or checkpoint_path.endswith(".pth"):
+            return RuntimeType.PYTORCH
+        elif checkpoint_path.endswith(".onnx"):
+            return RuntimeType.ONNXRUNTIME
+        elif checkpoint_path.endswith(".engine"):
+            return RuntimeType.TENSORRT
+        else:
+            raise ValueError(f"Unknown checkpoint format: '{checkpoint_path}'")
+
     def wait(self, model_id, target: Literal["started", "deployed"] = "started", timeout=5 * 60):
         t = time.monotonic()
         method = "is_alive" if target == "started" else "is_ready"
@@ -764,13 +796,24 @@ class DeployApi:
             raise ValueError(f"Path must start with '/'")
 
         if model.startswith("/experiments"):
-            try:
-                artifacts_dir, checkpoint_name = model.split("/checkpoints/")
-                return artifacts_dir, checkpoint_name
-            except:
-                raise ValueError(
-                    "Bad format of checkpoint path. Expected format: '/artifacts_dir/checkpoints/checkpoint_name'"
-                )
+            if model.endswith(".pt") or model.endswith(".pth"):
+                try:
+                    artifacts_dir, checkpoint_name = model.split("/checkpoints/")
+                    return artifacts_dir, checkpoint_name
+                except:
+                    raise ValueError(
+                        "Bad format of checkpoint path. Expected format: '/artifacts_dir/checkpoints/checkpoint_name'"
+                    )
+            elif model.endswith(".onnx") or model.endswith(".engine"):
+                try:
+                    artifacts_dir, checkpoint_name = model.split("/export/")
+                    return artifacts_dir, checkpoint_name
+                except:
+                    raise ValueError(
+                        "Bad format of checkpoint path. Expected format: '/artifacts_dir/export/checkpoint_name'"
+                    )
+            else:
+                raise ValueError(f"Unknown model format: '{get_file_name_with_ext(model)}'")
 
         framework_cls = self._get_framework_by_path(model)
         if framework_cls is None:
@@ -786,6 +829,14 @@ class DeployApi:
             artifacts_dir = checkpoints_dir
         return artifacts_dir, checkpoint_name
 
+    def _get_checkpoints_dir(self, checkpoint_name: str) -> str:
+        if checkpoint_name.endswith(".pt") or checkpoint_name.endswith(".pth"):
+            return "checkpoints"
+        elif checkpoint_name.endswith(".onnx") or checkpoint_name.endswith(".engine"):
+            return "export"
+        else:
+            raise ValueError(f"Unknown checkpoint format: '{checkpoint_name}'")
+
     def _get_framework_by_path(self, path: str):
         from supervisely.nn.artifacts import (
             RITM,

supervisely/api/nn/neural_network_api.py

@@ -3,12 +3,17 @@
 
 from __future__ import annotations
 
-from typing import Dict, List
+from typing import TYPE_CHECKING, Dict, List
 
 import supervisely.io.env as sly_env
 import supervisely.io.env as env
 from supervisely.sly_logger import logger
 
+if TYPE_CHECKING:
+    from supervisely.api.api import Api
+    from supervisely.nn.experiments import ExperimentInfo
+    from supervisely.nn.model.model_api import ModelAPI
+
 
 class NeuralNetworkApi:
     """
@@ -30,7 +35,7 @@ class NeuralNetworkApi:
         workspace_id: int = None,
         agent_id: int = None,
         **kwargs,
-    ) -> "ModelAPI":
+    ) -> ModelAPI:
         """
         Deploy a pretrained model or a custom model checkpoint in Supervisely platform.
         This method will start a new Serving App in Supervisely, deploy a given model, and return a `ModelAPI` object for running predictions and managing the model.
@@ -214,7 +219,7 @@ class NeuralNetworkApi:
             )
         return result
 
-    def get_experiment_info(self, task_id: int) -> "ExperimentInfo":
+    def get_experiment_info(self, task_id: int) -> ExperimentInfo:
         """
         Returns the experiment info of a finished training task by its task_id.
 
@@ -237,7 +242,7 @@ class NeuralNetworkApi:
     def connect(
         self,
         task_id: int,
-    ) -> "ModelAPI":
+    ) -> ModelAPI:
         """
         Connect to a running Serving App by its `task_id`. This allows you to make predictions and control the model state via API.
 

supervisely/api/pointcloud/pointcloud_api.py

@@ -36,6 +36,7 @@ from supervisely.io.fs import (
 )
 from supervisely.pointcloud.pointcloud import is_valid_format
 from supervisely.sly_logger import logger
+from supervisely.imaging import image as sly_image
 
 
 class PointcloudInfo(NamedTuple):
@@ -420,7 +421,7 @@ class PointcloudApi(RemoveableBulkModuleApi):
             convert_json_info_cb=lambda x: x,
         )
 
-    def download_related_image(self, id: int, path: str) -> Response:
+    def download_related_image(self, id: int, path: str = None) -> Response:
         """
         Download a related context image from Supervisely to local directory by image id.
 
@@ -454,11 +455,16 @@ class PointcloudApi(RemoveableBulkModuleApi):
             {ApiField.ID: id},
             stream=True,
         )
-        ensure_base_path(path)
-        with open(path, "wb") as fd:
-            for chunk in response.iter_content(chunk_size=1024 * 1024):
-                fd.write(chunk)
-        return response
+
+        if path:
+            ensure_base_path(path)
+            with open(path, "wb") as fd:
+                for chunk in response.iter_content(chunk_size=1024 * 1024):
+                    fd.write(chunk)
+            return response
+        else:
+            related_image = sly_image.read_bytes(response.content, False)
+            return related_image
 
     # @TODO: copypaste from video_api
     def upload_hash(

supervisely/nn/experiments.py

@@ -207,7 +207,8 @@ def _fetch_experiment_data(api, team_id: int, experiment_path: str) -> Union[Exp
                 f"Missing required fields: {missing_required_fields} for '{experiment_path}'. Skipping."
             )
             return None
-        return ExperimentInfo(**{k: v for k, v in response_json.items() if k in required_fields})
+        all_fields = required_fields | optional_fields
+        return ExperimentInfo(**{k: v for k, v in response_json.items() if k in all_fields})
     except requests.exceptions.RequestException as e:
         logger.debug(f"Request failed for '{experiment_path}': {e}")
     except JSONDecodeError as e:

supervisely/nn/inference/cache.py

@@ -233,14 +233,17 @@ class InferenceImageCache:
         with self._lock:
             self._cache.clear(False)
 
-    def download_image(self, api: sly.Api, image_id: int):
+    def download_image(self, api: sly.Api, image_id: int, related: bool = False):
         name = self._image_name(image_id)
         self._wait_if_in_queue(name, api.logger)
 
         if name not in self._cache:
             self._load_queue.set(name, image_id)
             api.logger.debug(f"Add image #{image_id} to cache")
-            img = api.image.download_np(image_id)
+            if not related:
+                img = api.image.download_np(image_id)
+            else:
+                img = api.pointcloud.download_related_image(image_id)
             self._add_to_cache(name, img)
             return img
 

supervisely/nn/inference/inference.py

@@ -611,9 +611,20 @@ class Inference:
             deploy_params = {}
         selected_model = None
         for model in self.pretrained_models:
-            if model["meta"]["model_name"].lower() == model_name.lower():
-                selected_model = model
-                break
+            model_meta = model.get("meta")
+            if model_meta is not None:
+                model_name = model_meta.get("model_name")
+                if model_name is not None:
+                    if model_name.lower() == model_name.lower():
+                        selected_model = model
+                        break
+                else:
+                    model_name = model.get("model_name")
+                    if model_name is not None:
+                        if model_name.lower() == model_name.lower():
+                            selected_model = model
+                            break
+
         if selected_model is None:
             raise ValueError(f"Model {model_name} not found in models.json of serving app")
         deploy_params["model_files"] = selected_model["meta"]["model_files"]
@@ -657,11 +668,11 @@ class Inference:
                     export = {}
                 export_model = export.get(deploy_params["runtime"], None)
                 if export_model is not None:
-                    if sly_fs.get_file_name(export_model) == sly_fs.get_file_name(
-                        deploy_params["model_files"]["checkpoint"]
-                    ):
+                    checkpoint = deploy_params["model_files"]["checkpoint"]
+                    artifacts_dir = deploy_params["model_info"]["artifacts_dir"].rstrip("/")
+                    if sly_fs.get_file_name(export_model) == sly_fs.get_file_name(checkpoint):
                         deploy_params["model_files"]["checkpoint"] = (
-                            deploy_params["model_info"]["artifacts_dir"] + export_model
+                            artifacts_dir + "/" + export_model
                         )
                         logger.info(f"Found model checkpoint for '{deploy_params['runtime']}'")
             return self._download_custom_model(deploy_params["model_files"], log_progress)
@@ -2610,7 +2621,7 @@ class Inference:
                 inference_request.set_stage(InferenceRequest.Stage.PREPARING, 0, file.size)
 
                 img_bytes = b""
-                while buf := file.read(64 * 1024 * 1024):
+                while buf := file.file.read(64 * 1024 * 1024):
                     img_bytes += buf
                     inference_request.done(len(buf))
 

supervisely/nn/inference/interactive_segmentation/functional.py

@@ -52,6 +52,10 @@ def download_image_from_context(
         return api.video.frame.download_np(
             context["video"]["video_id"], context["video"]["frame_index"]
         )
+    elif "pcd_related_image_id" in context:
+        if cache_load_img is not None:
+            return cache_load_img(api, context["pcd_related_image_id"], related=True)
+        return api.pointcloud.download_related_image(context["pcd_related_image_id"])
     else:
         raise Exception("Project type is not supported")
 
@@ -110,6 +114,8 @@ def get_hash_from_context(context: dict):
         return "_".join(map(str, [volume_id, slice_index, plane, window_center, window_width]))
     elif "video" in context:
         return "_".join(map(str, [context["video"]["video_id"], context["video"]["frame_index"]]))
+    elif "pcd_related_image_id" in context:
+        return str(context["pcd_related_image_id"])
     else:
         raise Exception("Project type is not supported")
 

{supervisely-6.73.370.dist-info → supervisely-6.73.372.dist-info}/METADATA

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

{supervisely-6.73.370.dist-info → supervisely-6.73.372.dist-info}/RECORD

@@ -55,11 +55,11 @@ supervisely/api/entity_annotation/figure_api.py,sha256=rmsE3L_JfqN94sLN637pQ0syi
 supervisely/api/entity_annotation/object_api.py,sha256=gbcNvN_KY6G80Me8fHKQgryc2Co7VU_kfFd1GYILZ4E,8875
 supervisely/api/entity_annotation/tag_api.py,sha256=h19YsJzJLDp0VIicQzoYCRyVhY149KY7pUysb4XX0RI,11114
 supervisely/api/nn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/api/nn/deploy_api.py,sha256=V7zWO8yoroFDifIqLIFYmZA72tLQriH5kYAhN0-50co,34326
-supervisely/api/nn/neural_network_api.py,sha256=vZyYBaKQzLJX9G3SAt09LmsxNLC8h88oYJ9b_PACzp0,10466
+supervisely/api/nn/deploy_api.py,sha256=fA5yk3-Q66BL821iu68HpsGWWO2qHXCcWTmrXoHE4gE,37008
+supervisely/api/nn/neural_network_api.py,sha256=dVETXQzMpmrLe3S5-jUx5Hw-rAjX8wdS_2f3XbQa3ic,10648
 supervisely/api/pointcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/api/pointcloud/pointcloud_annotation_api.py,sha256=xIXqCu0rKYsGt5ezh2EFT2utwsVrr2Xo-MOWUCnbvXc,11259
-supervisely/api/pointcloud/pointcloud_api.py,sha256=PKfgh-ssK9W1wLXSEuFgC36DSMoZAzo1cY_bu-inV-8,53280
+supervisely/api/pointcloud/pointcloud_api.py,sha256=Gii6INYqo5f3EUCkI14VMi2XuaxbRHEaqSb_HHmJJTA,53497
 supervisely/api/pointcloud/pointcloud_episode_annotation_api.py,sha256=zmDWDkRzUSfHKX65qDVrc44kNyYjfvItSwYmsERJ_8g,7012
 supervisely/api/pointcloud/pointcloud_episode_api.py,sha256=xg1zRKONV9ly0-B72V1dR6OMPFIw35bujazuEdrPGTQ,7922
 supervisely/api/pointcloud/pointcloud_episode_object_api.py,sha256=k2_wV0EVPo9vxSTVe1qOvqVOMSVE6zGDSkfR6TRNsKs,691
@@ -742,7 +742,7 @@ supervisely/metric/pixel_accuracy.py,sha256=qjtxInOTkGDwPeLUnjBdzOrVRT3V6kGGOWjB
 supervisely/metric/precision_recall_metric.py,sha256=4AQCkcB84mpYQS94yJ-wkG1LBuXlQf3X_tI9f67vtR8,3426
 supervisely/metric/projects_applier.py,sha256=ORtgLQHYtNi4KYsSGaGPPWiZPexTJF9IWqX_RuLRxPk,3415
 supervisely/nn/__init__.py,sha256=ZGCDjx_cGIW8CxIWNCzVDRVfAzt7QzlkcvKvLBE8wMc,669
-supervisely/nn/experiments.py,sha256=6jCVGQTd6CIf1M3Ef_Vo4NvxSBJQiQVoXoWcp0w0hiI,9685
+supervisely/nn/experiments.py,sha256=hJNQtvAuxZgo8BDlp41_WpJcGVUCeYqQCkyOQi5oN1Q,9735
 supervisely/nn/prediction_dto.py,sha256=oi146DJpUUBDbR-b-vYkL5WAhCZQYOGomqBDEQGbPdY,2700
 supervisely/nn/task_type.py,sha256=UJvSJ4L3I08j_e6sU6Ptu7kS5p1H09rfhfoDUSZ2iys,522
 supervisely/nn/utils.py,sha256=WoEidpLo5__R6eXsvEFH7VRxb4MtXCr9H-kchg25FDY,2965
@@ -887,8 +887,8 @@ supervisely/nn/benchmark/visualization/widgets/sidebar/sidebar.py,sha256=tKPURRS
 supervisely/nn/benchmark/visualization/widgets/table/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=rc_CRlCuTCzLDtcl1paTJib7ALTer0ge9o32WtoUMkY,34795
-supervisely/nn/inference/inference.py,sha256=gq0yvMiFZ2FfJvvEmw7PRHa0GikCwRX9S2CE_0fuGX4,177798
+supervisely/nn/inference/cache.py,sha256=yqVPIWzhIDRHwrCIpdm-gPxUM2rH8BD98omF659RElw,34938
+supervisely/nn/inference/inference.py,sha256=xRlxOm8ep_Zha97NpRszrxVdg5xDregpShKkZNNTq0g,178340
 supervisely/nn/inference/inference_request.py,sha256=y6yw0vbaRRcEBS27nq3y0sL6Gmq2qLA_Bm0GrnJGegE,14267
 supervisely/nn/inference/session.py,sha256=dIg2F-OBl68pUzcmtmcI0YQIp1WWNnrJTVMjwFN91Q4,35824
 supervisely/nn/inference/uploader.py,sha256=21a9coOimCHhEqAbV-llZWcp12847DEMoQp3N16bpK0,5425
@@ -906,7 +906,7 @@ supervisely/nn/inference/instance_segmentation/dashboard/main_ui.py,sha256=_M46q
 supervisely/nn/inference/instance_segmentation/dashboard/preview.py,sha256=uwUDlJzDLgKlGOn5CovCh03WAijlx04iyPs00qbsUpU,847
 supervisely/nn/inference/instance_segmentation/dashboard/preview_image.py,sha256=wXfPg7bAT2xXPlnl2zywkx4MJ66myl5KBGzrvoyS8zQ,279
 supervisely/nn/inference/interactive_segmentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/nn/inference/interactive_segmentation/functional.py,sha256=m2eL7e-yCVPsg9D26YtmWCnJd7t3Y-974b0PnTvTSBQ,4554
+supervisely/nn/inference/interactive_segmentation/functional.py,sha256=3GaeeOemji_ym0-C2mwj6SVEhnPkq7v3KCc4npw3iZ8,4905
 supervisely/nn/inference/interactive_segmentation/interactive_segmentation.py,sha256=vX1H9eaR8oRfMecQxJfpu6hGxbtf8bEESGJp_fPmfWc,20402
 supervisely/nn/inference/object_detection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/inference/object_detection/object_detection.py,sha256=Ki4updsAid1KOI2ahcdVVZ9lzdyRcYKyuQyzSz_9sXQ,1746
@@ -1097,9 +1097,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.370.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.370.dist-info/METADATA,sha256=fcZ2RfmecBVHdsVjrjwfDZ4Uv2z21M0Y-jJYbnaiFRE,35154
-supervisely-6.73.370.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.370.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.370.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.370.dist-info/RECORD,,
+supervisely-6.73.372.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.372.dist-info/METADATA,sha256=XPL2_lh1M9AS2npHgR0X2gs4DTWhMwvycMQuLo3wZws,35154
+supervisely-6.73.372.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.372.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.372.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.372.dist-info/RECORD,,