supervisely 6.73.259__tar.gz → 6.73.261__tar.gz

{supervisely-6.73.259/supervisely.egg-info → supervisely-6.73.261}/PKG-INFO

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

{supervisely-6.73.259 → supervisely-6.73.261}/supervisely/annotation/tag_meta.py

@@ -2,12 +2,14 @@
 """General information about :class:`Tag<supervisely.annotation.tag.Tag>`"""
 
 from __future__ import annotations
-from typing import List, Optional, Dict
+
 from copy import deepcopy
-from supervisely.imaging.color import random_rgb, rgb2hex, hex2rgb, _validate_color
-from supervisely.io.json import JsonSerializable
-from supervisely.collection.key_indexed_collection import KeyObject
+from typing import Dict, List, Optional
+
 from supervisely._utils import take_with_default
+from supervisely.collection.key_indexed_collection import KeyObject
+from supervisely.imaging.color import _validate_color, hex2rgb, random_rgb, rgb2hex
+from supervisely.io.json import JsonSerializable
 
 
 class TagValueType:
@@ -47,6 +49,7 @@ class TagMetaJsonFields:
     """"""
     APPLICABLE_CLASSES = "classes"
     """"""
+    TARGET_TYPE = "target_type"  # "Scope"
 
 
 class TagApplicableTo:
@@ -62,6 +65,19 @@ class TagApplicableTo:
     """"""
 
 
+class TagTargetType:
+    """
+    Defines Tag target type (scope) - entities, frames or both.
+    """
+
+    ALL = "all"  # both entities and frames
+    """"""
+    FRAME_BASED = "framesOnly"
+    """"""
+    GLOBAL = "entitiesOnly"
+    """"""
+
+
 SUPPORTED_TAG_VALUE_TYPES = [
     TagValueType.NONE,
     TagValueType.ANY_NUMBER,
@@ -74,6 +90,12 @@ SUPPORTED_APPLICABLE_TO = [
     TagApplicableTo.OBJECTS_ONLY,
 ]
 
+SUPPORTED_TARGET_TYPES = [
+    TagTargetType.ALL,
+    TagTargetType.FRAME_BASED,
+    TagTargetType.GLOBAL,
+]
+
 
 class TagMeta(KeyObject, JsonSerializable):
     """
@@ -95,6 +117,8 @@ class TagMeta(KeyObject, JsonSerializable):
     :type applicable_to: str, optional
     :param applicable_classes: Defines applicability of Tag only to certain classes.
     :type applicable_classes: List[str], optional
+    :param target_type: Defines Tag target type (scope) - entities, frames or both.
+    :type target_type: str, optional
     :raises: :class:`ValueError`, if color is not list, or doesn't have exactly 3 values
     :Usage example:
 
@@ -128,6 +152,7 @@ class TagMeta(KeyObject, JsonSerializable):
         hotkey: Optional[str] = None,
         applicable_to: Optional[str] = None,
         applicable_classes: Optional[List[str]] = None,
+        target_type: Optional[str] = None,
     ):
         if value_type not in SUPPORTED_TAG_VALUE_TYPES:
             raise ValueError(
@@ -144,12 +169,20 @@ class TagMeta(KeyObject, JsonSerializable):
         self._hotkey = take_with_default(hotkey, "")
         self._applicable_to = take_with_default(applicable_to, TagApplicableTo.ALL)
         self._applicable_classes = take_with_default(applicable_classes, [])
+        self._target_type = take_with_default(target_type, TagTargetType.ALL)
         if self._applicable_to not in SUPPORTED_APPLICABLE_TO:
             raise ValueError(
                 "applicable_to = {!r} is unknown, should be one of {}".format(
                     self._applicable_to, SUPPORTED_APPLICABLE_TO
                 )
             )
+        
+        if self._target_type not in SUPPORTED_TARGET_TYPES:
+            raise ValueError(
+                "target_type = {!r} is unknown, should be one of {}".format(
+                    self._target_type, SUPPORTED_TARGET_TYPES
+                )
+            )
 
         if self._value_type == TagValueType.ONEOF_STRING:
             if self._possible_values is None:
@@ -329,6 +362,24 @@ class TagMeta(KeyObject, JsonSerializable):
             # Output: ['car', 'bicycle']
         """
         return self._applicable_classes
+    
+    @property
+    def target_type(self) -> str:
+        """
+        Tag target type (scope) - entities, frames or both.
+
+        :return: Target type
+        :rtype: :class:`str`
+        :Usage example:
+
+         .. code-block:: python
+
+            meta_dog = sly.TagMeta('dog', sly.TagValueType.NONE, target_type=TagTargetType.FRAME_BASED)
+
+            print(meta_dog.target_type)
+            # Output: 'framesOnly'
+        """
+        return self._target_type
 
     def to_json(self) -> Dict:
         """
@@ -390,6 +441,8 @@ class TagMeta(KeyObject, JsonSerializable):
             jdict[TagMetaJsonFields.APPLICABLE_TYPE] = self.applicable_to
         if self._applicable_classes is not None:
             jdict[TagMetaJsonFields.APPLICABLE_CLASSES] = self.applicable_classes
+        if self._target_type is not None:
+            jdict[TagMetaJsonFields.TARGET_TYPE] = self.target_type
 
         return jdict
 
@@ -445,6 +498,7 @@ class TagMeta(KeyObject, JsonSerializable):
             hotkey = data.get(TagMetaJsonFields.HOTKEY, "")
             applicable_to = data.get(TagMetaJsonFields.APPLICABLE_TYPE, TagApplicableTo.ALL)
             applicable_classes = data.get(TagMetaJsonFields.APPLICABLE_CLASSES, [])
+            target_type = data.get(TagMetaJsonFields.TARGET_TYPE, TagTargetType.ALL)
 
             return cls(
                 name=name,
@@ -455,6 +509,7 @@ class TagMeta(KeyObject, JsonSerializable):
                 hotkey=hotkey,
                 applicable_to=applicable_to,
                 applicable_classes=applicable_classes,
+                target_type=target_type,
             )
         else:
             raise ValueError("Tags must be dict or str types.")
@@ -632,6 +687,7 @@ class TagMeta(KeyObject, JsonSerializable):
         hotkey: Optional[str] = None,
         applicable_to: Optional[str] = None,
         applicable_classes: Optional[List[str]] = None,
+        target_type: Optional[str] = None,
     ) -> TagMeta:
         """
         Clone makes a copy of TagMeta with new fields, if fields are given, otherwise it will use original TagMeta fields.
@@ -683,6 +739,7 @@ class TagMeta(KeyObject, JsonSerializable):
             hotkey=take_with_default(hotkey, self.hotkey),
             applicable_to=take_with_default(applicable_to, self.applicable_to),
             applicable_classes=take_with_default(applicable_classes, self.applicable_classes),
+            target_type=take_with_default(target_type, self.target_type),
         )
 
     def __str__(self):
