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

supervisely/app/widgets/__init__.py

@@ -150,3 +150,4 @@ from supervisely.app.widgets.report_thumbnail.report_thumbnail import ReportThum
 from supervisely.app.widgets.experiment_selector.experiment_selector import ExperimentSelector
 from supervisely.app.widgets.bokeh.bokeh import Bokeh
 from supervisely.app.widgets.run_app_button.run_app_button import RunAppButton
+from supervisely.app.widgets.select_collection.select_collection import SelectCollection

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>