supervisely 6.73.251__tar.gz → 6.73.253__tar.gz

{supervisely-6.73.251/supervisely.egg-info → supervisely-6.73.253}/PKG-INFO

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

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/api/dataset_api.py

@@ -263,6 +263,21 @@ class DatasetApi(UpdateableModule, RemoveableModuleApi):
             raise KeyError(f"Dataset with id={id} not found in your account")
         return info
 
+    def _get_effective_new_name(
+        self, project_id: int, name: str, change_name_if_conflict: bool, parent_id: int = None
+    ):
+        return (
+            self._get_free_name(
+                exist_check_fn=lambda name: self.get_info_by_name(
+                    project_id, name, parent_id=parent_id
+                )
+                is not None,
+                name=name,
+            )
+            if change_name_if_conflict
+            else name
+        )
+
     def create(
         self,
         project_id: int,
@@ -306,9 +321,10 @@ class DatasetApi(UpdateableModule, RemoveableModuleApi):
             print(len(new_ds_info)) # 2
         """
         effective_name = self._get_effective_new_name(
-            parent_id=project_id,
+            project_id=project_id,
             name=name,
             change_name_if_conflict=change_name_if_conflict,
+            parent_id=parent_id,
         )
         response = self._api.post(
             "datasets.add",

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/api/project_api.py

@@ -95,6 +95,7 @@ class ProjectInfo(NamedTuple):
     settings: dict
     import_settings: dict
     version: dict
+    created_by_id: int
 
     @property
     def image_preview_url(self):
@@ -169,6 +170,7 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
                         backup_archive={},
                         team_id=2,
                         import_settings={}
+                        version={'id': 260, 'version': 3}
                         )
         """
         return [
@@ -191,6 +193,7 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
             ApiField.SETTINGS,
             ApiField.IMPORT_SETTINGS,
             ApiField.VERSION,
+            ApiField.CREATED_BY_ID,
         ]
 
     @staticmethod
@@ -427,7 +430,7 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
         """
 
         fields = [
-            x for x in self.info_sequence() if x not in (ApiField.ITEMS_COUNT, ApiField.SETTINGS)
+            x for x in self.info_sequence() if x not in (ApiField.ITEMS_COUNT, ApiField.SETTINGS, ApiField.CREATED_BY_ID)
         ]
 
         info = super().get_info_by_name(parent_id, name, fields)

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/api/volume/volume_annotation_api.py

@@ -128,7 +128,9 @@ class VolumeAnnotationAPI(EntityAnnotationAPI):
         volume_info = self._api.volume.get_info_by_id(volume_id)
         return self._download(volume_info.dataset_id, volume_id)
 
-    def append(self, volume_id: int, ann: VolumeAnnotation, key_id_map: KeyIdMap = None):
+    def append(
+        self, volume_id: int, ann: VolumeAnnotation, key_id_map: KeyIdMap = None, volume_info=None
+    ):
         """
         Loads VolumeAnnotation to a given volume ID in the API.
 
@@ -159,13 +161,14 @@ class VolumeAnnotationAPI(EntityAnnotationAPI):
         else:
             figures = ann.figures
 
-        info = self._api.volume.get_info_by_id(volume_id)
+        if volume_info is None:
+            volume_info = self._api.volume.get_info_by_id(volume_id)
         self._append(
             self._api.volume.tag,
             self._api.volume.object,
             self._api.volume.figure,
-            info.project_id,
-            info.dataset_id,
+            volume_info.project_id,
+            volume_info.dataset_id,
             volume_id,
             ann.tags,
             ann.objects,

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/app/widgets/experiment_selector/experiment_selector.py

@@ -73,20 +73,28 @@ class ExperimentSelector(Widget):
 
             # col 3 project
             self._training_project_id = experiment_info.project_id
-            self._training_project_info = self._api.project.get_info_by_id(
-                self._training_project_id
-            )
+            if self._training_project_id is None:
+                self._training_project_info = None
+            else:
+                self._training_project_info = self._api.project.get_info_by_id(
+                    self._training_project_id
+                )
 
             # col 4 checkpoints
             self._checkpoints = experiment_info.checkpoints
 
             self._checkpoints_names = []
             self._checkpoints_paths = []
+            self._best_checkpoint_value = None
             for checkpoint_path in self._checkpoints:
                 self._checkpoints_names.append(get_file_name_with_ext(checkpoint_path))
                 self._checkpoints_paths.append(
                     os.path.join(experiment_info.artifacts_dir, checkpoint_path)
                 )
+                if experiment_info.best_checkpoint == get_file_name_with_ext(checkpoint_path):
+                    self._best_checkpoint = os.path.join(
+                        experiment_info.artifacts_dir, checkpoint_path
+                    )
 
             # col 5 session
             self._session_link = self._generate_session_link()
@@ -234,6 +242,8 @@ class ExperimentSelector(Widget):
             for path, name in zip(self._checkpoints_paths, self._checkpoints_names):
                 checkpoint_selector_items.append(Select.Item(value=path, label=name))
             checkpoint_selector = Select(items=checkpoint_selector_items)
+            if self._best_checkpoint_value is not None:
+                checkpoint_selector.set_value(self._best_checkpoint)
             return checkpoint_selector
 
         def _create_session_widget(self) -> Text:

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/artifacts.py

@@ -3,6 +3,7 @@ import string
 from abc import abstractmethod
 from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from datetime import datetime
 from json import JSONDecodeError
 from os.path import dirname, join
 from time import time
@@ -14,8 +15,9 @@ from supervisely import logger
 from supervisely._utils import abs_url, is_development
 from supervisely.api.api import Api, ApiField
 from supervisely.api.file_api import FileInfo
-from supervisely.io.fs import silent_remove
+from supervisely.io.fs import get_file_name_with_ext, silent_remove
 from supervisely.io.json import dump_json_file
+from supervisely.nn.experiments import ExperimentInfo
 
 
 class TrainInfo(NamedTuple):
@@ -53,6 +55,7 @@ class BaseTrainArtifacts:
         self._metadata_file_name: str = "train_info.json"
 
         self._app_name: str = None
+        self._framework_name: str = None
         self._framework_folder: str = None
         self._weights_folder: str = None
         self._task_type: str = None
@@ -91,6 +94,16 @@ class BaseTrainArtifacts:
         """
         return self._app_name
 
+    @property
+    def framework_name(self):
+        """
+        Framework name.
+
+        :return: The framework name.
+        :rtype: str
+        """
+        return self._framework_name
+
     @property
     def framework_folder(self):
         """
@@ -518,6 +531,84 @@ class BaseTrainArtifacts:
         logger.debug(f"Listing time: '{format(end_time - start_time, '.6f')}' sec")
         return train_infos
 
+    def get_list_experiment_info(self, sort: Literal["desc", "asc"] = "desc") -> List[TrainInfo]:
+        def build_experiment_info_from_train_info(
+            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, ""
+                )
+
+            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)
+
+        train_infos = self.get_list(sort)
+
+        # Sync version
+        # Uncomment for debug
+        # experiment_infos = [
+        #     convert_traininfo_to_experimentinfo(api, framework_cls, train_info)
+        #     for train_info in train_infos
+        # ]
+        # return experiment_infos
+
+        # Async version
+        with ThreadPoolExecutor() as executor:
+            experiment_infos = list(
+                executor.map(
+                    lambda t: build_experiment_info_from_train_info(self._api, t),
+                    train_infos,
+                )
+            )
+        return [info for info in experiment_infos if info is not None]
+
     def get_available_task_types(self) -> List[str]:
         """
         Get available task types.

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/detectron2.py

@@ -10,6 +10,7 @@ class Detectron2(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train Detectron2"
+        self._framework_name = "Detectron2"
         self._framework_folder = "/detectron2"
         self._weights_folder = "checkpoints"
         self._legacy_weights_folder = "detectron_data"

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/mmclassification.py

@@ -10,6 +10,7 @@ class MMClassification(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train MMClassification"
+        self._framework_name = "MMClassification"
         self._framework_folder = "/mmclassification"
         self._weights_folder = "checkpoints"
         self._task_type = "classification"

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/mmdetection.py

@@ -13,6 +13,7 @@ class MMDetection(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train MMDetection"
+        self._framework_name = "MMDetection"
         self._framework_folder = "/mmdetection"
         self._weights_folder = "checkpoints/data"
         self._task_type = None
@@ -58,6 +59,7 @@ class MMDetection3(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train MMDetection 3.0"
+        self._framework_name = "MMDetection 3.0"
         self._framework_folder = "/mmdetection-3"
         self._weights_folder = None
         self._task_type = None

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/mmsegmentation.py

@@ -10,6 +10,7 @@ class MMSegmentation(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train MMSegmentation"
+        self._framework_name = "MMSegmentation"
         self._framework_folder = "/mmsegmentation"
         self._weights_folder = "checkpoints/data"
         self._task_type = "instance segmentation"

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/ritm.py

@@ -10,6 +10,7 @@ class RITM(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train RITM"
+        self._framework_name = "RITM"
         self._framework_folder = "/RITM_training"
         self._weights_folder = "checkpoints"
         self._task_type = None

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/rtdetr.py

@@ -10,6 +10,7 @@ class RTDETR(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train RT-DETR"
+        self._framework_name = "RT-DETR"
         self._framework_folder = "/RT-DETR"
         self._weights_folder = "weights"
         self._task_type = "object detection"

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/unet.py

@@ -10,6 +10,7 @@ class UNet(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train UNet"
+        self._framework_name = "UNet"
         self._framework_folder = "/unet"
         self._weights_folder = "checkpoints"
         self._task_type = "semantic segmentation"

supervisely-6.73.253/supervisely/nn/artifacts/utils.py

@@ -0,0 +1,50 @@
+from supervisely.nn.artifacts.artifacts import BaseTrainArtifacts
+from supervisely.nn.artifacts import (
+    YOLOv5,
+    YOLOv5v2,
+    YOLOv8,
+    MMClassification,
+    MMSegmentation,
+    MMDetection,
+    MMDetection3,
+    Detectron2,
+    UNet,
+    RITM,
+    RTDETR,
+)
+
+
+class FrameworkName:
+    YOLOV5 = "YOLOv5"
+    YOLOV5V2 = "YOLOv5 2.0"
+    YOLOV8 = "YOLOv8+"
+    MMCLASSIFICATION = "MMClassification"
+    MMSEGMENTATION = "MMSegmentation"
+    MMDETECTION = "MMDetection"
+    MMDETECTION3 = "MMDetection 3.0"
+    RTDETR = "RT-DETR"
+    DETECTRON2 = "Detectron2"
+    UNET = "UNet"
+    RITM = "RITM"
+
+
+class FrameworkMapper:
+    _map = {
+        FrameworkName.YOLOV5: YOLOv5,
+        FrameworkName.YOLOV5V2: YOLOv5v2,
+        FrameworkName.YOLOV8: YOLOv8,
+        FrameworkName.MMCLASSIFICATION: MMClassification,
+        FrameworkName.MMSEGMENTATION: MMSegmentation,
+        FrameworkName.MMDETECTION: MMDetection,
+        FrameworkName.MMDETECTION3: MMDetection3,
+        FrameworkName.RTDETR: RTDETR,
+        FrameworkName.DETECTRON2: Detectron2,
+        FrameworkName.UNET: UNet,
+        FrameworkName.RITM: RITM,
+    }
+
+    @classmethod
+    def get_framework_cls(cls, name: str, team_id: int) -> BaseTrainArtifacts:
+        if name not in cls._map:
+            raise ValueError(f"Unknown framework: {name}")
+        return cls._map[name](team_id)

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/yolov5.py

@@ -10,6 +10,7 @@ class YOLOv5(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train YOLOv5"
+        self._framework_name = "YOLOv5"
         self._framework_folder = "/yolov5_train"
         self._weights_folder = "weights"
         self._task_type = "object detection"
@@ -39,6 +40,7 @@ class YOLOv5v2(YOLOv5):
         super().__init__(team_id)
 
         self._app_name = "Train YOLOv5 2.0"
+        self._framework_name = "YOLOv5 2.0"
         self._framework_folder = "/yolov5_2.0_train"
         self._weights_folder = "weights"
         self._task_type = "object detection"

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/artifacts/yolov8.py

@@ -10,6 +10,7 @@ class YOLOv8(BaseTrainArtifacts):
         super().__init__(team_id)
 
         self._app_name = "Train YOLOv8 | v9 | v10 | v11"
+        self._framework_name = "YOLOv8+"
         self._framework_folder = "/yolov8_train"
         self._weights_folder = "weights"
         self._task_type = None

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/experiments.py

@@ -2,13 +2,12 @@ from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass, fields
 from json import JSONDecodeError
 from os.path import dirname, join
-from typing import Any, Dict, List
+from typing import List
 
 import requests
 
 from supervisely import logger
 from supervisely.api.api import Api, ApiField
-from supervisely.api.file_api import FileInfo
 
 
 @dataclass
@@ -51,7 +50,9 @@ class ExperimentInfo:
     """Evaluation metrics"""
 
 
-def get_experiment_infos(api: Api, team_id: int, framework_name: str) -> List[ExperimentInfo]:
+def get_experiment_infos(
+    api: Api, team_id: int, framework_name: str
+) -> List[ExperimentInfo]:
     """
     Get experiments from the specified framework folder for Train v2
 
@@ -78,7 +79,9 @@ def get_experiment_infos(api: Api, team_id: int, framework_name: str) -> List[Ex
     experiments_folder = "/experiments"
     experiment_infos = []
 
-    file_infos = api.file.list(team_id, experiments_folder, recursive=True, return_type="fileinfo")
+    file_infos = api.file.list(
+        team_id, experiments_folder, recursive=True, return_type="fileinfo"
+    )
     sorted_experiment_paths = []
     for file_info in file_infos:
         if not file_info.path.endswith(metadata_name):
@@ -101,7 +104,9 @@ def get_experiment_infos(api: Api, team_id: int, framework_name: str) -> List[Ex
             required_fields = {field.name for field in fields(ExperimentInfo)}
             missing_fields = required_fields - response_json.keys()
             if missing_fields:
-                logger.debug(f"Missing fields: {missing_fields} for '{experiment_path}'")
+                logger.debug(
+                    f"Missing fields: {missing_fields} for '{experiment_path}'"
+                )
                 return None
             return ExperimentInfo(**response_json)
         except requests.exceptions.RequestException as e:
@@ -112,9 +117,10 @@ def get_experiment_infos(api: Api, team_id: int, framework_name: str) -> List[Ex
             logger.error(f"TypeError for '{experiment_path}': {e}")
         return None
 
-    # Error
     with ThreadPoolExecutor() as executor:
-        experiment_infos = list(executor.map(fetch_experiment_data, sorted_experiment_paths))
+        experiment_infos = list(
+            executor.map(fetch_experiment_data, sorted_experiment_paths)
+        )
 
     experiment_infos = [info for info in experiment_infos if info is not None]
     return experiment_infos

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely/nn/training/gui/model_selector.py

@@ -1,6 +1,7 @@
 from typing import Literal
 
 import supervisely.io.env as sly_env
+from supervisely import logger
 from supervisely.api.api import Api
 from supervisely.app.widgets import (
     Button,
@@ -13,6 +14,7 @@ from supervisely.app.widgets import (
 )
 from supervisely.nn.experiments import get_experiment_infos
 from supervisely.nn.utils import ModelSource
+from supervisely.nn.artifacts.utils import FrameworkMapper, FrameworkName
 
 
 class ModelSelector:
@@ -22,12 +24,21 @@ class ModelSelector:
 
     def __init__(self, api: Api, framework: str, models: list, app_options: dict = {}):
         self.display_widgets = []
-        self.team_id = sly_env.team_id()  # get from project id
+        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):
+            try:
+                framework_cls = FrameworkMapper.get_framework_cls(framework, self.team_id)
+                legacy_experiment_infos = framework_cls.get_list_experiment_info()
+                experiment_infos = experiment_infos + legacy_experiment_infos
+            except:
+                logger.warn(f"Legacy checkpoints are not available for '{framework}'")
+
         self.experiment_selector = ExperimentSelector(self.team_id, experiment_infos)
         self.model_source_tabs = RadioTabs(
             titles=[ModelSource.PRETRAINED, ModelSource.CUSTOM],

{supervisely-6.73.251 → supervisely-6.73.253/supervisely.egg-info}/PKG-INFO

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

{supervisely-6.73.251 → supervisely-6.73.253}/supervisely.egg-info/SOURCES.txt

@@ -734,6 +734,7 @@ supervisely/nn/artifacts/mmsegmentation.py
 supervisely/nn/artifacts/ritm.py
 supervisely/nn/artifacts/rtdetr.py
 supervisely/nn/artifacts/unet.py
+supervisely/nn/artifacts/utils.py
 supervisely/nn/artifacts/yolov5.py
 supervisely/nn/artifacts/yolov8.py
 supervisely/nn/benchmark/__init__.py