supervisely 6.73.447__py3-none-any.whl → 6.73.449__py3-none-any.whl

supervisely/app/widgets/dialog/dialog.py

@@ -28,6 +28,8 @@ class Dialog(Widget):
         dialog = Dialog(title="Dialog title", content=Input("Input"), size="large")
         dialog.show()
     """
+    class Routes:
+        ON_CLOSE = "close_cb"
 
     def __init__(
         self,
@@ -41,6 +43,16 @@ class Dialog(Widget):
         self._size = size
         super().__init__(widget_id=widget_id, file_path=__file__)
 
+        server = self._sly_app.get_server()
+        route = self.get_route_path(Dialog.Routes.ON_CLOSE)
+        @server.post(route)
+        def _on_close():
+            # * Change visibility state to False when dialog is closed on client side
+            visible = StateJson()[self.widget_id]["visible"]
+            if visible is True:
+                StateJson()[self.widget_id]["visible"] = False
+                # * no need to call send_changes(), as it is already changed on client side
+
     def get_json_data(self) -> Dict[str, str]:
         """Returns dictionary with widget data, which defines the appearance and behavior of the widget.
 

supervisely/app/widgets/dialog/template.html

@@ -2,8 +2,9 @@
   :title=data.{{{widget.widget_id}}}.title
   :size=data.{{{widget.widget_id}}}.size
   :visible.sync="state.{{{widget.widget_id}}}.visible"
+  @close="post('/{{{widget.widget_id}}}/close_cb');"
 >
   <div>
     {{{widget._content}}}
   </div>
-</el-dialog>
+</el-dialog>

supervisely/nn/inference/inference.py

@@ -1105,31 +1105,37 @@ class Inference:
         self.model_precision = deploy_params.get("model_precision", ModelPrecision.FP32)
         self._hardware = get_hardware_info(self.device)
 
-        checkpoint_path = deploy_params["model_files"]["checkpoint"]
-        checkpoint_ext = sly_fs.get_file_ext(checkpoint_path)
-        if self.runtime == RuntimeType.TENSORRT and checkpoint_ext == ".engine":
-            try:
-                self.load_model(**deploy_params)
-            except Exception as e:
-                logger.warning(f"Failed to load model with TensorRT. Downloading PyTorch to export to TensorRT. Error: {repr(e)}")
-                checkpoint_path = self._fallback_download_custom_model_pt(deploy_params)
-                deploy_params["model_files"]["checkpoint"] = checkpoint_path
-                logger.info("Exporting PyTorch model to TensorRT...")
-                self._remove_exported_checkpoints(checkpoint_path)
-                checkpoint_path = self.export_tensorrt(deploy_params)
+        model_files = deploy_params.get("model_files", None)
+        if model_files is not None:
+            checkpoint_path = deploy_params["model_files"]["checkpoint"]
+            checkpoint_ext = sly_fs.get_file_ext(checkpoint_path)
+            if self.runtime == RuntimeType.TENSORRT and checkpoint_ext == ".engine":
+                try:
+                    self.load_model(**deploy_params)
+                except Exception as e:
+                    logger.warning(
+                        f"Failed to load model with TensorRT. Downloading PyTorch to export to TensorRT. Error: {repr(e)}"
+                    )
+                    checkpoint_path = self._fallback_download_custom_model_pt(deploy_params)
+                    deploy_params["model_files"]["checkpoint"] = checkpoint_path
+                    logger.info("Exporting PyTorch model to TensorRT...")
+                    self._remove_exported_checkpoints(checkpoint_path)
+                    checkpoint_path = self.export_tensorrt(deploy_params)
+                    deploy_params["model_files"]["checkpoint"] = checkpoint_path
+                    self.load_model(**deploy_params)
+            if checkpoint_ext in (".pt", ".pth") and not self.runtime == RuntimeType.PYTORCH:
+                if self.runtime == RuntimeType.ONNXRUNTIME:
+                    logger.info("Exporting PyTorch model to ONNX...")
+                    self._remove_exported_checkpoints(checkpoint_path)
+                    checkpoint_path = self.export_onnx(deploy_params)
+                elif self.runtime == RuntimeType.TENSORRT:
+                    logger.info("Exporting PyTorch model to TensorRT...")
+                    self._remove_exported_checkpoints(checkpoint_path)
+                    checkpoint_path = self.export_tensorrt(deploy_params)
                 deploy_params["model_files"]["checkpoint"] = checkpoint_path
                 self.load_model(**deploy_params)
