supervisely 6.73.385__py3-none-any.whl → 6.73.387__py3-none-any.whl

supervisely/api/nn/deploy_api.py

@@ -3,6 +3,7 @@
 
 from __future__ import annotations
 
+import os
 import time
 from dataclasses import asdict
 from pathlib import Path
@@ -708,16 +709,12 @@ class DeployApi:
             )
 
         runtime = get_runtime(runtime)
-        experiment_task_id = experiment_info.task_id
-        experiment_task_info = self._api.task.get_info_by_id(experiment_task_id)
-        if experiment_task_info is None:
-            raise ValueError(f"Task with ID '{experiment_task_id}' not found")
-
+        module = None
         module_id = None
         serve_app_name = None
         if with_module:
-            train_module_id = experiment_task_info["meta"]["app"]["moduleId"]
-            module = self.get_serving_app_by_train_app(module_id=train_module_id)
+            framework_name = experiment_info.framework_name
+            module = self.find_serving_app_by_framework(framework_name)
             serve_app_name = module["name"]
             module_id = module["id"]
             logger.debug(f"Serving app detected: '{serve_app_name}'. Module ID: '{module_id}'")
@@ -768,10 +765,15 @@ class DeployApi:
             "runtime": runtime,
         }
 
-        config = experiment_info.model_files.get("config")
-        if config is not None:
-            deploy_params["model_files"]["config"] = f"{experiment_info.artifacts_dir}{config}"
-            logger.debug(f"Config file added: {experiment_info.artifacts_dir}{config}")
+        for file_key, file_path in experiment_info.model_files.items():
+            full_file_path = os.path.join(experiment_info.artifacts_dir, file_path)
+            if not self._api.file.exists(team_id, full_file_path):
+                logger.debug(f"Model file not found: '{full_file_path}'. Trying to find it by checkpoint path.")
+                full_file_path = os.path.join(artifacts_dir, file_path)
+                if not self._api.file.exists(team_id, full_file_path):
+                    raise ValueError(f"Model file not found: '{full_file_path}'. Make sure that the file exists in the artifacts directory.")
+            deploy_params["model_files"][file_key] = full_file_path
+            logger.debug(f"Model file added: {full_file_path}")
         return module_id, serve_app_name, deploy_params
 
     def _set_auto_runtime_by_checkpoint(self, checkpoint_path: str) -> str:

supervisely/nn/benchmark/object_detection/visualizer.py

@@ -705,8 +705,16 @@ class ObjectDetectionVisualizer(BaseVisualizer):
         return False
 
     def _get_sample_data_for_gallery(self):
-        # get sample images with annotations for visualization (Prediction project)
-        pred_ds = random.choice(self.eval_result.pred_dataset_infos)
-        self.eval_result.sample_images = self.api.image.get_list(pred_ds.id, limit=9)
-        image_ids = [x.id for x in self.eval_result.sample_images]
-        self.eval_result.sample_anns = self.api.annotation.download_batch(pred_ds.id, image_ids)
+        """Get sample images with annotations for visualization (preview gallery)"""
+        sample_images = []
+        limit = 9
+        for ds_info in self.eval_result.pred_dataset_infos:
+            images = self.api.image.get_list(
+                ds_info.id, limit=limit, force_metadata_for_links=False
+            )
+            sample_images.extend(images)
+        if len(sample_images) > limit:
+            sample_images = random.sample(sample_images, limit)
+        self.eval_result.sample_images = sample_images
+        ids = [img.id for img in sample_images]
+        self.eval_result.sample_anns = self.api.annotation.download_batch(ds_info.id, ids)

supervisely/nn/benchmark/semantic_segmentation/visualizer.py

@@ -280,15 +280,19 @@ class SemanticSegmentationVisualizer(BaseVisualizer):
                     raise RuntimeError(f"Match data was not created properly. {e}")
 
     def _get_sample_data_for_gallery(self):
-        # get sample images with annotations for visualization
-        pred_ds = random.choice(self.eval_result.pred_dataset_infos)
-        imgs = self.api.image.get_list(pred_ds.id, limit=9, force_metadata_for_links=False)
-        anns = self.api.annotation.download_batch(
-            pred_ds.id, [x.id for x in imgs], force_metadata_for_links=False
-        )
-
-        self.eval_result.sample_images = imgs
-        self.eval_result.sample_anns = anns
+        """Get sample images with annotations for visualization (preview gallery)"""
+        sample_images = []
+        limit = 9
+        for ds_info in self.eval_result.pred_dataset_infos:
+            images = self.api.image.get_list(
+                ds_info.id, limit=limit, force_metadata_for_links=False
+            )
+            sample_images.extend(images)
+        if len(sample_images) > limit:
+            sample_images = random.sample(sample_images, limit)
+        self.eval_result.sample_images = sample_images
+        ids = [img.id for img in sample_images]
+        self.eval_result.sample_anns = self.api.annotation.download_batch(ds_info.id, ids)
 
     def _create_clickable_label(self):
         return MarkdownWidget(name="clickable_label", title="", text=self.vis_texts.clickable_label)

{supervisely-6.73.385.dist-info → supervisely-6.73.387.dist-info}/METADATA

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