@@ -713,6 +770,7 @@ class TagMeta(KeyObject, JsonSerializable):
             "Hotkey",
             "Applicable to",
             "Applicable classes",
+            "Target type",
         ]
 
     def get_row_ptable(self):
@@ -724,6 +782,7 @@ class TagMeta(KeyObject, JsonSerializable):
             self.hotkey,
             self.applicable_to,
             self.applicable_classes,
+            self.target_type,
         ]
 
     def _set_id(self, id: int):

{supervisely-6.73.259 → supervisely-6.73.261}/supervisely/app/widgets/experiment_selector/experiment_selector.py

@@ -19,6 +19,8 @@ from supervisely.app.widgets import (
 )
 from supervisely.io.fs import get_file_name_with_ext
 from supervisely.nn.experiments import ExperimentInfo
+from supervisely.nn.utils import ModelSource
+
 
 WEIGHTS_DIR = "weights"
 
@@ -473,6 +475,17 @@ class ExperimentSelector(Widget):
         full_model_files["checkpoint"] = self.get_selected_checkpoint_path()
         return full_model_files
 
+    def get_deploy_params(self) -> Dict[str, Any]:
+        """
+        Returns a dictionary with deploy parameters except runtime and device keys.
+        """
+        deploy_params = {
+            "model_source": ModelSource.CUSTOM,
+            "model_files": self.get_model_files(),
+            "model_info": self.get_selected_experiment_info(),
+        }
+        return deploy_params
+
     def set_active_row(self, row_index: int) -> None:
         if row_index < 0 or row_index > len(self._rows) - 1:
             raise ValueError(f'Row with index "{row_index}" does not exist')

