supervisely 6.73.299__py3-none-any.whl → 6.73.300__py3-none-any.whl

supervisely/nn/inference/inference.py

@@ -670,6 +670,56 @@ class Inference:
             self.update_gui(self._model_served)
             self.gui.show_deployed_model_info(self)
 
+    def load_custom_checkpoint(self, model_files: dict, model_meta: dict, device: str = "cuda"):
+        """
+        Loads local custom model checkpoint.
+
+        :param: model_files: dict with paths to model files
+        :type: model_files: dict
+        :param: model_meta: dict with model meta
+        :type: model_meta: dict
+        :param: device: device to load model on
+        :type: device: str
+        :return: None
+        :rtype: None
+
+        :Usage Example:
+
+         .. code-block:: python
+
+            model_files = {
+                "checkpoint": "supervisely_integration/serve/best.pth",
+                "config": "supervisely_integration/serve/model_config.yml",
+            }
+            model_meta = sly.json.load_json_file("model_meta.json")
+
+            model.load_custom_checkpoint(model_files, model_meta)
+        """
+
+        checkpoint = model_files.get("checkpoint")
+        if checkpoint is None:
+            raise ValueError("Model checkpoint is not provided")
+        checkpoint_name = sly_fs.get_file_name_with_ext(model_files["checkpoint"])
+
+        self.checkpoint_info = CheckpointInfo(
+            checkpoint_name=checkpoint_name,
+            model_name=None,
+            architecture=None,
+            checkpoint_url=None,
+            custom_checkpoint_path=None,
+            model_source=ModelSource.CUSTOM,
+        )
+
+        deploy_params = {
+            "model_source": ModelSource.CUSTOM,
+            "model_files": model_files,
+            "model_info": {},
+            "device": device,
+            "runtime": RuntimeType.PYTORCH,
+        }
+        self._set_model_meta_custom_model({"model_meta": model_meta})
+        self._load_model(deploy_params)
+
     def _load_model_headless(
         self,
         model_files: dict,
@@ -959,6 +1009,47 @@ class Inference:
         else:
             return self._inference_one_by_one_wrapper(source, settings)
 
+    def inference(
+        self,
+        source: Union[str, int, np.ndarray, List[str], List[int], List[np.ndarray]],
+        settings: dict = None,
+    ) -> Union[Annotation, List[Annotation], dict, List[dict]]:
+        """
+        Inference method for images. Provide image path or numpy array of image.
+
+        :param: source: image path,image id, numpy array of image or list of image paths, image ids or numpy arrays
+        :type: source: Union[str, int, np.ndarray, List[str], List[int], List[np.ndarray]]
+        :param: settings: inference settings
+        :type: settings: dict
+        :return: annotation or list of annotations
+        :rtype: Union[Annotation, List[Annotation], dict, List[dict]]
+
+        :Usage Example:
+
+            .. code-block:: python
+
+            image_path = "/root/projects/demo/img/sample.jpg"
+            ann = model.inference(image_path)
+        """
+        input_is_list = True
+        if not isinstance(source, list):
+            input_is_list = False
+            source = [source]
+
+        if settings is None:
+            settings = self._get_inference_settings({})
+
+        if isinstance(source[0], int):
+            ann_jsons = self._inference_batch_ids(
+                self.api, {"batch_ids": source, "settings": settings}
+            )
+            anns = [Annotation.from_json(ann_json, self.model_meta) for ann_json in ann_jsons]
+        else:
+            anns, _ = self._inference_auto(source, settings)
+        if not input_is_list:
+            return anns[0]
+        return anns
+
     def _inference_batched_wrapper(
         self,
         source: List[Union[str, np.ndarray]],

{supervisely-6.73.299.dist-info → supervisely-6.73.300.dist-info}/METADATA

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

{supervisely-6.73.299.dist-info → supervisely-6.73.300.dist-info}/RECORD

@@ -875,7 +875,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=mtEci4Puu-fRXDnGn8RP47o97rv3VTE0hjbYO34Zwqg,1622
 supervisely/nn/inference/cache.py,sha256=h-pP_7th0ana3oJ75sFfTbead3hdKUvYA8Iq2OXDx3I,31317
-supervisely/nn/inference/inference.py,sha256=WsxKGawOxxziL5sGQebN_KQ5hi22lZOGXODOM5ev1uE,144908
+supervisely/nn/inference/inference.py,sha256=jy45Vya994PhW7g0f4tWsbqqjwBx2H87TTLId508rT8,148139
 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
@@ -1074,9 +1074,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.299.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.299.dist-info/METADATA,sha256=mFzVBBoeUq1EzLzUyZ85N97B8SfciKdI17Bho0SPVsk,33573
-supervisely-6.73.299.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.299.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.299.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.299.dist-info/RECORD,,
+supervisely-6.73.300.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.300.dist-info/METADATA,sha256=xhJBsSS_qNwfHrlZ3okP6SzD_J8NkxmLyDNvOaAH10A,33573
+supervisely-6.73.300.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.300.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.300.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.300.dist-info/RECORD,,