supervisely 6.73.297__py3-none-any.whl → 6.73.299__py3-none-any.whl

supervisely/api/module_api.py

@@ -619,6 +619,8 @@ class ApiField:
     """"""
     GROUP_ID = "groupId"
     """"""
+    EXPERIMENT = "experiment"
+    """"""
 
 
 def _get_single_item(items):

supervisely/api/task_api.py

@@ -1136,3 +1136,64 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
                 f"Invalid status value: {status}. Allowed values: {self.Status.values()}"
             )
         self._api.post("tasks.status.update", {ApiField.ID: task_id, ApiField.STATUS: status})
+
+    def set_output_experiment(self, task_id: int, experiment_info: dict) -> Dict:
+        """
+        Sets output for the task with experiment info.
+
+        :param task_id: Task ID in Supervisely.
+        :type task_id: int
+        :param experiment_info: Experiment info from TrainApp.
+        :type experiment_info: dict
+        :return: None
+        :rtype: :class:`NoneType`
+
+        Example of experiment_info:
+
+            experiment_info = {
+                'experiment_name': '247_Lemons_RT-DETRv2-M',
+                'framework_name': 'RT-DETRv2',
+                'model_name': 'RT-DETRv2-M',
+                'task_type': 'object detection',
+                'project_id': 76,
+                'task_id': 247,
+                'model_files': {'config': 'model_config.yml'},
+                'checkpoints': ['checkpoints/best.pth', 'checkpoints/checkpoint0025.pth', 'checkpoints/checkpoint0050.pth', 'checkpoints/last.pth'],
+                'best_checkpoint': 'best.pth',
+                'export': {'ONNXRuntime': 'export/best.onnx'},
+                'app_state': 'app_state.json',
+                'model_meta': 'model_meta.json',
+                'train_val_split': 'train_val_split.json',
+                'train_size': 4,
+                'val_size': 2,
+                'hyperparameters': 'hyperparameters.yaml',
+                'hyperparameters_id': 45234,
+                'artifacts_dir': '/experiments/76_Lemons/247_RT-DETRv2/',
+                'datetime': '2025-01-22 18:13:43',
+                'evaluation_report_id': 12961,
+                'evaluation_report_link': 'https://app.supervisely.com/model-benchmark?id=12961',
+                'evaluation_metrics': {
+                    'mAP': 0.994059405940594,
+                    'AP50': 1.0, 'AP75': 1.0,
+                    'f1': 0.9944444444444445,
+                    'precision': 0.9944444444444445,
+                    'recall': 0.9944444444444445,
+                    'iou': 0.9726227736959404,
+                    'classification_accuracy': 1.0,
+                    'calibration_score': 0.8935745942476048,
+                    'f1_optimal_conf': 0.500377893447876,
+                    'expected_calibration_error': 0.10642540575239527,
+                    'maximum_calibration_error': 0.499622106552124
+                },
+                'primary_metric': 'mAP'
+                'logs': {
+                    'type': 'tensorboard',
+                    'link': '/experiments/76_Lemons/247_RT-DETRv2/logs/'
+                },
+            }
+        """
+        output = {ApiField.EXPERIMENT: {ApiField.DATA: {**experiment_info}}}
+        resp = self._api.post(
+            "tasks.output.set", {ApiField.TASK_ID: task_id, ApiField.OUTPUT: output}
+        )
+        return resp.json()

supervisely/app/fastapi/index.html

@@ -86,7 +86,7 @@
 
   <div id="sly-app">
     <sly-app>
-      <template v-slot="{ post, state, data, session }">
+      <template v-slot="{ post, state, data, session, isStaticVersion, publicApiInstance }">
         <div
           :style="{'padding': `${state.app_body_padding} ${state.app_body_padding} 0`, 'display': 'flex', 'flex-direction': 'row', 'place-items': 'center'}"
           {% if __app_session_info_solid__ %} {% if __app_session_info_extra_content__ %}

supervisely/app/fastapi/templating.py

@@ -14,7 +14,7 @@ from supervisely.app.widgets_context import JinjaWidgets
 js_bundle_version = "2.1.98"
 
 # https://github.com/supervisely-ecosystem/supervisely-app-frontend-js
