supervisely 6.73.367__py3-none-any.whl → 6.73.368__py3-none-any.whl

supervisely/nn/model/prediction_session.py

@@ -1,11 +1,13 @@
 import json
 import time
 from os import PathLike
+from pathlib import Path
 from typing import Any, Dict, Iterator, List, Literal, Tuple, Union
 
 import numpy as np
 import requests
 from requests import Timeout
+from requests_toolbelt import MultipartEncoder, MultipartEncoderMonitor
 from tqdm.auto import tqdm
 
 import supervisely.io.env as env
@@ -17,6 +19,7 @@ from supervisely.io.fs import (
     dir_exists,
     file_exists,
     get_file_ext,
+    get_file_size,
     list_files,
     list_files_recursively,
 )
@@ -374,28 +377,26 @@ class PredictionSession:
         json_body = self._get_json_body()
         return self._post(method, json=json_body).json()
 
-    def _update_progress(self, tqdm: tqdm, response: Dict[str, Any]):
+    def _update_progress(
+        self,
+        tqdm: tqdm,
+        message: str = None,
+        current: int = None,
+        total: int = None,
+        is_size: bool = False,
+    ):
         if tqdm is None:
             return
-        json_progress = response.get("progress", None)
-        if json_progress is None or json_progress.get("message") is None:
-            json_progress = response.get("preparing_progress", None)
-        if json_progress is None:
-            return
         refresh = False
-        message = json_progress.get("message", json_progress.get("status", None))
-        if message is not None and tqdm.desc not in [message, f"{message}:"]:
+        if message is not None and tqdm.desc != message:
             tqdm.set_description(message, refresh=False)
             refresh = True
-        current = json_progress.get("current", None)
         if current is not None and tqdm.n != current:
             tqdm.n = current
             refresh = True
-        total = json_progress.get("total", None)
         if total is not None and tqdm.total != total:
             tqdm.total = total
             refresh = True
-        is_size = json_progress.get("is_size", False)
         if is_size and tqdm.unit == "it":
             tqdm.unit = "iB"
             tqdm.unit_scale = True
@@ -409,6 +410,20 @@ class PredictionSession:
         if refresh:
             tqdm.refresh()
 
+    def _update_progress_from_response(self, tqdm: tqdm, response: Dict[str, Any]):
+        if tqdm is None:
+            return
+        json_progress = response.get("progress", None)
+        if json_progress is None or json_progress.get("message") is None:
+            json_progress = response.get("preparing_progress", None)
+        if json_progress is None:
+            return
+        message = json_progress.get("message", json_progress.get("status", None))
+        current = json_progress.get("current", None)
+        total = json_progress.get("total", None)
+        is_size = json_progress.get("is_size", False)
+        self._update_progress(tqdm, message, current, total, is_size)
+
     def _wait_for_inference_start(
         self, delay=1, timeout=None, tqdm: tqdm = None
     ) -> Tuple[dict, bool]:
@@ -424,7 +439,7 @@ class PredictionSession:
                 last_stage = stage
             has_started = stage not in ["preparing", "preprocess", None]
             has_started = has_started or bool(resp.get("result")) or resp["progress"]["total"] != 1
-            self._update_progress(tqdm, resp)
+            self._update_progress_from_response(tqdm, resp)
             if not has_started:
                 time.sleep(delay)
             timeout_exceeded = timeout and time.time() - t0 > timeout
@@ -440,7 +455,7 @@ class PredictionSession:
         t0 = time.monotonic()
         while not has_results and not timeout_exceeded:
             resp = self._pop_pending_results()
-            self._update_progress(tqdm, resp)
+            self._update_progress_from_response(tqdm, resp)
             pending_results = resp["pending_results"]
             exception_json = resp["exception"]
             if exception_json:
@@ -567,14 +582,30 @@ class PredictionSession:
             state["video_id"] = videos[0]
             return self._start_inference(method, json=json_body)
         elif isinstance(videos[0], (str, PathLike)):
+            video_path = videos[0]
             files = []
             try:
                 method = "inference_video_async"
-                files = [("files", open(videos[0], "rb"))]
-                uploads = files + [("state", (None, json.dumps(state), "text/plain"))]
-                return self._start_inference(method, files=uploads)
+                files.append((Path(video_path).name, open(video_path, "rb"), "video/*"))
+                fields = {
+                    "files": files[-1],
+                    "state": json.dumps(state),
+                }
+                encoder = MultipartEncoder(fields)
+                if self.tqdm is not None:
+
+                    def _callback(monitor):
+                        self.tqdm.update(monitor.bytes_read)
+
+                    video_size = get_file_size(video_path)
+                    self._update_progress(self.tqdm, "Uploading video", 0, video_size, is_size=True)
+                    encoder = MultipartEncoderMonitor(encoder, _callback)
+
+                return self._start_inference(
+                    method, data=encoder, headers={"Content-Type": encoder.content_type}
+                )
             finally:
-                for _, f in files:
+                for _, f, _ in files:
                     f.close()
         else:
             raise ValueError(

{supervisely-6.73.367.dist-info → supervisely-6.73.368.dist-info}/METADATA

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

{supervisely-6.73.367.dist-info → supervisely-6.73.368.dist-info}/RECORD

@@ -965,7 +965,7 @@ supervisely/nn/legacy/training/eval_planner.py,sha256=zN9b0_CX7sWGdC8e6riTvD-NOU
 supervisely/nn/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/model/model_api.py,sha256=rIne6ymvL2aVwzSTJMGxAbevE0U-f-WKhDciqaneqRc,9666
 supervisely/nn/model/prediction.py,sha256=N3oO9s3NDiC5CFvW8utfU8rz3bfpCl37Sk4VEBH94Bc,11307
-supervisely/nn/model/prediction_session.py,sha256=Dk8WmO_TKuX9CbzZyzInuoGd4LniLr0oIPGTIHlcHNE,24454
+supervisely/nn/model/prediction_session.py,sha256=sy0FSQaWSmT8i0RkR4J8oIn3Ek4IDVJNBR1Tg4mulkM,25523
 supervisely/nn/tracker/__init__.py,sha256=LiojByb5kGsTQ49lWuboEh7B4JUwM1vfz81J8kJlLYo,337
 supervisely/nn/tracker/tracker.py,sha256=Hs0c07l9IVF86jvjloNAGJsSZAHuNQZf0kVaUHfw3Fs,9694
 supervisely/nn/tracker/bot_sort/__init__.py,sha256=zEs5eT8NQMrM5dtSn7kbI2aWpgS2rvO7aNmrAB8v0VU,632
@@ -1097,9 +1097,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.367.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.367.dist-info/METADATA,sha256=-TszuRFHXnXLeiPVh_RfMQ7badBe6_oFpbEtAZCrRAc,35154
-supervisely-6.73.367.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.367.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.367.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.367.dist-info/RECORD,,
+supervisely-6.73.368.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.368.dist-info/METADATA,sha256=xfFo1v5HarzQuLuIy2_abk6oYG3SHJcRjiw9wC9qEB4,35154
+supervisely-6.73.368.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.368.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.368.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.368.dist-info/RECORD,,