{supervisely-6.73.385.dist-info → supervisely-6.73.387.dist-info}/RECORD

@@ -55,7 +55,7 @@ supervisely/api/entity_annotation/figure_api.py,sha256=rmsE3L_JfqN94sLN637pQ0syi
 supervisely/api/entity_annotation/object_api.py,sha256=gbcNvN_KY6G80Me8fHKQgryc2Co7VU_kfFd1GYILZ4E,8875
 supervisely/api/entity_annotation/tag_api.py,sha256=IapvSZmakjdOn0yvqP2tQRY8gkZg0bcvIZBwWRcafrg,18996
 supervisely/api/nn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/api/nn/deploy_api.py,sha256=fA5yk3-Q66BL821iu68HpsGWWO2qHXCcWTmrXoHE4gE,37008
+supervisely/api/nn/deploy_api.py,sha256=yxTfi_B8KfKFxv410n4nt4OJiy18lJoZVScXnVCRYgA,37236
 supervisely/api/nn/neural_network_api.py,sha256=VYqpHb6xqCeEUofTNfOGUhvjI_5Di3T26qwVp5Z-0hE,10643
 supervisely/api/pointcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/api/pointcloud/pointcloud_annotation_api.py,sha256=xIXqCu0rKYsGt5ezh2EFT2utwsVrr2Xo-MOWUCnbvXc,11259
@@ -809,7 +809,7 @@ supervisely/nn/benchmark/object_detection/evaluation_params.yaml,sha256=fEYA-Exm
 supervisely/nn/benchmark/object_detection/evaluator.py,sha256=s-hPBm5BmoCgwoozVyDacum4kVLNtYK6I6NCt_L_LSA,7278
 supervisely/nn/benchmark/object_detection/metric_provider.py,sha256=_fxS24Q8KhE2n2HknMnt86xVPYEDFw5atxsvXRnCl4w,23855
 supervisely/nn/benchmark/object_detection/text_templates.py,sha256=4BgTIX1Co4WK9_VSUa1qWCmh5OJzo3_opVU6LOjKSjc,25842
-supervisely/nn/benchmark/object_detection/visualizer.py,sha256=0eJ-ATDVMyjMRInoEK604vL3vJPN5Ge1HjarS11CS0A,32365
+supervisely/nn/benchmark/object_detection/visualizer.py,sha256=4BOkSYl8rlvOKO87ZlmZuZCsAM9QTqDqAgNMoiwE8eI,32622
 supervisely/nn/benchmark/object_detection/vis_metrics/__init__.py,sha256=AXCLHEySEdR-B-5sfDoWBmmOLBVlyW2U_xr8Ta42sQI,2096
 supervisely/nn/benchmark/object_detection/vis_metrics/confidence_distribution.py,sha256=J6l9Vc8TGsvkTyH5u7Ry4P2jgJC2GYmcgOeMALftZBw,4254
 supervisely/nn/benchmark/object_detection/vis_metrics/confidence_score.py,sha256=pmxnF_UJk0WhqEdL7O_yIjIBtxPipLQZVJwCr6XB3zc,4751
@@ -838,7 +838,7 @@ supervisely/nn/benchmark/semantic_segmentation/evaluation_params.yaml,sha256=47D
 supervisely/nn/benchmark/semantic_segmentation/evaluator.py,sha256=XafPMpGL6v0ZQ-m7DkEjoY7W6fGCJNKolql5BA3M8V0,7261
 supervisely/nn/benchmark/semantic_segmentation/metric_provider.py,sha256=478l7w2n-yueBMVABsakfIQEo3MksbCYmKNrwMFOl6w,6546
 supervisely/nn/benchmark/semantic_segmentation/text_templates.py,sha256=7yRRD2FAdJHGSRqBVIjNjzCduKzaepA1OWtggi7B0Dg,8580
-supervisely/nn/benchmark/semantic_segmentation/visualizer.py,sha256=T7WTjnyFLL3BAyH7yQIqI6R5VNj1M3guamwhDglOegE,13293
+supervisely/nn/benchmark/semantic_segmentation/visualizer.py,sha256=ny7S9cYdYeRL5je5eGpJOneVSz7MxZdykImPdNQ8uPY,13500
 supervisely/nn/benchmark/semantic_segmentation/vis_metrics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/benchmark/semantic_segmentation/vis_metrics/acknowledgement.py,sha256=Lm82x8AIMKv1WqmqA0W9fugSlQ_JrP9dwYYYReZmhvI,440
 supervisely/nn/benchmark/semantic_segmentation/vis_metrics/classwise_error_analysis.py,sha256=0bmL43a4cqw3grFoG68NN8Y1fkRpHBIRJptcxMor-78,1884
@@ -1103,9 +1103,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.385.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.385.dist-info/METADATA,sha256=38qHHIiRGEYffwGVbazc2eXQ4_fNNjlxROUqPhBgH-4,35154
-supervisely-6.73.385.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.385.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.385.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.385.dist-info/RECORD,,
+supervisely-6.73.387.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.387.dist-info/METADATA,sha256=6bZcP704iqdDpgH802O7uWemj3baQXCsDcmb5-hsDIE,35154
+supervisely-6.73.387.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.387.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.387.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.387.dist-info/RECORD,,