-js_frontend_version = "v0.0.54"
+js_frontend_version = "v0.0.55"
 
 
 pyodide_version = "v0.25.0"

supervisely/app/widgets/__init__.py

@@ -148,4 +148,5 @@ from supervisely.app.widgets.select_dataset_tree.select_dataset_tree import Sele
 from supervisely.app.widgets.grid_gallery_v2.grid_gallery_v2 import GridGalleryV2
 from supervisely.app.widgets.report_thumbnail.report_thumbnail import ReportThumbnail
 from supervisely.app.widgets.experiment_selector.experiment_selector import ExperimentSelector
-from supervisely.app.widgets.bokeh.bokeh import Bokeh
+from supervisely.app.widgets.bokeh.bokeh import Bokeh
+from supervisely.app.widgets.run_app_button.run_app_button import RunAppButton

supervisely/app/widgets/button/button.py

@@ -67,6 +67,7 @@ class Button(Widget):
         emit_on_click: Optional[str] = None,
         style: Optional[str] = None,
         call_on_click: Optional[str] = None,
+        visible_by_vue_field: Optional[str] = "",
     ):
         self._widget_routes = {}
 
@@ -88,6 +89,7 @@ class Button(Widget):
         self._emit_on_click = emit_on_click
         self._style = style
         self._call_on_click = call_on_click
+        self._visible_by_vue_field = visible_by_vue_field
 
         super().__init__(widget_id=widget_id, file_path=__file__)
 
@@ -117,7 +119,7 @@ class Button(Widget):
 
     def get_json_state(self) -> None:
         """Button widget doesn't have state, so this method returns None."""
-        return None
+        return {"visible_by_vue_field": self._visible_by_vue_field}
 
     @property
     def text(self) -> str:

supervisely/app/widgets/button/template.html

@@ -6,7 +6,11 @@ if widget._link is not none
 {%
 endif  
 %}
+
 <el-button
+  {% if widget._visible_by_vue_field %}
+    v-show="{{{widget._visible_by_vue_field}}}"
+  {% endif %}
   :type="data.{{{widget.widget_id}}}.button_type"
   :plain="data.{{{widget.widget_id}}}.plain"
   :loading="data.{{{widget.widget_id}}}.loading"

supervisely/app/widgets/custom_models_selector/custom_models_selector.py

@@ -4,6 +4,7 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import datetime
 from typing import Callable, Dict, List, Union
 
+import supervisely.io.env as sly_env
 from supervisely import env, logger
 from supervisely._utils import abs_url, is_development
 from supervisely.api.api import Api
@@ -25,7 +26,6 @@ from supervisely.app.widgets import (
 )
 from supervisely.io.fs import get_file_name_with_ext
 from supervisely.nn.artifacts.artifacts import TrainInfo
-import supervisely.io.env as sly_env
 
 WEIGHTS_DIR = "weights"
 
@@ -427,7 +427,7 @@ class CustomModelsSelector(Widget):
                 )
                 return train_info.task_type, model_row
             except Exception as e:
-                logger.warning(f"Failed to process train info: {train_info}. Error: {repr(e)}")
+                logger.debug(f"Failed to process train info: {train_info}. Error: {repr(e)}")
                 return None, None
 
         table_rows = defaultdict(list)

supervisely/app/widgets/experiment_selector/experiment_selector.py

@@ -21,7 +21,6 @@ from supervisely.io.fs import get_file_name_with_ext
 from supervisely.nn.experiments import ExperimentInfo
 from supervisely.nn.utils import ModelSource
 
-
 WEIGHTS_DIR = "weights"
 
 COL_ID = "task id".upper()
@@ -272,7 +271,7 @@ class ExperimentSelector(Widget):
                     benchmark_report_link = f"/model-benchmark?id={self._benchmark_report_id}"
 
                 benchmark_widget = Text(
-                    f"<i class='zmdi zmdi-chart' style='color: #7f858e'></i> <a href='{benchmark_report_link}' target='_blank'>evaluation report</a>",
+                    f"<i class='zmdi zmdi-chart' style='color: #7f858e'></i> <a href='{benchmark_report_link}' target='_blank'>Evaluation report</a>",
                     "text",
                 )
             return benchmark_widget
