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

supervisely/video_annotation/video_figure.py

@@ -24,6 +24,8 @@ from supervisely.video_annotation.key_id_map import KeyIdMap
 from supervisely.video_annotation.video_object import VideoObject
 from supervisely.video_annotation.video_object_collection import VideoObjectCollection
 
+from supervisely.annotation.label import LabelingStatus
+
 
 class OutOfImageBoundsException(Exception):
     pass
@@ -55,6 +57,8 @@ class VideoFigure:
     :type smart_tool_input: dict, optional
     :param priority: Priority of the figure (position of the figure relative to other overlapping or underlying figures).
     :type priority: int, optional
+    :param status: Sets labeling status. Shows how label was created and corrected.
+    :type status: LabelingStatus, optional
     :Usage example:
 
      .. code-block:: python
@@ -86,7 +90,9 @@ class VideoFigure:
         #             ],
         #             "interior": []
         #         }
-        #     }
+        #     },
+        #    "nnCreated": false,
+        #    "nnUpdated": false
         # }
     """
 
@@ -103,6 +109,7 @@ class VideoFigure:
         track_id: Optional[str] = None,
         smart_tool_input: Optional[Dict] = None,
         priority: Optional[int] = None,
+        status: Optional[LabelingStatus] = None,
     ):
         self._video_object = video_object
         self._set_geometry_inplace(geometry)
@@ -116,6 +123,11 @@ class VideoFigure:
         self._smart_tool_input = smart_tool_input
         self._priority = priority
 
+        if status is None:
+            status = LabelingStatus.MANUAL
+        self._status = status
+        self._nn_created, self._nn_updated = LabelingStatus.to_flags(self.status)
+
     def _add_creation_info(self, d):
         if self.labeler_login is not None:
             d[LABELER_LOGIN] = self.labeler_login
@@ -339,9 +351,9 @@ class VideoFigure:
             #             "interior": []
             #         }
             #     },
-            #     "meta": {
-            #         "frame": 7
-            #     }
+            #     "meta": {"frame": 7},
+            #     "nnCreated": false,
+            #     "nnUpdated": false
             # }
         """
         data_json = {
@@ -349,6 +361,8 @@ class VideoFigure:
             OBJECT_KEY: self.parent_object.key().hex,
             ApiField.GEOMETRY_TYPE: self.geometry.geometry_name(),
             ApiField.GEOMETRY: self.geometry.to_json(),
+            ApiField.NN_CREATED: self._nn_created,
+            ApiField.NN_UPDATED: self._nn_updated,
         }
 
         if key_id_map is not None:
@@ -473,6 +487,10 @@ class VideoFigure:
         smart_tool_input = data.get(ApiField.SMART_TOOL_INPUT, None)
         priority = data.get(ApiField.PRIORITY, None)
 