-        if checkpoint_ext in (".pt", ".pth") and not self.runtime == RuntimeType.PYTORCH:
-            if self.runtime == RuntimeType.ONNXRUNTIME:
-                logger.info("Exporting PyTorch model to ONNX...")
-                self._remove_exported_checkpoints(checkpoint_path)
-                checkpoint_path = self.export_onnx(deploy_params)
-            elif self.runtime == RuntimeType.TENSORRT:
-                logger.info("Exporting PyTorch model to TensorRT...")
-                self._remove_exported_checkpoints(checkpoint_path)
-                checkpoint_path = self.export_tensorrt(deploy_params)
-            deploy_params["model_files"]["checkpoint"] = checkpoint_path
-            self.load_model(**deploy_params)
+            else:
+                self.load_model(**deploy_params)
         else:
             self.load_model(**deploy_params)
 

supervisely/nn/training/gui/train_val_splits_selector.py

@@ -180,7 +180,13 @@ class TrainValSplitsSelector:
                 return False
 
             # Check if datasets are not empty
-            filters = [{ ApiField.FIELD: ApiField.ID, ApiField.OPERATOR: "in", ApiField.VALUE: train_dataset_id + val_dataset_id}]
+            filters = [
+                {
+                    ApiField.FIELD: ApiField.ID,
+                    ApiField.OPERATOR: "in",
+                    ApiField.VALUE: train_dataset_id + val_dataset_id,
+                }
+            ]
             selected_datasets = self.api.dataset.get_list(self.project_id, filters, recursive=True)
             datasets_count = {}
             for dataset in selected_datasets:
@@ -334,6 +340,7 @@ class TrainValSplitsSelector:
 
     def _detect_splits(self, collections_split: bool, datasets_split: bool) -> bool:
         """Detect splits based on the selected method"""
+        self._parse_collections()
         splits_found = False
         if collections_split:
             splits_found = self._detect_collections()
@@ -341,47 +348,59 @@ class TrainValSplitsSelector:
             splits_found = self._detect_datasets()
         return splits_found
 
+    def _parse_collections(self) -> None:
+        """Parse collections with train and val prefixes and set them to train_val_splits variables"""
+        all_collections = self.api.entities_collection.get_list(self.project_id)
+        existing_train_collections = [
+            collection for collection in all_collections if collection.name.startswith("train_")
+        ]
+        existing_val_collections = [
+            collection for collection in all_collections if collection.name.startswith("val_")
+        ]
+
+        self._all_train_collections = existing_train_collections
+        self._all_val_collections = existing_val_collections
+        self._latest_train_collection = self._get_latest_collection(existing_train_collections, "train")
+        self._latest_val_collection = self._get_latest_collection(existing_val_collections, "val")
+
+    def _get_latest_collection(
+        self, collections: List[EntitiesCollectionInfo], expected_prefix: str
+    ) -> EntitiesCollectionInfo:
+        curr_collection = None
+        curr_idx = 0
+        for collection in collections:
+            parts = collection.name.split("_")
+            if len(parts) == 2:
+                prefix = parts[0].lower()
+                if prefix == expected_prefix:
+                    if parts[1].isdigit():
+                        collection_idx = int(parts[1])
+                        if collection_idx > curr_idx:
+                            curr_idx = collection_idx
+                            curr_collection = collection
+        return curr_collection
+
+
     def _detect_collections(self) -> bool:
         """Find collections with train and val prefixes and set them to train_val_splits"""
