supervisely 6.73.371__tar.gz → 6.73.373__tar.gz

{supervisely-6.73.371/supervisely.egg-info → supervisely-6.73.373}/PKG-INFO

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

{supervisely-6.73.371 → supervisely-6.73.373}/supervisely/_utils.py

@@ -575,3 +575,14 @@ def removesuffix(string, suffix):
     if string.endswith(suffix):
         return string[: -len(suffix)]
     return string
+
+
+def remove_non_printable(text: str) -> str:
+    """Remove non-printable characters from a string.
+
+    :param text: Input string
+    :type text: str
+    :return: String with non-printable characters removed
+    :rtype: str
+    """
+    return "".join(char for char in text if char.isprintable()).strip()

{supervisely-6.73.371 → supervisely-6.73.373}/supervisely/api/labeling_job_api.py

@@ -340,6 +340,7 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
         disable_confirm: Optional[bool] = None,
         disable_submit: Optional[bool] = None,
         toolbox_settings: Optional[Dict] = None,
+        enable_quality_check: Optional[bool] = None,
     ) -> List[LabelingJobInfo]:
         """
         Creates Labeling Job and assigns given Users to it.
@@ -382,6 +383,8 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
         :type disable_submit: bool, optional
         :param toolbox_settings: Settings for the labeling tool. Only video projects are supported.
         :type toolbox_settings: Dict, optional
+        :param enable_quality_check: If True, adds an intermediate step between "review" and completing the Labeling Job.
+        :type enable_quality_check: bool, optional
         :return: List of information about new Labeling Job. See :class:`info_sequence<info_sequence>`
         :rtype: :class:`List[LabelingJobInfo]`
         :Usage example:
@@ -499,6 +502,8 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
             meta.update({"disableConfirm": disable_confirm})
         if disable_submit is not None:
             meta.update({"disableSubmit": disable_submit})
+        if enable_quality_check is not None:
+            meta.update({"enableIntermediateReview": enable_quality_check})
 
         data = {
             ApiField.NAME: name,

{supervisely-6.73.371 → supervisely-6.73.373}/supervisely/api/labeling_queue_api.py

@@ -198,6 +198,8 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         hide_figure_author: Optional[bool] = False,
         allow_review_own_annotations: Optional[bool] = False,
         skip_complete_job_on_empty: Optional[bool] = False,
+        enable_quality_check: Optional[bool] = None,
+        quality_check_user_ids: Optional[List[int]] = None,
     ) -> int:
         """
         Creates Labeling Queue and assigns given Users to it.
@@ -210,6 +212,8 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         :type collection_id: int, optional
         :param user_ids: User IDs in Supervisely to assign Users as labelers to Labeling Queue.
         :type user_ids: List[int]
+        :param reviewer_ids: User IDs in Supervisely to assign Users as reviewers to Labeling Queue.
+        :type reviewer_ids: List[int]
         :param readme: Additional information about Labeling Queue.
         :type readme: str, optional
         :param description: Description of Labeling Queue.
@@ -242,6 +246,16 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         :type disable_submit: bool, optional
         :param toolbox_settings: Settings for the labeling tool. Only video projects are supported.
         :type toolbox_settings: Dict, optional
+        :param hide_figure_author: If True, hides the author of the figure in the labeling tool.
+        :type hide_figure_author: bool, optional
+        :param allow_review_own_annotations: If True, allows labelers to review their own annotations.
+        :type allow_review_own_annotations: bool, optional
+        :param skip_complete_job_on_empty: If True, skips completing the Labeling Queue if there are no images to label.
+        :type skip_complete_job_on_empty: bool, optional
+        :param enable_quality_check: If True, adds an intermediate step between "review" and completing the Labeling Queue.
+        :type enable_quality_check: bool, optional
+        :param quality_check_user_ids: List of User IDs in Supervisely to assign Users as Quality Checkers to Labeling Queue.
+        :type quality_check_user_ids: List[int], optional
         :return: Labeling Queue ID in Supervisely.
         :rtype: int
         :Usage example:
@@ -348,6 +362,12 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
             meta.update({"disableConfirm": disable_confirm})
         if disable_submit is not None:
             meta.update({"disableSubmit": disable_submit})
+        if enable_quality_check is not None:
+            if quality_check_user_ids is None:
+                raise RuntimeError(
+                    "quality_check_user_ids must be provided if enable_quality_check is True"
+                )
+            meta.update({"enableIntermediateReview": enable_quality_check})
 
         queue_meta = {}
         if allow_review_own_annotations is True:
@@ -366,6 +386,12 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
             data[ApiField.DATASET_ID] = dataset_id
         if collection_id is not None:
             data[ApiField.COLLECTION_ID] = collection_id
+        if quality_check_user_ids is not None:
+            if enable_quality_check is not True:
+                raise RuntimeError(
+                    "quality_check_user_ids can be set only if enable_quality_check is True"
+                )
+            data[ApiField.QUALITY_CHECK_USER_IDS] = quality_check_user_ids
 
         if len(queue_meta) > 0:
             data[ApiField.QUEUE_META] = queue_meta

{supervisely-6.73.371 → supervisely-6.73.373}/supervisely/api/module_api.py

@@ -661,6 +661,8 @@ class ApiField:
     """"""
     COLLECTION_ID = "collectionId"
     """"""
+    QUALITY_CHECK_USER_IDS = "qualityCheckUserIds"
+    """"""
 
 
 def _get_single_item(items):

{supervisely-6.73.371 → supervisely-6.73.373}/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-6.73.371 → supervisely-6.73.373}/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-6.73.371 → supervisely-6.73.373}/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-6.73.371 → supervisely-6.73.373}/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-6.73.371 → supervisely-6.73.373/supervisely.egg-info}/PKG-INFO

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