supervisely 6.73.325__py3-none-any.whl → 6.73.327__py3-none-any.whl

supervisely/nn/training/gui/train_val_splits_selector.py

@@ -10,7 +10,16 @@ class TrainValSplitsSelector:
     lock_message = "Select input options to unlock"
 
     def __init__(self, api: Api, project_id: int, app_options: dict = {}):
+        # Init widgets
+        self.train_val_splits = None
+        self.validator_text = None
+        self.button = None
+        self.container = None
+        self.card = None
+        # -------------------------------- #
+
         self.display_widgets = []
+        self.app_options = app_options
         self.api = api
         self.project_id = project_id
 
@@ -50,7 +59,7 @@ class TrainValSplitsSelector:
             description=self.description,
             content=self.container,
             lock_message=self.lock_message,
-            collapsable=app_options.get("collapsable", False),
+            collapsable=self.app_options.get("collapsable", False),
         )
         self.card.lock()
 

supervisely/nn/training/gui/training_artifacts.py

@@ -5,7 +5,6 @@ import supervisely.io.env as sly_env
 import supervisely.nn.training.gui.utils as gui_utils
 from supervisely import Api, logger
 from supervisely._utils import is_production
-from supervisely.api.api import ApiField
 from supervisely.app.widgets import (
     Card,
     Container,
@@ -34,13 +33,30 @@ class TrainingArtifacts:
     lock_message = "Artifacts will be available after training is completed"
 
     def __init__(self, api: Api, app_options: Dict[str, Any]):
+        # Init widgets
+        self.artifacts_thumbnail = None
+        self.artifacts_field = None
+        self.model_benchmark_report_thumbnail = None
+        self.model_benchmark_fail_text = None
+        self.model_benchmark_widgets = None
+        self.model_benchmark_report_field = None
+        self.pytorch_instruction = None
+        self.onnx_instruction = None
+        self.trt_instruction = None
+        self.inference_demo_field = None
+        self.validator_text = None
+        self.container = None
+        self.card = None
+        # -------------------------------- #
+
         self.display_widgets = []
+        self.app_options = app_options
+
         self.success_message_text = (
             "Training completed. Training artifacts were uploaded to Team Files. "
             "You can find and open tensorboard logs in the artifacts folder via the "
             "<a href='https://ecosystem.supervisely.com/apps/tensorboard-experiments-viewer' target='_blank'>Tensorboard Experiment Viewer</a> app."
         )
-        self.app_options = app_options
 
         # GUI Components
         self.validator_text = Text("")
@@ -60,7 +76,7 @@ class TrainingArtifacts:
         self.display_widgets.extend([self.artifacts_field])
 
         # Optional Model Benchmark
-        if app_options.get("model_benchmark", False):
+        if self.app_options.get("model_benchmark", False):
             self.model_benchmark_report_thumbnail = ReportThumbnail()
             self.model_benchmark_report_thumbnail.hide()
 
@@ -86,6 +102,8 @@ class TrainingArtifacts:
         # PyTorch, ONNX, TensorRT demo
         self.inference_demo_widgets = []
 
+        # Demo display works only for released apps
+        self.need_upload_demo = False
         model_demo = self.app_options.get("demo", None)
         if model_demo is not None:
             model_demo_path = model_demo.get("path", None)
@@ -111,7 +129,7 @@ class TrainingArtifacts:
                         )
 
                 if model_demo_gh_link is not None:
-                    gh_branch = "blob/main"
+                    gh_branch = f"blob/{model_demo.get('branch', 'master')}"
                     link_to_demo = f"{model_demo_gh_link}/{gh_branch}/{model_demo_path}"
 
                     if model_demo_gh_link is not None and model_demo_path is not None:
@@ -186,6 +204,7 @@ class TrainingArtifacts:
                         )
                         self.inference_demo_field.hide()
                         self.display_widgets.extend([self.inference_demo_field])
+                        self.need_upload_demo = True
         # -------------------------------- #
 
         self.container = Container(self.display_widgets)

