supervisely 6.73.331__py3-none-any.whl → 6.73.333__py3-none-any.whl

supervisely/api/task_api.py

@@ -786,7 +786,7 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
         resp = self._api.post("tasks.data.get", data)
         return resp.json()["result"]
 
-    def get_field(self, task_id: int, field: Dict):
+    def get_field(self, task_id: int, field: str):
         """get_field"""
         result = self.get_fields(task_id, [field])
         return result[field]

supervisely/nn/inference/inference.py

@@ -11,7 +11,7 @@ import time
 import uuid
 from collections import OrderedDict, defaultdict
 from concurrent.futures import ThreadPoolExecutor
-from dataclasses import asdict
+from dataclasses import asdict, dataclass
 from functools import partial, wraps
 from pathlib import Path
 from queue import Queue
@@ -46,7 +46,7 @@ from supervisely.annotation.label import Label
 from supervisely.annotation.obj_class import ObjClass
 from supervisely.annotation.tag_collection import TagCollection
 from supervisely.annotation.tag_meta import TagMeta, TagValueType
-from supervisely.api.api import Api
+from supervisely.api.api import Api, ApiField
 from supervisely.api.app_api import WorkflowMeta, WorkflowSettings
 from supervisely.api.image_api import ImageInfo
 from supervisely.app.content import StateJson, get_data_dir
@@ -91,6 +91,33 @@ except ImportError:
     from typing_extensions import Literal
 
 
+@dataclass
+class AutoRestartInfo:
+    deploy_params: dict
+
+    class Fields:
+        AUTO_RESTART_INFO = "autoRestartInfo"
+        DEPLOY_PARAMS = "deployParams"
+
+    def generate_fields(self) -> List[dict]:
+        return [
+            {
+                ApiField.FIELD: self.Fields.AUTO_RESTART_INFO,
+                ApiField.PAYLOAD: {self.Fields.DEPLOY_PARAMS: self.deploy_params},
+            }
+        ]
+
+    @classmethod
+    def from_response(cls, data: dict):
+        autorestart_info = data.get(cls.Fields.AUTO_RESTART_INFO, None)
+        if autorestart_info is None:
+            return None
+        return cls(deploy_params=autorestart_info.get(cls.Fields.DEPLOY_PARAMS, None))
+
+    def is_changed(self, deploy_params: dict) -> bool:
+        return self.deploy_params != deploy_params
+
+
 class Inference:
     FRAMEWORK_NAME: str = None
     """Name of framework to register models in Supervisely"""
@@ -127,6 +154,7 @@ class Inference:
                 model_dir = os.path.join(get_data_dir(), "models")
         sly_fs.mkdir(model_dir)
 
+        self.autorestart = None
         self.device: str = None
         self.runtime: str = None
         self.model_precision: str = None
@@ -327,6 +355,9 @@ class Inference:
                 self._user_layout_card.unlock()
 
     def set_params_to_gui(self, deploy_params: dict) -> None:
+        """
+        Set params for load_model method to GUI.
+        """
         if isinstance(self.gui, GUI.ServingGUI):
             self._user_layout_card.hide()
             self._api_request_model_info.set_text(json.dumps(deploy_params), "json")
@@ -677,6 +708,16 @@ class Inference:
         self.load_model(**deploy_params)
         self._model_served = True
         self._deploy_params = deploy_params
+        try:
+            if self.autorestart is None:
+                logger.debug("Autorestart info is not set. Creating new one.")
+                self.autorestart = AutoRestartInfo(self._deploy_params)
+                self.api.task.set_fields(self._task_id, self.autorestart.generate_fields())
+            elif self.autorestart.is_changed(self._deploy_params):
+                logger.debug("Autorestart info is changed. Updating.")
+                self.autorestart.deploy_params.update(self._deploy_params)
+        except Exception as e:
+            logger.warning(f"Failed to update autorestart info: {repr(e)}")
         if self.gui is not None:
             self.update_gui(self._model_served)
             self.gui.show_deployed_model_info(self)