-        def _get_latest_collection(collections: List[EntitiesCollectionInfo]) -> EntitiesCollectionInfo:
-            curr_collection = None
-            curr_idx = 0
-            for collection in collections:
-                collection_idx = int(collection.name.rsplit('_', 1)[-1])
-                if collection_idx > curr_idx:
-                    curr_idx = collection_idx
-                    curr_collection = collection
-            return curr_collection
 
-        all_collections = self.api.entities_collection.get_list(self.project_id)
-        train_collections = []
-        val_collections = []
         collections_found = False
-        for collection in all_collections:
-            if collection.name.lower().startswith("train_"):
-                train_collections.append(collection)
-            elif collection.name.lower().startswith("val_"):
-                val_collections.append(collection)
-
-        train_collection = _get_latest_collection(train_collections)
-        val_collection = _get_latest_collection(val_collections)
-        if train_collection is not None and val_collection is not None:
-            self.train_val_splits.set_collections_splits([train_collection.id], [val_collection.id])
+        if self._latest_train_collection is not None and self._latest_val_collection is not None:
+            self.train_val_splits.set_collections_splits(
+                [self._latest_train_collection.id], [self._latest_val_collection.id]
+            )
             self.validator_text = Text("Train and val collections are detected", status="info")
             self.validator_text.show()
             collections_found = True
-            self._all_train_collections = train_collections
-            self._all_val_collections = val_collections
-            self._latest_train_collection = train_collection
-            self._latest_val_collection = val_collection
         else:
             self.validator_text = Text("")
             self.validator_text.hide()
             collections_found = False
         return collections_found
-        
+
     def _detect_datasets(self) -> bool:
         """Find datasets with train and val prefixes and set them to train_val_splits"""
+
         def _extend_with_nested(root_ds):
             nested = self.api.dataset.get_nested(self.project_id, root_ds.id)
             nested_ids = [ds.id for ds in nested]
@@ -407,7 +426,9 @@ class TrainValSplitsSelector:
         val_count = len(train_val_dataset_ids["val"])
 
         if train_count > 0 and val_count > 0:
-            self.train_val_splits.set_datasets_splits(train_val_dataset_ids["train"], train_val_dataset_ids["val"])
+            self.train_val_splits.set_datasets_splits(
+                train_val_dataset_ids["train"], train_val_dataset_ids["val"]
+            )
             datasets_found = True
 
         if train_count > 0 and val_count > 0:
@@ -415,7 +436,7 @@ class TrainValSplitsSelector:
                 message = "train and val datasets are detected"
             else:
                 message = "Multiple train and val datasets are detected. Check manually if selection is correct"
-            
+
             self.validator_text = Text(message, status="info")
             self.validator_text.show()
             datasets_found = True
@@ -423,4 +444,4 @@ class TrainValSplitsSelector:
             self.validator_text = Text("")
             self.validator_text.hide()
             datasets_found = False
-        return datasets_found
+        return datasets_found

{supervisely-6.73.447.dist-info → supervisely-6.73.449.dist-info}/METADATA

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

{supervisely-6.73.447.dist-info → supervisely-6.73.449.dist-info}/RECORD

@@ -230,8 +230,8 @@ supervisely/app/widgets/destination_project/__init__.py,sha256=47DEQpj8HBSa-_TIm
 supervisely/app/widgets/destination_project/destination_project.py,sha256=zSFrCfvFMbeZY4uC3FRz-EkEpuqU24Mq-KqAckOc184,5476
 supervisely/app/widgets/destination_project/template.html,sha256=AhhHte0PDFwbYRs06Q824gz3uy68ouVur_KM4FaCWtE,5526
 supervisely/app/widgets/dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/app/widgets/dialog/dialog.py,sha256=Pg1Lk3Hh1sLYyX06sbvLvVhyTWHvR92Vy9aqOR3UPwQ,3023