{supervisely-6.73.259 → supervisely-6.73.261}/supervisely/app/widgets/pretrained_models_selector/pretrained_models_selector.py

@@ -1,9 +1,10 @@
-from typing import Dict, List, Union
+from typing import Dict, List, Literal, Union
 
 from supervisely.api.api import Api
 from supervisely.app.content import DataJson, StateJson
 from supervisely.app.widgets import Widget
 from supervisely.io.fs import get_file_ext
+from supervisely.nn.utils import ModelSource
 
 
 class PretrainedModelsSelector(Widget):
@@ -134,39 +135,71 @@ class PretrainedModelsSelector(Widget):
             selected_row_index = int(widget_actual_state["selectedRow"])
             return models[selected_row_index]
 
-    def get_selected_model_params(self, model_name_column: str = "Model") -> Union[Dict, None]:
+    def get_selected_model_params(
+        self,
+        model_name_column: str = "Model",
+        train_version: Literal["v1", "v2"] = "v1",
+    ) -> Union[Dict, None]:
         selected_model = self.get_selected_row()
         if selected_model is None:
             return {}
 
-        model_name = selected_model.get(model_name_column)
-        if model_name is None:
-            raise ValueError(
-                "Could not find model name. Make sure you have column 'Model' in your models list."
-            )
-        checkpoint_url = selected_model.get("meta", {}).get("weights_url")
-        if checkpoint_url is None:
-            pass
-
-        checkpoint_ext = get_file_ext(checkpoint_url)
-        checkpoint_name = f"{model_name.lower()}{checkpoint_ext}"
-
-        task_type = self.get_selected_task_type()
-        model_params = {
-            "model_source": "Pretrained models",
-            "task_type": task_type,
-            "checkpoint_name": checkpoint_name,
-            "checkpoint_url": checkpoint_url,
-        }
-
-        if len(self._arch_types) > 1:
-            arch_type = self.get_selected_arch_type()
-            model_params["arch_type"] = arch_type
-
-        config_url = selected_model.get("meta", {}).get("config_url")
-        if config_url is not None:
-            model_params["config_url"] = config_url
+        if train_version == "v1":
+            model_name = selected_model.get(model_name_column)
+            if model_name is None:
+                raise ValueError(
+                    "Could not find model name. Make sure you have column 'Model' in your models list."
+                )
+
+            model_meta = selected_model.get("meta")
+            if model_meta is None:
+                raise ValueError(
+                    "Could not find model meta. Make sure you have key 'meta' in your models configuration list."
+                )
+            checkpoint_url = model_meta.get("weights_url")
+            if checkpoint_url is None:
+                model_files = model_meta.get("model_files")
+                if model_files is None:
+                    raise ValueError(
+                        "Could not find model files. Make sure you have key 'model_files' or 'weights_url' in 'meta' in your models configuration list."
+                    )
+                checkpoint_url = model_files.get("checkpoint")
+                if checkpoint_url is None:
+                    raise ValueError(
+                        "Could not find checkpoint url. Make sure you have key 'checkpoint' in 'model_files' in 'meta' in your models configuration list."
+                    )
+
+            checkpoint_ext = get_file_ext(checkpoint_url)
+            checkpoint_name = f"{model_name.lower()}{checkpoint_ext}"
+
+            task_type = self.get_selected_task_type()
+            model_params = {
+                "model_source": "Pretrained models",
+                "task_type": task_type,
+                "checkpoint_name": checkpoint_name,
+                "checkpoint_url": checkpoint_url,
+            }
 
+            if len(self._arch_types) > 1:
+                arch_type = self.get_selected_arch_type()
+                model_params["arch_type"] = arch_type
+
+            config_url = selected_model.get("meta", {}).get("config_url")
+            if config_url is not None:
+                model_params["config_url"] = config_url
+        elif train_version == "v2":
+            model_info = self.get_selected_row()
+            meta = model_info.get("meta")
+            if meta is None:
+                raise ValueError("key 'meta' not found in model configuration")
+            model_files = meta.get("model_files")
+            if model_files is None:
+                raise ValueError("key 'model_files' not found in key 'meta' in model configuration")
+            model_params = {
+                "model_source": ModelSource.PRETRAINED,
+                "model_info": model_info,
+                "model_files": model_files,
+            }
         return model_params
 
     def get_selected_row_index(self, state=StateJson()) -> Union[int, None]:

