supervisely 6.73.373__py3-none-any.whl → 6.73.374__py3-none-any.whl

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/app/widgets/run_app_button/script.js

@@ -1,46 +1,106 @@
-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>
-  `,
+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/app/widgets/run_app_button/template.html

@@ -1,10 +1,5 @@
-<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>
+<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/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/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/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.373.dist-info → supervisely-6.73.374.dist-info}/METADATA

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

{supervisely-6.73.373.dist-info → supervisely-6.73.374.dist-info}/RECORD

@@ -427,9 +427,9 @@ supervisely/app/widgets/report_thumbnail/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 supervisely/app/widgets/report_thumbnail/report_thumbnail.py,sha256=JYEoNi9tXslx9nlxdFcklxk-4ONtb_F46H5FRxZD1p0,2163
 supervisely/app/widgets/report_thumbnail/template.html,sha256=7dGngqwO_xxWZLOre0f6Vml3B_qXWu0l1P96L3opJ84,429
 supervisely/app/widgets/run_app_button/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/app/widgets/run_app_button/run_app_button.py,sha256=CGX37FLyl7eWtVdWRu-00zgebEmPRS2yfnEkSowH_F8,10011
-supervisely/app/widgets/run_app_button/script.js,sha256=SIBDV5CepA34aFuLUPNMsAZiqLqkUq8kP9PQfLp-iAM,1325
-supervisely/app/widgets/run_app_button/template.html,sha256=-SX7zZ53ehyfQMg_az3B9dl5_UC3TdvHL9yXNNgsowk,403
+supervisely/app/widgets/run_app_button/run_app_button.py,sha256=cr07jabP1vF-rvH0_swVTuzpWXsvI9tHy_oQbJrHxSU,11044
+supervisely/app/widgets/run_app_button/script.js,sha256=6rlluiW1hbHN7swtNSoFX9Gmrz2U-nRNOwoUpnSBmiw,2736
+supervisely/app/widgets/run_app_button/template.html,sha256=rFIYPC9hl2b9H_LR1Kr_1RCpzfAAd-FBcmTmt75YXnE,511
 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
@@ -994,7 +994,7 @@ supervisely/nn/tracking/__init__.py,sha256=Ld1ed7ZZQZPkhX-5Xr-UbHZx5zLCm2-tInHnP
 supervisely/nn/tracking/boxmot.py,sha256=H9cQjYGL9nX_TLrfKDChhljTIiE9lffcgbwWCf_4PJU,4277
 supervisely/nn/tracking/tracking.py,sha256=WNrNm02B1pspA3d_AmzSJ-54RZTqWV2NZiC7FHe88bo,857
 supervisely/nn/training/__init__.py,sha256=gY4PCykJ-42MWKsqb9kl-skemKa8yB6t_fb5kzqR66U,111
-supervisely/nn/training/train_app.py,sha256=D2Fuy1SzoHTqeMWrdLLVLqeZN5Eu6M_CzU85y78na6I,116077
+supervisely/nn/training/train_app.py,sha256=-NbFxj0MMPGJ8ysQcIxYd3j7oKutEcOYL9-9oO-bCiU,116587
 supervisely/nn/training/gui/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 supervisely/nn/training/gui/classes_selector.py,sha256=Bpp-RFDQqcZ0kLJmS6ZnExkdscWwRusvF4vbWjEsKlQ,3926
 supervisely/nn/training/gui/gui.py,sha256=Z68uMPNkOyb70rpxfVDfJuGSzcoOhrqqDog8PABF2JQ,43312
@@ -1004,9 +1004,9 @@ supervisely/nn/training/gui/model_selector.py,sha256=I6KRKyylpwUEC3CApEnzDKkWe5x
 supervisely/nn/training/gui/tags_selector.py,sha256=ZirVXm5NNuIDjXO3wuHDnpYTWgFVLn-W7voBudh5bP0,3772
 supervisely/nn/training/gui/train_val_splits_selector.py,sha256=V8aMe0l-CaoHxP0y6GeCBGDMd7L3epQ3KqeFsMY43rs,11191
 supervisely/nn/training/gui/training_artifacts.py,sha256=c0GH70ZByvnL413KWHjSKcSX8V5DStXM5sjFVZafSZo,10519
-supervisely/nn/training/gui/training_logs.py,sha256=fXj1Cszu7Qi4p8tNdBPqwet08I4xcphB5jbTPjCDmVk,4851
+supervisely/nn/training/gui/training_logs.py,sha256=GgEQMj9p98Z3p2b_-3BkHOhY7WQYELxctsRKmkbg3JY,4966
 supervisely/nn/training/gui/training_process.py,sha256=2F65cuu5ypKWkdaO4uVpNLMkwXjM8dpprd7Km5aedds,3192
-supervisely/nn/training/gui/utils.py,sha256=EO629fSOwxOsiXL7mr1EXTiKKMIg7xgVm3jtCnF4r7Q,4268
+supervisely/nn/training/gui/utils.py,sha256=cEOsYItxgGTGKxFAvn7zQcTpwHgcGRO_UNGBn8idMUI,4983
 supervisely/nn/training/loggers/__init__.py,sha256=DOqR-4NJv25C4Y1HCWggvGNM5mgo1CbwQOdvROOL-60,777
 supervisely/nn/training/loggers/base_train_logger.py,sha256=Gf_TKwSfQdSVG6P3wAeWf5t2_EJWJqOPqt_TsJ5jpBY,1914
 supervisely/nn/training/loggers/tensorboard_logger.py,sha256=s6dNFHIaucRTRMEdDM8mHT7v8bUdl13oDK78kPeCW8U,1116
@@ -1097,9 +1097,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.373.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.373.dist-info/METADATA,sha256=9QccODidDNZTM4MfriUbOZMtOFQ7d8SzadddcA2TMZU,35154
-supervisely-6.73.373.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.373.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.373.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.373.dist-info/RECORD,,
+supervisely-6.73.374.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.374.dist-info/METADATA,sha256=CZQRzlek6lQZ0EeIc-BYmKKPqE-p-nVIGMMm7eh4Aws,35154
+supervisely-6.73.374.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.374.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.374.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.374.dist-info/RECORD,,