supervisely 6.73.305__py3-none-any.whl → 6.73.307__py3-none-any.whl

supervisely/api/task_api.py

@@ -1159,7 +1159,9 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
             )
         self._api.post("tasks.status.update", {ApiField.ID: task_id, ApiField.STATUS: status})
 
-    def set_output_experiment(self, task_id: int, experiment_info: dict) -> Dict:
+    def set_output_experiment(
+        self, task_id: int, experiment_info: dict, project_name: str = None
+    ) -> Dict:
         """
         Sets output for the task with experiment info.
 
@@ -1214,7 +1216,17 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
                 },
             }
         """
-        output = {ApiField.EXPERIMENT: {ApiField.DATA: {**experiment_info}}}
+        project_id = experiment_info.get("project_id")
+        if project_id is None:
+            raise ValueError("Key 'project_id' is required in experiment_info")
+        if project_name is None:
+            project = self._api.project.get_info_by_id(project_id, raise_error=True)
+            project_name = project.name
+
+        output = {
+            ApiField.PROJECT: {ApiField.ID: project_id, ApiField.TITLE: project_name},
+            ApiField.EXPERIMENT: {ApiField.DATA: {**experiment_info}},
+        }
         resp = self._api.post(
             "tasks.output.set", {ApiField.TASK_ID: task_id, ApiField.OUTPUT: output}
         )

supervisely/convert/pointcloud_episodes/nuscenes_conv/nuscenes_converter.py

@@ -1,3 +1,4 @@
+import os
 from os import path as osp
 from pathlib import Path
 from typing import Dict, Optional
@@ -60,19 +61,22 @@ class NuscenesEpisodesConverter(PointcloudEpisodeConverter):
             logger.warning("Please, run 'pip install nuscenes-devkit' to import NuScenes data.")
             return False
 
-        def filter_fn(path):
-            return all([(Path(path) / name).exists() for name in ["maps", "samples"]])
+        def _contains_tables(p):
+            return all(fs.file_exists(Path(p) / f"{name}.json") for name in helpers.TABLE_NAMES)
 
-        input_path = next((d for d in fs.dirs_filter(self._input_data, filter_fn)), None)
-        if input_path is None:
-            return False
+        def _filter_fn(path):
+            has_tables = False
+            for p in os.scandir(path):
+                if p.is_dir() and _contains_tables(p.path):
+                    has_tables = True
+                    break
+            return has_tables and (Path(path) / "samples").exists()
 
-        sample_dir = input_path + "/samples/"
-        if any([not fs.dir_exists(f"{sample_dir}/{d}") for d in helpers.DIR_NAMES]):
+        input_path = next((d for d in fs.dirs_filter(self._input_data, _filter_fn)), None)
+        if input_path is None:
             return False
 
-        fil_fn = lambda p: all(fs.file_exists(f"{p}/{name}.json") for name in helpers.TABLE_NAMES)
-        ann_dir = next((d for d in fs.dirs_filter(input_path, fil_fn)), None)
+        ann_dir = next((d for d in fs.dirs_filter(input_path, _contains_tables)), None)
         if ann_dir is None:
             return False
 

supervisely/nn/inference/inference.py

@@ -785,9 +785,11 @@ class Inference:
             checkpoint_file_path = os.path.join(
                 model_info.get("artifacts_dir"), "checkpoints", checkpoint_name
             )
-            checkpoint_file_info = self.api.file.get_info_by_path(
-                sly_env.team_id(), checkpoint_file_path
-            )
+            checkpoint_file_info = None
+            if not self._is_local_deploy:
+                checkpoint_file_info = self.api.file.get_info_by_path(
+                    sly_env.team_id(), checkpoint_file_path
+                )
             if checkpoint_file_info is None:
                 checkpoint_url = None
             else:
@@ -2413,6 +2415,7 @@ class Inference:
                 self._inference_by_local_deploy_args()
                 # Gracefully shut down the server
                 self._app.shutdown()
+                exit(0)
         # else: run server after endpoints
 
         @call_on_autostart()
@@ -3017,6 +3020,8 @@ class Inference:
         def _load_experiment_info(artifacts_dir):
             experiment_path = os.path.join(artifacts_dir, "experiment_info.json")
             model_info = self._load_json_file(experiment_path)
+            model_meta_path = os.path.join(artifacts_dir, "model_meta.json")
+            model_info["model_meta"] = self._load_json_file(model_meta_path)
             original_model_files = model_info.get("model_files")
             if not original_model_files:
                 raise ValueError("Invalid 'experiment_info.json'. Missing 'model_files' key.")
@@ -3106,7 +3111,7 @@ class Inference:
             "runtime": runtime,
         }
 
-        logger.info(f"Deploy parameters: {deploy_params}")
+        logger.debug(f"Deploy parameters: {deploy_params}")
         return deploy_params, need_download
 
     def _run_server(self):
@@ -3151,14 +3156,17 @@ class Inference:
                 ann = predict_image_np(image_np)
                 api.annotation.upload_ann(image, ann)
             elif isinstance(image, str):