{supervisely-6.73.259 → supervisely-6.73.261}/supervisely/nn/artifacts/artifacts.py

@@ -536,58 +536,62 @@ class BaseTrainArtifacts:
             api: Api, train_info: TrainInfo
         ) -> ExperimentInfo:
 
-            checkpoints = []
-            for chk in train_info.checkpoints:
-                if self.weights_folder:
-                    checkpoints.append(join(self.weights_folder, chk.name))
-                else:
-                    checkpoints.append(chk.name)
-
-            best_checkpoint = next(
-                (chk.name for chk in train_info.checkpoints if "best" in chk.name), None
-            )
-            if not best_checkpoint and checkpoints:
-                best_checkpoint = get_file_name_with_ext(checkpoints[-1])
-
-            task_info = api.task.get_info_by_id(train_info.task_id)
-            workspace_id = task_info["workspaceId"]
-
-            project = api.project.get_info_by_name(workspace_id, train_info.project_name)
-            project_id = project.id if project else None
-
-            model_files = {}
-            if train_info.config_path:
-                model_files["config"] = self.get_config_path(train_info.artifacts_folder).replace(
-                    train_info.artifacts_folder, ""
+            try:
+                checkpoints = []
+                for chk in train_info.checkpoints:
+                    if self.weights_folder:
+                        checkpoints.append(join(self.weights_folder, chk.name))
+                    else:
+                        checkpoints.append(chk.name)
+
+                best_checkpoint = next(
+                    (chk.name for chk in train_info.checkpoints if "best" in chk.name), None
                 )
-
-            input_datetime = task_info["startedAt"]
-            parsed_datetime = datetime.strptime(input_datetime, "%Y-%m-%dT%H:%M:%S.%fZ")
-            date_time = parsed_datetime.strftime("%Y-%m-%d %H:%M:%S")
-
-            experiment_info_data = {
-                "experiment_name": f"Unknown {self.framework_name} experiment",
-                "framework_name": self.framework_name,
-                "model_name": f"Unknown {self.framework_name} model",
-                "task_type": train_info.task_type,
-                "project_id": project_id,
-                "task_id": train_info.task_id,
-                "model_files": model_files,
-                "checkpoints": checkpoints,
-                "best_checkpoint": best_checkpoint,
-                "artifacts_dir": train_info.artifacts_folder,
-                "datetime": date_time,
-            }
-
-            experiment_info_fields = {
-                field.name
-                for field in ExperimentInfo.__dataclass_fields__.values()  # pylint: disable=no-member
-            }
-            for field in experiment_info_fields:
-                if field not in experiment_info_data:
-                    experiment_info_data[field] = None
-
-            return ExperimentInfo(**experiment_info_data)
+                if not best_checkpoint and checkpoints:
+                    best_checkpoint = get_file_name_with_ext(checkpoints[-1])
+
+                task_info = api.task.get_info_by_id(train_info.task_id)
+                workspace_id = task_info["workspaceId"]
+
+                project = api.project.get_info_by_name(workspace_id, train_info.project_name)
+                project_id = project.id if project else None
+
+                model_files = {}
+                if train_info.config_path:
+                    model_files["config"] = self.get_config_path(
+                        train_info.artifacts_folder
+                    ).replace(train_info.artifacts_folder, "")
+
+                input_datetime = task_info["startedAt"]
+                parsed_datetime = datetime.strptime(input_datetime, "%Y-%m-%dT%H:%M:%S.%fZ")
+                date_time = parsed_datetime.strftime("%Y-%m-%d %H:%M:%S")
+
+                experiment_info_data = {
+                    "experiment_name": f"Unknown {self.framework_name} experiment",
+                    "framework_name": self.framework_name,
+                    "model_name": f"Unknown {self.framework_name} model",
+                    "task_type": train_info.task_type,
+                    "project_id": project_id,
+                    "task_id": train_info.task_id,
+                    "model_files": model_files,
+                    "checkpoints": checkpoints,
+                    "best_checkpoint": best_checkpoint,
+                    "artifacts_dir": train_info.artifacts_folder,
+                    "datetime": date_time,
+                }
+
+                experiment_info_fields = {
+                    field.name
+                    for field in ExperimentInfo.__dataclass_fields__.values()  # pylint: disable=no-member
+                }
+                for field in experiment_info_fields:
+                    if field not in experiment_info_data:
+                        experiment_info_data[field] = None
+
+                return ExperimentInfo(**experiment_info_data)
+            except Exception as e:
+                logger.warning(f"Failed to build experiment info: {e}")
+                return None
 
         train_infos = self.get_list(sort)
 

{supervisely-6.73.259 → supervisely-6.73.261}/supervisely/nn/inference/inference.py

@@ -571,7 +571,9 @@ class Inference:
                     ) as download_pbar:
                         self.gui.download_progress.show()
                         sly_fs.download(
-                            url=file_url, save_path=file_path, progress=download_pbar.update
+                            url=file_url,
+                            save_path=file_path,
+                            progress=download_pbar.update,
                         )
                     local_model_files[file] = file_path
             else:
