supervisely 6.73.473__tar.gz → 6.73.478__tar.gz

{supervisely-6.73.473/supervisely.egg-info → supervisely-6.73.478}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: supervisely
-Version: 6.73.473
+Version: 6.73.478
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely
@@ -44,7 +44,7 @@ Requires-Dist: pydantic<=2.12.3,>=1.7.4
 Requires-Dist: fastapi<=0.119.1,>=0.103.1
 Requires-Dist: websockets<=13.1,>=10.3
 Requires-Dist: jinja2<4.0.0,>=3.0.3
-Requires-Dist: psutil<6.0.0,>=5.9.0
+Requires-Dist: psutil<=7.2.0,>=5.9.0
 Requires-Dist: jsonpatch<2.0,>=1.32
 Requires-Dist: MarkupSafe<3.0.0,>=2.1.1
 Requires-Dist: arel<1.0.0,>=0.2.0
@@ -146,6 +146,18 @@ Requires-Dist: imagecorruptions<2.0.0,>=1.1.2; extra == "aug"
 Requires-Dist: numpy<2.0.0,>=1.19; extra == "aug"
 Provides-Extra: agent
 Requires-Dist: protobuf<=3.20.3,>=3.19.5; extra == "agent"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <h1 align="center">
   <a href="https://supervisely.com"><img alt="Supervisely" title="Supervisely" src="https://i.imgur.com/B276eMS.png"></a>

{supervisely-6.73.473 → supervisely-6.73.478}/setup.py

@@ -101,7 +101,7 @@ INSTALL_REQUIRES = [
     "fastapi>=0.103.1, <=0.119.1",
     "websockets>=10.3, <=13.1",
     "jinja2>=3.0.3, <4.0.0",
-    "psutil>=5.9.0, <6.0.0",
+    "psutil>=5.9.0, <=7.2.0",
     "jsonpatch>=1.32, <2.0",
     "MarkupSafe>=2.1.1, <3.0.0",
     "arel>=0.2.0, <1.0.0",

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/api/entities_collection_api.py

@@ -281,6 +281,7 @@ class EntitiesCollectionApi(UpdateableModule, RemoveableModuleApi):
         description: Optional[str] = None,
         type: str = CollectionType.DEFAULT,
         ai_search_key: Optional[str] = None,
+        change_name_if_conflict=False,
     ) -> EntitiesCollectionInfo:
         """
         Creates Entities Collections.
@@ -295,6 +296,8 @@ class EntitiesCollectionApi(UpdateableModule, RemoveableModuleApi):
         :type type: str
         :param ai_search_key: AI search key for the collection. Defaults to None.
         :type ai_search_key: Optional[str]
+        :param change_name_if_conflict: Checks if given name already exists and adds suffix to the end of the name. Defaults to False.
+        :type change_name_if_conflict: bool
         :return: Information about new Entities Collection
         :rtype: :class:`EntitiesCollectionInfo`
         :Usage example:
@@ -316,6 +319,13 @@ class EntitiesCollectionApi(UpdateableModule, RemoveableModuleApi):
             new_collection = api.entities_collection.create(project_id, name, description, type, ai_search_key)
             print(new_collection)
         """
+
+        name = self._get_effective_new_name(
+            parent_id=project_id,
+            name=name,
+            change_name_if_conflict=change_name_if_conflict,
+        )
+
         method = "entities-collections.add"
         data = {
             ApiField.PROJECT_ID: project_id,

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/api/labeling_job_api.py

@@ -89,6 +89,7 @@ class LabelingJobInfo(NamedTuple):
     exclude_images_with_tags: list
     entities: list
     priority: int
+    guide_id: Optional[int] = None
 
 
 class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
@@ -223,6 +224,7 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
             ApiField.EXCLUDE_IMAGES_WITH_TAGS,
             ApiField.ENTITIES,
             ApiField.PRIORITY,
+            ApiField.M_GUIDE_ID,
         ]
 
     @staticmethod
@@ -261,7 +263,10 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
                             else:
                                 value = info[sub_name]
                         else:
-                            value = value[sub_name]
+                            if skip_missing is True:
+                                value = value.get(sub_name, None)
+                            else:
+                                value = value[sub_name]
                 else:
                     raise RuntimeError("Can not parse field {!r}".format(field_name))
 
