supervisely 6.73.444__py3-none-any.whl → 6.73.468__py3-none-any.whl

supervisely/video/video.py

@@ -4,7 +4,7 @@
 from __future__ import annotations
 
 import os
-from typing import Dict, Generator, List, Optional, Tuple
+from typing import Dict, Generator, Iterable, List, Optional, Tuple
 
 import cv2
 import numpy as np
@@ -18,7 +18,7 @@ ALLOWED_VIDEO_EXTENSIONS = [".avi", ".mp4", ".3gp", ".flv", ".webm", ".wmv", ".m
 
 
 _SUPPORTED_CONTAINERS = {"mp4", "webm", "ogg", "ogv"}
-_SUPPORTED_CODECS = {"h264", "vp8", "vp9"}
+_SUPPORTED_CODECS = {"h264", "vp8", "vp9", "h265", "hevc", "av1"}
 
 
 class VideoExtensionError(Exception):
@@ -537,11 +537,9 @@ class VideoFrameReader:
             try:
                 import decord
 
-                self.vr = decord.VideoReader(str(self.video_path))
+                self.vr = decord.VideoReader(str(self.video_path), num_threads=1)
             except ImportError:
-                default_logger.debug(
-                    "Decord is not installed. Falling back to OpenCV for video reading."
-                )
+                default_logger.debug("Decord is not installed. Falling back to OpenCV for video reading.")
                 self.cap = cv2.VideoCapture(str(self.video_path))
 
     def close(self):
@@ -562,24 +560,30 @@ class VideoFrameReader:
     def __del__(self):
         self.close()
 
-    def iterate_frames(self, frame_indexes: List[int] = None) -> Generator[np.ndarray, None, None]:
+    def iterate_frames(self, frame_indexes: Optional[List[int]] = None) -> Generator[np.ndarray, None, None]:
         self._ensure_initialized()
         if frame_indexes is None:
             frame_indexes = self.frame_indexes
         if self.vr is not None:
+            # Decord
             if frame_indexes is None:
                 frame_indexes = range(len(self.vr))
-            for frame_index in frame_indexes:
-                frame = self.vr[frame_index]
-                yield frame.asnumpy()
+            for idx in frame_indexes:
+                arr = self.vr[idx].asnumpy()
+                yield arr
+                del arr
         else:
+            # OpenCV fallback
             if frame_indexes is None:
                 frame_count = int(self.cap.get(cv2.CAP_PROP_FRAME_COUNT))
                 frame_indexes = range(frame_count)
             for frame_index in frame_indexes:
-                if 1 > frame_index - self.prev_idx < 20:
+                if 1 < frame_index - self.prev_idx < 20:
                     while self.prev_idx < frame_index - 1:
-                        self.cap.read()
+                        ok, _ = self.cap.read()
+                        if not ok:
+                            break
+                        self.prev_idx += 1
                 if frame_index != self.prev_idx + 1:
                     self.cap.set(cv2.CAP_PROP_POS_FRAMES, frame_index)
                 ret, frame = self.cap.read()
@@ -588,6 +592,17 @@ class VideoFrameReader:
                 yield cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
                 self.prev_idx = frame_index
 
+    def read_batch(self, frame_indexes: List[int]) -> List[np.ndarray]:
+        self._ensure_initialized()
+        if self.vr is not None:
+            batch_nd = self.vr.get_batch(frame_indexes)
+            batch_np = batch_nd.asnumpy()
+            frames = [batch_np[i].copy() for i in range(batch_np.shape[0])]
+            del batch_np
+            return frames
+        else:
+            return list(self.iterate_frames(frame_indexes))
+
     def read_frames(self, frame_indexes: List[int] = None) -> List[np.ndarray]:
         return list(self.iterate_frames(frame_indexes))
 
@@ -625,3 +640,17 @@ class VideoFrameReader:
             return self.vr.get_avg_fps()
         else:
             return int(self.cap.get(cv2.CAP_PROP_FPS))
+
+
+def create_from_frames(frames: Iterable[np.ndarray], output_path: str, fps: int = 30) -> None:
+    video_writer = None
+    for frame in frames:
+        if video_writer is None:
+            height, width, _ = frame.shape
+            fourcc = cv2.VideoWriter.fourcc(*"mp4v")
+            video_writer = cv2.VideoWriter(output_path, fourcc, fps, (width, height))
+        if frame.dtype != np.uint8:
+            frame = (frame * 255).astype(np.uint8) if frame.max() <= 1.0 else frame.astype(np.uint8)
+
+        video_writer.write(frame)
+    video_writer.release()

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.444.dist-info → supervisely-6.73.468.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.444
+Version: 6.73.468
 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: pillow<=10.4.0,>=5.4.1
 Requires-Dist: python-json-logger<3.0.0,>=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,9 +39,9 @@ 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
@@ -50,7 +49,7 @@ 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: pandas<=2.3.3,>=1.1.3
 Requires-Dist: async-asgi-testclient
 Requires-Dist: PyYAML>=5.4.0
 Requires-Dist: distinctipy
@@ -71,6 +70,9 @@ Requires-Dist: zstd
 Requires-Dist: aiofiles
 Requires-Dist: httpx[http2]==0.27.2
 Requires-Dist: debugpy
+Requires-Dist: setuptools<81.0.0
+Provides-Extra: agent
+Requires-Dist: protobuf<=3.20.3,>=3.19.5; extra == "agent"
 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 +83,11 @@ 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"
+Requires-Dist: pandas<=2.3.3,>=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: numpy<2.0.0,>=1.19; extra == "aug"
 Provides-Extra: docs
 Requires-Dist: sphinx==4.4.0; extra == "docs"
 Requires-Dist: jinja2==3.0.3; extra == "docs"
@@ -100,7 +103,7 @@ 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: pandas<=2.3.3,>=1.1.3; extra == "extras"
 Requires-Dist: ruamel.yaml==0.17.21; extra == "extras"
 Provides-Extra: model-benchmark
 Requires-Dist: pycocotools; extra == "model-benchmark"