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

supervisely/app/singleton.py

@@ -1,11 +1,32 @@
+import supervisely.io.env as sly_env
+
+
 class Singleton(type):
     _instances = {}
+    _nested_instances = {}
 
     def __call__(cls, *args, **kwargs):
         local = kwargs.pop("__local__", False)
         if local is False:
             if cls not in cls._instances:
                 cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
+
+            if sly_env.is_multiuser_mode_enabled():
+                from supervisely.app.content import DataJson, StateJson
+                from copy import deepcopy
+
+                # Initialize nested instances dict once
+                nested_instances = cls._nested_instances.setdefault(cls, {})
+                
+                user_id = sly_env.user_from_multiuser_app()
+                if user_id is not None and cls in (StateJson, DataJson):
+                    if user_id not in nested_instances:
+                        # Create new instance and copy data
+                        instance = super(Singleton, cls).__call__(*args, **kwargs)
+                        instance.update(deepcopy(dict(cls._instances[cls])))
+                        nested_instances[user_id] = instance
+                    
+                    return nested_instances[user_id]
             return cls._instances[cls]
         else:
             return super(Singleton, cls).__call__(*args, **kwargs)

supervisely/app/v1/app_service.py

@@ -1,3 +1,5 @@
+# isort: skip_file
+
 import json
 import os
 import time
@@ -12,7 +14,8 @@ import queue
 import re
 
 from supervisely.worker_api.agent_api import AgentAPI
-from supervisely.worker_proto import worker_api_pb2 as api_proto
+
+# from supervisely.worker_proto import worker_api_pb2 as api_proto # Import moved to methods where needed
 from supervisely.function_wrapper import function_wrapper
 from supervisely._utils import take_with_default
 from supervisely.sly_logger import logger as default_logger
@@ -30,7 +33,6 @@ from supervisely._utils import _remove_sensitive_information
 from supervisely.worker_api.agent_rpc import send_from_memory_generator
 from supervisely.io.fs_cache import FileCache
 
-
 # https://www.roguelynn.com/words/asyncio-we-did-it-wrong/
 
 
@@ -390,6 +392,13 @@ class AppService:
         )
 
     def publish_sync(self, initial_events=None):
+        try:
+            from supervisely.worker_proto import worker_api_pb2 as api_proto
+        except Exception as e:
+            from supervisely.app.v1.constants import PROTOBUF_REQUIRED_ERROR
+
+            raise ImportError(PROTOBUF_REQUIRED_ERROR) from e
+
         if initial_events is not None:
             for event_obj in initial_events:
                 event_obj["api_token"] = os.environ[API_TOKEN]
@@ -507,6 +516,13 @@ class AppService:
             self._error = error
 
     def send_response(self, request_id, data):
