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

supervisely/nn/training/gui/gui.py

@@ -6,11 +6,15 @@ training workflows in Supervisely.
 """
 
 from os import environ
+from typing import Union
 
 import supervisely.io.env as sly_env
+import supervisely.io.json as sly_json
 from supervisely import Api, ProjectMeta
 from supervisely._utils import is_production
 from supervisely.app.widgets import Stepper, Widget
+from supervisely.geometry.bitmap import Bitmap
+from supervisely.geometry.graph import GraphNodes
 from supervisely.geometry.polygon import Polygon
 from supervisely.geometry.rectangle import Rectangle
 from supervisely.nn.task_type import TaskType
@@ -63,7 +67,7 @@ class TrainGUI:
         self.models = models
         self.hyperparameters = hyperparameters
         self.app_options = app_options
-        self.collapsable = app_options.get("collapsable", False)
+        self.collapsable = self.app_options.get("collapsable", False)
         self.need_convert_shapes_for_bm = False
 
         self.team_id = sly_env.team_id(raise_not_found=False)
@@ -142,33 +146,73 @@ class TrainGUI:
             self.training_process.set_experiment_name(experiment_name)
 
         def need_convert_class_shapes() -> bool:
-            if not self.hyperparameters_selector.run_model_benchmark_checkbox.is_checked():
-                self.hyperparameters_selector.model_benchmark_auto_convert_warning.hide()
-                self.need_convert_shapes_for_bm = False
-            else:
-                task_type = self.model_selector.get_selected_task_type()
-
-                def _need_convert(shape):
-                    if task_type == TaskType.OBJECT_DETECTION:
-                        return shape != Rectangle.geometry_name()
-                    elif task_type in [
-                        TaskType.INSTANCE_SEGMENTATION,
-                        TaskType.SEMANTIC_SEGMENTATION,
-                    ]:
-                        return shape == Polygon.geometry_name()
-                    return
-
-                data = self.classes_selector.classes_table._table_data
-                selected_classes = set(self.classes_selector.classes_table.get_selected_classes())
-                empty = set(r[0]["data"] for r in data if r[2]["data"] == 0 and r[3]["data"] == 0)
-                need_convert = set(r[0]["data"] for r in data if _need_convert(r[1]["data"]))
-
-                if need_convert.intersection(selected_classes - empty):
-                    self.hyperparameters_selector.model_benchmark_auto_convert_warning.show()
-                    self.need_convert_shapes_for_bm = True
-                else:
+            if self.hyperparameters_selector.run_model_benchmark_checkbox is not None:
+                if not self.hyperparameters_selector.run_model_benchmark_checkbox.is_checked():
                     self.hyperparameters_selector.model_benchmark_auto_convert_warning.hide()
                     self.need_convert_shapes_for_bm = False
+                else:
+                    task_type = self.model_selector.get_selected_task_type()
+
+                    def _need_convert(shape):
+                        if task_type == TaskType.OBJECT_DETECTION:
+                            return shape != Rectangle.geometry_name()
+                        elif task_type in [
+                            TaskType.INSTANCE_SEGMENTATION,
+                            TaskType.SEMANTIC_SEGMENTATION,
+                        ]:
+                            return shape == Polygon.geometry_name()
+                        return
+
+                    data = self.classes_selector.classes_table._table_data
+                    selected_classes = set(
+                        self.classes_selector.classes_table.get_selected_classes()
+                    )
+                    empty = set(
+                        r[0]["data"] for r in data if r[2]["data"] == 0 and r[3]["data"] == 0
+                    )
+                    need_convert = set(r[0]["data"] for r in data if _need_convert(r[1]["data"]))
+
+                    if need_convert.intersection(selected_classes - empty):
+                        self.hyperparameters_selector.model_benchmark_auto_convert_warning.show()
+                        self.need_convert_shapes_for_bm = True
+                    else:
+                        self.hyperparameters_selector.model_benchmark_auto_convert_warning.hide()
+                        self.need_convert_shapes_for_bm = False
+            else:
+                self.need_convert_shapes_for_bm = False
+
+        def validate_class_shape_for_model_task():
+            task_type = self.model_selector.get_selected_task_type()
+            classes = self.classes_selector.get_selected_classes()
+
+            required_geometries = {
+                TaskType.INSTANCE_SEGMENTATION: {Polygon, Bitmap},
+                TaskType.SEMANTIC_SEGMENTATION: {Polygon, Bitmap},
+                TaskType.POSE_ESTIMATION: {GraphNodes},
+            }
+            task_specific_texts = {
+                TaskType.INSTANCE_SEGMENTATION: "Only polygon and bitmap shapes are supported for segmentation task",
+                TaskType.SEMANTIC_SEGMENTATION: "Only polygon and bitmap shapes are supported for segmentation task",
+                TaskType.POSE_ESTIMATION: "Only keypoint (graph) shape is supported for pose estimation task",
+            }
+
+            if task_type not in required_geometries:
+                return
+
+            wrong_shape_classes = [
+                class_name
+                for class_name in classes
+                if self.project_meta.get_obj_class(class_name).geometry_type
+                not in required_geometries[task_type]
+            ]
+
+            if wrong_shape_classes:
+                specific_text = task_specific_texts[task_type]
+                message_text = f"Model task type is {task_type}. {specific_text}. Selected classes have wrong shapes for the model task: {', '.join(wrong_shape_classes)}"
+                self.model_selector.validator_text.set(
+                    text=message_text,
+                    status="warning",
+                )
 
         # ------------------------------------------------- #
 
@@ -201,7 +245,11 @@ class TrainGUI:
             callback=self.hyperparameters_selector_cb,
             validation_text=self.model_selector.validator_text,
             validation_func=self.model_selector.validate_step,
-            on_select_click=[set_experiment_name, need_convert_class_shapes],
+            on_select_click=[
+                set_experiment_name,
+                need_convert_class_shapes,
+                validate_class_shape_for_model_task,
+            ],
             collapse_card=(self.model_selector.card, self.collapsable),
         )
 
@@ -299,17 +347,19 @@ class TrainGUI:
         # ------------------------------------------------- #
 
         # Other Buttons
-        if app_options.get("show_logs_in_gui", False):
+        if self.app_options.get("show_logs_in_gui", False):
 
             @self.training_logs.logs_button.click
             def show_logs():
                 self.training_logs.toggle_logs()
 
         # Other handlers
-        @self.hyperparameters_selector.run_model_benchmark_checkbox.value_changed
-        def show_mb_speedtest(is_checked: bool):
-            self.hyperparameters_selector.toggle_mb_speedtest(is_checked)
-            need_convert_class_shapes()
+        if self.hyperparameters_selector.run_model_benchmark_checkbox is not None:
+
+            @self.hyperparameters_selector.run_model_benchmark_checkbox.value_changed
+            def show_mb_speedtest(is_checked: bool):
+                self.hyperparameters_selector.toggle_mb_speedtest(is_checked)
+                need_convert_class_shapes()
 
         # ------------------------------------------------- #
 
@@ -361,7 +411,6 @@ class TrainGUI:
             raise ValueError("app_state must be a dictionary")
 
         required_keys = {
-            "input": ["project_id"],
             "train_val_split": ["method"],
             "classes": list,
             "model": ["source"],
@@ -453,7 +502,7 @@ class TrainGUI:
                 raise ValueError("percent must be an integer in range 1 to 99")
         return app_state
 
-    def load_from_app_state(self, app_state: dict) -> None:
+    def load_from_app_state(self, app_state: Union[str, dict]) -> None:
         """
         Load the GUI state from app state dictionary.
 