@@ -341,6 +346,7 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
         disable_submit: Optional[bool] = None,
         toolbox_settings: Optional[Dict] = None,
         enable_quality_check: Optional[bool] = None,
+        guide_id: Optional[int] = None,
     ) -> List[LabelingJobInfo]:
         """
         Creates Labeling Job and assigns given Users to it.
@@ -385,6 +391,8 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
         :type toolbox_settings: Dict, optional
         :param enable_quality_check: If True, adds an intermediate step between "review" and completing the Labeling Job.
         :type enable_quality_check: bool, optional
+        :param guide_id: Guide ID in Supervisely to assign a guide to the Labeling Job.
+        :type guide_id: int, optional
         :return: List of information about new Labeling Job. See :class:`info_sequence<info_sequence>`
         :rtype: :class:`List[LabelingJobInfo]`
         :Usage example:
@@ -465,6 +473,15 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
             "dynamicTags": dynamic_tags,
         }
 
+        if guide_id is not None:
+            try:
+                guide_id = int(guide_id)
+            except Exception as e:
+                raise ValueError(
+                    f"guide_id must be an integer, got {type(guide_id)} with value '{guide_id}'"
+                ) from None
+            meta["guide"] = guide_id
+
         if toolbox_settings is not None:
             dataset_info = self._api.dataset.get_info_by_id(dataset_id)
             project_id = dataset_info.project_id

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/api/labeling_queue_api.py

@@ -200,6 +200,7 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         skip_complete_job_on_empty: Optional[bool] = False,
         enable_quality_check: Optional[bool] = None,
         quality_check_user_ids: Optional[List[int]] = None,
+        guide_id: Optional[int] = None,
     ) -> int:
         """
         Creates Labeling Queue and assigns given Users to it.
@@ -256,6 +257,8 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         :type enable_quality_check: bool, optional
         :param quality_check_user_ids: List of User IDs in Supervisely to assign Users as Quality Checkers to Labeling Queue.
         :type quality_check_user_ids: List[int], optional
+        :param guide_id: Guide ID in Supervisely to assign a guide to the Labeling Queue.
+        :type guide_id: int, optional
         :return: Labeling Queue ID in Supervisely.
         :rtype: int
         :Usage example:
@@ -340,6 +343,15 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         if images_ids is not None:
             meta["entityIds"] = images_ids
 
+        if guide_id is not None:
+            try:
+                guide_id = int(guide_id)
+            except Exception as e:
+                raise ValueError(
+                    f"guide_id must be an integer, got {type(guide_id)} with value '{guide_id}'"
+                ) from None
+            meta["guide"] = guide_id
+
         if toolbox_settings is not None:
             if dataset_id is not None:
                 dataset_info = self._api.dataset.get_info_by_id(dataset_id)

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/api/module_api.py

@@ -713,6 +713,9 @@ class ApiField:
     """"""
     NN_UPDATED = "nnUpdated"
     """"""
+    M_GUIDE_ID = (["meta", "guide"], "guide_id")
+    """"""
+    GUIDE_ID = "guideId"
 
 
 def _get_single_item(items):

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/api/project_api.py

@@ -52,6 +52,7 @@ from supervisely.io.json import dump_json_file, load_json_file
 from supervisely.project.project_meta import ProjectMeta
 from supervisely.project.project_meta import ProjectMetaJsonFields as MetaJsonF
 from supervisely.project.project_settings import (
+    LabelingInterface,
     ProjectSettings,
     ProjectSettingsJsonFields,
 )
@@ -1993,8 +1994,11 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
         )
 
     def set_multiview_settings(self, project_id: int) -> None:
-        """Sets the project settings for multiview images.
-        Images will be grouped by tag and have synchronized view and labeling.
+        """Sets the project settings for multiview mode.
+        Automatically detects project type and applies appropriate settings:
+
+        - For IMAGE projects: Images are grouped by tag with synchronized view and labeling.
+        - For VIDEO projects: Videos are grouped by datasets (each dataset = one group).
 
         :param project_id: Project ID to set multiview settings.
         :type project_id: int
@@ -2015,17 +2019,51 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
             load_dotenv(os.path.expanduser("~/supervisely.env"))
             api = sly.Api.from_env()
 
