supervisely 6.73.452__py3-none-any.whl → 6.73.513__py3-none-any.whl

supervisely/app/widgets/classes_list_selector/template.html

@@ -1,131 +1,98 @@
-<link
-	rel="stylesheet"
-	href="./sly/css/app/widgets/classes_list_selector/style.css"
-/>
+<link rel="stylesheet" href="./sly/css/app/widgets/classes_list_selector/style.css" />
 
 <div v-show="data.{{{widget.widget_id}}}.classes.length == 0">
 	{{{widget.empty_notification}}}
 </div>
 <div v-show="data.{{{widget.widget_id}}}.classes.length != 0">
-	<link
-		rel="stylesheet"
-		href="./sly/css/app/widgets/object_class_view/style.css"
-	/>
+	<link rel="stylesheet" href="./sly/css/app/widgets/object_class_view/style.css" />
 	{% if widget._multiple %}
 	<div>
-		<el-button
-			style="margin-right: 10px"
-			type="text"
-			{%
-			if
-			widget._checkboxes_handled
-			%}
-			@click="{
+		<el-button style="margin-right: 10px" type="text" {% if widget._checkboxes_handled %} @click="{
 					state.{{{widget.widget_id}}}.selected = state.{{{widget.widget_id}}}.selected.map(() => true);
 					post('/{{{widget.widget_id}}}/checkbox_cb');
-				}"
-			{%
-			else
-			%}
-			@click="state.{{{widget.widget_id}}}.selected = state.{{{widget.widget_id}}}.selected.map(() => true)"
-			{%
-			endif
-			%}
-		>
+				}" {% else %}
+			@click="state.{{{widget.widget_id}}}.selected = state.{{{widget.widget_id}}}.selected.map(() => true)" {%
+			endif %}>
 			<i class="zmdi zmdi-check-all"></i>
 			Select all
 		</el-button>
-		<el-button
-			style="margin-right: 10px"
-			type="text"
-			{%
-			if
-			widget._checkboxes_handled
-			%}
-			@click="{
+		<el-button style="margin-right: 10px" type="text" {% if widget._checkboxes_handled %} @click="{
 					state.{{{widget.widget_id}}}.selected = state.{{{widget.widget_id}}}.selected.map(() => false);
 					post('/{{{widget.widget_id}}}/checkbox_cb');
-				}"
-			{%
-			else
-			%}
-			@click="state.{{{widget.widget_id}}}.selected = state.{{{widget.widget_id}}}.selected.map(() => false)"
-			{%
-			endif
-			%}
-		>
+				}" {% else %}
+			@click="state.{{{widget.widget_id}}}.selected = state.{{{widget.widget_id}}}.selected.map(() => false)" {%
+			endif %}>
 			<i class="zmdi zmdi-square-o"></i>
 			Deselect all
 		</el-button>
 	</div>
 	{% endif %}
-	<div
-		class="fflex"
-		v-for="(obj_class, idx) in data.{{{widget.widget_id}}}.classes"
-	>
-		<el-checkbox
-			v-model="state.{{{widget.widget_id}}}.selected[idx]"
-			style="margin-right: 10px"
-			{%
-			if
-			widget._checkboxes_handled
-			%}
-			{%
-			if
-			not
-			widget._multiple
-			%}
-			@change="() => {
+	{% if widget._allow_new_classes %}
+	<div style="margin-bottom: 10px; margin-top: 10px">
+		<el-button type="primary" size="small" icon="el-icon-plus"
+			@click="state.{{{widget.widget_id}}}.createClassDialog.visible = true">
+			Add new class
+		</el-button>
+	</div>
+	{% endif %}
+	<div class="fflex" v-for="(obj_class, idx) in data.{{{widget.widget_id}}}.classes">
+		<el-checkbox v-model="state.{{{widget.widget_id}}}.selected[idx]" style="margin-right: 10px" {% if
+			widget._checkboxes_handled %} {% if not widget._multiple %} @change="() => {
 						if ($event.target.checked) {
 							state.{{{widget.widget_id}}}.selected = state.{{{widget.widget_id}}}.selected.map((_, i) => i == idx);
 						}
 						post('/{{{widget.widget_id}}}/checkbox_cb');