@@ -463,7 +512,6 @@ class TrainGUI:
         app_state example:
 
             app_state = {
-                "input": {"project_id": 43192},
                 "train_val_split": {
                     "method": "random",
                     "split": "train",
@@ -489,10 +537,13 @@ class TrainGUI:
                 }
             }
         """
+        if isinstance(app_state, str):
+            app_state = sly_json.load_json_file(app_state)
+
         app_state = self.validate_app_state(app_state)
 
         options = app_state.get("options", {})
-        input_settings = app_state["input"]
+        input_settings = app_state.get("input")
         train_val_splits_settings = app_state["train_val_split"]
         classes_settings = app_state["classes"]
         model_settings = app_state["model"]
@@ -504,7 +555,7 @@ class TrainGUI:
         self._init_model(model_settings)
         self._init_hyperparameters(hyperparameters_settings, options)
 
-    def _init_input(self, input_settings: dict, options: dict) -> None:
+    def _init_input(self, input_settings: Union[dict, None], options: dict) -> None:
         """
         Initialize the input selector with the given settings.
 
@@ -604,6 +655,8 @@ class TrainGUI:
             )
             self.hyperparameters_selector.set_speedtest_checkbox_value(
                 model_benchmark_settings["speed_test"]
+                if model_benchmark_settings["enable"]
+                else False
             )
         export_weights_settings = options.get("export", None)
         if export_weights_settings is not None:

supervisely/nn/training/gui/hyperparameters_selector.py

@@ -9,7 +9,6 @@ from supervisely.app.widgets import (
     Field,
     Text,
 )
-from supervisely.nn.utils import RuntimeType
 
 
 class HyperparametersSelector:
@@ -18,6 +17,22 @@ class HyperparametersSelector:
     lock_message = "Select model to unlock"
 
     def __init__(self, hyperparameters: dict, app_options: dict = {}):
+        # Init widgets
+        self.editor = None
+        self.run_model_benchmark_checkbox = None
+        self.run_speedtest_checkbox = None
+        self.model_benchmark_field = None
+        self.model_benchmark_learn_more = None
+        self.model_benchmark_auto_convert_warning = None
+        self.export_onnx_checkbox = None
+        self.export_tensorrt_checkbox = None
+        self.export_field = None
+        self.validator_text = None
+        self.button = None
+        self.container = None
+        self.card = None
+        # -------------------------------- #
+
         self.display_widgets = []
         self.app_options = app_options
 
@@ -28,7 +43,7 @@ class HyperparametersSelector:
         self.display_widgets.extend([self.editor])
 
         # Optional Model Benchmark
-        if app_options.get("model_benchmark", True):
+        if self.app_options.get("model_benchmark", True):
             # Model Benchmark
             self.run_model_benchmark_checkbox = Checkbox(
                 content="Run Model Benchmark evaluation", checked=True
@@ -37,7 +52,7 @@ class HyperparametersSelector:
 
             self.model_benchmark_field = Field(
                 title="Model Evaluation Benchmark",
-                description=f"Generate evalutaion dashboard with visualizations and detailed analysis of the model performance after training. The best checkpoint will be used for evaluation. You can also run speed test to evaluate model inference speed.",
+                description="Generate evaluation dashboard with visualizations and detailed analysis of the model performance after training. The best checkpoint will be used for evaluation. You can also run speed test to evaluate model inference speed.",
                 content=Container([self.run_model_benchmark_checkbox, self.run_speedtest_checkbox]),
             )
             docs_link = '<a href="https://docs.supervisely.com/neural-networks/model-evaluation-benchmark/" target="_blank">documentation</a>'
@@ -60,8 +75,8 @@ class HyperparametersSelector:
         # -------------------------------- #
 
         # Optional Export Weights
-        export_onnx_supported = app_options.get("export_onnx_supported", False)
-        export_tensorrt_supported = app_options.get("export_tensorrt_supported", False)
+        export_onnx_supported = self.app_options.get("export_onnx_supported", False)
+        export_tensorrt_supported = self.app_options.get("export_tensorrt_supported", False)
 
         onnx_name = "ONNX"
         tensorrt_name = "TensorRT engine"
@@ -120,26 +135,28 @@ class HyperparametersSelector:
         return self.editor.get_value()
 
     def get_model_benchmark_checkbox_value(self) -> bool:
-        if self.app_options.get("model_benchmark", True):
+        if self.run_model_benchmark_checkbox is not None:
             return self.run_model_benchmark_checkbox.is_checked()
         return False
 
     def set_model_benchmark_checkbox_value(self, is_checked: bool) -> bool:
-        if is_checked:
-            self.run_model_benchmark_checkbox.check()
-        else:
-            self.run_model_benchmark_checkbox.uncheck()
+        if self.run_model_benchmark_checkbox is not None:
+            if is_checked:
+                self.run_model_benchmark_checkbox.check()
+            else:
+                self.run_model_benchmark_checkbox.uncheck()
 
     def get_speedtest_checkbox_value(self) -> bool:
-        if self.app_options.get("model_benchmark", True):
+        if self.run_speedtest_checkbox is not None:
             return self.run_speedtest_checkbox.is_checked()
         return False
 
     def set_speedtest_checkbox_value(self, is_checked: bool) -> bool:
-        if is_checked:
-            self.run_speedtest_checkbox.check()
-        else:
-            self.run_speedtest_checkbox.uncheck()
+        if self.run_speedtest_checkbox is not None:
+            if is_checked:
+                self.run_speedtest_checkbox.check()
+            else:
+                self.run_speedtest_checkbox.uncheck()
 
     def toggle_mb_speedtest(self, is_checked: bool) -> None:
         if is_checked:

supervisely/nn/training/gui/input_selector.py

@@ -4,7 +4,6 @@ from supervisely.app.widgets import (
     Card,
     Checkbox,
     Container,
-    Field,
     ProjectThumbnail,
     Text,
 )
@@ -17,7 +16,19 @@ class InputSelector:
     lock_message = None
 
     def __init__(self, project_info: ProjectInfo, app_options: dict = {}):
+        # Init widgets
+        self.project_thumbnail = None
+        self.use_cache_text = None
+        self.use_cache_checkbox = None
+        self.validator_text = None
+        self.button = None
+        self.container = None
+        self.card = None
+        # -------------------------------- #
+
         self.display_widgets = []
+        self.app_options = app_options
+
         self.project_id = project_info.id
         self.project_info = project_info
 
@@ -49,7 +60,7 @@ class InputSelector:
             title=self.title,
             description=self.description,
             content=self.container,
-            collapsable=app_options.get("collapsable", False),
+            collapsable=self.app_options.get("collapsable", False),
         )
 
     @property