-            api.project.set_multiview_settings(project_id=123)
+            # For images project - will enable grouping by tags
+            api.project.set_multiview_settings(image_project_id)
+
+            # For videos project - will enable grouping by datasets
+            api.project.set_multiview_settings(video_project_id)
         """
+        project_info = self.get_info_by_id(project_id)
+        if project_info.type == ProjectType.IMAGES.value:
+            self._set_custom_grouping_settings(
+                id=project_id,
+                group_images=True,
+                tag_name=_MULTIVIEW_TAG_NAME,
+                sync=False,
+                label_group_tag_name=_LABEL_GROUP_TAG_NAME,
+            )
+        elif project_info.type == ProjectType.VIDEOS.value:
+            self._set_custom_grouping_settings_video(project_id, sync=True)
+        else:
+            raise ValueError("Multiview settings can only be set for image or video projects")
 
-        self._set_custom_grouping_settings(
-            id=project_id,
-            group_images=True,
-            tag_name=_MULTIVIEW_TAG_NAME,
-            sync=False,
-            label_group_tag_name=_LABEL_GROUP_TAG_NAME,
+    def _set_custom_grouping_settings_video(self, project_id: int, sync: bool = True) -> None:
+        """Sets the project settings for multiview videos (private method).
+        For video projects, videos are grouped by datasets (not by tags).
+        Each dataset represents a group of videos that will be displayed together in multiview mode.
+
+        :param project_id: Project ID to set video multiview settings.
+        :type project_id: int
+        :param sync: If True, enables synchronized playback across video views.
+        :type sync: bool
+        :return: None
+        :rtype: :class:`NoneType`
+        """
+        meta = ProjectMeta.from_json(self.get_meta(project_id, with_settings=True))
+
+        new_settings = ProjectSettings(
+            multiview_enabled=True,
+            multiview_tag_name=None,  # Not used for videos
+            multiview_tag_id=None,  # Not used for videos
+            multiview_is_synced=sync,
+            labeling_interface=LabelingInterface.MULTIVIEW,
         )
 
+        meta = meta.clone(project_settings=new_settings)
+        self.update_meta(id=project_id, meta=meta)
+
     def remove_permanently(
         self, ids: Union[int, List], batch_size: int = 50, progress_cb=None
     ) -> List[dict]:
@@ -2606,7 +2644,9 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
             )
             dst_project_id = dst_project_info.id
 
-        datasets = self._api.dataset.get_list(src_project_id, recursive=True, include_custom_data=True)
+        datasets = self._api.dataset.get_list(
+            src_project_id, recursive=True, include_custom_data=True
+        )
         src_to_dst_ids = {}
 
         for src_dataset_info in datasets:

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/api/video/video_api.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import asyncio
 import datetime
+from itertools import zip_longest
 import json
 import os
 import re
@@ -705,7 +706,7 @@ class VideoApi(RemoveableBulkModuleApi):
         return project_id, dataset_id
 
     def upload_hash(
-        self, dataset_id: int, name: str, hash: str, stream_index: Optional[int] = None
+        self, dataset_id: int, name: str, hash: str, stream_index: Optional[int] = None, metadata: Optional[Dict] = None
     ) -> VideoInfo:
         """
         Upload Video from given hash to Dataset.
@@ -718,6 +719,8 @@ class VideoApi(RemoveableBulkModuleApi):
         :type hash: str
         :param stream_index: Index of video stream.
         :type stream_index: int, optional
+        :param metadata: Video metadata.
+        :type metadata: dict, optional
         :return: Information about Video. See :class:`info_sequence<info_sequence>`
         :rtype: :class:`VideoInfo`
         :Usage example:
@@ -786,6 +789,8 @@ class VideoApi(RemoveableBulkModuleApi):
         meta = {}
         if stream_index is not None and type(stream_index) is int:
             meta = {"videoStreamIndex": stream_index}
