supervisely 6.73.461__py3-none-any.whl → 6.73.462__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.
Potentially problematic release.
This version of supervisely might be problematic. Click here for more details.
- supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py +9 -2
- supervisely/nn/inference/session.py +40 -34
- {supervisely-6.73.461.dist-info → supervisely-6.73.462.dist-info}/METADATA +1 -1
- {supervisely-6.73.461.dist-info → supervisely-6.73.462.dist-info}/RECORD +8 -8
- {supervisely-6.73.461.dist-info → supervisely-6.73.462.dist-info}/LICENSE +0 -0
- {supervisely-6.73.461.dist-info → supervisely-6.73.462.dist-info}/WHEEL +0 -0
- {supervisely-6.73.461.dist-info → supervisely-6.73.462.dist-info}/entry_points.txt +0 -0
- {supervisely-6.73.461.dist-info → supervisely-6.73.462.dist-info}/top_level.txt +0 -0
|
@@ -7,7 +7,6 @@ from supervisely.app.widgets.checkbox.checkbox import Checkbox
|
|
|
7
7
|
from supervisely.app.widgets.container.container import Container
|
|
8
8
|
from supervisely.app.widgets.field.field import Field
|
|
9
9
|
from supervisely.app.widgets.select.select import Select
|
|
10
|
-
from supervisely.app.widgets.select_project.select_project import SelectProject
|
|
11
10
|
from supervisely.app.widgets.tree_select.tree_select import TreeSelect
|
|
12
11
|
from supervisely.project.project_type import ProjectType
|
|
13
12
|
|
|
@@ -120,7 +119,15 @@ class SelectDatasetTree(Widget):
|
|
|
120
119
|
if self._project_id:
|
|
121
120
|
project_info = self._api.project.get_info_by_id(self._project_id)
|
|
122
121
|
if allowed_project_types is not None:
|
|
123
|
-
|
|
122
|
+
allowed_values = []
|
|
123
|
+
if not isinstance(allowed_project_types, list):
|
|
124
|
+
allowed_project_types = [allowed_project_types]
|
|
125
|
+
|
|
126
|
+
for pt in allowed_project_types:
|
|
127
|
+
if isinstance(pt, (ProjectType, str)):
|
|
128
|
+
allowed_values.append(str(pt))
|
|
129
|
+
|
|
130
|
+
if project_info.type not in allowed_values:
|
|
124
131
|
self._project_id = None
|
|
125
132
|
|
|
126
133
|
self._multiselect = multiselect
|
|
@@ -441,46 +441,52 @@ class SessionJSON:
|
|
|
441
441
|
prev_current = 0
|
|
442
442
|
if preparing_cb:
|
|
443
443
|
# wait for inference status
|
|
444
|
-
|
|
445
|
-
awaiting_preparing_progress = 0
|
|
446
|
-
break_flag = False
|
|
447
|
-
while resp.get("status") is None:
|
|
448
|
-
time.sleep(1)
|
|
449
|
-
awaiting_preparing_progress += 1
|
|
450
|
-
if awaiting_preparing_progress > 30:
|
|
451
|
-
break_flag = True
|
|
444
|
+
try:
|
|
452
445
|
resp = self._get_preparing_progress()
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
446
|
+
for i in range(30):
|
|
447
|
+
logger.info(
|
|
448
|
+
f"Waiting for preparing progress... {30 - i} seconds left until timeout"
|
|
449
|
+
)
|
|
450
|
+
resp = self._get_preparing_progress()
|
|
451
|
+
if resp.get("status") is not None:
|
|
452
|
+
break
|
|
453
|
+
time.sleep(1)
|
|
454
|
+
if not resp.get("status"):
|
|
455
|
+
raise RuntimeError("Preparing progress status is not available.")
|
|
456
|
+
|
|
457
|
+
if resp.get("status") == "download_info":
|
|
458
|
+
logger.info("Downloading infos...")
|
|
459
459
|
progress_widget = preparing_cb(
|
|
460
460
|
message="Downloading infos", total=resp["total"], unit="it"
|
|
461
461
|
)
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
if resp
|
|
462
|
+
while resp["status"] == "download_info":
|
|
463
|
+
current = resp["current"]
|
|
464
|
+
# pylint: disable=possibly-used-before-assignment
|
|
465
|
+
progress_widget.update(current - prev_current)
|
|
466
|
+
prev_current = current
|
|
467
|
+
resp = self._get_preparing_progress()
|
|
468
|
+
|
|
469
|
+
if resp.get("status") == "download_project":
|
|
470
|
+
logger.info("Downloading project...")
|
|
470
471
|
progress_widget = preparing_cb(message="Download project", total=resp["total"])
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
if resp
|
|
472
|
+
while resp.get("status") == "download_project":
|
|
473
|
+
current = resp["current"]
|
|
474
|
+
progress_widget.update(current - prev_current)
|
|
475
|
+
prev_current = current
|
|
476
|
+
resp = self._get_preparing_progress()
|
|
477
|
+
|
|
478
|
+
if resp.get("status") == "warmup":
|
|
479
|
+
logger.info("Running warmup...")
|
|
478
480
|
progress_widget = preparing_cb(message="Running warmup", total=resp["total"])
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
481
|
+
while resp.get("status") == "warmup":
|
|
482
|
+
current = resp["current"]
|
|
483
|
+
progress_widget.update(current - prev_current)
|
|
484
|
+
prev_current = current
|
|
485
|
+
resp = self._get_preparing_progress()
|
|
486
|
+
except Exception as ex:
|
|
487
|
+
logger.warning(
|
|
488
|
+
f"An error occurred while getting preparing progress: {ex}. Continue without preparing progress status."
|
|
489
|
+
)
|
|
484
490
|
|
|
485
491
|
logger.info("Inference has started:", extra={"response": resp})
|
|
486
492
|
resp, has_started = self._wait_for_async_inference_start()
|
|
@@ -461,7 +461,7 @@ supervisely/app/widgets/select_dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
|
|
|
461
461
|
supervisely/app/widgets/select_dataset/select_dataset.py,sha256=S7zl83lUhquJ1U8GugiViEiGId6a5nVDfyIRRxh_LT4,10295
|
|
462
462
|
supervisely/app/widgets/select_dataset/template.html,sha256=7O_ZgmRs0vOL8tng6QvYbI_0o6A4yMAPB2MlfzWHeHQ,984
|
|
463
463
|
supervisely/app/widgets/select_dataset_tree/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
464
|
-
supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py,sha256=
|
|
464
|
+
supervisely/app/widgets/select_dataset_tree/select_dataset_tree.py,sha256=HQwKXzz5yhmdcS79qfP_AGDUpGgQESNmLcASZx2rv78,25802
|
|
465
465
|
supervisely/app/widgets/select_dataset_tree/template.html,sha256=_uvKCMP0nkpSl3FiTUxqy10JZw3q8-9hXCv22W3BDF0,38
|
|
466
466
|
supervisely/app/widgets/select_item/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
467
467
|
supervisely/app/widgets/select_item/select_item.py,sha256=dcB0UN46rn3nFQybgrGpLRfwB6xnPo-GGrv9rsMeCbA,3833
|
|
@@ -908,7 +908,7 @@ supervisely/nn/inference/__init__.py,sha256=QFukX2ip-U7263aEPCF_UCFwj6EujbMnsgrX
|
|
|
908
908
|
supervisely/nn/inference/cache.py,sha256=Hkxvu70rrB-j7ztQ4TBOxQePAxiKS7Erdb2FmK7aetY,35795
|
|
909
909
|
supervisely/nn/inference/inference.py,sha256=54SXkXYEyswQN1L9hbOn0luSLyWbFOoaSH1qzNfu7HQ,219687
|
|
910
910
|
supervisely/nn/inference/inference_request.py,sha256=yuqEL4BWjC-aKze_raGScEQyhHe8loYb_eNhGPsf2-4,14870
|
|
911
|
-
supervisely/nn/inference/session.py,sha256=
|
|
911
|
+
supervisely/nn/inference/session.py,sha256=WRJKVnmh5GPXnwtuKJn7AO1C7Td39wZo774ZIVQJGYk,36228
|
|
912
912
|
supervisely/nn/inference/uploader.py,sha256=Dn5MfMRq7tclEWpP0B9fJjTiQPBpwumfXxC8-lOYgnM,5659
|
|
913
913
|
supervisely/nn/inference/video_inference.py,sha256=8Bshjr6rDyLay5Za8IB8Dr6FURMO2R_v7aELasO8pR4,5746
|
|
914
914
|
supervisely/nn/inference/gui/__init__.py,sha256=wCxd-lF5Zhcwsis-wScDA8n1Gk_1O00PKgDviUZ3F1U,221
|
|
@@ -1129,9 +1129,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
|
|
|
1129
1129
|
supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
|
|
1130
1130
|
supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
|
|
1131
1131
|
supervisely_lib/__init__.py,sha256=yRwzEQmVwSd6lUQoAUdBngKEOlnoQ6hA9ZcoZGJRNC4,331
|
|
1132
|
-
supervisely-6.73.
|
|
1133
|
-
supervisely-6.73.
|
|
1134
|
-
supervisely-6.73.
|
|
1135
|
-
supervisely-6.73.
|
|
1136
|
-
supervisely-6.73.
|
|
1137
|
-
supervisely-6.73.
|
|
1132
|
+
supervisely-6.73.462.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
|
1133
|
+
supervisely-6.73.462.dist-info/METADATA,sha256=OzYjw5iRdUCofQdUCsd5xkjgEOSl600QFG7lHM7GAlU,35604
|
|
1134
|
+
supervisely-6.73.462.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
|
|
1135
|
+
supervisely-6.73.462.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
|
|
1136
|
+
supervisely-6.73.462.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
|
|
1137
|
+
supervisely-6.73.462.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|