+        nn_created = data.get(ApiField.NN_CREATED, False)
+        nn_updated = data.get(ApiField.NN_UPDATED, False)
+        status = LabelingStatus.from_flags(nn_created, nn_updated)
+
         return cls(
             object,
             geometry,
@@ -485,6 +503,7 @@ class VideoFigure:
             track_id=track_id,
             smart_tool_input=smart_tool_input,
             priority=priority,
+            status=status,
         )
 
     def clone(
@@ -500,6 +519,7 @@ class VideoFigure:
         track_id: Optional[str] = None,
         smart_tool_input: Optional[Dict] = None,
         priority: Optional[int] = None,
+        status: Optional[LabelingStatus] = None,
     ) -> VideoFigure:
         """
         Makes a copy of VideoFigure with new fields, if fields are given, otherwise it will use fields of the original VideoFigure.
@@ -526,6 +546,8 @@ class VideoFigure:
         :type smart_tool_input: dict, optional
         :param priority: Priority of the figure (position of the figure relative to other overlapping or underlying figures).
         :type priority: int, optional
+        :param status: Sets labeling status. Specifies if the VideoFigure was created by NN model, manually or created by NN and then manually corrected.
+        :type status: LabelingStatus, optional
         :return: VideoFigure object
         :rtype: :class:`VideoFigure`
 
@@ -582,8 +604,20 @@ class VideoFigure:
             track_id=take_with_default(track_id, self.track_id),
             smart_tool_input=take_with_default(smart_tool_input, self._smart_tool_input),
             priority=take_with_default(priority, self._priority),
+            status=take_with_default(status, self.status),
         )
 
+    @property
+    def status(self) -> LabelingStatus:
+        """Labeling status. Specifies if the VideoFigure was created by NN model, manually or created by NN and then manually corrected."""
+        return self._status
+
+    @status.setter
+    def status(self, status: LabelingStatus):
+        """Set labeling status."""
+        self._status = status
+        self._nn_created, self._nn_updated = LabelingStatus.to_flags(self.status)
+
     def validate_bounds(
         self, img_size: Tuple[int, int], _auto_correct: Optional[bool] = False
     ) -> None:

supervisely/video_annotation/video_object.py

@@ -18,6 +18,7 @@ from supervisely.geometry.constants import (
     UPDATED_AT,
 )
 from supervisely.project.project_meta import ProjectMeta
+from supervisely.project.project_settings import LabelingInterface
 from supervisely.video_annotation.constants import ID, KEY, OBJECTS_MAP
 from supervisely.video_annotation.key_id_map import KeyIdMap
 from supervisely.video_annotation.video_tag import VideoTag
@@ -362,10 +363,34 @@ class VideoObject(KeyObject):
                 f"was not found in the given project meta."
             )
 
-        key = uuid.UUID(data[KEY]) if KEY in data else uuid.uuid4()
-
-        if key_id_map is not None:
-            key_id_map.add_object(key, data.get(ID, None))
+        is_multiview = False
+        try:
+            if project_meta.labeling_interface == LabelingInterface.MULTIVIEW:
+                is_multiview = True
+        except AttributeError:
+            is_multiview = False
+
+        raw_id = data.get(ID, None)
+
+        if not is_multiview:
+            key = uuid.UUID(data[KEY]) if KEY in data else uuid.uuid4()
+            if key_id_map is not None:
+                key_id_map.add_object(key, raw_id)
+        else:
+            if KEY in data:
+                key = uuid.UUID(data[KEY])
+            elif key_id_map is not None and isinstance(raw_id, int):
+                existing_key = key_id_map.get_object_key(raw_id)
+                if isinstance(existing_key, uuid.UUID):
+                    key = existing_key
+                else:
+                    key = uuid.uuid4()
+            else:
+                key = uuid.uuid4()
+
+            if key_id_map is not None and isinstance(raw_id, int):
+                if key_id_map.get_object_id(key) is None:
+                    key_id_map.add_object(key, raw_id)
 
         class_id = data.get(CLASS_ID, None)
         labeler_login = data.get(LABELER_LOGIN, None)

supervisely/volume/stl_converter.py

@@ -15,6 +15,8 @@ from supervisely.io.fs import (
     change_directory_at_index,
 )
 
+if not hasattr(np, "bool"):
+    np.bool = np.bool_
 
 def matrix_from_nrrd_header(header: Dict) -> np.ndarray:
     """

supervisely/worker_api/agent_rpc.py

@@ -1,10 +1,12 @@
 # coding: utf-8
+# isort: skip_file
 
 import cv2
 import numpy as np
 
 from .chunking import load_to_memory_chunked_image, load_to_memory_chunked
-from ..worker_proto import worker_api_pb2 as api_proto
+
+# from ..worker_proto import worker_api_pb2 as api_proto # Import moved to methods where needed
 
 
 class SimpleCache:
@@ -22,6 +24,13 @@ class SimpleCache:
 
 
 def download_image_from_remote(agent_api, image_hash, src_node_token, logger):