+        if metadata is not None:
+            meta.update(metadata)
         return self.upload_hashes(dataset_id, [name], [hash], [meta])[0]
 
     def upload_hashes(
@@ -1111,10 +1116,10 @@ class VideoApi(RemoveableBulkModuleApi):
             validate_ext(os.path.splitext(name)[1])
 
         for batch in batched(list(zip(names, items, metas))):
-            images = []
+            videos = []
             for name, item, meta in batch:
                 item_tuple = func_item_to_kv(item)
-                images.append(
+                videos.append(
                     {
                         "title": name,
                         item_tuple[0]: item_tuple[1],
@@ -1125,12 +1130,12 @@ class VideoApi(RemoveableBulkModuleApi):
                 "videos.bulk.add",
                 {
                     ApiField.DATASET_ID: dataset_id,
-                    ApiField.VIDEOS: images,
+                    ApiField.VIDEOS: videos,
                     ApiField.FORCE_METADATA_FOR_LINKS: force_metadata_for_links,
                 },
             )
             if progress_cb is not None:
-                progress_cb(len(images))
+                progress_cb(len(videos))
 
             results = [self._convert_json_info(item) for item in response.json()]
             name_to_res = {img_info.name: img_info for img_info in results}
@@ -1576,15 +1581,20 @@ class VideoApi(RemoveableBulkModuleApi):
         for hash_value, meta in zip(unique_hashes, unique_metas):
             hash_meta_dict[hash_value] = meta
 
-        metas = [hash_meta_dict[hash_value] for hash_value in hashes]
-
-        metas2 = [meta["meta"] for meta in metas]
-
+        video_metadatas = [hash_meta_dict[hash_value] for hash_value in hashes]
+        video_metadatas2 = [meta["meta"] for meta in video_metadatas]
         names = self.get_free_names(dataset_id, names)
 
-        for name, hash, meta in zip(names, hashes, metas2):
+        if metas is None:
+            metas = [None] * len(names)
+        if not isinstance(metas, list):
+            raise ValueError("metas must be a list")
+
+        for name, hash, video_metadata, metadata in zip_longest(
+            names, hashes, video_metadatas2, metas
+        ):
             try:
-                all_streams = meta["streams"]
+                all_streams = video_metadata["streams"]
                 video_streams = get_video_streams(all_streams)
                 for stream_info in video_streams:
                     stream_index = stream_info["index"]
@@ -1599,7 +1609,7 @@ class VideoApi(RemoveableBulkModuleApi):
                     # info = self._api.video.get_info_by_name(dataset_id, item_name)
                     # if info is not None:
                     #     item_name = gen_video_stream_name(name, stream_index)
-                    res = self.upload_hash(dataset_id, name, hash, stream_index)
+                    res = self.upload_hash(dataset_id, name, hash, stream_index, metadata)
                     video_info_results.append(res)
             except Exception as e:
                 from supervisely.io.exception_handlers import (

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/app/widgets/ecosystem_model_selector/ecosystem_model_selector.py

@@ -95,7 +95,7 @@ class EcosystemModelSelector(Widget):
         for model in models:
             if frameworks and model["framework"] not in frameworks:
                 continue
-            if task_types and model["model"]["task"] not in task_types:
+            if task_types and model["task"] not in task_types:
                 continue
             filtered_models.append(model)
         return filtered_models

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/app/widgets/fast_table/fast_table.py

@@ -904,9 +904,9 @@ class FastTable(Widget):
     def _default_search_function(self, data: pd.DataFrame, search_value: str) -> pd.DataFrame:
         # Use map() for pandas >= 2.1.0, fallback to applymap() for older versions
         if hasattr(pd.DataFrame, "map"):
-            data = data[data.map(lambda x: search_value in str(x)).any(axis=1)]
+            data = data[data.map(lambda x: search_value.lower() in str(x).lower()).any(axis=1)]
         else:
-            data = data[data.applymap(lambda x: search_value in str(x)).any(axis=1)]
+            data = data[data.applymap(lambda x: search_value.lower() in str(x).lower()).any(axis=1)]
         return data
 
     def _search(self, search_value: str) -> pd.DataFrame:

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/convert/base_converter.py

@@ -49,6 +49,7 @@ class AvailableVideoConverters:
     SLY = "supervisely"
     MOT = "mot"
     DAVIS = "davis"
+    MULTI_VIEW = "multi_view"
 
 
 class AvailablePointcloudConverters:

{supervisely-6.73.473 → supervisely-6.73.478}/supervisely/convert/video/__init__.py

@@ -1,3 +1,4 @@
 # Video
 from supervisely.convert.video.mot.mot_converter import MOTConverter
 from supervisely.convert.video.sly.sly_video_converter import SLYVideoConverter
+from supervisely.convert.video.multi_view.multi_view import MultiViewVideoConverter