supervisely/nn/training/gui/model_selector.py

@@ -14,7 +14,7 @@ from supervisely.app.widgets import (
 )
 from supervisely.nn.artifacts.utils import FrameworkMapper
 from supervisely.nn.experiments import get_experiment_infos
-from supervisely.nn.utils import ModelSource
+from supervisely.nn.utils import ModelSource, _get_model_name
 
 
 class ModelSelector:
@@ -23,15 +23,26 @@ class ModelSelector:
     lock_message = "Select classes to unlock"
 
     def __init__(self, api: Api, framework: str, models: list, app_options: dict = {}):
+        # Init widgets
+        self.pretrained_models_table = None
+        self.experiment_selector = None
+        self.model_source_tabs = None
+        self.validator_text = None
+        self.button = None
+        self.container = None
+        self.card = None
+        # -------------------------------- #
+
         self.display_widgets = []
+        self.app_options = app_options
+
         self.team_id = sly_env.team_id()
         self.models = models
 
         # GUI Components
         self.pretrained_models_table = PretrainedModelsSelector(self.models)
-
         experiment_infos = get_experiment_infos(api, self.team_id, framework)
-        if app_options.get("legacy_checkpoints", False):
+        if self.app_options.get("legacy_checkpoints", False):
             try:
                 framework_cls = FrameworkMapper.get_framework_cls(framework, self.team_id)
                 legacy_experiment_infos = framework_cls.get_list_experiment_info()
@@ -61,7 +72,7 @@ class ModelSelector:
             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()
 
@@ -82,8 +93,7 @@ class ModelSelector:
     def get_model_name(self) -> str:
         if self.get_model_source() == ModelSource.PRETRAINED:
             selected_row = self.pretrained_models_table.get_selected_row()
-            model_meta = selected_row.get("meta", {})
-            model_name = model_meta.get("model_name", None)
+            model_name = _get_model_name(selected_row)
         else:
             selected_row = self.experiment_selector.get_selected_experiment_info()
             model_name = selected_row.get("model_name", None)

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(