supervisely 6.73.372__tar.gz → 6.73.374__tar.gz

{supervisely-6.73.372/supervisely.egg-info → supervisely-6.73.374}/PKG-INFO

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

{supervisely-6.73.372 → supervisely-6.73.374}/supervisely/_utils.py

@@ -575,3 +575,14 @@ def removesuffix(string, suffix):
     if string.endswith(suffix):
         return string[: -len(suffix)]
     return string
+
+
+def remove_non_printable(text: str) -> str:
+    """Remove non-printable characters from a string.
+
+    :param text: Input string
+    :type text: str
+    :return: String with non-printable characters removed
+    :rtype: str
+    """
+    return "".join(char for char in text if char.isprintable()).strip()

{supervisely-6.73.372 → supervisely-6.73.374}/supervisely/api/labeling_job_api.py

@@ -340,6 +340,7 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
         disable_confirm: Optional[bool] = None,
         disable_submit: Optional[bool] = None,
         toolbox_settings: Optional[Dict] = None,
+        enable_quality_check: Optional[bool] = None,
     ) -> List[LabelingJobInfo]:
         """
         Creates Labeling Job and assigns given Users to it.
@@ -382,6 +383,8 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
         :type disable_submit: bool, optional
         :param toolbox_settings: Settings for the labeling tool. Only video projects are supported.
         :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
         :return: List of information about new Labeling Job. See :class:`info_sequence<info_sequence>`
         :rtype: :class:`List[LabelingJobInfo]`
         :Usage example:
@@ -499,6 +502,8 @@ class LabelingJobApi(RemoveableBulkModuleApi, ModuleWithStatus):
             meta.update({"disableConfirm": disable_confirm})
         if disable_submit is not None:
             meta.update({"disableSubmit": disable_submit})
+        if enable_quality_check is not None:
+            meta.update({"enableIntermediateReview": enable_quality_check})
 
         data = {
             ApiField.NAME: name,

{supervisely-6.73.372 → supervisely-6.73.374}/supervisely/api/labeling_queue_api.py

@@ -198,6 +198,8 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         hide_figure_author: Optional[bool] = False,
         allow_review_own_annotations: Optional[bool] = False,
         skip_complete_job_on_empty: Optional[bool] = False,
+        enable_quality_check: Optional[bool] = None,
+        quality_check_user_ids: Optional[List[int]] = None,
     ) -> int:
         """
         Creates Labeling Queue and assigns given Users to it.
@@ -210,6 +212,8 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         :type collection_id: int, optional
         :param user_ids: User IDs in Supervisely to assign Users as labelers to Labeling Queue.
         :type user_ids: List[int]
+        :param reviewer_ids: User IDs in Supervisely to assign Users as reviewers to Labeling Queue.
+        :type reviewer_ids: List[int]
         :param readme: Additional information about Labeling Queue.
         :type readme: str, optional
         :param description: Description of Labeling Queue.
@@ -242,6 +246,16 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
         :type disable_submit: bool, optional
         :param toolbox_settings: Settings for the labeling tool. Only video projects are supported.
         :type toolbox_settings: Dict, optional
+        :param hide_figure_author: If True, hides the author of the figure in the labeling tool.
+        :type hide_figure_author: bool, optional
+        :param allow_review_own_annotations: If True, allows labelers to review their own annotations.
+        :type allow_review_own_annotations: bool, optional
+        :param skip_complete_job_on_empty: If True, skips completing the Labeling Queue if there are no images to label.
+        :type skip_complete_job_on_empty: bool, optional
+        :param enable_quality_check: If True, adds an intermediate step between "review" and completing the Labeling Queue.
+        :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
         :return: Labeling Queue ID in Supervisely.
         :rtype: int
         :Usage example:
@@ -348,6 +362,12 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
             meta.update({"disableConfirm": disable_confirm})
         if disable_submit is not None:
             meta.update({"disableSubmit": disable_submit})