-					}"
-			{%
-			else
-			%}
-			@change="() => {
+					}" {% else %} @change="() => {
 						post('/{{{widget.widget_id}}}/checkbox_cb');
-					}"
-			{%
-			endif
-			%}
-			{%
-			else
-			%}
-			{%
-			if
-			not
-			widget._multiple
-			%}
+					}" {% endif %} {% else %} {% if not widget._multiple %}
 			@change="if ($event.target.checked) {state.{{{widget.widget_id}}}.selected = state.{{{widget.widget_id}}}.selected.map((_, i) => i == idx);}"
-			{%
-			endif
-			%}
-			{%
-			endif
-			%}
-		>
+			{% endif %} {% endif %}>
 		</el-checkbox>
 		<span class="icon-text-line classes-list-preview-sidebar">
-			<i
-				class="zmdi zmdi-circle"
-				style="margin-right: 5px"
-				:style="{color: obj_class.color}"
-			></i>
+			<i class="zmdi zmdi-circle" style="margin-right: 5px" :style="{color: obj_class.color}"></i>
 			<b style="font-size: 16">{{obj_class.title}}</b>
-			<span
-				v-if="obj_class.shape_text"
-				style="
+			<span v-if="obj_class.shape_text" style="
 					flex: none;
 					margin-left: 5px;
 					font-size: 12px;
 					color: #8492a6;
 					line-height: initial;
-				"
-			>
+				">
 				{{obj_class.shape_text}}
 			</span>
 		</span>
 	</div>
 </div>
+
+{% if widget._allow_new_classes %}
+<!-- Dialog for creating new class -->
+<el-dialog title="Create New Class" :visible.sync="state.{{{widget.widget_id}}}.createClassDialog.visible" width="450px"
+	:close-on-click-modal="false" @open="state.{{{widget.widget_id}}}.createClassDialog.showError = false">
+	<el-form label-width="120px" label-position="left">
+		<el-form-item label="Class Name">
+			<el-input v-model="state.{{{widget.widget_id}}}.createClassDialog.className" placeholder="Enter class name"
+				@input="state.{{{widget.widget_id}}}.createClassDialog.showError = false"
+				@keyup.enter.native="post('/{{{widget.widget_id}}}/class_created_cb')"></el-input>
+		</el-form-item>
+		<el-form-item label="Geometry Type">
+			<el-select v-model="state.{{{widget.widget_id}}}.createClassDialog.geometryType"
+				placeholder="Select geometry type" style="width: 100%">
+				<el-option v-for="geom in data.{{{widget.widget_id}}}.availableGeometryTypes" :key="geom.value"
+					:label="geom.label" :value="geom.value">
+				</el-option>
+			</el-select>
+		</el-form-item>
+		<div v-show="state.{{{widget.widget_id}}}.createClassDialog.showError" style="margin-top: 10px;">
+			{{{widget._error_message}}}
+		</div>
+	</el-form>
+	<span slot="footer" class="dialog-footer">
+		<el-button @click="state.{{{widget.widget_id}}}.createClassDialog.visible = false">
+			Cancel
+		</el-button>
+		<el-button type="primary" @click="post('/{{{widget.widget_id}}}/class_created_cb')">
+			Create
+		</el-button>
+	</span>
+</el-dialog>
+{% endif %}

supervisely/app/widgets/classes_mapping/classes_mapping.py

@@ -1,23 +1,23 @@
-from typing import Optional, Union, List
-from supervisely.app.widgets import Widget, NotificationBox, Button, generate_id
+from typing import List, Optional, Union
+
 from supervisely import ObjClass, ObjClassCollection
 from supervisely.app import DataJson, StateJson