supervisely/nn/training/gui/training_logs.py

@@ -21,9 +21,21 @@ class TrainingLogs:
     lock_message = "Start training to unlock"
 
     def __init__(self, app_options: Dict[str, Any]):
+        # Init widgets
+        self.tensorboard_button = None
+        self.tensorboard_offline_button = None
+        self.logs_button = None
+        self.task_logs = None
+        self.progress_bar_main = None
+        self.progress_bar_secondary = None
+        self.validator_text = None
+        self.container = None
+        self.card = None
+        # -------------------------------- #
+
         self.display_widgets = []
-        api = Api.from_env()
         self.app_options = app_options
+        api = Api.from_env()
 
         # GUI Components
         self.validator_text = Text("")
@@ -42,6 +54,7 @@ class TrainingLogs:
             self.tensorboard_link = f"{api.server_address}{sly_url_prefix}/tensorboard/"
         else:
             self.tensorboard_link = "http://localhost:8000/tensorboard"
+
         self.tensorboard_button = Button(
             "Open Tensorboard",
             button_type="info",
@@ -54,7 +67,6 @@ class TrainingLogs:
         self.display_widgets.extend([self.validator_text, self.tensorboard_button])
 
         # Offline session Tensorboard button
-        self.tensorboard_offline_button = None
         if is_production():
             workspace_id = sly_env.workspace_id()
             app_name = "Tensorboard Experiments Viewer"
@@ -79,7 +91,7 @@ class TrainingLogs:
                 )
 
         # Optional Show logs button