+        if enable_quality_check is not None:
+            if quality_check_user_ids is None:
+                raise RuntimeError(
+                    "quality_check_user_ids must be provided if enable_quality_check is True"
+                )
+            meta.update({"enableIntermediateReview": enable_quality_check})
 
         queue_meta = {}
         if allow_review_own_annotations is True:
@@ -366,6 +386,12 @@ class LabelingQueueApi(RemoveableBulkModuleApi, ModuleWithStatus):
             data[ApiField.DATASET_ID] = dataset_id
         if collection_id is not None:
             data[ApiField.COLLECTION_ID] = collection_id
+        if quality_check_user_ids is not None:
+            if enable_quality_check is not True:
+                raise RuntimeError(
+                    "quality_check_user_ids can be set only if enable_quality_check is True"
+                )
+            data[ApiField.QUALITY_CHECK_USER_IDS] = quality_check_user_ids
 
         if len(queue_meta) > 0:
             data[ApiField.QUEUE_META] = queue_meta

{supervisely-6.73.372 → supervisely-6.73.374}/supervisely/api/module_api.py

@@ -661,6 +661,8 @@ class ApiField:
     """"""
     COLLECTION_ID = "collectionId"
     """"""
+    QUALITY_CHECK_USER_IDS = "qualityCheckUserIds"
+    """"""
 
 
 def _get_single_item(items):

{supervisely-6.73.372 → supervisely-6.73.374}/supervisely/app/widgets/run_app_button/run_app_button.py

