supervisely 6.73.337__py3-none-any.whl → 6.73.339__py3-none-any.whl

supervisely/app/fastapi/templating.py

@@ -11,7 +11,7 @@ from supervisely.app.singleton import Singleton
 from supervisely.app.widgets_context import JinjaWidgets
 
 # https://github.com/supervisely/js-bundle
-js_bundle_version = "2.1.98"
+js_bundle_version = "2.1.99"
 
 # https://github.com/supervisely-ecosystem/supervisely-app-frontend-js
 js_frontend_version = "v0.0.55"

supervisely/app/widgets/select/select.py

@@ -93,6 +93,7 @@ class Select(ConditionalWidget):
         widget_id: str = None,
         items_links: List[str] = None,
         width_percent: Optional[int] = None,
+        width_px: Optional[int] = None,
     ) -> Select:
         if items is None and groups is None:
             raise ValueError("One of the arguments has to be defined: items or groups")
@@ -113,6 +114,7 @@ class Select(ConditionalWidget):
             self._width_percent = min(max(width_percent, 1), 100)
         else:
             self._width_percent = None
+        self._width_px = width_px
 
         if items_links is not None:
             if items is None:
@@ -140,6 +142,7 @@ class Select(ConditionalWidget):
             "groups": None,
             "with_link": self._with_link,
             "width_percent": self._width_percent,
+            "width_px": self._width_px,
         }
         if self._items is not None:
             res["items"] = [item.to_json() for item in self._items]

supervisely/app/widgets/select/template.html

@@ -10,7 +10,9 @@
   :multiple="data.{{{widget.widget_id}}}.multiple"
   :filterable="data.{{{widget.widget_id}}}.filterable"
   :fit-input-width="data.{{{widget.widget_id}}}.fit_input_width"
-  {% if widget._width_percent is not none %}
+  {% if widget._width_px is not none %}
+  :style="{ width: `${data.{{{widget.widget_id}}}.width_px}px` }"
+  {% elif widget._width_percent is not none %}
   :style="{ width: `${data.{{{widget.widget_id}}}.width_percent}%` }"
   {% endif %}
 >

supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py

@@ -96,8 +96,9 @@ class SelectDatasetTree(Widget):
         append_to_body: bool = True,
         widget_id: Union[str, None] = None,
         show_select_all_datasets_checkbox: bool = True,
+        width: int = 193,
     ):
-        self._api = Api()
+        self._api = Api.from_env()
 
         if default_id is not None and project_id is None:
             raise ValueError("Project ID must be provided when default dataset ID is set.")
@@ -136,6 +137,7 @@ class SelectDatasetTree(Widget):
         self._select_workspace = None
         self._select_project = None
         self._select_dataset = None
+        self._width = width
 
         # List of widgets will be used to create a Container.
         self._widgets = []
@@ -361,7 +363,7 @@ class SelectDatasetTree(Widget):
             flat=flat,
             always_open=always_open,
             append_to_body=self._append_to_body,
-            width=193,
+            width=self._width,
             placeholder="Select dataset",
         )
         if self._dataset_id is not None:
@@ -416,7 +418,10 @@ class SelectDatasetTree(Widget):
                 self._select_dataset.hide()
 
         self._select_team = Select(
-            items=self._get_select_items(), placeholder="Select team", filterable=True
+            items=self._get_select_items(),
+            placeholder="Select team",
+            filterable=True,
+            width_px=self._width,
         )
         self._select_team.set_value(self._team_id)
         if not team_is_selectable:
@@ -426,6 +431,7 @@ class SelectDatasetTree(Widget):
             items=self._get_select_items(team_id=self._team_id),
             placeholder="Select workspace",
             filterable=True,
+            width_px=self._width,
         )
         self._select_workspace.set_value(self._workspace_id)
         if not workspace_is_selectable:
@@ -435,6 +441,7 @@ class SelectDatasetTree(Widget):
             items=self._get_select_items(workspace_id=self._workspace_id),
             placeholder="Select project",
             filterable=True,
+            width_px=self._width,
         )
         self._select_project.set_value(self._project_id)
 

supervisely/app/widgets/tree_select/tree_select.py

@@ -131,6 +131,7 @@ class TreeSelect(Widget):
         append_to_body: bool = True,
         widget_id: Optional[str] = None,
         placeholder: Optional[str] = None,
+        show_tooltip: bool = True,
     ):
         self._items = items or []
         self._multiple = multiple_select
@@ -141,6 +142,7 @@ class TreeSelect(Widget):
         self._width = width
         self._append_to_body = append_to_body
         self._placeholder = placeholder
+        self._show_tooltip = show_tooltip
 
         super().__init__(widget_id=widget_id, file_path=__file__)
 
@@ -170,6 +172,7 @@ class TreeSelect(Widget):
                 "valueFormat": self._value_format,
                 "appendToBody": self._append_to_body,
                 "placeholder": self._placeholder,
+                "showTooltip": self._show_tooltip,
             },
         }
 

supervisely/project/video_project.py

@@ -69,6 +69,8 @@ class VideoDataset(Dataset):
     annotation_class = VideoAnnotation
     item_info_class = VideoInfo
 