-        if app_options.get("show_logs_in_gui", False):
+        if self.app_options.get("show_logs_in_gui", False):
             self.logs_button = Button(
                 text="Show logs",
                 plain=True,

supervisely/nn/training/gui/training_process.py

@@ -1,16 +1,12 @@
 from typing import Any, Dict
 
-from supervisely import Api
 from supervisely.app.widgets import (
     Button,
     Card,
     Container,
-    DoneLabel,
     Empty,
     Field,
-    FolderThumbnail,
     Input,
-    ReportThumbnail,
     SelectCudaDevice,
     Text,
 )
@@ -19,14 +15,25 @@ from supervisely.app.widgets import (
 class TrainingProcess:
     title = "Training Process"
     description = "Manage training process"
-    lock_message = "Select hyperparametrs to unlock"
+    lock_message = "Select hyperparameters to unlock"
 
     def __init__(self, app_options: Dict[str, Any]):
+        # Initialize widgets to None
+        self.select_device = None
+        self.select_device_field = None
+        self.experiment_name_input = None
+        self.experiment_name_field = None
+        self.start_button = None
+        self.stop_button = None
+        self.validator_text = None
+        self.container = None
+        self.card = None
+        # -------------------------------- #
+
         self.display_widgets = []
         self.app_options = app_options
 
         # GUI Components
-        # Optional Select CUDA device
         if self.app_options.get("device_selector", False):
             self.select_device = SelectCudaDevice()
             self.select_device_field = Field(
@@ -35,7 +42,6 @@ class TrainingProcess:
                 content=self.select_device,
             )
             self.display_widgets.extend([self.select_device_field])
-        # -------------------------------- #
 
         self.experiment_name_input = Input("Enter experiment name")
         self.experiment_name_field = Field(
@@ -59,13 +65,8 @@ class TrainingProcess:
         self.validator_text.hide()
 
         self.display_widgets.extend(
-            [
-                self.experiment_name_field,
-                button_container,
-                self.validator_text,
-            ]
+            [self.experiment_name_field, button_container, self.validator_text]
         )
-        # -------------------------------- #
 
         self.container = Container(self.display_widgets)
         self.card = Card(

supervisely/nn/training/train_app.py

@@ -8,7 +8,7 @@ training workflows in a Supervisely application.
 import shutil
 import subprocess
 from datetime import datetime
-from os import getcwd, listdir
+from os import getcwd, listdir, walk
 from os.path import basename, exists, expanduser, isdir, isfile, join
 from typing import Any, Dict, List, Literal, Optional, Union
 from urllib.request import urlopen
@@ -56,7 +56,7 @@ from supervisely.nn.inference.inference import Inference
 from supervisely.nn.task_type import TaskType
 from supervisely.nn.training.gui.gui import TrainGUI
 from supervisely.nn.training.loggers import setup_train_logger, train_logger
-from supervisely.nn.utils import ModelSource
+from supervisely.nn.utils import ModelSource, _get_model_name
 from supervisely.output import set_directory
 from supervisely.project.download import (
     copy_from_cache,
@@ -135,6 +135,7 @@ class TrainApp:
         self._hyperparameters = self._load_hyperparameters(hyperparameters)
         self._app_options = self._load_app_options(app_options)
         self._inference_class = None
+        self._is_inference_class_regirested = False
         # ----------------------------------------- #
 
         # Directories
@@ -174,6 +175,7 @@ class TrainApp:
         self.gui: TrainGUI = TrainGUI(
             self.framework_name, self._models, self._hyperparameters, self._app_options
         )
+
         self.app = Application(layout=self.gui.layout)
         self._server = self.app.get_server()
         self._train_func = None
@@ -345,6 +347,16 @@ class TrainApp:
         """
         return self.gui.model_selector.get_model_info()
 
+    @property
+    def task_type(self) -> TaskType:
+        """
+        Returns the task type of the model.
+
+        :return: Task type.
+        :rtype: TaskType
+        """
+        return self.gui.model_selector.get_selected_task_type()
+
     @property
     def device(self) -> str:
         """
@@ -359,9 +371,9 @@ class TrainApp:
     @property
     def classes(self) -> List[str]:
         """
-        Returns the selected classes for training.
+        Returns the selected classes names for training.
 
-        :return: List of selected classes.
+        :return: List of selected classes names.
         :rtype: List[str]
         """
         selected_classes = set(self.gui.classes_selector.get_selected_classes())
@@ -556,7 +568,10 @@ class TrainApp:
                     model_meta,
                     gt_project_id,
                 )
-                evaluation_report_link = abs_url(f"/model-benchmark?id={str(mb_eval_report_id)}")
+                if mb_eval_report_id is not None:
+                    evaluation_report_link = abs_url(
+                        f"/model-benchmark?id={str(mb_eval_report_id)}"
+                    )
             except Exception as e:
                 logger.error(f"Model benchmark failed: {e}")
 
@@ -596,7 +611,7 @@ class TrainApp:
             self._workflow_output(remote_dir, file_info, mb_eval_lnk_file_info, mb_eval_report_id)
 
     def register_inference_class(
-        self, inference_class: Inference, inference_settings: dict = None
+        self, inference_class: Inference, inference_settings: Union[str, dict] = None
     ) -> None:
         """
         Registers an inference class for the training application to do model benchmarking.
@@ -606,8 +621,19 @@ class TrainApp:
         :param inference_settings: Settings for the inference class.
         :type inference_settings: dict
         """
+        # if not self.is_model_benchmark_enabled:
+        #     raise ValueError(
+        #         "Enable 'model_benchmark' in app_options.yaml to register an inference class."
+        #     )
+
+        self._is_inference_class_regirested = True
         self._inference_class = inference_class
-        self._inference_settings = inference_settings
+        self._inference_settings = None
+        if isinstance(inference_settings, str):
+            with open(inference_settings, "r") as file:
+                self._inference_settings = yaml.safe_load(file)
+        else:
+            self._inference_settings = inference_settings
 
     def get_app_state(self, experiment_info: dict = None) -> dict:
         """
@@ -616,7 +642,6 @@ class TrainApp:
         :return: Application state.
         :rtype: dict
         """
-        input_data = {"project_id": self.project_id}
         train_val_splits = self._get_train_val_splits_for_app_state()
         model = self._get_model_config_for_app_state(experiment_info)
 
@@ -629,7 +654,6 @@ class TrainApp:
         }
 
         app_state = {
-            "input": input_data,
             "train_val_split": train_val_splits,
             "classes": self.classes,
             "model": model,
@@ -778,6 +802,7 @@ class TrainApp:
         if not self.gui.input_selector.get_cache_value() or is_development():
             self._download_no_cache(dataset_infos, total_images)
             self.sly_project = Project(self.project_dir, OpenMode.READ)
+            self.sly_project.remove_classes_except(self.project_dir, self.classes, True)
             return
 
         try:
@@ -792,6 +817,7 @@ class TrainApp:
             self._download_no_cache(dataset_infos, total_images)
         finally:
             self.sly_project = Project(self.project_dir, OpenMode.READ)
+            self.sly_project.remove_classes_except(self.project_dir, self.classes, True)
             logger.info(f"Project downloaded successfully to: '{self.project_dir}'")
 
     def _download_no_cache(self, dataset_infos: List[DatasetInfo], total_images: int) -> None:
@@ -1160,9 +1186,9 @@ class TrainApp:
         experiment_info should contain the following keys:
             - model_name": str
             - task_type": str
-            - model_files": dict
             - checkpoints": list
             - best_checkpoint": str
+            - model_files": Optional[dict]
 
         Other keys are generated by the TrainApp class automatically
 
@@ -1179,7 +1205,6 @@ class TrainApp:
         required_keys = {
             "model_name": str,
             "task_type": str,
-            "model_files": dict,
             "checkpoints": (list, str),
             "best_checkpoint": str,
         }
@@ -1388,7 +1413,14 @@ class TrainApp:
         # Prepare logs
         if sly_fs.dir_exists(self.log_dir):
             logs_dir = join(self.output_dir, "logs")
-            shutil.copytree(self.log_dir, logs_dir)
+            logger_type = self._app_options.get("train_logger", None)
+            for root, _, files in walk(self.log_dir):
+                for file in files:
+                    if logger_type is None or logger_type == "tensorboard":
+                        if ".tfevents." in file:
+                            src_log_path = join(root, file)
+                            dst_log_path = join(logs_dir, file)
+                            sly_fs.copy_file(src_log_path, dst_log_path)
         return experiment_info
 
     # Generate experiment_info.json and app_state.json
@@ -1534,9 +1566,11 @@ class TrainApp:
         experiment_info["best_checkpoint"] = sly_fs.get_file_name_with_ext(
             experiment_info["best_checkpoint"]
         )
-        experiment_info["model_files"]["config"] = sly_fs.get_file_name_with_ext(
-            experiment_info["model_files"]["config"]
-        )
+
+        for file in experiment_info["model_files"]:
+            experiment_info["model_files"][file] = sly_fs.get_file_name_with_ext(
+                experiment_info["model_files"][file]
+            )
 
         local_path = join(self.output_dir, self._experiment_json_file)
         remote_path = join(remote_dir, self._experiment_json_file)
@@ -1594,6 +1628,8 @@ class TrainApp:
         )
 
     def _upload_demo_files(self, remote_dir: str) -> None:
+        if not self.gui.training_artifacts.need_upload_demo:
+            return
         demo = self._app_options.get("demo")
         if demo is None:
             return
@@ -1671,9 +1707,7 @@ class TrainApp:
         experiment_info = experiment_info or {}
 
         if self.model_source == ModelSource.PRETRAINED:
-            model_name = experiment_info.get("model_name") or self.model_info.get("meta", {}).get(
-                "model_name"
-            )
+            model_name = experiment_info.get("model_name") or _get_model_name(self.model_info)
             return {
                 "source": ModelSource.PRETRAINED,
                 "model_name": model_name,
@@ -1682,7 +1716,7 @@ class TrainApp:
             return {
                 "source": ModelSource.CUSTOM,
                 "task_id": self.task_id,
-                "checkpoint": "checkpoint.pth",
+                "checkpoint": "custom checkpoint",
             }
 
     # ----------------------------------------- #
@@ -1764,10 +1798,10 @@ class TrainApp:
         self.gui.training_process.start_button.loading = False
         self.gui.training_process.start_button.disable()
         self.gui.training_process.stop_button.disable()
-        # self.gui.training_logs.tensorboard_button.disable()
 
         # Set artifacts to GUI
-        self._api.task.set_output_experiment(self.task_id, experiment_info)
+        if is_production():
+            self._api.task.set_output_experiment(self.task_id, experiment_info)
         set_directory(remote_dir)
         self.gui.training_artifacts.artifacts_thumbnail.set(file_info)
         self.gui.training_artifacts.artifacts_thumbnail.show()
@@ -1814,7 +1848,7 @@ class TrainApp:
                 self.gui.training_artifacts.trt_instruction.show()
 
             # Show the inference demo widget if overview or any demo is available
-            if hasattr(self.gui.training_artifacts, "inference_demo_field") and any(
+            if self.gui.training_artifacts.inference_demo_field is not None and any(
                 [
                     self.gui.training_artifacts.overview_demo_exists(demo_path),
                     self.gui.training_artifacts.pytorch_demo_exists(demo_path),
@@ -1822,7 +1856,8 @@ class TrainApp:
                     self.gui.training_artifacts.trt_demo_exists(demo_path),
                 ]
             ):
-                self.gui.training_artifacts.inference_demo_field.show()
+                if self.gui.training_artifacts.inference_demo_field is not None:
+                    self.gui.training_artifacts.inference_demo_field.show()
         # ---------------------------- #
 
         # Set status to completed and unlock
@@ -1932,6 +1967,7 @@ class TrainApp:
                 "model_name": experiment_info["model_name"],
                 "framework_name": self.framework_name,
                 "model_meta": model_meta.to_json(),
+                "task_type": task_type,
             }
 
             logger.info(f"Deploy parameters: {self._benchmark_params}")
@@ -2551,7 +2587,6 @@ class TrainApp:
         if task_type == TaskType.OBJECT_DETECTION:
             Project.to_detection_task(project.directory, inplace=True)
             pr_prefix = "[detection]: "
-        # @TODO: dont convert segmentation?
         elif (
             task_type == TaskType.INSTANCE_SEGMENTATION
             or task_type == TaskType.SEMANTIC_SEGMENTATION

supervisely/nn/utils.py

@@ -55,3 +55,12 @@ class DeployInfo:
     model_precision: str
     hardware: str
     deploy_params: dict
+
+
+def _get_model_name(model_info: dict):
+    name = model_info.get("model_name")
+    if not name:
+        name = model_info.get("meta", {}).get("model_name")
+    if not name:
+        raise ValueError("Model name not found not in model_info nor in meta.")
+    return name

supervisely/project/project.py

@@ -1933,9 +1933,10 @@ class Dataset(KeyObject):
         self,
         meta: ProjectMeta,
         dest_dir: Optional[str] = None,
-        task_type: Literal["detection", "segmentation", "pose"] = "detection",
+        task_type: Literal["detect", "segment", "pose"] = "detect",
         log_progress: bool = False,
         progress_cb: Optional[Callable] = None,
+        is_val: Optional[bool] = None,
     ):
         """
         Convert Supervisely dataset to YOLO format.
@@ -1950,6 +1951,8 @@ class Dataset(KeyObject):
         :type log_progress: :class:`str`, optional
         :param progress_cb: Progress callback.
         :type progress_cb: :class:`Callable`, optional
+        :param is_val: If True, the dataset is a validation dataset.
+        :type is_val: :class:`bool`, optional
         :return: YOLO dataset in dictionary format.
         :rtype: :class:`dict`
 
@@ -1975,6 +1978,7 @@ class Dataset(KeyObject):
             task_type=task_type,
             log_progress=log_progress,
             progress_cb=progress_cb,
+            is_val=is_val,
         )
 
     def to_pascal_voc(
@@ -3821,19 +3825,27 @@ class Project:
     def to_yolo(
         self,
         dest_dir: Optional[str] = None,
-        task_type: Literal["detection", "segmentation", "pose"] = "detection",
+        task_type: Literal["detect", "segment", "pose"] = "detect",
         log_progress: bool = True,
         progress_cb: Optional[Callable] = None,
+        val_datasets: Optional[List[str]] = None,
     ) -> None:
         """
         Convert Supervisely project to YOLO format.
 
         :param dest_dir: Destination directory.
         :type dest_dir: :class:`str`, optional
+        :param task_type: Task type for YOLO format. Possible values: 'detection', 'segmentation', 'pose'.
+        :type task_type: :class:`str` or :class:`TaskType`, optional
         :param log_progress: Show uploading progress bar.
         :type log_progress: :class:`bool`
         :param progress_cb: Function for tracking conversion progress (for all items in the project).
         :type progress_cb: callable, optional
+        :param val_datasets:    List of dataset names for validation.
+                            Full dataset names are required (e.g., 'ds0/nested_ds1/ds3').
+                            If specified, datasets from the list will be marked as val, others as train.
+                            If not specified, the function will determine the validation datasets automatically.
+        :type val_datasets: :class:`list` [ :class:`str` ], optional
         :return: None
         :rtype: NoneType
 
@@ -3855,12 +3867,13 @@ class Project:
 
         from supervisely.convert import project_to_yolo
 
-        project_to_yolo(
+        return project_to_yolo(
             project=self,
             dest_dir=dest_dir,
             task_type=task_type,
             log_progress=log_progress,
             progress_cb=progress_cb,
+            val_datasets=val_datasets,
         )
 
     def to_pascal_voc(

supervisely/volume/volume.py

@@ -816,30 +816,28 @@ def convert_3d_nifti_to_nrrd(path: str) -> Tuple[np.ndarray, dict]:
         path = "/home/admin/work/volumes/vol_01.nii"
         data, header = sly.volume.convert_nifti_to_nrrd(path)
     """
+    import SimpleITK as sitk
 
-    import nibabel as nib  # pylint: disable=import-error
+    nifti_image = sitk.ReadImage(path)
+    nifti_image = _sitk_image_orient_ras(nifti_image)
+    data = sitk.GetArrayFromImage(nifti_image)
+    data = np.transpose(data, (2, 1, 0))
+
+    direction = np.array(nifti_image.GetDirection()).reshape(3, 3)
+    spacing = np.array(nifti_image.GetSpacing())
+    origin = np.array(nifti_image.GetOrigin())
+
+    space_directions = (direction.T * spacing[:, None]).tolist()
 
-    orientation_map = {
-        ('R', 'A', 'S'): "right-anterior-superior",
-        ('L', 'P', 'S'): "left-posterior-superior",
-        ('R', 'P', 'I'): "right-posterior-inferior",
-        ('L', 'A', 'I'): "left-anterior-inferior"
-    }
-    nifti = nib.load(path)
-    reordered_to_ras_nifti = nib.as_closest_canonical(nifti)
-    data = reordered_to_ras_nifti.get_fdata()
-    affine = reordered_to_ras_nifti.affine
-    orientation = nib.aff2axcodes(affine)
-    space_directions = affine[:3, :3].tolist()
-    space_origin = affine[:3, 3].tolist()
     header = {
-        "space": orientation_map.get(orientation, "unknown"),
-        "space directions": space_directions,
-        "space origin": space_origin,
-        "sizes": data.shape,
-        "type": str(data.dtype),
-        "dimension": len(data.shape),
-    }
+            "dimension": 3,
+            "space": "right-anterior-superior",
+            "sizes": list(data.shape),
+            "space directions": space_directions,
+            "endian": "little",
+            "encoding": "gzip",
+            "space origin": origin
+        }
     return data, header
 
 

{supervisely-6.73.325.dist-info → supervisely-6.73.327.dist-info}/METADATA

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