supervisely 6.73.410__py3-none-any.whl → 6.73.470__py3-none-any.whl

supervisely/app/widgets/transfer/transfer.py

@@ -41,7 +41,9 @@ class Transfer(Widget):
     :param right_checked: A list of keys of the items in the right (target) list, which should be checked at widget
                         initialization. Defaults to None.
     :type right_checked: List[str], optional
-            
+    :param width: The width of the widget in pixels. The default and minimum width is 150 pixels.
+    :type width: int, optional
+
     :Methods:
     get_transferred_items(): returns the list of keys of the items, which are currently displayed in the
         right (target) list.
@@ -88,7 +90,7 @@ class Transfer(Widget):
     """
     class Routes:
         VALUE_CHANGED = "value_changed"
-        
+
     class Item:
         """
         Class for representing items in the Transfer widget.
@@ -123,45 +125,49 @@ class Transfer(Widget):
             else:
                 self.label = label
             self.disabled = disabled
-    
+
         def to_json(self):
             return {"key": self.key, "label": self.label, "disabled": self.disabled}
-    
-    def __init__(self, 
-                 items: Optional[Union[List[Item], List[str]]] = None, 
-                 transferred_items: Optional[List[str]] = None, 
-                 widget_id: Optional[str] = None,
-                 filterable: Optional[bool] = False, 
-                 filter_placeholder: Optional[str] = None, 
-                 titles: Optional[List[str]] = None,
-                 button_texts: Optional[List[str]] = None, 
-                 left_checked: Optional[List[str]] = None, 
-                 right_checked: Optional[List[str]] = None):    
-        
+
+    def __init__(
+        self,
+        items: Optional[Union[List[Item], List[str]]] = None,
+        transferred_items: Optional[List[str]] = None,
+        widget_id: Optional[str] = None,
+        filterable: Optional[bool] = False,
+        filter_placeholder: Optional[str] = None,
+        titles: Optional[List[str]] = None,
+        button_texts: Optional[List[str]] = None,
+        left_checked: Optional[List[str]] = None,
+        right_checked: Optional[List[str]] = None,
+        width: int = 150,
+    ):
+
         self._changes_handled = False
         self._items = []
         self._transferred_items = []
-        
+
         if items:
             self._items = self.__checked_items(items)
-        
+
         if transferred_items:
             self._transferred_items = self.__checked_transferred_items(transferred_items)
-        
+
         # If wrong items are specified, items won't be checked.
         self._left_checked = left_checked
         self._right_checked = right_checked
-        
+
         self._filterable = filterable
         self._filter_placeholder = filter_placeholder
-        
+
+        self._width = max(width, 150)
+
         self._titles = titles if titles is not None else ["Source", "Target"]
-        
+
         self._button_texts = button_texts
-        
+
         super().__init__(widget_id=widget_id, file_path=__file__)
-    
-    
+
     def __checked_items(self, items: Optional[Union[List[Item], List[str]]]) -> List[Transfer.Item]:
         """
         If the list of items is specified as a list of strings, they will be converted to Transfer.Item objects. List of
@@ -183,17 +189,17 @@ class Transfer(Widget):
             if len(set(items)) != len(items):
                 # If the keys of the items are not unique, an error will be raised.
                 raise ValueError("The keys of the items should be unique.")
-            
+
             checked_items = [Transfer.Item(key=item) for item in items]
         else:
             # If items are specified as Transfer.Item objects, they will be checked for uniqueness.
             if len({item.key for item in items}) != len(items):
                 # If the keys of the items are not unique, an error will be raised.
                 raise ValueError("The keys of the items should be unique.")
-            
+
             checked_items = items
         return checked_items
-    
+
     def __checked_transferred_items(self, transferred_items: List[str]) -> List[str]:
         """
         If the self._items is specified, the list of transferred items will be checked for the keys of the items. Since
@@ -223,7 +229,7 @@ class Transfer(Widget):
                     "the keys of the items specified in the 'items' argument.")
             else:
                 return transferred_items