+    datasets_dir_name = "datasets"
+
     @property
     def project_dir(self) -> str:
         """
@@ -1308,24 +1310,19 @@ def download_video_project(
     LOG_BATCH_SIZE = 1
 
     key_id_map = KeyIdMap()
-
     project_fs = VideoProject(dest_dir, OpenMode.CREATE)
-
     meta = ProjectMeta.from_json(api.project.get_meta(project_id))
     project_fs.set_meta(meta)
-
     if progress_cb is not None:
         log_progress = False
 
-    datasets = []
-    if dataset_ids is not None:
-        for ds_id in dataset_ids:
-            datasets.append(api.dataset.get_info_by_id(ds_id))
-    else:
-        datasets = api.dataset.get_list(project_id)
+    dataset_ids = set(dataset_ids) if (dataset_ids is not None) else None
+    for parents, dataset in api.dataset.tree(project_id):
+        if dataset_ids is not None and dataset.id not in dataset_ids:
+            continue
 
-    for dataset in datasets:
-        dataset_fs = project_fs.create_dataset(dataset.name)
+        dataset_path = Dataset._get_dataset_path(dataset.name, parents)
+        dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
         videos = api.video.get_list(dataset.id)
 
         ds_progress = progress_cb
@@ -1463,9 +1460,17 @@ def upload_video_project(
     if progress_cb is not None:
         log_progress = False
 
+    dataset_map = {}
     for dataset_fs in project_fs.datasets:
         dataset_fs: VideoDataset
-        dataset = api.dataset.create(project.id, dataset_fs.name)
+        if len(dataset_fs.parents) > 0:
+            parent = f"{os.path.sep}".join(dataset_fs.parents)
+            parent_id = dataset_map.get(parent)
+        else:
+            parent = ""
+            parent_id = None      
+        dataset = api.dataset.create(project.id, dataset_fs.short_name, parent_id=parent_id)
+        dataset_map[os.path.join(parent, dataset.name)] = dataset.id
 
         names, item_paths, ann_paths = [], [], []
         for item_name in dataset_fs:
@@ -1603,15 +1608,14 @@ async def download_video_project_async(
     if progress_cb is not None:
         log_progress = False
 
-    datasets = []
-    if dataset_ids is not None:
-        for ds_id in dataset_ids:
-            datasets.append(api.dataset.get_info_by_id(ds_id))
-    else:
-        datasets = api.dataset.get_list(project_id, recursive=True)
+    dataset_ids = set(dataset_ids) if (dataset_ids is not None) else None
+    for parents, dataset in api.dataset.tree(project_id):
+        if dataset_ids is not None and dataset.id not in dataset_ids:
+            continue
+
+        dataset_path = Dataset._get_dataset_path(dataset.name, parents)
 
-    for dataset in datasets:
-        dataset_fs = project_fs.create_dataset(dataset.name)
+        dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
         videos = api.video.get_list(dataset.id)
 
         if log_progress is True:

{supervisely-6.73.337.dist-info → supervisely-6.73.339.dist-info}/METADATA

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

{supervisely-6.73.337.dist-info → supervisely-6.73.339.dist-info}/RECORD

@@ -94,7 +94,7 @@ supervisely/app/fastapi/no_html_main.html,sha256=NhQP7noyORBx72lFh1CQKgBRupkWjiq
 supervisely/app/fastapi/offline.py,sha256=CwMMkJ1frD6wiZS-SEoNDtQ1UJcJe1Ob6ohE3r4CQL8,7414
 supervisely/app/fastapi/request.py,sha256=NU7rKmxJ1pfkDZ7_yHckRcRAueJRQIqCor11UO2OHr8,766
 supervisely/app/fastapi/subapp.py,sha256=5lMfFLYBfHzE1OmITHsogB9hScyTJFjGV45AKY67Hkg,45647
-supervisely/app/fastapi/templating.py,sha256=JOAW8U-14GD47E286mzFi3mZSPbm_csJGqtXWLRM4rc,2929
+supervisely/app/fastapi/templating.py,sha256=3X69vo-_RO2tlaVz5obifXjrNEIHVSNVQFNm_xjOMe4,2929
 supervisely/app/fastapi/utils.py,sha256=t_UquzlFrdkKtAJmH6eJ279pE8Aa3BaIu4XjX-SEaIE,946
 supervisely/app/fastapi/websocket.py,sha256=TlRSPOAhRItTv1HGvdukK1ZvhRjMUxRa-lJlsRR9rJw,1308
 supervisely/app/v1/__init__.py,sha256=OdU0PYv6hLwahYoyaLFO8m3cbJSchvPbqxuG1N3T734,848
@@ -428,8 +428,8 @@ supervisely/app/widgets/run_app_button/template.html,sha256=-SX7zZ53ehyfQMg_az3B
 supervisely/app/widgets/scatter_chart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/scatter_chart/scatter_chart.py,sha256=nX7fZbWsDiMjOek5FvIHgKbnBwQ-ol_V3XvnoAnz59c,4832
 supervisely/app/widgets/select/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/app/widgets/select/select.py,sha256=pYxUYl0-yuMnGQ9wjxkbDKWRMVi-egXw29YJZHTvKrI,11253
-supervisely/app/widgets/select/template.html,sha256=S7Bx4TSc6Ua4BL1duY_pfVX9MDBmAJkKnCNzPf-jt2A,1933
+supervisely/app/widgets/select/select.py,sha256=1aB7Oi1mtyBySvBc78McZy4NnNNxGXGwMkCeYpOsLew,11367
+supervisely/app/widgets/select/template.html,sha256=s5ZpmWkYf3JOVyBEgWPAIMbQzTK6txL9E-k5-HNFj3s,2041
 supervisely/app/widgets/select_app_session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/select_app_session/select_app_session.py,sha256=l8Nam2bG8g9re29ra28i5PmmW9LKhkOGAG48dgHFr9M,2038
 supervisely/app/widgets/select_app_session/template.html,sha256=PGr5YL7Ts3ALO9ZQkuYNnRhP7eyYq54sf7Y9EhDbuvE,959
@@ -440,7 +440,7 @@ supervisely/app/widgets/select_dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 supervisely/app/widgets/select_dataset/select_dataset.py,sha256=2bltbJ70plGFoF8mpLxAU2huVBce8D6CsCcX9wxO5KU,9713
 supervisely/app/widgets/select_dataset/template.html,sha256=7O_ZgmRs0vOL8tng6QvYbI_0o6A4yMAPB2MlfzWHeHQ,984
 supervisely/app/widgets/select_dataset_tree/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py,sha256=abFPT8MJv6a7oPZzwCvak6q4HB72ijpW7axJHjoJvH0,22319
+supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py,sha256=ngSp4-R7rLsExYOY3VY7yhhC_yeeO_BkAxN95savSPc,22517
 supervisely/app/widgets/select_dataset_tree/template.html,sha256=_uvKCMP0nkpSl3FiTUxqy10JZw3q8-9hXCv22W3BDF0,38
 supervisely/app/widgets/select_item/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/select_item/select_item.py,sha256=dcB0UN46rn3nFQybgrGpLRfwB6xnPo-GGrv9rsMeCbA,3833
@@ -530,7 +530,7 @@ supervisely/app/widgets/transfer/template.html,sha256=w9T5TrityCeHUBPPyzRBBSm48z
 supervisely/app/widgets/transfer/transfer.py,sha256=tZ6HhRH11xOrEhz3TAH0Redw3NE2GFSDHuHCmKBSY_s,19986
 supervisely/app/widgets/tree_select/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/tree_select/template.html,sha256=eUHN0yn_llRRozAOvdc8SjhY-KX12TcgOUXCemHWGew,613
-supervisely/app/widgets/tree_select/tree_select.py,sha256=qy5JBVQ812FcyXIDPwCjt7C9N9H9gSzXwlkvO8mKqrQ,14371
+supervisely/app/widgets/tree_select/tree_select.py,sha256=A86TCS_gXHi6UvHmsvZUyijnKgTvQ6UGnrHPJ19U_IY,14499
 supervisely/app/widgets/treemap_chart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/treemap_chart/treemap_chart.py,sha256=g6wc1M30kNFA92Xj-6g2bJlnnV23ro17pJn0s4WDgvs,9298
 supervisely/app/widgets/video/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1026,7 +1026,7 @@ supervisely/project/project_settings.py,sha256=NLThzU_DCynOK6hkHhVdFyezwprn9Uqln
 supervisely/project/project_type.py,sha256=EZDJFRi4MmC_5epYexBgML5WMZsWdEVk_CjqDQy5m3c,572
 supervisely/project/readme_template.md,sha256=rGmSLRVUSGjvorjpzl0sZ7YA4sKfDexl95NFtMISj3I,9128
 supervisely/project/upload.py,sha256=AjgHYgVZwUE25ygC5pqvFjdAladbyB8T78mlet5Qpho,3750
-supervisely/project/video_project.py,sha256=STlkzLeRhpcg0kXLankWvX4DmkGTo4YlEgACAYSIeio,63580
+supervisely/project/video_project.py,sha256=bkQI3JTimQR-83iWAThjoz7bTcbCIqvvk039AG3BPXc,64081
 supervisely/project/volume_project.py,sha256=Kn9VEvWuKKZvL2nx6B6bjSvHuoZhAOxEc6DvPRexUco,22666
 supervisely/pyscripts_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/pyscripts_utils/utils.py,sha256=scEwHJvHRQa8NHIOn2eTwH6-Zc8CGdLoxM-WzH9jcRo,314
@@ -1082,9 +1082,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=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
-supervisely-6.73.337.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.337.dist-info/METADATA,sha256=jScEliXar4ZvwI1uw3RQwMuYWDQiojDu2__YBWsvfDg,33596
-supervisely-6.73.337.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.337.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.337.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.337.dist-info/RECORD,,
+supervisely-6.73.339.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.339.dist-info/METADATA,sha256=jUY-G7GqpZ9Qe4qSdlGrj8lMGoV8P386z114kCWh7gk,33596
+supervisely-6.73.339.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.339.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.339.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.339.dist-info/RECORD,,