-                if sly_fs.file_exists(self._args.predict):
-                    image_np = sly_image.read(self._args.predict)
+                if sly_fs.file_exists(self._args.predict_image):
+                    image_np = sly_image.read(self._args.predict_image)
                     ann = predict_image_np(image_np)
                     pred_ann_path = image + ".json"
                     sly_json.dump_json_file(ann.to_json(), pred_ann_path)
-                    # Save image for debug
+                    # Save image and ann for debug
                     # ann.draw_pretty(image_np)
-                    # pred_path = os.path.join(os.path.dirname(self._args.predict), "pred_" + os.path.basename(self._args.predict))
+                    # pred_path = os.path.join(
+                    #     os.path.dirname(self._args.predict_image),
+                    #     "pred_" + os.path.basename(self._args.predict_image),
+                    # )
                     # sly_image.write(pred_path, image_np)
 
         if self._args.predict_project is not None:

supervisely/nn/training/train_app.py

@@ -1759,7 +1759,7 @@ class TrainApp:
         # self.gui.training_logs.tensorboard_button.disable()
 
         # Set artifacts to GUI
-        self._api.task.set_output_experiment(self.task_id, experiment_info)
+        self._api.task.set_output_experiment(self.task_id, experiment_info, self.project_name)
         set_directory(remote_dir)
         self.gui.training_artifacts.artifacts_thumbnail.set(file_info)
         self.gui.training_artifacts.artifacts_thumbnail.show()

{supervisely-6.73.305.dist-info → supervisely-6.73.307.dist-info}/METADATA

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

{supervisely-6.73.305.dist-info → supervisely-6.73.307.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=iaP5v0WrVJFjdmoIuBBk___7kS57fxgmhjByZX7ZSHo,53610
+supervisely/api/task_api.py,sha256=1xbKi6JYl8FOHno2GoE224ZiQBXdKGR4Sz5uP9LElyE,54085
 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
@@ -641,7 +641,7 @@ supervisely/convert/pointcloud_episodes/bag/bag_converter.py,sha256=jzWKXoFUWu11
 supervisely/convert/pointcloud_episodes/lyft/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/pointcloud_episodes/lyft/lyft_converter.py,sha256=QXreWUJ-QhoWgLPqRxCayatYCCCuSV6Z2XCZKScrD3o,10419
 supervisely/convert/pointcloud_episodes/nuscenes_conv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/pointcloud_episodes/nuscenes_conv/nuscenes_converter.py,sha256=4HWouf-H4e5M_Hwd481DpLq17mIZMGkhRVOBgY4alXM,12692
+supervisely/convert/pointcloud_episodes/nuscenes_conv/nuscenes_converter.py,sha256=O8QIwqwb0DUuYmS8oq6kGv3uTlzS3GyGvAxfL1bYW-s,12764
 supervisely/convert/pointcloud_episodes/nuscenes_conv/nuscenes_helper.py,sha256=cJTwhFn1JgblbPjrTrZu30y6FxyjGF-12sMFfvN1xzM,8969
 supervisely/convert/pointcloud_episodes/sly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_converter.py,sha256=fSEGxuTtFTAOLNBAZncOxw9PVALBOtB7yZ8qTCaET7w,6102
@@ -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=-RXgGv9QUI-hJk1fVDYZVNguLlvSHjCDtElwSIz21Ow,148340
+supervisely/nn/inference/inference.py,sha256=WIFVWA-x5RtcIhpq_9I0XjOeQfP32V5Ef1-cL8YyNJ8,148722
 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
@@ -972,7 +972,7 @@ supervisely/nn/tracker/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 supervisely/nn/tracker/utils/gmc.py,sha256=3JX8979H3NA-YHNaRQyj9Z-xb9qtyMittPEjGw8y2Jo,11557
 supervisely/nn/tracker/utils/kalman_filter.py,sha256=eSFmCjM0mikHCAFvj-KCVzw-0Jxpoc3Cfc2NWEjJC1Q,17268
 supervisely/nn/training/__init__.py,sha256=gY4PCykJ-42MWKsqb9kl-skemKa8yB6t_fb5kzqR66U,111
-supervisely/nn/training/train_app.py,sha256=oFK1lGNmFAWvSel7nxYd-YA54gA0XJXnaZze1B3pqbg,103947
+supervisely/nn/training/train_app.py,sha256=6bbmj4d2uemKMnv2u5d-2Wp6RFOQl3COl3CgwC6-Gqs,103966
 supervisely/nn/training/gui/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 supervisely/nn/training/gui/classes_selector.py,sha256=8UgzA4aogOAr1s42smwEcDbgaBj_i0JLhjwlZ9bFdIA,3772
 supervisely/nn/training/gui/gui.py,sha256=CnT_QhihrxdSHKybpI0pXhPLwCaXEana_qdn0DhXByg,25558
@@ -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.305.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.305.dist-info/METADATA,sha256=shsy_XeVHlxZo_9oE0WGUDjT-AHdGnrSZxs8aA_ru9Q,33573
-supervisely-6.73.305.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.305.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.305.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.305.dist-info/RECORD,,
+supervisely-6.73.307.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.307.dist-info/METADATA,sha256=cAJxuLzG815JpY_UwjFG3soVNxtAiUo89L7wcISLSDY,33573
+supervisely-6.73.307.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.307.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.307.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.307.dist-info/RECORD,,