-    
+
     def get_json_data(self) -> Dict[str, Union[List[Dict[str, Union[str, bool]]], None]]:
         """
         Returns the data of the widget in JSON format.
@@ -243,7 +249,7 @@ class Transfer(Widget):
             res["items"] = [item.to_json() for item in self._items]
 
         return res
-    
+
     def get_json_state(self) -> Dict[str, List[str]]:
         """
         Returns the state of the widget in JSON format.
@@ -256,9 +262,9 @@ class Transfer(Widget):
         """
 
         transferred_items = self._transferred_items
-        
+
         return {"transferred_items": transferred_items}
-    
+
     def get_transferred_items(self) -> List[str]:        
         """
         Returns the list of transferred items.
@@ -268,8 +274,7 @@ class Transfer(Widget):
         """
 
         return StateJson()[self.widget_id]["transferred_items"]
-    
-    
+
     def get_untransferred_items(self) -> List[str]:
         """
         Returns the list of untransferred items.
@@ -279,8 +284,7 @@ class Transfer(Widget):
         """
 
         return [item.key for item in self._items if item.key not in self.get_transferred_items()]
-    
-    
+
     def value_changed(self, func: Callable) -> Callable:
         """
         Decorates a function which will be called when the the items in right list are changed (moved in or out of the list).
@@ -305,22 +309,21 @@ class Transfer(Widget):
                 print(items.untransferred_items) # ["item3"]
         """
 
-        
         route_path = self.get_route_path(Transfer.Routes.VALUE_CHANGED)
         server = self._sly_app.get_server()
         self._changes_handled = True
 
         @server.post(route_path)
         def _click():
-            
+
             Items = namedtuple("Items", ["transferred_items", "untransferred_items"])
-            
+
             res = Items(transferred_items=self.get_transferred_items(), untransferred_items=self.get_untransferred_items())
-            
+
             func(res)
 
         return _click
-    
+
     def set_items(self, items: Union[List[Transfer.Item], List[str]]):
         """
         Sets the list of items for the widget.
@@ -345,7 +348,7 @@ class Transfer(Widget):
 
             # As you can see, the list of items was replaced with the new one.
         """
-        
+
         if items:
             self._items = self.__checked_items(items)
         else:
@@ -365,7 +368,7 @@ class Transfer(Widget):
         self._transferred_items = self.__checked_transferred_items(transferred_items)
         self.update_state()
         StateJson().send_changes()
-        
+
     def add(self, items: Union[List[Item], List[str]]):
         """
         Adds new items to the current list of items.
@@ -391,14 +394,14 @@ class Transfer(Widget):
         """
 
         items = self.__checked_items(items)
-        
+
         if any([item.key in [item.key for item in self._items] for item in items]):
             raise ValueError("The 'items' argument should not contain any items with the same key as the items in the current list.")
         else:
             self._items.extend(items)
             self.update_data()
             DataJson().send_changes()
-            
+
     def remove(self, items_keys: List[str]):
         """
         Removes items from the current list of items.
@@ -416,7 +419,7 @@ class Transfer(Widget):
         self.update_state()
         DataJson().send_changes()
         StateJson().send_changes()