@@ -378,7 +377,7 @@ class ExperimentSelector(Widget):
                 )
                 return experiment_info.task_type, model_row
             except Exception as e:
-                logger.warn(f"Failed to process experiment info: {experiment_info}")
+                logger.debug(f"Failed to process experiment info: {experiment_info}")
                 return None, None
 
         table_rows = defaultdict(list)

supervisely/app/widgets/run_app_button/run_app_button.py

@@ -0,0 +1,300 @@
+try:
+    from typing import Literal
+except ImportError:
+    from typing_extensions import Literal
+
+from typing import Optional
+
+from supervisely.app import DataJson, StateJson
+from supervisely.app.widgets import Widget
+from supervisely.app.widgets_context import JinjaWidgets
+
+
+class RunAppButton(Widget):
+    def __init__(
+        self,
+        workspace_id: int,
+        module_id: int,
+        payload: dict = None,
+        text: Optional[str] = "Button",
+        button_type: Optional[
+            Literal["primary", "info", "warning", "danger", "success", "text"]
+        ] = "primary",
+        button_size: Optional[Literal["mini", "small", "large"]] = None,
+        plain: Optional[bool] = False,
+        icon: Optional[str] = None,
+        icon_gap: Optional[int] = 5,
+        available_in_offline: Optional[bool] = False,
+        visible_by_vue_field: Optional[str] = "",
+        widget_id: Optional[str] = None,
+    ):
+        """
+        Button the runs an app on Supervisely instance.
+
+        :param workspace_id: Workspace ID.
+        :type workspace_id: int
+        :param module_id: Module ID.
+        :type module_id: int
+        :param payload: Payload to be sent to the app.
+        :type payload: dict, optional
+        :param text: Text to be displayed on the button.
+        :type text: str, optional
+        :param button_type: Type of the button.
+        :type button_type: Literal["primary", "info", "warning", "danger", "success", "text"], optional
+        :param button_size: Size of the button.
+        :type button_size: Literal["mini", "small", "large"], optional
+        :param plain: If True, the button will be plain.
+        :type plain: bool, optional
+        :param icon: Icon to be displayed on the button.
+        :type icon: str, optional
+        :param icon_gap: Gap between the icon and the text.
+        :type icon_gap: int, optional
+        :param available_in_offline: If True, the button will be available in offline session.
+        :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 widget_id: Widget ID.
+        :type widget_id: str, optional
+
+        :Usage example:
+        .. code-block:: python
+            from supervisely.app.widgets import RunAppButton
+
+            workspace_id = 123
+            project_id = 555
+            app_module_id = 777
+
+            run_app_button = RunAppButton(
+                workspace_id=workspace_id,
+                module_id=app_module_id,
+                payload={"state": {"slyProjectId": project_id}},
+                text="Run App",
+                button_type="info",
+                plain=True,
+                icon="zmdi zmdi-chart",
+                available_in_offline=True,
+                visible_by_vue_field="isStaticVersion",
+            )
+        """
+        self._text = text
+        self._button_type = button_type
+        self._button_size = button_size
+        self._plain = plain
+        self._icon_gap = icon_gap
+        if icon is None:
+            self._icon = ""
+        else:
+            self._icon = f'<i class="{icon}" style="margin-right: {icon_gap}px"></i>'
+
+        self._available_in_offline = available_in_offline
+        self._visible_by_vue_field = visible_by_vue_field
+
+        self._loading = False
+        self._disabled = False
+        self._workspace_id = workspace_id
+        self._module_id = module_id
+        self._payload = payload
+
+        super().__init__(widget_id=widget_id, file_path=__file__)
+
+        script_path = "./sly/css/app/widgets/run_app_button/script.js"
+        JinjaWidgets().context["__widget_scripts__"][self.__class__.__name__] = script_path
+
+    def get_json_data(self):
+        """Returns dictionary with widget data, which defines the appearance and behavior of the widget.
+
+        Dictionary contains the following fields:
+            - text: Text to be displayed on the button.
+            - button_type: Type of the button.
+            - plain: If True, the button will be plain.
+            - button_size: Size of the button.
+            - loading: If True, the button will show loading animation.
+            - disabled: If True, the button will be disabled.
+            - icon: Icon to be displayed on the button.
+            - available_in_offline: If True, the button will be available in offline session.
+        """
+        return {
+            "options": {
+                "text": self._text,
+                "button_type": self._button_type,
+                "plain": self._plain,
+                "button_size": self._button_size,
+                "loading": self._loading,
+                "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 {
+            "workspace_id": self._workspace_id,
+            "module_id": self._module_id,
+            "payload": self._payload,
+            "visible_by_vue_field": self._visible_by_vue_field,
+        }
+
+    @property
+    def workspace_id(self) -> int:
+        """Returns the workspace ID.
+
+        :return: Workspace ID.
+        :rtype: int
+        """
+        return self._workspace_id
+
+    @workspace_id.setter
+    def workspace_id(self, value: int) -> None:
+        """Sets the workspace ID.
+
+        :param value: Workspace ID.
+        :type value: int
+        """
+        self._workspace_id = value
+        StateJson()[self.widget_id]["workspace_id"] = self._workspace_id
+        StateJson().send_changes()
+
+    @property
+    def text(self) -> str:
+        """Returns the text to be displayed on the button.
+
+        :return: Text to be displayed on the button.
+        :rtype: str
+        """
+        return self._text
+
+    @text.setter
+    def text(self, value: str) -> None:
+        """Sets the text to be displayed on the button.
+
+        :param value: Text to be displayed on the button.
+        :type value: str
+        """
+        self._text = value
+        DataJson()[self.widget_id]["options"]["text"] = self._text
+        DataJson().send_changes()
+
+    @property
+    def payload(self) -> dict:
+        """Returns the payload to be sent to the app.
+
+        :return: Payload to be sent to the app.
+        :rtype: dict
+        """
+        return self._payload
+
+    @payload.setter
+    def payload(self, value: dict) -> None:
+        """Sets the payload to be sent to the app.
+
+        :param value: Payload to be sent to the app.
+        :type value: dict
+        """
+        self._payload = value
+        StateJson()[self.widget_id]["payload"] = self._payload
+        StateJson().send_changes()
+
+    @property
+    def icon(self) -> str:
+        """Returns the icon to be displayed on the button.
+
+        :return: Icon to be displayed on the button.
+        :rtype: str
+        """
+        return self._icon
+
+    @icon.setter
+    def icon(self, value: str) -> None:
+        """Sets the icon to be displayed on the button.
+
+        :param value: Icon to be displayed on the button.
+        :type value: str
+        """
+        if value is None:
+            self._icon = ""
+        else:
+            self._icon = f'<i class="{value}" style="margin-right: {self._icon_gap}px"></i>'
+        DataJson()[self.widget_id]["options"]["icon"] = self._icon
+        DataJson().send_changes()
+
+    @property
+    def button_type(self) -> str:
+        """Returns the type of the button.
+
+        :return: Type of the button.
+        :rtype: str
+        """
+        return self._button_type
+
+    @button_type.setter
+    def button_type(
+        self, value: Literal["primary", "info", "warning", "danger", "success", "text"]
+    ) -> None:
+        """Sets the type of the button.
+
+        :param value: Type of the button.
+        :type value: Literal["primary", "info", "warning", "danger", "success", "text"]
+        """
+        self._button_type = value
+        DataJson()[self.widget_id]["options"]["button_type"] = self._button_type
+        DataJson().send_changes()
+
+    @property
+    def plain(self) -> bool:
+        """Returns True if the button is plain, False otherwise.
+
+        :return: True if the button is plain, False otherwise.
+        :rtype: bool
+        """
+        return self._plain
+
+    @plain.setter
+    def plain(self, value: bool) -> None:
+        """Sets the button to be plain or not.
+
+        :param value: If True, the button will be plain.
+        :type value: bool
+        """
+        self._plain = value
+        DataJson()[self.widget_id]["options"]["plain"] = self._plain
+        DataJson().send_changes()
+
+    @property
+    def loading(self) -> bool:
+        """Returns True if the button shows loading animation, False otherwise.
+
+        :return: True if the button shows loading animation, False otherwise.
+        :rtype: bool
+        """
+        return self._loading
+
+    @loading.setter
+    def loading(self, value: bool) -> None:
+        """Sets the button loading animation.
+
+        :param value: If True, the animation will be enabled, otherwise disabled.
+        :type value: bool
+        """
+        self._loading = value
+        DataJson()[self.widget_id]["options"]["loading"] = self._loading
+        DataJson().send_changes()
+
+    @property
+    def disabled(self) -> bool:
+        """Returns True if the button is disabled, False otherwise.
+
+        :return: True if the button is disabled, False otherwise.
+        :rtype: bool
+        """
+        return self._disabled
+
+    @disabled.setter
+    def disabled(self, value: bool) -> None:
+        """Sets the button to be disabled or not.
+
+        :param value: If True, the button will be disabled.
+        :type value: bool
+        """
+        self._disabled = value
+        DataJson()[self.widget_id]["options"]["disabled"] = self._disabled

supervisely/app/widgets/run_app_button/script.js

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

@@ -0,0 +1,10 @@
+<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>

supervisely/nn/artifacts/artifacts.py

@@ -372,7 +372,7 @@ class BaseTrainArtifacts:
             _upload_metadata(train_json)
             logger.info(f"Metadata for '{artifacts_folder}' was generated")
         else:
-            logger.warn(f"Invalid metadata for '{artifacts_folder}'")
+            logger.debug(f"Invalid metadata for '{artifacts_folder}'")
             train_json = None
         return train_json
 
@@ -436,7 +436,7 @@ class BaseTrainArtifacts:
             )
             is_valid = self._validate_train_json(json_data)
             if not is_valid:
-                logger.warn(f"Invalid metadata for '{artifacts_folder}'")
+                logger.debug(f"Invalid metadata for '{artifacts_folder}'")
                 json_data = None
         return json_data
 
@@ -590,7 +590,7 @@ class BaseTrainArtifacts:
 
                 return ExperimentInfo(**experiment_info_data)
             except Exception as e:
-                logger.warning(f"Failed to build experiment info: {e}")
+                logger.debug(f"Failed to build experiment info: {e}")
                 return None
 
         train_infos = self.get_list(sort)

supervisely/nn/benchmark/base_benchmark.py

@@ -1,6 +1,6 @@
 import os
 from pathlib import Path
-from typing import Callable, List, Optional, Tuple, Union, Type
+from typing import Callable, List, Optional, Tuple, Type, Union
 
 import numpy as np
 
@@ -96,7 +96,7 @@ class BaseBenchmark:
     def key_metrics(self):
         eval_results = self.get_eval_result()
         return eval_results.key_metrics
-    
+
     @property
     def primary_metric_name(self) -> str:
         return self._get_evaluator_class().eval_result_cls.PRIMARY_METRIC
@@ -415,7 +415,6 @@ class BaseBenchmark:
                 "id": app_info["id"],
             }
         else:
-            logger.warning("session.task_id is not set. App info will not be fetched.")
             app_info = None
         model_info = {
             **deploy_info,
@@ -561,15 +560,20 @@ class BaseBenchmark:
     def lnk(self):
         return self.visualizer.renderer.lnk
 
-    def upload_report_link(self, remote_dir: str):
-        template_path = os.path.join(remote_dir, "template.vue")
-        vue_template_info = self.api.file.get_info_by_path(self.team_id, template_path)
-        self.report_id = vue_template_info.id
-
-        report_link = "/model-benchmark?id=" + str(vue_template_info.id)
+    def upload_report_link(self, remote_dir: str, report_id: int = None, local_dir: str = None):
+        if report_id is None:
+            template_path = os.path.join(remote_dir, "template.vue")
+            vue_template_info = self.api.file.get_info_by_path(self.team_id, template_path)
+            self.report_id = vue_template_info.id
+            report_id = vue_template_info.id
 
+        report_link = "/model-benchmark?id=" + str(report_id)
         lnk_name = "Model Evaluation Report.lnk"
-        local_path = os.path.join(self.get_layout_results_dir(), lnk_name)
+
+        if local_dir is None:
+            local_dir = self.get_layout_results_dir()
+        local_path = os.path.join(local_dir, lnk_name)
+
         with open(local_path, "w") as file:
             file.write(report_link)