-supervisely/app/widgets/dialog/template.html,sha256=OGakbpPL9KKVHL-_entT5g_4RTiW0xxJiBPjsPy3V9k,207
+supervisely/app/widgets/dialog/dialog.py,sha256=Uc7K6wLv4HYUiISbmyNZnLsyjDMYgZ2P5NedhniXl8I,3563
+supervisely/app/widgets/dialog/template.html,sha256=ccYatR1_h9MktDpGUHNTw88_Hihw7Wsxl0k4l7r54WQ,261
 supervisely/app/widgets/done_label/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/done_label/done_label.py,sha256=7IMLbt4v-six26QNfuJUg2CzvL-lMiarEMCF1Fwywsg,1944
 supervisely/app/widgets/done_label/template.html,sha256=PShF4P5x4InVFYAJUPRdMfjY7lJGSfaAFUAG8chxllo,238
@@ -904,7 +904,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=rfmb1teJ9lNDfisUSh6bwDCVkPZocn8GMvDgLQktnbo,35023
-supervisely/nn/inference/inference.py,sha256=p1yUIB85nTOmwVJbqzoU_DLTVcUHrJiF18bqB1I9IrA,207202
+supervisely/nn/inference/inference.py,sha256=71E5_DG5He2y9TWu2YN8P9MWz0EwldGJa_7pK6pVp7E,207512
 supervisely/nn/inference/inference_request.py,sha256=1Tq-OV7bYtr0bKDqvBXh72wpR5Misgk-iQn5waCxtqo,14830
 supervisely/nn/inference/session.py,sha256=f2Tyvj21oO9AKxqr6_yHZ81Ol-wXC-h5cweTHEoljkg,35796
 supervisely/nn/inference/uploader.py,sha256=Dn5MfMRq7tclEWpP0B9fJjTiQPBpwumfXxC8-lOYgnM,5659
@@ -1020,7 +1020,7 @@ supervisely/nn/training/gui/hyperparameters_selector.py,sha256=tEyppV5ay7nECi6qB
 supervisely/nn/training/gui/input_selector.py,sha256=rmirJzpdxuYONI6y5_cvMdGWBJ--T20YTsISghATHu4,2510
 supervisely/nn/training/gui/model_selector.py,sha256=YKBAk6MheulFEl9TF9_mVtE3-Hsc0B3LmeOzMiV6AlQ,7487
 supervisely/nn/training/gui/tags_selector.py,sha256=0yg2OGPqiHUBp3iML2vrzTOVeSKtRtR9JoMy4Snx41U,3755
-supervisely/nn/training/gui/train_val_splits_selector.py,sha256=CqVRp3nz6nJ8nk9J-5QiMMYiTsaTCAwLMg-ZqRr0Fto,18866
+supervisely/nn/training/gui/train_val_splits_selector.py,sha256=NWyulmr3lBZU1tcT_2HXXVIag-vpQjSjzNvtqJ_f2kw,19409
 supervisely/nn/training/gui/training_artifacts.py,sha256=ZyTnB9PyhwsqGAANwnpyLriJtAb4p0f03Yhmm_jkfIE,10946
 supervisely/nn/training/gui/training_logs.py,sha256=GgEQMj9p98Z3p2b_-3BkHOhY7WQYELxctsRKmkbg3JY,4966
 supervisely/nn/training/gui/training_process.py,sha256=XJ3ELyys_rBFmLQnI9qe3QhmfZ6U0CrK1FbI6d-Fbns,3664
@@ -1127,9 +1127,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=yRwzEQmVwSd6lUQoAUdBngKEOlnoQ6hA9ZcoZGJRNC4,331
-supervisely-6.73.447.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.447.dist-info/METADATA,sha256=Fb3qYfdHQT27KPMPPY3g82sbHQOyxe_ApnyLfPYeUHg,35480
-supervisely-6.73.447.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.447.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.447.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.447.dist-info/RECORD,,
+supervisely-6.73.449.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.449.dist-info/METADATA,sha256=d65TCju-7Q_u75UWtDWAgTcIRszBoX5r8KPONLcp0Bo,35480
+supervisely-6.73.449.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.449.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.449.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.449.dist-info/RECORD,,