@@ -590,6 +592,10 @@ class Inference:
         for file in model_files:
             file_url = model_files[file]
             file_info = self.api.file.get_info_by_path(team_id, file_url)
+            if file_info is None:
+                raise FileNotFoundError(
+                    f"File '{file_url}' not found in Team Files. Make sure the file exists."
+                )
             file_size = file_info.sizeb
             file_name = os.path.basename(file_url)
             file_path = os.path.join(self.model_dir, file_name)
@@ -1374,7 +1380,11 @@ class Inference:
         return result
 
     def _inference_images_ids(
-        self, api: Api, state: dict, images_ids: List[int], async_inference_request_uuid: str = None
+        self,
+        api: Api,
+        state: dict,
+        images_ids: List[int],
+        async_inference_request_uuid: str = None,
     ):
         """Inference images by ids.
         If "output_project_id" in state, upload images and annotations to the output project.
@@ -1799,7 +1809,8 @@ class Inference:
             dataset_id = _get_or_create_new_dataset(output_project_id, src_dataset_id)
             image_names = [result["image_name"] for result in results]
             image_infos = api.image.get_list(
-                dataset_id, filters=[{"field": "name", "operator": "in", "value": image_names}]
+                dataset_id,
+                filters=[{"field": "name", "operator": "in", "value": image_names}],
             )
             meta_changed = False
             anns = []
@@ -2104,7 +2115,10 @@ class Inference:
                 # Read images
                 if cache_project_on_model:
                     images_nps = []
-                    for dataset_id, images_infos in images_infos_batch_by_dataset.items():
+                    for (
+                        dataset_id,
+                        images_infos,
+                    ) in images_infos_batch_by_dataset.items():
                         dataset_info = datasets_infos_dict[dataset_id]
                         images_paths, _ = zip(
                             *read_from_cached_project(
@@ -2116,7 +2130,10 @@ class Inference:
                         images_nps.extend([sly_image.read(path) for path in images_paths])
                 else:
                     images_nps = []
-                    for dataset_id, images_infos in images_infos_batch_by_dataset.items():
+                    for (
+                        dataset_id,
+                        images_infos,
+                    ) in images_infos_batch_by_dataset.items():
                         images_nps.extend(
                             self.cache.download_images(
                                 api,
@@ -2845,7 +2862,8 @@ def update_meta_and_ann(meta: ProjectMeta, ann: Annotation):
     """Update project meta and annotation to match each other
     If obj class or tag meta from annotation conflicts with project meta
     add suffix to obj class or tag meta.
-    Return tuple of updated project meta, annotation and boolean flag if meta was changed."""
+    Return tuple of updated project meta, annotation and boolean flag if meta was changed.
+    """
     obj_classes_suffixes = ["_nn"]
     tag_meta_suffixes = ["_nn"]
     ann_obj_classes = {}

{supervisely-6.73.259 → supervisely-6.73.261/supervisely.egg-info}/PKG-INFO

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