+    try:
+        from ..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
+
     resp = agent_api.get_stream_with_data(
         'DownloadImages',
         api_proto.ChunkImage,
@@ -34,6 +43,13 @@ def download_image_from_remote(agent_api, image_hash, src_node_token, logger):
 
 
 def download_data_from_remote(agent_api, req_id, logger):
+    try:
+        from ..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
+
     resp = agent_api.get_stream_with_data('GetGeneralEventData', api_proto.Chunk, api_proto.Empty(),
                                           addit_headers={'x-request-id': req_id})
     b_data = load_to_memory_chunked(resp)
@@ -47,6 +63,13 @@ def batched(seq, batch_size):
 
 
 def send_from_memory_generator(out_bytes, chunk_size):
+    try:
+        from ..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
+
     for bytes_chunk in batched(out_bytes, chunk_size):
         yield api_proto.Chunk(buffer=bytes_chunk, total_size=len(out_bytes))
 

supervisely/worker_api/rpc_servicer.py

@@ -1,4 +1,5 @@
 # coding: utf-8
+# isort: skip_file
 
 import os
 import concurrent.futures
@@ -11,18 +12,27 @@ import threading
 from supervisely.annotation.annotation import Annotation
 from supervisely.function_wrapper import function_wrapper, function_wrapper_nofail
 from supervisely.imaging.image import drop_image_alpha_channel
-from supervisely.nn.legacy.hosted.inference_modes import InferenceModeFactory, InfModeFullImage, \
-    MODE, NAME, get_effective_inference_mode_config
+from supervisely.nn.legacy.hosted.inference_modes import (
+    InferenceModeFactory,
+    InfModeFullImage,
+    MODE,
+    NAME,
+    get_effective_inference_mode_config,
+)
 from supervisely.project.project_meta import ProjectMeta
 from supervisely.worker_api.agent_api import AgentAPI
-from supervisely.worker_api.agent_rpc import decode_image, download_image_from_remote, download_data_from_remote, \
-    send_from_memory_generator
+from supervisely.worker_api.agent_rpc import (
+    decode_image,
+    download_image_from_remote,
+    download_data_from_remote,
+    send_from_memory_generator,
+)
 from supervisely.worker_api.interfaces import SingleImageInferenceInterface
-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.task.progress import report_agent_rpc_ready
 from supervisely.api.api import Api
 
-
 REQUEST_TYPE = 'request_type'
 GET_OUT_META = 'get_out_meta'
 INFERENCE = 'inference'
@@ -123,6 +133,13 @@ class AgentRPCServicerBase:
             self.thread_pool.submit(function_wrapper_nofail, self._send_data, res_msg, req_id)  # skip errors
 
     def _send_data(self, out_msg, req_id):
+        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
+
         self.logger.trace('Will send output data.', extra={REQUEST_ID: req_id})
         out_bytes = json.dumps(out_msg).encode('utf-8')
 
@@ -173,6 +190,13 @@ class AgentRPCServicerBase:
             self._load_data_if_required(event_obj)
 
     def run_inf_loop(self):
+        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
+
         def seq_inf_wrapped():
             function_wrapper(self._sequential_final_processing)  # exit if raised
 
@@ -252,4 +276,4 @@ class InactiveRPCServicer(AgentRPCServicer):
         self.logger.info('Created InactiveRPCServicer for internal usage', extra=conn_config)
 
     def run_inf_loop(self):
-        raise RuntimeError("Method is not accessible")
+        raise RuntimeError("Method is not accessible")

{supervisely-6.73.438.dist-info → supervisely-6.73.513.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: supervisely
-Version: 6.73.438
+Version: 6.73.513
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely
@@ -21,15 +21,14 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: cachetools<=5.5.0,>=4.2.3
-Requires-Dist: numpy<2.0.0,>=1.19
+Requires-Dist: numpy<=2.3.3,>=1.19
 Requires-Dist: opencv-python<5.0.0.0,>=4.6.0.66
 Requires-Dist: PTable<1.0.0,>=0.9.2
-Requires-Dist: pillow<=10.2.0,>=5.4.1
-Requires-Dist: protobuf<=3.20.3,>=3.19.5
-Requires-Dist: python-json-logger<3.0.0,>=0.1.11
+Requires-Dist: pillow<=10.4.0,>=5.4.1
+Requires-Dist: python-json-logger<=3.0.1,>=0.1.11
 Requires-Dist: requests<3.0.0,>=2.27.1
 Requires-Dist: requests-toolbelt>=0.9.1
-Requires-Dist: Shapely<=2.0.2,>=1.7.1
+Requires-Dist: Shapely<=2.1.2,>=1.7.1
 Requires-Dist: bidict<1.0.0,>=0.21.2
 Requires-Dist: varname<1.0.0,>=0.8.1
 Requires-Dist: python-dotenv<=1.0.1,>=0.19.2
@@ -40,18 +39,18 @@ Requires-Dist: stringcase<2.0.0,>=1.2.0
 Requires-Dist: python-magic<1.0.0,>=0.4.25
 Requires-Dist: trimesh<=4.5.0,>=3.11.2
 Requires-Dist: uvicorn[standard]<1.0.0,>=0.18.2
-Requires-Dist: pydantic<=2.11.3,>=1.7.4
-Requires-Dist: anyio<=4.2.0,>=3.7.1
-Requires-Dist: fastapi<=0.109.0,>=0.79.0
+Requires-Dist: starlette<=0.47.3
+Requires-Dist: pydantic<=2.12.3,>=1.7.4
+Requires-Dist: fastapi<=0.119.1,>=0.103.1
 Requires-Dist: websockets<=13.1,>=10.3
 Requires-Dist: jinja2<4.0.0,>=3.0.3
-Requires-Dist: psutil<6.0.0,>=5.9.0
+Requires-Dist: psutil<=7.2.0,>=5.9.0
 Requires-Dist: jsonpatch<2.0,>=1.32
 Requires-Dist: MarkupSafe<3.0.0,>=2.1.1
 Requires-Dist: arel<1.0.0,>=0.2.0
 Requires-Dist: tqdm<5.0.0,>=4.62.3
-Requires-Dist: pandas<=2.1.4,>=1.1.3
-Requires-Dist: async-asgi-testclient
+Requires-Dist: pandas<=2.3.3,>=1.1.3
+Requires-Dist: async_asgi_testclient
 Requires-Dist: PyYAML>=5.4.0
 Requires-Dist: distinctipy
 Requires-Dist: beautifulsoup4
@@ -71,6 +70,16 @@ Requires-Dist: zstd
 Requires-Dist: aiofiles
 Requires-Dist: httpx[http2]==0.27.2
 Requires-Dist: debugpy
+Requires-Dist: setuptools<81.0.0
+Provides-Extra: extras
+Requires-Dist: docker<6.0.0,>=5.0.3; extra == "extras"
+Requires-Dist: imagecorruptions<2.0.0,>=1.1.2; extra == "extras"
+Requires-Dist: scikit-image<1.0.0,>=0.17.1; extra == "extras"
+Requires-Dist: matplotlib<4.0.0,>=3.3.2; extra == "extras"
+Requires-Dist: pascal-voc-writer<1.0.0,>=0.1.4; extra == "extras"
+Requires-Dist: scipy<2.0.0,>=1.8.0; extra == "extras"
+Requires-Dist: pandas<=2.3.3,>=1.1.3; extra == "extras"
+Requires-Dist: ruamel.yaml==0.17.21; extra == "extras"
 Provides-Extra: apps
 Requires-Dist: uvicorn[standard]<1.0.0,>=0.18.2; extra == "apps"
 Requires-Dist: fastapi<1.0.0,>=0.79.0; extra == "apps"
@@ -81,10 +90,7 @@ Requires-Dist: jsonpatch<2.0,>=1.32; extra == "apps"
 Requires-Dist: MarkupSafe<3.0.0,>=2.1.1; extra == "apps"
 Requires-Dist: arel<1.0.0,>=0.2.0; extra == "apps"
 Requires-Dist: tqdm<5.0.0,>=4.62.3; extra == "apps"
-Requires-Dist: pandas<1.4.0,>=1.1.3; extra == "apps"
-Provides-Extra: aug
-Requires-Dist: imgaug<1.0.0,>=0.4.0; extra == "aug"
-Requires-Dist: imagecorruptions<2.0.0,>=1.1.2; extra == "aug"
+Requires-Dist: pandas<=2.3.3,>=1.1.3; extra == "apps"
 Provides-Extra: docs
 Requires-Dist: sphinx==4.4.0; extra == "docs"
 Requires-Dist: jinja2==3.0.3; extra == "docs"
@@ -93,26 +99,6 @@ Requires-Dist: sphinx-copybutton==0.4.0; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints==1.15.3; extra == "docs"
 Requires-Dist: sphinxcontrib-details-directive==0.1.0; extra == "docs"
 Requires-Dist: myst-parser==0.18.0; extra == "docs"
-Provides-Extra: extras
-Requires-Dist: docker<6.0.0,>=5.0.3; extra == "extras"
-Requires-Dist: imagecorruptions<2.0.0,>=1.1.2; extra == "extras"
-Requires-Dist: scikit-image<1.0.0,>=0.17.1; extra == "extras"
-Requires-Dist: matplotlib<4.0.0,>=3.3.2; extra == "extras"
-Requires-Dist: pascal-voc-writer<1.0.0,>=0.1.4; extra == "extras"
-Requires-Dist: scipy<2.0.0,>=1.8.0; extra == "extras"
-Requires-Dist: pandas<1.4.0,>=1.1.3; extra == "extras"
-Requires-Dist: ruamel.yaml==0.17.21; extra == "extras"
-Provides-Extra: model-benchmark
-Requires-Dist: pycocotools; extra == "model-benchmark"
-Requires-Dist: scikit-learn; extra == "model-benchmark"
-Requires-Dist: plotly==5.22.0; extra == "model-benchmark"
-Requires-Dist: torch; extra == "model-benchmark"
-Requires-Dist: torchvision; extra == "model-benchmark"
-Provides-Extra: plugins
-Requires-Dist: jsonschema<3.0.0,>=2.6.0; extra == "plugins"
-Provides-Extra: sdk-nn-plugins
-Requires-Dist: flask-restful<1.0.0,>=0.3.7; extra == "sdk-nn-plugins"
-Requires-Dist: Werkzeug<3.0.0,>=1.0.1; extra == "sdk-nn-plugins"
 Provides-Extra: sdk-no-usages
 Requires-Dist: grpcio<2.0.0,>=1.53.2; extra == "sdk-no-usages"
 Requires-Dist: plotly<6.0.0,>=4.11.0; extra == "sdk-no-usages"
@@ -122,7 +108,7 @@ Requires-Dist: yacs; extra == "tracking"
 Requires-Dist: matplotlib<4.0.0,>=3.3.2; extra == "tracking"
 Requires-Dist: scipy<2.0.0,>=1.8.0; extra == "tracking"
 Requires-Dist: lap; extra == "tracking"
-Requires-Dist: cython-bbox; extra == "tracking"
+Requires-Dist: cython_bbox; extra == "tracking"
 Requires-Dist: termcolor; extra == "tracking"
 Requires-Dist: scikit-learn; extra == "tracking"
 Requires-Dist: faiss-gpu; extra == "tracking"
@@ -131,6 +117,13 @@ Requires-Dist: tensorboard; extra == "tracking"
 Requires-Dist: decord; extra == "tracking"
 Requires-Dist: gdown; extra == "tracking"
 Requires-Dist: torch; extra == "tracking"
+Requires-Dist: motmetrics; extra == "tracking"
+Provides-Extra: model-benchmark
+Requires-Dist: pycocotools; extra == "model-benchmark"
+Requires-Dist: scikit-learn; extra == "model-benchmark"
+Requires-Dist: plotly==5.22.0; extra == "model-benchmark"
+Requires-Dist: torch; extra == "model-benchmark"
+Requires-Dist: torchvision; extra == "model-benchmark"
 Provides-Extra: training
 Requires-Dist: pycocotools; extra == "training"
 Requires-Dist: scikit-learn; extra == "training"
@@ -142,6 +135,31 @@ Requires-Dist: markdown; extra == "training"
 Requires-Dist: pymdown-extensions; extra == "training"
 Requires-Dist: tbparse; extra == "training"
 Requires-Dist: kaleido==0.2.1; extra == "training"
+Provides-Extra: plugins
+Requires-Dist: jsonschema<3.0.0,>=2.6.0; extra == "plugins"
+Provides-Extra: sdk-nn-plugins
+Requires-Dist: flask-restful<1.0.0,>=0.3.7; extra == "sdk-nn-plugins"
+Requires-Dist: Werkzeug<3.0.0,>=1.0.1; extra == "sdk-nn-plugins"
+Provides-Extra: aug
+Requires-Dist: imgaug<1.0.0,>=0.4.0; extra == "aug"
+Requires-Dist: imagecorruptions<2.0.0,>=1.1.2; extra == "aug"
+Requires-Dist: numpy<2.0.0,>=1.19; extra == "aug"
+Provides-Extra: agent
+Requires-Dist: protobuf<=3.20.3,>=3.19.5; extra == "agent"
+Provides-Extra: versioning
+Requires-Dist: pyarrow<=22.0.0,>=17.0.0; extra == "versioning"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <h1 align="center">
   <a href="https://supervisely.com"><img alt="Supervisely" title="Supervisely" src="https://i.imgur.com/B276eMS.png"></a>
@@ -263,7 +281,7 @@ More concretely, Supervisely includes the following functionality:
 
 The simplicity of creating Supervisely Apps has already led to the development of [hundreds of applications](https://ecosystem.supervisely.com/), ready to be run within a single click in a web browser and get the job done.
 
-Label your data, perform quality assurance, inspect every aspect of your data, collaborate easily, train and apply state-of-the-art neural networks, integrate custom models, automate routine tasks and more — like in a real AppStore, there should be an app for everything.
+Label your data, perform quality assurance, inspect every aspect of your data, collaborate easily, train and apply state-of-the-art neural networks, integrate custom models, automate routine tasks and more - like in a real AppStore, there should be an app for everything.
 
 ## [Development](https://developer.supervisely.com/) 🧑‍💻
 
@@ -425,7 +443,7 @@ Development for Supervisely builds upon these five principles:
 
 ### Start in a minute
 
-Supervisely's open-source SDK and app framework are straightforward to get started with. It’s just a matter of:
+Supervisely's open-source SDK and app framework are straightforward to get started with. It's just a matter of:
 
 ```
 pip install supervisely