supervisely 6.73.232__py3-none-any.whl → 6.73.233__py3-none-any.whl

supervisely/api/video/video_api.py

@@ -1372,6 +1372,19 @@ class VideoApi(RemoveableBulkModuleApi):
             },
         )
 
+    def notify_tracking_warning(self, track_id: int, video_id: int, message: str):
+        self._api.post(
+            "videos.notify-annotation-tool",
+            data={
+                "type": "videos:tracking-warning",
+                "data": {
+                    ApiField.VIDEO_ID: str(video_id),
+                    ApiField.TRACK_ID: str(track_id),
+                    ApiField.MESSAGE: message,
+                },
+            },
+        )
+
     # def upload(self):
     #     #"/videos.bulk.upload"
     #     pass
@@ -2055,7 +2068,7 @@ class VideoApi(RemoveableBulkModuleApi):
             hashes=[h],
             metas=[meta],
             skip_download=skip_download,
-            force_metadata_for_links=force_metadata_for_links
+            force_metadata_for_links=force_metadata_for_links,
         )
         if len(links) != 1:
             raise RuntimeError(

supervisely/nn/inference/cache.py

@@ -1,7 +1,6 @@
 import json
-import os
 import shutil
-from concurrent.futures import ThreadPoolExecutor
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from enum import Enum
 from logging import Logger
 from pathlib import Path
@@ -16,6 +15,7 @@ from cachetools import Cache, LRUCache, TTLCache
 from fastapi import BackgroundTasks, FastAPI, Form, Request, UploadFile
 
 import supervisely as sly
+from supervisely._utils import batched
 from supervisely.io.fs import silent_remove
 
 
@@ -151,6 +151,38 @@ class PersistentImageTTLCache(TTLCache):
     def get_project_meta(self, project_meta_name):
         return self[project_meta_name]
 
+    def copy_to(self, name, path):
+        shutil.copyfile(str(self[name]), path)
+
+
+class VideoFrameReader:
+    def __init__(self, video_path: str, frame_indexes: List[int]):
+        self.video_path = video_path
+        self.frame_indexes = frame_indexes
+        self.cap = None
+        self.prev_idx = -1
+
+    def __enter__(self):
+        self.cap = cv2.VideoCapture(str(self.video_path))
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if self.cap is not None:
+            self.cap.release()
+
+    def read_frames(self) -> Generator:
+        try:
+            for frame_index in self.frame_indexes:
+                if frame_index != self.prev_idx + 1:
+                    self.cap.set(cv2.CAP_PROP_POS_FRAMES, frame_index)
+                ret, frame = self.cap.read()
+                if not ret:
+                    raise KeyError(f"Frame {frame_index} not found in video {self.video_path}")
+                yield cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
+                self.prev_idx = frame_index
+        finally:
+            self.cap.release()
+
 
 class InferenceImageCache:
     class _LoadType(Enum):
@@ -238,25 +270,18 @@ class InferenceImageCache:
             return_images,
         )
 
+    def _read_frames_from_cached_video_iter(self, video_id, frame_indexes):
+        video_path = self._cache.get_video_path(video_id)
+        with VideoFrameReader(video_path, frame_indexes) as reader:
+            for frame in reader.read_frames():
+                yield frame
+
     def _read_frames_from_cached_video(
         self, video_id: int, frame_indexes: List[int]
     ) -> List[np.ndarray]:
-        video_path = self._cache.get_video_path(video_id)
-        if video_path is None or not video_path.exists():
-            raise KeyError(f"Video {video_id} not found in cache")
-        cap = cv2.VideoCapture(str(video_path))
-        frames = []
-        prev_idx = -1
-        for frame_index in frame_indexes:
-            if frame_index != prev_idx + 1:
-                cap.set(cv2.CAP_PROP_POS_FRAMES, frame_index)
-            ret, frame = cap.read()
-            if not ret:
-                raise KeyError(f"Frame {frame_index} not found in video {video_id}")
-            frames.append(cv2.cvtColor(frame, cv2.COLOR_BGR2RGB))
-            prev_idx = frame_index
-        cap.release()
-        return frames
+        return [
+            frame for frame in self._read_frames_from_cached_video_iter(video_id, frame_indexes)
+        ]
 
     def get_frame_from_cache(self, video_id: int, frame_index: int) -> np.ndarray:
         name = self._frame_name(video_id, frame_index)
@@ -664,3 +689,39 @@ class InferenceImageCache:
             # TODO: sleep if slowdown
             sleep(0.1)
             continue
