supervisely 6.73.339__py3-none-any.whl → 6.73.341__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- supervisely/api/image_api.py +5 -2
- supervisely/nn/inference/inference.py +10 -9
- supervisely/nn/training/train_app.py +15 -6
- {supervisely-6.73.339.dist-info → supervisely-6.73.341.dist-info}/METADATA +1 -1
- {supervisely-6.73.339.dist-info → supervisely-6.73.341.dist-info}/RECORD +9 -9
- {supervisely-6.73.339.dist-info → supervisely-6.73.341.dist-info}/LICENSE +0 -0
- {supervisely-6.73.339.dist-info → supervisely-6.73.341.dist-info}/WHEEL +0 -0
- {supervisely-6.73.339.dist-info → supervisely-6.73.341.dist-info}/entry_points.txt +0 -0
- {supervisely-6.73.339.dist-info → supervisely-6.73.341.dist-info}/top_level.txt +0 -0
supervisely/api/image_api.py
CHANGED
|
@@ -2245,7 +2245,7 @@ class ImageApi(RemoveableBulkModuleApi):
|
|
|
2245
2245
|
if len(ids) == 0:
|
|
2246
2246
|
return
|
|
2247
2247
|
|
|
2248
|
-
existing_images = self.get_list(dst_dataset_id)
|
|
2248
|
+
existing_images = self.get_list(dst_dataset_id, force_metadata_for_links=False)
|
|
2249
2249
|
existing_names = {image.name for image in existing_images}
|
|
2250
2250
|
|
|
2251
2251
|
ids_info = self.get_info_by_id_batch(ids, force_metadata_for_links=False)
|
|
@@ -2271,7 +2271,8 @@ class ImageApi(RemoveableBulkModuleApi):
|
|
|
2271
2271
|
"names intersection"
|
|
2272
2272
|
)
|
|
2273
2273
|
|
|
2274
|
-
|
|
2274
|
+
img_metas = [info.meta or {} for info in ids_info]
|
|
2275
|
+
new_images = self.upload_ids(dst_dataset_id, new_names, ids, progress_cb, metas=img_metas)
|
|
2275
2276
|
new_ids = [new_image.id for new_image in new_images]
|
|
2276
2277
|
|
|
2277
2278
|
if with_annotations:
|
|
@@ -2356,12 +2357,14 @@ class ImageApi(RemoveableBulkModuleApi):
|
|
|
2356
2357
|
raise RuntimeError("len(dst_names) != len(src_image_infos)")
|
|
2357
2358
|
new_names = dst_names
|
|
2358
2359
|
|
|
2360
|
+
img_metas = [info.meta or {} for info in src_image_infos]
|
|
2359
2361
|
src_ids = [info.id for info in src_image_infos]
|
|
2360
2362
|
new_images = self.upload_ids(
|
|
2361
2363
|
dst_dataset_id,
|
|
2362
2364
|
new_names,
|
|
2363
2365
|
src_ids,
|
|
2364
2366
|
progress_cb,
|
|
2367
|
+
metas=img_metas,
|
|
2365
2368
|
batch_size=batch_size,
|
|
2366
2369
|
force_metadata_for_links=False,
|
|
2367
2370
|
infos=src_image_infos,
|
|
@@ -598,15 +598,16 @@ class Inference:
|
|
|
598
598
|
def _download_model_files(self, deploy_params: dict, log_progress: bool = True) -> dict:
|
|
599
599
|
if deploy_params["runtime"] != RuntimeType.PYTORCH:
|
|
600
600
|
export = deploy_params["model_info"].get("export", {})
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
if
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
deploy_params["
|
|
608
|
-
|
|
609
|
-
|
|
601
|
+
if export is not None:
|
|
602
|
+
export_model = export.get(deploy_params["runtime"], None)
|
|
603
|
+
if export_model is not None:
|
|
604
|
+
if sly_fs.get_file_name(export_model) == sly_fs.get_file_name(
|
|
605
|
+
deploy_params["model_files"]["checkpoint"]
|
|
606
|
+
):
|
|
607
|
+
deploy_params["model_files"]["checkpoint"] = (
|
|
608
|
+
deploy_params["model_info"]["artifacts_dir"] + export_model
|
|
609
|
+
)
|
|
610
|
+
logger.info(f"Found model checkpoint for '{deploy_params['runtime']}'")
|
|
610
611
|
|
|
611
612
|
if deploy_params["model_source"] == ModelSource.PRETRAINED:
|
|
612
613
|
return self._download_pretrained_model(deploy_params["model_files"], log_progress)
|
|
@@ -2524,17 +2524,26 @@ class TrainApp:
|
|
|
2524
2524
|
self.gui.hyperparameters_selector.get_export_onnx_checkbox_value() is True
|
|
2525
2525
|
and self._convert_onnx_func is not None
|
|
2526
2526
|
):
|
|
2527
|
-
|
|
2528
|
-
|
|
2529
|
-
|
|
2527
|
+
try:
|
|
2528
|
+
self._set_text_status("export_onnx")
|
|
2529
|
+
onnx_path = self._convert_onnx_func(experiment_info)
|
|
2530
|
+
if sly_fs.file_exists(onnx_path):
|
|
2531
|
+
export_weights[RuntimeType.ONNXRUNTIME] = onnx_path
|
|
2532
|
+
except Exception as e:
|
|
2533
|
+
logger.error(f"Failed to export ONNX model: {e}")
|
|
2530
2534
|
|
|
2531
2535
|
if (
|
|
2532
2536
|
self.gui.hyperparameters_selector.get_export_tensorrt_checkbox_value() is True
|
|
2533
2537
|
and self._convert_tensorrt_func is not None
|
|
2534
2538
|
):
|
|
2535
|
-
|
|
2536
|
-
|
|
2537
|
-
|
|
2539
|
+
try:
|
|
2540
|
+
self._set_text_status("export_trt")
|
|
2541
|
+
tensorrt_path = self._convert_tensorrt_func(experiment_info)
|
|
2542
|
+
if sly_fs.file_exists(tensorrt_path):
|
|
2543
|
+
export_weights[RuntimeType.TENSORRT] = tensorrt_path
|
|
2544
|
+
except Exception as e:
|
|
2545
|
+
logger.error(f"Failed to export TensorRT model: {e}")
|
|
2546
|
+
|
|
2538
2547
|
return export_weights
|
|
2539
2548
|
|
|
2540
2549
|
def _upload_export_weights(
|
|
@@ -28,7 +28,7 @@ supervisely/api/dataset_api.py,sha256=GH7prDRJKyJlTv_7_Y-RkTwJN7ED4EkXNqqmi3iIdI
|
|
|
28
28
|
supervisely/api/file_api.py,sha256=bVWv6kf3B5n6qlB14HmUa6iUr8ara5cr-pPK8QC7XWg,92932
|
|
29
29
|
supervisely/api/github_api.py,sha256=NIexNjEer9H5rf5sw2LEZd7C1WR-tK4t6IZzsgeAAwQ,623
|
|
30
30
|
supervisely/api/image_annotation_tool_api.py,sha256=YcUo78jRDBJYvIjrd-Y6FJAasLta54nnxhyaGyanovA,5237
|
|
31
|
-
supervisely/api/image_api.py,sha256=
|
|
31
|
+
supervisely/api/image_api.py,sha256=MIs4hVOy0J7o7KHF2aHt3V9noin5Lr2q4HGOIz5ONMw,192578
|
|
32
32
|
supervisely/api/import_storage_api.py,sha256=BDCgmR0Hv6OoiRHLCVPKt3iDxSVlQp1WrnKhAK_Zl84,460
|
|
33
33
|
supervisely/api/issues_api.py,sha256=BqDJXmNoTzwc3xe6_-mA7FDFC5QQ-ahGbXk_HmpkSeQ,17925
|
|
34
34
|
supervisely/api/labeling_job_api.py,sha256=VM1pjM65cUTeer1hrI7cSmCUOHJb7fzK6gJ-abA07hg,55097
|
|
@@ -883,7 +883,7 @@ supervisely/nn/benchmark/visualization/widgets/table/__init__.py,sha256=47DEQpj8
|
|
|
883
883
|
supervisely/nn/benchmark/visualization/widgets/table/table.py,sha256=atmDnF1Af6qLQBUjLhK18RMDKAYlxnsuVHMSEa5a-e8,4319
|
|
884
884
|
supervisely/nn/inference/__init__.py,sha256=QFukX2ip-U7263aEPCF_UCFwj6EujbMnsgrXp5Bbt8I,1623
|
|
885
885
|
supervisely/nn/inference/cache.py,sha256=LAirR5mFHCtK59EO1lefQ2qhpp0vBvRTH26EVrs13Y0,32073
|
|
886
|
-
supervisely/nn/inference/inference.py,sha256=
|
|
886
|
+
supervisely/nn/inference/inference.py,sha256=FUTlgyy676IsFhNH6PTRdnGz6aOXXH_5RtRKqxX8Pss,169801
|
|
887
887
|
supervisely/nn/inference/session.py,sha256=jmkkxbe2kH-lEgUU6Afh62jP68dxfhF5v6OGDfLU62E,35757
|
|
888
888
|
supervisely/nn/inference/video_inference.py,sha256=8Bshjr6rDyLay5Za8IB8Dr6FURMO2R_v7aELasO8pR4,5746
|
|
889
889
|
supervisely/nn/inference/gui/__init__.py,sha256=wCxd-lF5Zhcwsis-wScDA8n1Gk_1O00PKgDviUZ3F1U,221
|
|
@@ -980,7 +980,7 @@ supervisely/nn/tracker/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
|
|
|
980
980
|
supervisely/nn/tracker/utils/gmc.py,sha256=3JX8979H3NA-YHNaRQyj9Z-xb9qtyMittPEjGw8y2Jo,11557
|
|
981
981
|
supervisely/nn/tracker/utils/kalman_filter.py,sha256=eSFmCjM0mikHCAFvj-KCVzw-0Jxpoc3Cfc2NWEjJC1Q,17268
|
|
982
982
|
supervisely/nn/training/__init__.py,sha256=gY4PCykJ-42MWKsqb9kl-skemKa8yB6t_fb5kzqR66U,111
|
|
983
|
-
supervisely/nn/training/train_app.py,sha256=
|
|
983
|
+
supervisely/nn/training/train_app.py,sha256=GsE8uh_PnExFceEyrmy0ubccbgSf96KCToyP8BXodI0,106666
|
|
984
984
|
supervisely/nn/training/gui/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
|
|
985
985
|
supervisely/nn/training/gui/classes_selector.py,sha256=Bpp-RFDQqcZ0kLJmS6ZnExkdscWwRusvF4vbWjEsKlQ,3926
|
|
986
986
|
supervisely/nn/training/gui/gui.py,sha256=QDeWa6iow3z3EwLZcHlQ48d4Ur6hCmedNvCod-8qZ-k,27978
|
|
@@ -1082,9 +1082,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
|
|
|
1082
1082
|
supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
|
|
1083
1083
|
supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
|
|
1084
1084
|
supervisely_lib/__init__.py,sha256=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
|
|
1085
|
-
supervisely-6.73.
|
|
1086
|
-
supervisely-6.73.
|
|
1087
|
-
supervisely-6.73.
|
|
1088
|
-
supervisely-6.73.
|
|
1089
|
-
supervisely-6.73.
|
|
1090
|
-
supervisely-6.73.
|
|
1085
|
+
supervisely-6.73.341.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
|
1086
|
+
supervisely-6.73.341.dist-info/METADATA,sha256=1CoprezNuu8F9RHjpci14MSHrSqIsxBLfOZolC6GNyM,33596
|
|
1087
|
+
supervisely-6.73.341.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
|
|
1088
|
+
supervisely-6.73.341.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
|
|
1089
|
+
supervisely-6.73.341.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
|
|
1090
|
+
supervisely-6.73.341.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|