@@ -2420,6 +2461,29 @@ class Inference:
             future.add_done_callback(end_callback)
         logger.debug("Scheduled task.", extra={"inference_request_uuid": inference_request_uuid})
 
+    def _deploy_on_autorestart(self):
+        try:
+            self._api_request_model_layout._title = (
+                "Model was deployed during auto restart with the following settings"
+            )
+            self._api_request_model_layout.update_data()
+            deploy_params = self.autorestart.deploy_params
+            if isinstance(self.gui, GUI.ServingGUITemplate):
+                model_files = self._download_model_files(deploy_params)
+                deploy_params["model_files"] = model_files
+                self._load_model_headless(**deploy_params)
+            elif isinstance(self.gui, GUI.ServingGUI):
+                self._load_model(deploy_params)
+
+            self.set_params_to_gui(deploy_params)
+            # update to set correct device
+            device = deploy_params.get("device", "cpu")
+            self.gui.set_deployed(device)
+            return {"result": "model was successfully deployed"}
+        except Exception as e:
+            self.gui._success_label.hide()
+            raise e
+
     def serve(self):
         if not self._use_gui and not self._is_local_deploy:
             Progress("Deploying model ...", 1)
@@ -2463,6 +2527,21 @@ class Inference:
         else:
             self._app = Application(layout=self.get_ui())
 
+        try:
+            if self._task_id is not None:
+                logger.debug("Checking autorestart info...")
+                response = self.api.task.get_fields(
+                    self._task_id, [AutoRestartInfo.Fields.AUTO_RESTART_INFO]
+                )
+                self.autorestart = AutoRestartInfo.from_response(response)
+                if self.autorestart is not None:
+                    logger.debug("Autorestart info:", extra=self.autorestart.deploy_params)
+                    self._deploy_on_autorestart()
+                else:
+                    logger.debug("Autorestart info is not set.")
+        except Exception:
+            logger.error("Autorestart failed.", exc_info=True)
+
         server = self._app.get_server()
         self._app.set_ready_check_function(self.is_model_deployed)
 

supervisely/video_annotation/video_figure.py

@@ -368,6 +368,9 @@ class VideoFigure:
         if self._priority is not None:
             data_json[ApiField.PRIORITY] = self._priority
 
+        if self.track_id is not None:
+            data_json[ApiField.TRACK_ID] = self.track_id
+
         self._add_creation_info(data_json)
         return data_json
 
@@ -441,9 +444,7 @@ class VideoFigure:
                 raise RuntimeError("Figure can not be deserialized: key_id_map is None")
             object_key = key_id_map.get_object_key(object_id)
             if object_key is None:
-                raise RuntimeError(
-                    "Object with id={!r} not found in key_id_map".format(object_id)
-                )
+                raise RuntimeError("Object with id={!r} not found in key_id_map".format(object_id))
 
         object = objects.get(object_key)
         if object is None:

{supervisely-6.73.331.dist-info → supervisely-6.73.333.dist-info}/METADATA

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

{supervisely-6.73.331.dist-info → supervisely-6.73.333.dist-info}/RECORD

@@ -42,7 +42,7 @@ supervisely/api/remote_storage_api.py,sha256=qTuPhPsstgEjRm1g-ZInddik8BNC_38YvBB
 supervisely/api/report_api.py,sha256=Om7CGulUbQ4BuJ16eDtz7luLe0JQNqab-LoLpUXu7YE,7123
 supervisely/api/role_api.py,sha256=aBL4mxtn08LDPXQuS153-lQFN6N2kcwiz8MbescZ8Gk,3044
 supervisely/api/storage_api.py,sha256=FPGYf3Rn3LBoe38RBNdoiURs306oshzvKOEOQ56XAbs,13030