@@ -13,6 +13,7 @@ from supervisely.app.widgets_context import JinjaWidgets
 class RunAppButton(Widget):
     def __init__(
         self,
+        team_id: int,
         workspace_id: int,
         module_id: int,
         payload: dict = None,
@@ -26,11 +27,14 @@ class RunAppButton(Widget):
         icon_gap: Optional[int] = 5,
         available_in_offline: Optional[bool] = False,
         visible_by_vue_field: Optional[str] = "",
+        check_existing_task_cb: Optional[str] = "null",
         widget_id: Optional[str] = None,
     ):
         """
         Button the runs an app on Supervisely instance.
 
+        :param team_id: Team ID.
+        :type team_id: int
         :param workspace_id: Workspace ID.
         :type workspace_id: int
         :param module_id: Module ID.
@@ -53,6 +57,8 @@ class RunAppButton(Widget):
         :type available_in_offline: bool, optional
         :param visible_by_vue_field: Vue field that controls the button visibility. If set to "isStaticVersion", the button will be visible only in offline session.
         :type visible_by_vue_field: str, optional
+        :param check_existing_task_cb: Sets the callback function for checking existing tasks. Function should be a string (docstring) of JavaScript code.
+        :type check_existing_task_cb: str, optional
         :param widget_id: Widget ID.
         :type widget_id: str, optional
 
@@ -88,12 +94,13 @@ class RunAppButton(Widget):
 
         self._available_in_offline = available_in_offline
         self._visible_by_vue_field = visible_by_vue_field
-
         self._loading = False
         self._disabled = False
+        self._team_id = team_id
         self._workspace_id = workspace_id
         self._module_id = module_id
         self._payload = payload
+        self._check_existing_task_cb = check_existing_task_cb
 
         super().__init__(widget_id=widget_id, file_path=__file__)
 
@@ -114,6 +121,7 @@ class RunAppButton(Widget):
             - available_in_offline: If True, the button will be available in offline session.
         """
         return {
+            "check_existing_task_cb": self._check_existing_task_cb,
             "options": {
                 "text": self._text,
                 "button_type": self._button_type,
@@ -123,12 +131,13 @@ class RunAppButton(Widget):
                 "disabled": self._disabled,
                 "icon": self._icon,
                 "available_in_offline": self._available_in_offline,
-            }
+            },
         }
 
     def get_json_state(self) -> None:
         """Button widget doesn't have state, so this method returns None."""
         return {
+            "team_id": self._team_id,
             "workspace_id": self._workspace_id,
             "module_id": self._module_id,
             "payload": self._payload,
@@ -298,3 +307,14 @@ class RunAppButton(Widget):
         """
         self._disabled = value
         DataJson()[self.widget_id]["options"]["disabled"] = self._disabled
+
+    def set_check_existing_task_cb(self, function: str) -> None:
+        """Sets the callback function for checking existing tasks.
+        Function should be a string (docstring) of JavaScript code.
+
+        :param function: Callback function for checking existing tasks.
+        :type function: str
+        """
+        self._check_existing_task_cb = function
+        DataJson()[self.widget_id]["check_existing_task_cb"] = self._check_existing_task_cb
+        DataJson().send_changes()

supervisely-6.73.374/supervisely/app/widgets/run_app_button/script.js

@@ -0,0 +1,106 @@
+Vue.component("sly-run-app-button", {
+	props: {
+		publicApiInstance: { type: Function },
+		workspaceId: { type: Number },
+		moduleId: { type: Number },
+		payload: { type: Object },
+		options: { type: Object, default: () => ({}) },
+		groupId: { type: Number },
+		checkExistingTaskCb: { type: Function, default: null },
+	},
+	data() {
+		return {
+			loading: false,
+		};
+	},
+	methods: {
+		async runApp() {
+			try {
+				this.loading = true;
+
+				if (this.checkExistingTaskCb) {
+					let checkExistingTaskCb =
+						typeof this.checkExistingTaskCb === "function"
+							? this.checkExistingTaskCb
+							: null;
+
+					if (typeof this.checkExistingTaskCb === "string") {
+						console.log("checkExistingTaskCb", this.checkExistingTaskCb);
+						try {
+							checkExistingTaskCb = new Function(
+								"task",
+								this.checkExistingTaskCb
+							);
+						} catch (err) {
+							console.log("Error parsing checkExistingTaskCb string:", err);
+						}
+					}
+
+					console.log("Before check checkExistingTaskCb", checkExistingTaskCb);
+					if (checkExistingTaskCb) {
+						const allEntities = await this.publicApiInstance
+							.post("apps.list", {
+								withShared: true,
+								onlyRunning: true,
+								groupId: this.groupId,
+								filter: [
+									{ field: "moduleId", operator: "=", value: this.moduleId },
+								],
+							})
+							.then((res) => res.data?.entities || []);
+
+						const existTasks = allEntities.flatMap(
+							(entity) => entity.tasks || []
+						);
+
+						if (existTasks.length) {
+							const foundTask = existTasks.find((t) => checkExistingTaskCb(t));
+							console.log("foundTask", foundTask);
+
+							if (foundTask) {
+								window.open(
+									`/apps/${foundTask.meta.app.id}/sessions/${foundTask.id}`,
+									"_blank"
+								);
+								return;
+							}
+						}
+					}
+				}
+
+				const tasks = await this.publicApiInstance
+					.post("tasks.run.app", {
+						params: this.payload,
+						workspaceId: this.workspaceId,
+						moduleId: this.moduleId,
+						nodeId: null,
+					})
+					.then((response) => response.data);
+
+				const task = tasks[0];
+				const origin = new URL(this.publicApiInstance.defaults.baseURL).origin;
+				window.open(
+					`${origin}/apps/${task.appId}/sessions/${task.taskId}`,
+					"_blank"
+				);
+			} finally {
+				this.loading = false;
+			}
+		},
+	},
+	template: `
+    <el-button
+      :class="{'available-in-offline': options.available_in_offline}"
+      @click="runApp"
+      v-loading="options.loading || loading"
+      :type="options.button_type"
+      :plain="options.plain"
+      :size="options.button_size"
+      :disabled="options.disabled"
+      
+    >
+    <span v-html="options.icon"></span>
+    <span v-html="options.text"></span>
+    </el-button>
+    `,
+});

supervisely-6.73.374/supervisely/app/widgets/run_app_button/template.html

@@ -0,0 +1,5 @@
+<sly-run-app-button :public-api-instance="publicApiInstance" :group-id="state.{{{widget.widget_id}}}.team_id"
+	:workspace-id="state.{{{widget.widget_id}}}.workspace_id" :module-id="state.{{{widget.widget_id}}}.module_id"
+	:payload="state.{{{widget.widget_id}}}.payload" :options="data.{{{widget.widget_id}}}.options" {% if
+	widget._visible_by_vue_field %} v-show="{{{widget._visible_by_vue_field}}}" {% endif %}
+	:check-existing-task-cb="data.{{{widget.widget_id}}}.check_existing_task_cb"></sly-run-app-button>

{supervisely-6.73.372 → supervisely-6.73.374}/supervisely/nn/training/gui/training_logs.py

@@ -36,6 +36,7 @@ class TrainingLogs:
         self.display_widgets = []
         self.app_options = app_options
         api = Api.from_env()
+        team_id = sly_env.team_id()
 
         # GUI Components
         self.validator_text = Text("")
@@ -73,6 +74,7 @@ class TrainingLogs:
             module_info = gui_utils.get_module_info_by_name(api, app_name)
             if module_info is not None:
                 self.tensorboard_offline_button = RunAppButton(
+                    team_id=team_id,
                     workspace_id=workspace_id,
                     module_id=module_info["id"],
                     payload={},
@@ -81,9 +83,10 @@ class TrainingLogs:
                     plain=True,
                     icon="zmdi zmdi-chart",
                     available_in_offline=True,
-                    visible_by_vue_field="isStaticVersion",
+                    visible_by_vue_field=None,
                 )
                 self.tensorboard_offline_button.disable()
+                self.tensorboard_offline_button.hide()
                 self.display_widgets.extend([self.tensorboard_offline_button])
             else:
                 logger.warning(

{supervisely-6.73.372 → supervisely-6.73.374}/supervisely/nn/training/gui/utils.py

@@ -136,3 +136,26 @@ def get_module_info_by_name(api: Api, app_name: str) -> Union[Dict, None]:
         if module["name"] == app_name:
             app_info = api.app.get_info(module["id"])
             return app_info
+
+
+def generate_task_check_function_js(folder: str) -> str:
+    """
+    Returns JavaScript function code for checking existing tasks.
+
+    :param folder: Remote folder to check.
+    :type folder: str
+    :return: JavaScript function code for checking existing tasks.
+    :rtype: str
+    """
+    escaped_folder = folder.replace("'", "\\'")
+    js_code = f"""
+        if (!task || !task.meta || !task.meta.params || !task.meta.params.state) {{
+            return false;
+        }}
+        const taskFolder = task.meta.params.state.slyFolder;
+        if (!taskFolder || typeof taskFolder !== 'string') {{
+            return false;
+        }}
+        return taskFolder === '{escaped_folder}';
+    """
+    return js_code

{supervisely-6.73.372 → supervisely-6.73.374}/supervisely/nn/training/train_app.py

@@ -10,6 +10,7 @@ import subprocess
 from datetime import datetime
 from os import getcwd, listdir, walk
 from os.path import basename, dirname, exists, expanduser, isdir, isfile, join
+from time import sleep
 from typing import Any, Dict, List, Literal, Optional, Union
 from urllib.request import urlopen
 
@@ -57,6 +58,7 @@ from supervisely.nn.inference import RuntimeType, SessionJSON
 from supervisely.nn.inference.inference import Inference
 from supervisely.nn.task_type import TaskType
 from supervisely.nn.training.gui.gui import TrainGUI
+from supervisely.nn.training.gui.utils import generate_task_check_function_js
 from supervisely.nn.training.loggers import setup_train_logger, train_logger
 from supervisely.nn.utils import ModelSource, _get_model_name
 from supervisely.output import set_directory
@@ -1949,11 +1951,15 @@ class TrainApp:
             self.progress_bar_main.hide()
 
         file_info = self._api.file.get_info_by_path(self.team_id, join(remote_dir, "open_app.lnk"))
+
         # Set offline tensorboard button payload
         if is_production():
-            self.gui.training_logs.tensorboard_offline_button.payload = {
-                "state": {"slyFolder": f"{join(remote_dir, 'logs')}"}
-            }
+            remote_log_dir = join(remote_dir, "logs")
+            tb_btn_payload = {"state": {"slyFolder": remote_log_dir}}
+            self.gui.training_logs.tensorboard_offline_button.payload = tb_btn_payload
+            self.gui.training_logs.tensorboard_offline_button.set_check_existing_task_cb(
+                generate_task_check_function_js(remote_log_dir)
+            )
             self.gui.training_logs.tensorboard_offline_button.enable()
 
         return remote_dir, file_info
@@ -2608,6 +2614,10 @@ class TrainApp:
             self.gui.training_process.start_button.loading = False
 
             # Shutdown the app after training is finished
+
+            self.gui.training_logs.tensorboard_button.hide()
+            self.gui.training_logs.tensorboard_offline_button.show()
+            sleep(1)  # wait for the button to be shown
             self.app.shutdown()
         except Exception as e:
             message = f"Error occurred during finalizing and uploading training artifacts. {check_logs_text}"

{supervisely-6.73.372 → supervisely-6.73.374/supervisely.egg-info}/PKG-INFO

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

supervisely-6.73.372/supervisely/app/widgets/run_app_button/script.js

@@ -1,46 +0,0 @@
-Vue.component('sly-run-app-button', {
-  props: {
-    'publicApiInstance': { 'type': Object },
-    'workspaceId': { 'type': Number }, 'moduleId': { 'type': Number }, 'payload': { 'type': Object }, 'options': { 'type': Object }
-  },
-    data() {
-      return {
-        loading: false,
-      };
-    },
-    methods: {
-      async runApp() {
-        try {
-          this.loading = true;
-  
-          const tasks = await this.publicApiInstance.post('tasks.run.app', {
-            params: this.payload,
-            workspaceId: this.workspaceId,
-            moduleId: this.moduleId,
-            nodeId: null,
-          }).then(response => response.data);
-  
-          const task = tasks[0];
-          const origin = new URL(this.publicApiInstance.defaults.baseURL).origin;
-          window.open(`${origin}/apps/${task.appId}/sessions/${task.taskId}`, '_blank');
-        } finally {
-          this.loading = false;
-        }
-      }
-    },
-    template: `
-  <el-button
-    :class="{'available-in-offline': options.available_in_offline}"
-    @click="runApp"
-    v-loading="options.loading || loading"
-    :type="options.button_type"
-    :plain="options.plain"
-    :size="options.button_size"
-    :disabled="options.disabled"
-    
-  >
-  <span v-html="options.icon"></span>
-  <span v-html="options.text"></span>
-  </el-button>
-  `,
-});

supervisely-6.73.372/supervisely/app/widgets/run_app_button/template.html

@@ -1,10 +0,0 @@
-<sly-run-app-button 
-  :public-api-instance="publicApiInstance"
-  :workspace-id="state.{{{widget.widget_id}}}.workspace_id"
-  :module-id="state.{{{widget.widget_id}}}.module_id"
-  :payload="state.{{{widget.widget_id}}}.payload"
-  :options="data.{{{widget.widget_id}}}.options"
-  {% if widget._visible_by_vue_field %}
-    v-show="{{{widget._visible_by_vue_field}}}"
-  {% endif %}
-  ></sly-run-app-button>