+
+    def download_frames_to_paths(self, api, video_id, frame_indexes, paths, progress_cb=None):
+        def _download_frame(frame_index):
+            self.download_frame(api, video_id, frame_index)
+            name = self._frame_name(video_id, frame_index)
+            return frame_index, name
+
+        def _download_and_save(this_frame_indexes, this_paths):
+            if video_id in self._cache:
+                for path, frame in zip(
+                    this_paths,
+                    self._read_frames_from_cached_video_iter(video_id, this_frame_indexes),
+                ):
+                    sly.image.write(path, frame)
+                    if progress_cb is not None:
+                        progress_cb()
+                return
+
+            futures = []
+            frame_index_to_path = {}
+            for frame_index, path in zip(this_frame_indexes[:5], this_paths[:5]):
+                frame_index_to_path[frame_index] = path
+                futures.append(executor.submit(_download_frame, frame_index))
+            for future in as_completed(futures):
+                frame_index, name = future.result()
+                path = frame_index_to_path[frame_index]
+                self._cache.copy_to(name, path)
+                if progress_cb is not None:
+                    progress_cb()
+            if len(this_frame_indexes) > 5:
+                _download_and_save(this_frame_indexes[5:], this_paths[5:])
+
+        # optimization for frame read from video file
+        frame_indexes, paths = zip(*sorted(zip(frame_indexes, paths), key=lambda x: x[0]))
+        executor = ThreadPoolExecutor(max_workers=5)
+        _download_and_save(frame_indexes, paths)

{supervisely-6.73.232.dist-info → supervisely-6.73.233.dist-info}/METADATA

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

{supervisely-6.73.232.dist-info → supervisely-6.73.233.dist-info}/RECORD

@@ -64,7 +64,7 @@ supervisely/api/pointcloud/pointcloud_object_api.py,sha256=bO1USWb9HAywG_CW4CDu1
 supervisely/api/pointcloud/pointcloud_tag_api.py,sha256=iShtr052nOElxsyMyZEUT2vypEm6kP00gnP13ABX24A,4691
 supervisely/api/video/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/api/video/video_annotation_api.py,sha256=Um_7UOJtP_E25X6v41mrZfDbJaJuLMGoZm2IULwyg3w,10977
-supervisely/api/video/video_api.py,sha256=2yFm1pbL-ziHl8vDyrf8z1qLbZxlo_22FyqjKPQbNg4,94228
+supervisely/api/video/video_api.py,sha256=KO_Nfqa4xDWrc7FqOR14PciC0TX8PF0g0peqgPnctEE,94677
 supervisely/api/video/video_figure_api.py,sha256=quksohjhgrK2l2-PtbbNE99fOW6uWXX59-_4xfc-I-k,6244
 supervisely/api/video/video_frame_api.py,sha256=4GwSI4xdCNYEUvTqzKc-Ewd44fw5zqkFoD24jrrN_aY,10214
 supervisely/api/video/video_object_api.py,sha256=IC0NP8EoIT_d3xxDRgz2cA3ixSiuJ5ymy64eS-RfmDM,2227
@@ -816,7 +816,7 @@ supervisely/nn/benchmark/visualization/widgets/sidebar/sidebar.py,sha256=tKPURRS
 supervisely/nn/benchmark/visualization/widgets/table/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/benchmark/visualization/widgets/table/table.py,sha256=YiCpt-mdINJnNBWsUTPkRR_9w09Ne2Y0n93DY8vsE8I,4090
 supervisely/nn/inference/__init__.py,sha256=mtEci4Puu-fRXDnGn8RP47o97rv3VTE0hjbYO34Zwqg,1622
-supervisely/nn/inference/cache.py,sha256=WylgHgPQRIoA_RDks8FyKgHqeZZ_YFoyddxkVvOX2YQ,25713
+supervisely/nn/inference/cache.py,sha256=KvzCgMbEBLdiJAxJDLicIPKAlYb52P9_kpNPWfiVY8Y,28194
 supervisely/nn/inference/inference.py,sha256=CmQe6QnhZuUV128jcIp2YKsgeggAtmc1NL7PdFnc_hw,116997
 supervisely/nn/inference/session.py,sha256=jmkkxbe2kH-lEgUU6Afh62jP68dxfhF5v6OGDfLU62E,35757
 supervisely/nn/inference/video_inference.py,sha256=8Bshjr6rDyLay5Za8IB8Dr6FURMO2R_v7aELasO8pR4,5746
@@ -997,9 +997,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.232.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.232.dist-info/METADATA,sha256=xZnrkZw3qSVTsMB9IDC8aQsI6xxhZRlM_9LNc9MBjXY,33150
-supervisely-6.73.232.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.232.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.232.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.232.dist-info/RECORD,,
+supervisely-6.73.233.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.233.dist-info/METADATA,sha256=MJtm60rKHXwewU1uAmNhtaWHuI_g_Y4oGxJbqM-oiFM,33150
+supervisely-6.73.233.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.233.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.233.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.233.dist-info/RECORD,,