-supervisely/api/task_api.py,sha256=WUyovA322egcfjG6Iv_vX8RdfU_3Bw7qxcniYeLpqwA,53874
+supervisely/api/task_api.py,sha256=ZuPXAfHO5WwWRfR0f93iprkcGlqRMK0q2UXF55dGneo,53873
 supervisely/api/team_api.py,sha256=bEoz3mrykvliLhKnzEy52vzdd_H8VBJCpxF-Bnek9Q8,19467
 supervisely/api/user_api.py,sha256=4S97yIc6AMTZCa0N57lzETnpIE8CeqClvCb6kjUkgfc,24940
 supervisely/api/video_annotation_tool_api.py,sha256=3A9-U8WJzrTShP_n9T8U01M9FzGYdeS51CCBTzUnooo,6686
@@ -883,7 +883,7 @@ supervisely/nn/benchmark/visualization/widgets/table/__init__.py,sha256=47DEQpj8
 supervisely/nn/benchmark/visualization/widgets/table/table.py,sha256=atmDnF1Af6qLQBUjLhK18RMDKAYlxnsuVHMSEa5a-e8,4319
 supervisely/nn/inference/__init__.py,sha256=QFukX2ip-U7263aEPCF_UCFwj6EujbMnsgrXp5Bbt8I,1623
 supervisely/nn/inference/cache.py,sha256=LAirR5mFHCtK59EO1lefQ2qhpp0vBvRTH26EVrs13Y0,32073
-supervisely/nn/inference/inference.py,sha256=O0GR2o0t9hDh-bMdiKrxk-hxdmQU1M-44aIcZM89Qo8,166222
+supervisely/nn/inference/inference.py,sha256=pIylesTNxmhnJqd3sd5cs9QjAew2wPuqH63KOlimOqA,169495
 supervisely/nn/inference/session.py,sha256=jmkkxbe2kH-lEgUU6Afh62jP68dxfhF5v6OGDfLU62E,35757
 supervisely/nn/inference/video_inference.py,sha256=8Bshjr6rDyLay5Za8IB8Dr6FURMO2R_v7aELasO8pR4,5746
 supervisely/nn/inference/gui/__init__.py,sha256=wCxd-lF5Zhcwsis-wScDA8n1Gk_1O00PKgDviUZ3F1U,221
@@ -1051,7 +1051,7 @@ supervisely/video_annotation/frame.py,sha256=H1G7Wl4LEEmQE-E0B2QWD8kyzZ4-w-GJSUd
 supervisely/video_annotation/frame_collection.py,sha256=RZrnw7lURgvzRrskwvnEIQQfJkp9htMhircU3hLiHVY,15031
 supervisely/video_annotation/key_id_map.py,sha256=KayYOhTtAe3ITq1-NQ82T6YIiBjmu4aJm8t4UxdvI8U,37712
 supervisely/video_annotation/video_annotation.py,sha256=syqfhIerzhMWNh8scM_kWskBl8R2E-pfOSW_jN2Lb1Y,28867
-supervisely/video_annotation/video_figure.py,sha256=j1ZoDnMLO_bFRUI19GDK3A2CzTWGr5pGYbd3NjC7ztE,23766
+supervisely/video_annotation/video_figure.py,sha256=9oWtcixcbJ8Ue89-dnaU1Re2Zhjzwro5M-tdUN5BP80,23824
 supervisely/video_annotation/video_object.py,sha256=i-oiliNpDr2X4Wcy9DJ7sBbuVUT3QYiSrtklCCJGVsY,16736
 supervisely/video_annotation/video_object_collection.py,sha256=Epu9MAC9uZiThfBn4NxKbQ7JRbW4eFZHglTzaJJ9WUQ,9047
 supervisely/video_annotation/video_tag.py,sha256=a1mdzRoq1GLJl7GxyHNGkX1PEGvudlVoqCDn0MxxAEQ,18306
@@ -1082,9 +1082,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.331.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.331.dist-info/METADATA,sha256=Jl2Q2-aQqYnnh1EDKOY95wpocUZnttqC5StXwKTOO8I,33596
-supervisely-6.73.331.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.331.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.331.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.331.dist-info/RECORD,,
+supervisely-6.73.333.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.333.dist-info/METADATA,sha256=dYUKmQZXH6UwwNCIKAYsS0ycDRlPKEpcUlBM7q6djPU,33596
+supervisely-6.73.333.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.333.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.333.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.333.dist-info/RECORD,,