-    
+
     def get_items_keys(self) -> List[str]:
         """
         Returns the list of keys of the items.

supervisely/app/widgets/tree_select/tree_select.py

@@ -264,6 +264,8 @@ class TreeSelect(Widget):
 
         def _get_all_items(items: List[TreeSelect.Item]) -> List[TreeSelect.Item]:
             res = []
+            if not items:
+                return res
             for item in items:
                 res.append(item)
                 res.extend(_get_all_items(item.children))

supervisely/convert/image/csv/csv_converter.py

@@ -24,6 +24,7 @@ from supervisely.io.fs import (
     get_file_name_with_ext,
     list_files_recursively,
 )
+from supervisely.io.env import team_id
 from supervisely.io.json import load_json_file
 from supervisely.project.project_settings import LabelingInterface
 
@@ -78,16 +79,16 @@ class CSVConverter(ImageConverter):
     }
 
     def __init__(
-            self,
-            input_data: str,
-            labeling_interface: Optional[Union[LabelingInterface, str]],
-            upload_as_links: bool,
-            remote_files_map: Optional[Dict[str, str]] = None,
+        self,
+        input_data: str,
+        labeling_interface: Optional[Union[LabelingInterface, str]],
+        upload_as_links: bool,
+        remote_files_map: Optional[Dict[str, str]] = None,
     ):
         super().__init__(input_data, labeling_interface, upload_as_links, remote_files_map)
 
+        self._supports_links = True
         self._csv_reader = None
-        self._team_id = None
 
     def __str__(self):
         return AvailableImageConverters.CSV
@@ -121,6 +122,12 @@ class CSVConverter(ImageConverter):
 
         full_path = valid_files[0]
 
+        if self.upload_as_links and self._supports_links:
+            for local_path, remote_path in self._remote_files_map.items():
+                if local_path.endswith(full_path):
+                    self._api.storage.download(self._team_id, remote_path, local_path)
+                    break
+
         file_ext = get_file_ext(full_path)
         if file_ext in self.conversion_functions:
             csv_full_path = os.path.splitext(full_path)[0] + ".csv"
@@ -147,7 +154,7 @@ class CSVConverter(ImageConverter):
                         team_files = False
                     break
             if item_path is None:
-                logger.warn(f"Failed to find image path in row: {row}. Skipping.")
+                logger.warning(f"Failed to find image path in row: {row}. Skipping.")
                 continue
             ann_data = row.get("tag")
             item = CSVConverter.Item(
@@ -192,7 +199,7 @@ class CSVConverter(ImageConverter):
                 ann_json = csv_helper.rename_in_json(ann_json, renamed_classes, renamed_tags)
             return Annotation.from_json(ann_json, meta)
         except Exception as e:
-            logger.warn(f"Failed to convert annotation: {repr(e)}")
+            logger.warning(f"Failed to convert annotation: {repr(e)}")
             return item.create_empty_annotation()
 
     def process_remote_image(
@@ -209,19 +216,21 @@ class CSVConverter(ImageConverter):
         image_path = image_path.strip()
         if is_team_file:
             if not api.file.exists(team_id, image_path):
-                logger.warn(f"File {image_path} not found in Team Files. Skipping...")
+                logger.warning(f"File {image_path} not found in Team Files. Skipping...")
                 return None
             team_file_image_info = api.file.list(team_id, image_path)
             image_path = team_file_image_info[0]["fullStorageUrl"]
             if not image_path:
-                logger.warn(f"Failed to get full storage URL for file '{image_path}'. Skipping...")
+                logger.warning(
+                    f"Failed to get full storage URL for file '{image_path}'. Skipping..."
+                )
                 return None
 
         extension = os.path.splitext(image_path)[1]
         if not extension:
-            logger.warn(f"FYI: Image [{image_path}] doesn't have extension.")
+            logger.warning(f"FYI: Image [{image_path}] doesn't have extension.")
         elif extension.lower() not in SUPPORTED_IMG_EXTS:
-            logger.warn(
+            logger.warning(
                 f"Image [{image_path}] has unsupported extension [{extension}]. Skipping..."
             )
             return None
@@ -234,7 +243,7 @@ class CSVConverter(ImageConverter):
                 force_metadata_for_links=force_metadata,
             )
         except Exception:
-            logger.warn(f"Failed to upload image {image_name}. Skipping...")
+            logger.warning(f"Failed to link image {image_name}. Skipping...")
             return None
         if progress_cb is not None:
             progress_cb(1)
@@ -312,7 +321,7 @@ class CSVConverter(ImageConverter):
                     success = False
                     continue
                 if item.name not in info.name:
-                    logger.warn(
+                    logger.warning(
                         f"Batched image with name '{item.name}' doesn't match uploaded image name '{info.name}'"
                     )
                     success = False
@@ -339,4 +348,4 @@ class CSVConverter(ImageConverter):
         if success:
             logger.info(f"Dataset ID:'{dataset_id}' has been successfully uploaded.")
         else:
-            logger.warn(f"Dataset ID:'{dataset_id}' has been uploaded.")
+            logger.warning(f"Dataset ID:'{dataset_id}' has been uploaded.")

supervisely/convert/pointcloud/nuscenes_conv/nuscenes_converter.py

@@ -1,13 +1,15 @@
 import os
-from typing import Dict, Optional
+import uuid
+from typing import Dict, List, Optional
 
 import supervisely.convert.pointcloud_episodes.nuscenes_conv.nuscenes_helper as helpers
 import supervisely.io.fs as fs
-from supervisely import PointcloudAnnotation, PointcloudObject
+from supervisely import KeyIdMap, PointcloudAnnotation, PointcloudObject
 from supervisely._utils import is_development
 from supervisely.annotation.obj_class import ObjClass
 from supervisely.annotation.tag_meta import TagMeta, TagValueType
 from supervisely.api.api import Api, ApiField
+from supervisely.api.dataset_api import DatasetInfo
 from supervisely.convert.base_converter import AvailablePointcloudConverters
 from supervisely.convert.pointcloud.pointcloud_converter import PointcloudConverter
 from supervisely.convert.pointcloud_episodes.nuscenes_conv.nuscenes_converter import (
@@ -29,22 +31,9 @@ from supervisely.sly_logger import logger
 class NuscenesConverter(NuscenesEpisodesConverter, PointcloudConverter):
     """Converter for NuScenes pointcloud format."""
 
-    def __init__(
-        self,
-        input_data: str,
-        labeling_interface: str,
-        upload_as_links: bool,
-        remote_files_map: Optional[Dict[str, str]] = None,
-    ):
-        super().__init__(input_data, labeling_interface, upload_as_links, remote_files_map)
-        self._nuscenes = None
-
-    def __str__(self) -> str:
-        return AvailablePointcloudConverters.NUSCENES
-
     def to_supervisely(
         self,
-        scene_sample,
+        scene_sample: helpers.Sample,
         meta: ProjectMeta,
         renamed_classes: dict = {},
         renamed_tags: dict = {},
@@ -68,29 +57,27 @@ class NuscenesConverter(NuscenesEpisodesConverter, PointcloudConverter):
         return PointcloudAnnotation(PointcloudObjectCollection(objs), figures)
 
     def upload_dataset(self, api: Api, dataset_id: int, batch_size: int = 1, log_progress=True):
-        nuscenes = self._nuscenes
+        from nuscenes.nuscenes import NuScenes  # pylint: disable=import-error
+
+        nuscenes: NuScenes = self._nuscenes
+
+        key_id_map = KeyIdMap()
 
         tag_metas = [TagMeta(attr["name"], TagValueType.NONE) for attr in nuscenes.attribute]
         obj_classes = []
+        classes_token_map = {}
         for category in nuscenes.category:
             color = nuscenes.colormap[category["name"]]
-            description = category["description"]
-            if len(description) > 255:
-                # * Trim description to fit into 255 characters limit
-                sentences = description.split(".")
-                trimmed_description = ""
-                for sentence in sentences:
-                    if len(trimmed_description) + len(sentence) + 1 > 255:
-                        break
-                    trimmed_description += sentence + "."
-                description = trimmed_description.strip()
+            description = helpers.trim_description(category["description"])
             obj_classes.append(ObjClass(category["name"], Cuboid3d, color, description=description))
+            classes_token_map[category["token"]] = category["name"]
+        self._custom_data["classes_token_map"] = classes_token_map
 
         self._meta = ProjectMeta(obj_classes, tag_metas)
         meta, renamed_classes, renamed_tags = self.merge_metas_with_conflicts(api, dataset_id)
 
         dataset_info = api.dataset.get_info_by_id(dataset_id)
-        scene_name_to_dataset = {}
+        scene_name_to_dataset: Dict[str, DatasetInfo] = {}
 
         scene_names = [scene["name"] for scene in nuscenes.scene]
         scene_cnt = len(scene_names)
@@ -116,6 +103,7 @@ class NuscenesConverter(NuscenesEpisodesConverter, PointcloudConverter):
         else:
             progress_cb = None
 
+        self._custom_data["frame_token_map"] = {}
         for scene in nuscenes.scene:
             current_dataset_id = scene_name_to_dataset[scene["name"]].id
 
@@ -123,9 +111,11 @@ class NuscenesConverter(NuscenesEpisodesConverter, PointcloudConverter):
             sample_token = scene["first_sample_token"]
 
             # * Extract scene's samples
-            scene_samples = []
+            scene_samples: List[helpers.Sample] = []
+            frame_token_map = {}
             for i in range(scene["nbr_samples"]):
                 sample = nuscenes.get("sample", sample_token)
+                frame_token_map[sample["token"]] = i
                 lidar_path, boxes, _ = nuscenes.get_sample_data(sample["data"]["LIDAR_TOP"])
                 if not os.path.exists(lidar_path):
                     logger.warning(f'Scene "{scene["name"]}" has no LIDAR data.')
@@ -145,17 +135,18 @@ class NuscenesConverter(NuscenesEpisodesConverter, PointcloudConverter):
                     ]
                     visibility = nuscenes.get("visibility", ann["visibility_token"])["level"]
 
-                    anns.append(
-                        helpers.AnnotationObject(
-                            name,
-                            box,
-                            current_instance_token,
-                            parent_token,
-                            category,
-                            attributes,
-                            visibility,
-                        )
+                    ann_uuid = uuid.UUID(ann["token"])
+                    ann = helpers.AnnotationObject(
+                        name=name,
+                        bbox=box,
+                        token=ann_uuid,
+                        instance_token=current_instance_token,
+                        parent_token=parent_token,
+                        category=category,
+                        attributes=attributes,
+                        visibility=visibility,
                     )
+                    anns.append(ann)
 
                 # get camera data
                 sample_data = nuscenes.get("sample_data", sample["data"]["LIDAR_TOP"])
@@ -171,13 +162,14 @@ class NuscenesConverter(NuscenesEpisodesConverter, PointcloudConverter):
                 ]
                 scene_samples.append(helpers.Sample(timestamp, lidar_path, anns, camera_data))
                 sample_token = sample["next"]
+            self._custom_data["frame_token_map"][current_dataset_id] = frame_token_map
 
             # * Convert and upload pointclouds w/ annotations
             for idx, sample in enumerate(scene_samples):
                 pcd_ann = self.to_supervisely(sample, meta, renamed_classes, renamed_tags)
 
                 pcd_path = sample.convert_lidar_to_supervisely()
-                pcd_name = fs.get_file_name(pcd_path)
+                pcd_name = fs.get_file_name_with_ext(pcd_path)
                 pcd_meta = {
                     "frame": idx,
                     "vehicle": log["vehicle"],
@@ -191,7 +183,7 @@ class NuscenesConverter(NuscenesEpisodesConverter, PointcloudConverter):
                 pcd_id = info.id
                 # * Upload pointcloud annotation
                 try:
-                    api.pointcloud.annotation.append(pcd_id, pcd_ann)
+                    api.pointcloud.annotation.append(pcd_id, pcd_ann, key_id_map)
                 except Exception as e:
                     error_msg = getattr(getattr(e, "response", e), "text", str(e))
                     logger.warning(
@@ -222,6 +214,16 @@ class NuscenesConverter(NuscenesEpisodesConverter, PointcloudConverter):
 
             logger.info(f"Dataset ID:{current_dataset_id} has been successfully uploaded.")
 
+        key_id_map = key_id_map.to_dict()
+        key_id_map.pop("tags")
+        key_id_map.pop("videos")
+        self._custom_data["key_id_map"] = key_id_map
+
+        project_id = dataset_info.project_id
+        current_custom_data = api.project.get_custom_data(project_id)
+        current_custom_data.update(self._custom_data)
+        api.project.update_custom_data(project_id, current_custom_data)
+
         if log_progress:
             if is_development():
                 progress.close()