-
-from supervisely.geometry.bitmap import Bitmap
+from supervisely.app.widgets import Button, NotificationBox, Widget, generate_id
 from supervisely.geometry.alpha_mask import AlphaMask
+from supervisely.geometry.any_geometry import AnyGeometry
+from supervisely.geometry.bitmap import Bitmap
+from supervisely.geometry.closed_surface_mesh import ClosedSurfaceMesh
 from supervisely.geometry.cuboid import Cuboid
+from supervisely.geometry.cuboid_3d import Cuboid3d
+from supervisely.geometry.graph import GraphNodes
+from supervisely.geometry.multichannel_bitmap import MultichannelBitmap
+from supervisely.geometry.oriented_bbox import OrientedBBox
 from supervisely.geometry.point import Point
+from supervisely.geometry.point_3d import Point3d
+from supervisely.geometry.pointcloud import Pointcloud
 from supervisely.geometry.polygon import Polygon
 from supervisely.geometry.polyline import Polyline
 from supervisely.geometry.rectangle import Rectangle
-from supervisely.geometry.graph import GraphNodes
-from supervisely.geometry.any_geometry import AnyGeometry
-from supervisely.geometry.cuboid_3d import Cuboid3d
-from supervisely.geometry.pointcloud import Pointcloud
-from supervisely.geometry.point_3d import Point3d
-from supervisely.geometry.multichannel_bitmap import MultichannelBitmap
-from supervisely.geometry.closed_surface_mesh import ClosedSurfaceMesh
-
 
 type_to_shape_text = {
     AnyGeometry: "any shape",
@@ -34,6 +34,7 @@ type_to_shape_text = {
     Point3d: "point 3d",  # "zmdi zmdi-select-all"
     GraphNodes: "keypoints",
     ClosedSurfaceMesh: "volume (3d mask)",
+    OrientedBBox: "oriented bbox",
 }
 
 

supervisely/app/widgets/classes_table/classes_table.py

@@ -24,6 +24,7 @@ type_to_zmdi_icon = {
     Pointcloud: "zmdi zmdi-cloud-outline",  # "zmdi zmdi-border-clear"
     sly.MultichannelBitmap: "zmdi zmdi-layers",  # "zmdi zmdi-collection-item"
     Point3d: "zmdi zmdi-filter-center-focus",  # "zmdi zmdi-select-all"
+    sly.OrientedBBox: "zmdi zmdi-rotate-cw",
 }
 
 

supervisely/app/widgets/deploy_model/deploy_model.py

@@ -1,10 +1,10 @@
 import datetime
 import tempfile
+import threading
 from pathlib import Path
 from typing import Any, Dict, List, Literal
 
 import pandas as pd
-import yaml
 
 from supervisely._utils import logger
 from supervisely.api.api import Api
@@ -12,8 +12,6 @@ from supervisely.api.app_api import ModuleInfo
 from supervisely.app.widgets.agent_selector.agent_selector import AgentSelector
 from supervisely.app.widgets.button.button import Button
 from supervisely.app.widgets.container.container import Container
-from supervisely.app.widgets.card.card import Card
-from supervisely.app.widgets.model_info.model_info import ModelInfo
 from supervisely.app.widgets.ecosystem_model_selector.ecosystem_model_selector import (
     EcosystemModelSelector,
 )
@@ -23,7 +21,8 @@ from supervisely.app.widgets.experiment_selector.experiment_selector import (
 from supervisely.app.widgets.fast_table.fast_table import FastTable
 from supervisely.app.widgets.field.field import Field
 from supervisely.app.widgets.flexbox.flexbox import Flexbox
-from supervisely.app.widgets.tabs.tabs import Tabs
+from supervisely.app.widgets.model_info.model_info import ModelInfo
+from supervisely.app.widgets.radio_tabs.radio_tabs import RadioTabs
 from supervisely.app.widgets.text.text import Text
 from supervisely.app.widgets.widget import Widget
 from supervisely.io import env
@@ -211,24 +210,31 @@ class DeployModel(Widget):
             return self._layout
 
         def _create_layout(self) -> Container:
-            frameworks = self.deploy_model.get_frameworks()
-            experiment_infos = []
-            for framework_name in frameworks:
-                experiment_infos.extend(
-                    get_experiment_infos(self.api, self.team_id, framework_name=framework_name)
-                )
             self.experiment_table = ExperimentSelector(
-                experiment_infos=experiment_infos,
-                team_id=self.team_id,
                 api=self.api,
+                team_id=self.team_id,
             )
 
             @self.experiment_table.checkpoint_changed
             def _checkpoint_changed(row: ExperimentSelector.ModelRow, checkpoint_value: str):
                 print(f"Checkpoint changed for {row._experiment_info.task_id}: {checkpoint_value}")
 
+            threading.Thread(target=self.refresh_experiments, daemon=True).start()
+
             return self.experiment_table
 
+        def refresh_experiments(self):
+            self.experiment_table.loading = True
+            frameworks = self.deploy_model.get_frameworks()
+            experiment_infos = []
+            for framework_name in frameworks:
+                experiment_infos.extend(
+                    get_experiment_infos(self.api, self.team_id, framework_name=framework_name)
+                )
+
+            self.experiment_table.set_experiment_infos(experiment_infos)
+            self.experiment_table.loading = False
+
         def get_deploy_parameters(self) -> Dict[str, Any]:
             experiment_info = self.experiment_table.get_selected_experiment_info()
             return {
@@ -267,8 +273,8 @@ class DeployModel(Widget):
     MODES = [str(MODE.CONNECT), str(MODE.PRETRAINED), str(MODE.CUSTOM)]
     MODE_TO_CLASS = {
         str(MODE.CONNECT): Connect,
-        str(MODE.PRETRAINED): Pretrained,
         str(MODE.CUSTOM): Custom,
+        str(MODE.PRETRAINED): Pretrained,
     }
 
     def __init__(
@@ -295,6 +301,11 @@ class DeployModel(Widget):
             self.MODE.PRETRAINED: "Pretrained",
             self.MODE.CUSTOM: "Custom",
         }
+        self.modes_descriptions = {
+            self.MODE.CONNECT: "Connect to an already deployed model",
+            self.MODE.PRETRAINED: "Deploy a pretrained model from the ecosystem",
+            self.MODE.CUSTOM: "Deploy a custom model from your experiments",
+        }
 
         # GUI
         self.layout: Widget = None
@@ -444,31 +455,41 @@ class DeployModel(Widget):
 
         self._init_modes(modes)
         _labels = []
+        _descriptions = []
         _contents = []
+        self.statuses_widgets = Container(
+            widgets=[
+                self.sesson_link,
+                self._model_info_container,
+            ],
+            gap=20,
+        )
+        self.statuses_widgets.hide()
         for mode_name, mode in self.modes.items():
             label = self.modes_labels[mode_name]
+            description = self.modes_descriptions[mode_name]
             if mode_name == str(self.MODE.CONNECT):
                 widgets = [
                     mode.layout,
-                    self._model_info_card,
-                    self.connect_stop_buttons,
                     self.status,
-                    self.sesson_link,
+                    self.statuses_widgets,
+                    self.connect_stop_buttons,
                 ]
             else:
                 widgets = [
                     mode.layout,
-                    self._model_info_card,
                     self.select_agent_field,
-                    self.deploy_stop_buttons,
                     self.status,
-                    self.sesson_link,
+                    self.statuses_widgets,
+                    self.deploy_stop_buttons,
                 ]
+
             content = Container(widgets=widgets, gap=20)
             _labels.append(label)
+            _descriptions.append(description)
             _contents.append(content)
 
-        self.tabs = Tabs(labels=_labels, contents=_contents)
+        self.tabs = RadioTabs(titles=_labels, descriptions=_descriptions, contents=_contents)
         if len(self.modes) == 1:
             self.layout = _contents[0]
         else:
@@ -490,7 +511,7 @@ class DeployModel(Widget):
         def _disconnect_button_clicked():
             self.disconnect()
 
-        @self.tabs.click
+        @self.tabs.value_changed
         def _active_tab_changed(tab_name: str):
             self.set_model_message_by_tab(tab_name)
 
@@ -573,6 +594,7 @@ class DeployModel(Widget):
                 f"Model {framework}: {model_name} deployed with session ID {model_api.task_id}."
             )
             self.model_api = model_api
+            self.statuses_widgets.show()
             self.set_model_status("connected")
             self.set_session_info(task_info)
             self.set_model_info(model_api.task_id)
@@ -603,12 +625,14 @@ class DeployModel(Widget):
             self.set_session_info(task_info)
             self.set_model_info(model_api.task_id)
             self.show_stop()
+            self.statuses_widgets.show()
         except Exception as e:
             logger.error(f"Failed to deploy model: {e}", exc_info=True)
             self.set_model_status("error", str(e))
             self.set_session_info(None)
             self.reset_model_info()
             self.show_deploy_button()
+            self.statuses_widgets.hide()
             self.enable_modes()
         else:
             if str(self.MODE.CONNECT) in self.modes:
@@ -634,6 +658,7 @@ class DeployModel(Widget):
         self.enable_modes()
         self.reset_model_info()
         self.show_deploy_button()
+        self.statuses_widgets.hide()
         if str(self.MODE.CONNECT) in self.modes:
             self.modes[str(self.MODE.CONNECT)]._update_sessions()
 
@@ -645,6 +670,7 @@ class DeployModel(Widget):
         self.set_session_info(None)
         self.reset_model_info()
         self.show_deploy_button()
+        self.statuses_widgets.hide()
         self.enable_modes()
 
     def load_from_json(self, data: Dict[str, Any]) -> None:
@@ -690,29 +716,24 @@ class DeployModel(Widget):
             title="Model Info",
             description="Information about the deployed model",
         )
-
-        self._model_info_container = Container([self._model_info_widget_field])
-        self._model_info_container.hide()
         self._model_info_message = Text("Connect to model to see the session information.")
-
-        self._model_info_card = Card(
-            title="Session Info",
-            description="Model parameters and classes",
-            collapsable=True,
-            content=Container([self._model_info_container, self._model_info_message]),
+        self._model_info_container = Container(
+            [self._model_info_widget_field, self._model_info_message], gap=0
         )
-        self._model_info_card.collapse()
+        self._model_info_widget_field.hide()
+
+        self._model_info_container.hide()
 
     def set_model_info(self, session_id):
-        self._model_info_widget.set_model_info(session_id)
+        self._model_info_widget.set_session_id(session_id)
 
         self._model_info_message.hide()
+        self._model_info_widget_field.show()
         self._model_info_container.show()
-        self._model_info_card.uncollapse()
 
     def reset_model_info(self):
-        self._model_info_card.collapse()
         self._model_info_container.hide()
+        self._model_info_widget_field.hide()
         self._model_info_message.show()
 
     def set_model_message_by_tab(self, tab_name: str):
@@ -724,6 +745,6 @@ class DeployModel(Widget):
             self._model_info_message.set(
                 "Deploy model to see the session information.", status="text"
             )
-        self._model_info_card.collapse()
+        self._model_info_widget_field.hide()
 
     # ------------------------------------------------------------ #

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/app/widgets/experiment_selector/experiment_selector.py

@@ -721,6 +721,14 @@ class ExperimentSelector(Widget):
     def enable(self):
         return self.table.enable()
 
+    @property
+    def loading(self):
+        return self.table.loading
+
+    @loading.setter
+    def loading(self, value: bool):
+        self.table.loading = value
+
     def get_json_data(self):
         return {}