+        try:
+            from supervisely.worker_proto import worker_api_pb2 as api_proto
+        except Exception as e:
+            from supervisely.app.v1.constants import PROTOBUF_REQUIRED_ERROR
+
+            raise ImportError(PROTOBUF_REQUIRED_ERROR) from e
+
         out_bytes = json.dumps(data).encode("utf-8")
         self.api.put_stream_with_data(
             "SendGeneralEventData",

supervisely/app/v1/constants.py

@@ -7,4 +7,10 @@ SHARED_DATA = '/sessions'
 
 STOP_COMMAND = "stop"
 
-IMAGE_ANNOTATION_EVENTS = ["manual_selected_figure_changed"]
+IMAGE_ANNOTATION_EVENTS = ["manual_selected_figure_changed"]
+
+# Error message for missing or incompatible protobuf dependencies
+PROTOBUF_REQUIRED_ERROR = (
+    "protobuf is required for agent/worker/app_v1 functionality. "
+    "Please install supervisely with agent extras: pip install 'supervisely[agent]'"
+)

supervisely/app/widgets/__init__.py

@@ -104,6 +104,8 @@ from supervisely.app.widgets.pie_chart.pie_chart import PieChart
 from supervisely.app.widgets.timeline.timeline import Timeline
 from supervisely.app.widgets.nodes_flow.nodes_flow import NodesFlow
 from supervisely.app.widgets.dialog.dialog import Dialog
+from supervisely.app.widgets.modal.modal import Modal
+from supervisely.app.widgets.activity_feed.activity_feed import ActivityFeed
 from supervisely.app.widgets.draggable.draggable import Draggable
 from supervisely.app.widgets.tooltip.tooltip import Tooltip
 from supervisely.app.widgets.image_annotation_preview.image_annotation_preview import (
@@ -129,6 +131,9 @@ from supervisely.app.widgets.classes_mapping_preview.classes_mapping_preview imp
 )
 from supervisely.app.widgets.classes_list_selector.classes_list_selector import ClassesListSelector
 from supervisely.app.widgets.classes_list_preview.classes_list_preview import ClassesListPreview
+from supervisely.app.widgets.select_class.select_class import SelectClass
+from supervisely.app.widgets.select_tag.select_tag import SelectTag
+from supervisely.app.widgets.select_user.select_user import SelectUser
 from supervisely.app.widgets.tags_list_selector.tags_list_selector import TagsListSelector
 from supervisely.app.widgets.tags_list_preview.tags_list_preview import TagsListPreview
 from supervisely.app.widgets.members_list_selector.members_list_selector import MembersListSelector
@@ -161,3 +166,4 @@ from supervisely.app.widgets.dropdown_checkbox_selector.dropdown_checkbox_select
 from supervisely.app.widgets.ecosystem_model_selector.ecosystem_model_selector import (
     EcosystemModelSelector,
 )
+from supervisely.app.widgets.heatmap.heatmap import Heatmap

supervisely/app/widgets/activity_feed/activity_feed.py

@@ -0,0 +1,239 @@
+from __future__ import annotations
+
+from typing import Dict, List, Optional
+
+from supervisely.app import DataJson
+from supervisely.app.widgets import Widget
+
+try:
+    from typing import Literal
+except ImportError:
+    from typing_extensions import Literal
+
+
+class ActivityFeed(Widget):
+    """ActivityFeed is a widget that displays a vertical list of activity items with status indicators.
+    Similar to a timeline or activity log showing sequential events with their current status.
+
+    Each item can contain a custom widget as content and displays a status indicator (pending, in process, completed, failed).
+    Items are automatically numbered if no number is provided.
+
+    Read about it in `Developer Portal <https://developer.supervisely.com/app-development/widgets/layouts-and-containers/activity-feed>`_
+        (including screenshots and examples).
+
+    :param items: List of ActivityFeed.Item objects to display
+    :type items: Optional[List[ActivityFeed.Item]]
+    :param widget_id: An identifier of the widget.
+    :type widget_id: str, optional
+
+    :Usage example:
+    .. code-block:: python
+
+        from supervisely.app.widgets import ActivityFeed, Text
+
+        # Create items with custom content
+        item1 = ActivityFeed.Item(
+            content=Text("Processing dataset"),
+            status="completed"
+        )
+        item2 = ActivityFeed.Item(
+            content=Text("Training model"),
+            status="in_progress",
+            number=2
+        )
+        item3 = ActivityFeed.Item(
+            content=Text("Generating report"),
+            status="pending"
+        )
+
+        # Create activity feed
+        feed = ActivityFeed(items=[item1, item2, item3])
+
+        # Add item during runtime
+        new_item = ActivityFeed.Item(
+            content=Text("Deploy model"),
+            status="pending"
+        )
+        feed.add_item(new_item)
+
+        # Update status by item number
+        feed.set_status(2, "completed")
+
+        # Get item status
+        status = feed.get_status(2)
+    """
+
+    class Item:
+        """Represents a single item in the ActivityFeed.
+
+        :param content: Widget to display as the item content
+        :type content: Widget
+        :param status: Status of the item (pending, in_progress, completed, failed)
+        :type status: Literal["pending", "in_progress", "completed", "failed"]
+        :param number: Position number in the feed (auto-assigned if not provided)
+        :type number: Optional[int]
+        """
+
+        def __init__(
+            self,
+            content: Widget,
+            status: Literal["pending", "in_progress", "completed", "failed"] = "pending",
+            number: Optional[int] = None,
+        ) -> ActivityFeed.Item:
+            self.content = content
+            self.status = status
+            self.number = number
+            self._validate_status()
+
+        def _validate_status(self):
+            valid_statuses = ["pending", "in_progress", "completed", "failed"]
+            if self.status not in valid_statuses:
+                raise ValueError(
+                    f"Invalid status '{self.status}'. Must be one of: {', '.join(valid_statuses)}"
+                )
+
+        def to_json(self):
+            return {
+                "number": self.number,
+                "status": self.status,
+            }
+
+    def __init__(
+        self,
+        items: Optional[List[ActivityFeed.Item]] = None,
+        widget_id: Optional[str] = None,
+    ):
+        self._items = items if items is not None else []
+        self._auto_assign_numbers()
+        super().__init__(widget_id=widget_id, file_path=__file__)
+
+    def _auto_assign_numbers(self):
+        """Automatically assign numbers to items that don't have them."""
+        next_number = 1
+        for item in self._items:
+            if item.number is None:
+                item.number = next_number
+            next_number = max(next_number, item.number) + 1
+
+    def get_json_data(self) -> Dict:
+        """Returns dictionary with widget data.
+
+        :return: Dictionary with items data
+        :rtype: Dict
+        """
+        return {
+            "items": [item.to_json() for item in self._items],
+        }
+
+    def get_json_state(self) -> Dict:
+        """Returns dictionary with widget state (empty for this widget).
+
+        :return: Empty dictionary
+        :rtype: Dict
+        """
+        return {}
+
+    def add_item(
+        self,
+        item: Optional[ActivityFeed.Item] = None,
+        content: Optional[Widget] = None,
+        status: Literal["pending", "in_progress", "completed", "failed"] = "pending",
+        number: Optional[int] = None,
+    ) -> None:
+        """Add a new item to the activity feed.
+
+        You can either pass an ActivityFeed.Item object or provide content and status separately.
+
+        :param item: ActivityFeed.Item to add
+        :type item: Optional[ActivityFeed.Item]
+        :param content: Widget content (used if item is not provided)
+        :type content: Optional[Widget]
+        :param status: Status of the item (used if item is not provided)
+        :type status: Literal["pending", "in_progress", "completed", "failed"]
+        :param number: Position number (auto-assigned if not provided)
+        :type number: Optional[int]
+        """
+        if item is None:
+            if content is None:
+                raise ValueError("Either 'item' or 'content' must be provided")
+            item = ActivityFeed.Item(content=content, status=status, number=number)
+
+        if item.number is None:
+            # Auto-assign number
+            if self._items:
+                item.number = max(i.number for i in self._items) + 1
+            else:
+                item.number = 1
+
+        self._items.append(item)
+        self.update_data()
+        DataJson().send_changes()
+
+    def remove_item(self, number: int) -> None:
+        """Remove an item from the activity feed by its number.
+
+        :param number: Number of the item to remove. Starts from 1.
+        :type number: int
+        """
+        self._items = [item for item in self._items if item.number != number]
+        self.update_data()
+        DataJson().send_changes()
+
+    def set_status(
+        self,
+        number: int,
+        status: Literal["pending", "in_progress", "completed", "failed"],
+    ) -> None:
+        """Update the status of an item by its number.
+
+        :param number: Number of the item to update. Starts from 1.
+        :type number: int
+        :param status: New status for the item
+        :type status: Literal["pending", "in_progress", "completed", "failed"]
+        """
+        for i, item in enumerate(self._items):
+            if item.number == number:
+                item.status = status
+                item._validate_status()
+                DataJson()[self.widget_id]["items"][i]["status"] = status
+                DataJson().send_changes()
+                return
+        raise ValueError(f"Item with number {number} not found")
+
+    def get_status(self, number: int) -> str:
+        """Get the status of an item by its number.
+
+        :param number: Number of the item. Starts from 1.
+        :type number: int
+        :return: Status of the item
+        :rtype: str
+        """
+        for item in self._items:
+            if item.number == number:
+                return item.status
+        raise ValueError(f"Item with number {number} not found")
+
+    def get_items(self) -> List[ActivityFeed.Item]:
+        """Get all items in the activity feed.
+
+        :return: List of all items
+        :rtype: List[ActivityFeed.Item]
+        """
+        return self._items
+
+    def clear(self) -> None:
+        """Remove all items from the activity feed."""
+        self._items = []
+        self.update_data()
+        DataJson().send_changes()
+
+    def set_items(self, items: List[ActivityFeed.Item]) -> None:
+        """Replace all items in the activity feed.
+
+        :param items: New list of items
+        :type items: List[ActivityFeed.Item]
+        """
+        self._items = items
+        self._auto_assign_numbers()
+        self.update_data()
+        DataJson().send_changes()

supervisely/app/widgets/activity_feed/style.css

@@ -0,0 +1,78 @@
+.sly-activity-feed {
+  padding: 10px;
+}
+
+.sly-activity-feed-item {
+  display: flex;
+  position: relative;
+  padding-bottom: 20px;
+}
+
+.sly-activity-feed-item:last-child {
+  padding-bottom: 0;
+}
+
+.sly-activity-feed-item:not(:last-child) .sly-activity-feed-line {
+  display: block;
+}
+
+.sly-activity-feed-marker {
+  flex-shrink: 0;
+  width: 40px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+
+.sly-activity-feed-circle {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  font-size: 10px;
+  color: white;
+  z-index: 1;
+}
+
+.sly-activity-feed-circle.completed {
+  background-color: #67C23A;
+}
+
+.sly-activity-feed-circle.failed {
+  background-color: #F56C6C;
+}
+
+.sly-activity-feed-circle.in_progress {
+  background-color: #409EFF;
+}
+
+.sly-activity-feed-circle.pending {
+  background-color: #909399;
+}
+
+.sly-activity-feed-line {
+  position: absolute;
+  top: 16px;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 2px;
+  height: calc(100% + 4px);
+  background-color: #E4E7ED;
+  display: none;
+}
+
+.sly-activity-feed-content {
+  flex: 1;
+  padding-left: 10px;
+  padding-top: 0px;
+}
+
+.sly-activity-feed-number {
+  font-size: 11px;
+  color: #909399;
+  margin-top: 4px;
+}

supervisely/app/widgets/activity_feed/template.html

@@ -0,0 +1,22 @@
+<link rel="stylesheet" href="./sly/css/app/widgets/activity_feed/style.css" />
+
+<div class="sly-activity-feed">
+  {% for item in widget._items %}
+  <div class="sly-activity-feed-item" v-if="data.{{{widget.widget_id}}}.items[{{{loop.index0}}}]">
+    <div class="sly-activity-feed-marker">
+      <div class="sly-activity-feed-circle" :class="data.{{{widget.widget_id}}}.items[{{{loop.index0}}}].status">
+        <i v-if="data.{{{widget.widget_id}}}.items[{{{loop.index0}}}].status === 'completed'" class="el-icon-check"></i>
+        <i v-else-if="data.{{{widget.widget_id}}}.items[{{{loop.index0}}}].status === 'failed'"
+          class="el-icon-close"></i>
+        <i v-else-if="data.{{{widget.widget_id}}}.items[{{{loop.index0}}}].status === 'in_progress'"
+          class="el-icon-loading"></i>
+        <i v-else class="el-icon-time"></i>
+      </div>
+      <div class="sly-activity-feed-line"></div>
+    </div>
+    <div class="sly-activity-feed-content">
+      {{{item.content}}}
+    </div>
+  </div>
+  {% endfor %}
+</div>

supervisely/app/widgets/card/card.py

@@ -157,3 +157,23 @@ class Card(Widget):
         :rtype: bool
         """
         return self._disabled["disabled"]
+
+    @property
+    def description(self) -> Optional[str]:
+        """Description of the card.
+
+        :return: Description of the card.
+        :rtype: Optional[str]
+        """
+        return self._description
+
+    @description.setter
+    def description(self, value: str) -> None:
+        """Sets the description of the card.
+
+        :param value: Description of the card.
+        :type value: str
+        """
+        self._description = value
+        StateJson()[self.widget_id]["description"] = self._description
+        StateJson().send_changes()