supervisely 6.73.213__py3-none-any.whl → 6.73.214__py3-none-any.whl

supervisely/io/network_exceptions.py

@@ -1,14 +1,17 @@
 # coding: utf-8
 
+import time
 import traceback
+
 import requests
-import time
 
-CONNECTION_ERROR = 'Temporary connection error, please wait ...'
-AGENT_CONNECTION_ERROR = 'Temporary connection error (agent ping), please wait ...'
+CONNECTION_ERROR = "Temporary connection error, please wait ..."
+AGENT_CONNECTION_ERROR = "Temporary connection error (agent ping), please wait ..."
 
-REQUEST_FAILED = 'Request has failed. This may be due to connection problems or invalid requests. '
-SPECIAL_RECONNECT_ERROR = "Agent should call AgentConnected or AgentPing before attempting any other request"
+REQUEST_FAILED = "Request has failed. This may be due to connection problems or invalid requests. "
+SPECIAL_RECONNECT_ERROR = (
+    "Agent should call AgentConnected or AgentPing before attempting any other request"
+)
 RETRY_STATUS_CODES = {
     408,  # Request Timeout
     429,  # Too Many Requests
@@ -19,51 +22,100 @@ RETRY_STATUS_CODES = {
     504,  # Gateway Timeout
     509,  # Bandwidth Limit Exceeded (Apache)
     598,  # Network read timeout error
-    599   # Network connect timeout error
+    599,  # Network connect timeout error
 }
 
 
-def process_requests_exception(external_logger, exc, api_method_name, url,
-                               verbose=True, swallow_exc=False, sleep_sec=None, response=None, retry_info=None):
-    is_connection_error = isinstance(exc, (requests.exceptions.ConnectionError,
-                                           requests.exceptions.Timeout,
-                                           requests.exceptions.TooManyRedirects,
-                                           requests.exceptions.ChunkedEncodingError))
-
-    is_server_retryable_error = isinstance(exc, requests.exceptions.HTTPError) and \
-                                hasattr(exc, 'response') and \
-                                (exc.response.status_code in RETRY_STATUS_CODES)
+def process_requests_exception(
+    external_logger,
+    exc,
+    api_method_name,
+    url,
+    verbose=True,
+    swallow_exc=False,
+    sleep_sec=None,
+    response=None,
+    retry_info=None,
+):
+    is_connection_error = isinstance(
+        exc,
+        (
+            requests.exceptions.ConnectionError,
+            requests.exceptions.Timeout,
+            requests.exceptions.TooManyRedirects,
+            requests.exceptions.ChunkedEncodingError,
+        ),
+    )
+
+    is_server_retryable_error = (
+        isinstance(exc, requests.exceptions.HTTPError)
+        and hasattr(exc, "response")
+        and (exc.response.status_code in RETRY_STATUS_CODES)
+    )
 
     is_need_ping_error = False
-    if isinstance(exc, requests.exceptions.HTTPError) and hasattr(exc, 'response') and (exc.response.status_code == 400):
+    if (
+        isinstance(exc, requests.exceptions.HTTPError)
+        and hasattr(exc, "response")
+        and (exc.response.status_code == 400)
+    ):
         try:
             server_explanation = exc.response.json()
-            is_need_ping_error = (server_explanation.get('error', None) == SPECIAL_RECONNECT_ERROR)
+            is_need_ping_error = server_explanation.get("error", None) == SPECIAL_RECONNECT_ERROR
         except (AttributeError, ValueError):
             pass
 
     if is_connection_error or is_server_retryable_error:
-        process_retryable_request(external_logger, exc, api_method_name, url,
-                                  CONNECTION_ERROR,
-                                  verbose=verbose, swallow_exc=swallow_exc, sleep_sec=sleep_sec, retry_info=retry_info)
+        process_retryable_request(
+            external_logger,
+            exc,
+            api_method_name,
+            url,
+            CONNECTION_ERROR,
+            verbose=verbose,
+            swallow_exc=swallow_exc,
+            sleep_sec=sleep_sec,
+            retry_info=retry_info,
+        )
     elif is_need_ping_error:
-        process_retryable_request(external_logger, exc, api_method_name, url,
-                                  AGENT_CONNECTION_ERROR,
-                                  verbose=verbose, swallow_exc=swallow_exc, sleep_sec=sleep_sec, retry_info=retry_info)
+        process_retryable_request(
+            external_logger,
+            exc,
+            api_method_name,
+            url,
+            AGENT_CONNECTION_ERROR,
+            verbose=verbose,
+            swallow_exc=swallow_exc,
+            sleep_sec=sleep_sec,
+            retry_info=retry_info,
+        )
+    elif response is None:
+        process_unhandled_request(external_logger, exc)
     elif isinstance(exc, requests.exceptions.HTTPError):
         process_invalid_request(external_logger, exc, response, verbose)
     else:
         process_unhandled_request(external_logger, exc)
 
 
-def process_retryable_request(external_logger, exc, api_method_name, url, user_message,
-                              verbose=True, swallow_exc=False, sleep_sec=None, retry_info=None):
+def process_retryable_request(
+    external_logger,
+    exc,
+    api_method_name,
+    url,
+    user_message,
+    verbose=True,
+    swallow_exc=False,
+    sleep_sec=None,
+    retry_info=None,
+):
     if retry_info is not None:
         retry_idx = retry_info["retry_idx"]
         retry_limit = retry_info["retry_limit"]
         user_message = "{}:  Retrying ({}/{}).".format(user_message, retry_idx, retry_limit)
     if verbose:
-        external_logger.warn(user_message, extra={'method': api_method_name, 'url': url, 'details': str(exc)})
+        external_logger.warn(
+            user_message, extra={"method": api_method_name, "url": url, "details": str(exc)}
+        )
 
     if sleep_sec is not None:
         time.sleep(sleep_sec)
@@ -74,13 +126,18 @@ def process_retryable_request(external_logger, exc, api_method_name, url, user_m
 
 def process_invalid_request(external_logger, exc, response, verbose=True):
     if verbose:
-        external_logger.warn(REQUEST_FAILED, extra={'reason': response.content.decode('utf-8'),
-                                                    'status_code': response.status_code,
-                                                    'url': response.url})
+        external_logger.warn(
+            REQUEST_FAILED,
+            extra={
+                "reason": response.content.decode("utf-8"),
+                "status_code": response.status_code,
+                "url": response.url,
+            },
+        )
     raise exc
 
 
 def process_unhandled_request(external_logger, exc):
     exc_str = str(exc)
-    external_logger.error(traceback.format_exc(), exc_info=True, extra={'exc_str': exc_str})
-    raise RuntimeError(REQUEST_FAILED + 'Last failure: {!r}'.format(exc_str))
+    external_logger.error(traceback.format_exc(), exc_info=True, extra={"exc_str": exc_str})
+    raise RuntimeError(REQUEST_FAILED + "Last failure: {!r}".format(exc_str))

supervisely/nn/inference/cache.py

@@ -1,18 +1,18 @@
 import json
 import os
 import shutil
+from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
 from logging import Logger
 from pathlib import Path
 from threading import Lock, Thread
-from concurrent.futures import ThreadPoolExecutor
 from time import sleep
 from typing import Any, Callable, Generator, List, Optional, Tuple, Union
 
 import cv2
 import numpy as np
 from cacheout import Cache as CacheOut
-from cachetools import Cache, LRUCache, TTLCache, _Link
+from cachetools import Cache, LRUCache, TTLCache
 from fastapi import BackgroundTasks, FastAPI, Form, Request, UploadFile
 
 import supervisely as sly
@@ -83,7 +83,10 @@ class PersistentImageTTLCache(TTLCache):
             # pylint: disable=no-member
             link = self._TTLCache__getlink(key)
             # pylint: disable=no-member
-            link.expire = self._TTLCache__timer() + self._TTLCache__ttl
+            if hasattr(link, "expire"):
+                link.expire = self.timer() + self._TTLCache__ttl
+            else:
+                link.expires = self.timer() + self._TTLCache__ttl
         except KeyError:
             return
 
@@ -626,11 +629,11 @@ class InferenceImageCache:
                 pos_by_name[name] = pos
             elif return_images is True:
                 items.append((pos, name))
-        
+
         def get_one_image(item):
             pos, name = item
             return pos, self._cache.get_image(name)
-        
+
         if len(items) > 0:
             with ThreadPoolExecutor(min(64, len(items))) as executor:
                 for pos, image in executor.map(get_one_image, items):

{supervisely-6.73.213.dist-info → supervisely-6.73.214.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.213
+Version: 6.73.214
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cachetools<5.0.0,>=4.2.3
+Requires-Dist: cachetools<=5.5.0,>=4.2.3
 Requires-Dist: numpy<2.0.0,>=1.19
 Requires-Dist: opencv-python<5.0.0.0,>=4.5.5.62
 Requires-Dist: PTable<1.0.0,>=0.9.2
@@ -38,12 +38,12 @@ Requires-Dist: SimpleITK<3.0.0.0,>=2.1.1.2
 Requires-Dist: pydicom<3.0.0,>=2.3.0
 Requires-Dist: stringcase<2.0.0,>=1.2.0
 Requires-Dist: python-magic<1.0.0,>=0.4.25
-Requires-Dist: trimesh<4.0.0,>=3.11.2
+Requires-Dist: trimesh<=4.5.0,>=3.11.2
 Requires-Dist: uvicorn[standard]<1.0.0,>=0.18.2
 Requires-Dist: pydantic<=2.8.2,>=1.7.4
 Requires-Dist: anyio<=4.2.0,>=3.7.1
 Requires-Dist: fastapi<=0.109.0,>=0.79.0
-Requires-Dist: websockets<11.0,>=10.3
+Requires-Dist: websockets<=13.1,>=10.3
 Requires-Dist: jinja2<4.0.0,>=3.0.3
 Requires-Dist: psutil<6.0.0,>=5.9.0
 Requires-Dist: jsonpatch<2.0,>=1.32
@@ -71,7 +71,7 @@ Requires-Dist: zstd
 Provides-Extra: apps
 Requires-Dist: uvicorn[standard]<1.0.0,>=0.18.2; extra == "apps"
 Requires-Dist: fastapi<1.0.0,>=0.79.0; extra == "apps"
-Requires-Dist: websockets<11.0,>=10.3; extra == "apps"
+Requires-Dist: websockets<=13.1,>=10.3; extra == "apps"
 Requires-Dist: jinja2<4.0.0,>=3.0.3; extra == "apps"
 Requires-Dist: psutil<6.0.0,>=5.9.0; extra == "apps"
 Requires-Dist: jsonpatch<2.0,>=1.32; extra == "apps"

{supervisely-6.73.213.dist-info → supervisely-6.73.214.dist-info}/RECORD

@@ -689,7 +689,7 @@ supervisely/io/fs_cache.py,sha256=UvG27YGuLHOahY-cVchYXciTZNEM2aJfh0TAnP_xeeQ,57
 supervisely/io/github_utils.py,sha256=jGmvQJ5bjtACuSFABzrxL0jJdh14SezovrHp8T-9y8g,1779
 supervisely/io/json.py,sha256=7RGAk72FpPtlHYcyo7-uWZf5IAvQJg_nM09RpXBpaNo,7588
 supervisely/io/multipart_stream_decoder.py,sha256=rCheeSCAGdw2tNyaWEYa4dvoIDuldXOxH86RVB82c78,14417
-supervisely/io/network_exceptions.py,sha256=Zy9INsRk0eZL73LW6e_Gs3mIYzGXW1BJqNkBxTuPRzg,3952
+supervisely/io/network_exceptions.py,sha256=ka5ce-L4brzqnzARFpma5zmVZaq1ojgVZcfxzWQPTJ8,4126
 supervisely/labeling_jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/labeling_jobs/constants.py,sha256=GF_pwF9fC9_DGbpD3cAk3llifskAxpDmyuXwxM1f3Hw,104
 supervisely/labeling_jobs/utils.py,sha256=XOGF2cbnTGbXFdT5jGL1LIPQfiCEJgRkmKNIjTlFois,22656
@@ -776,7 +776,7 @@ supervisely/nn/benchmark/visualization/vis_metrics/recall_vs_precision.py,sha256
 supervisely/nn/benchmark/visualization/vis_metrics/reliability_diagram.py,sha256=Vxta2s0RTTcV0GCcMiF8CykCtZYryLTwGjW9vVUrK3I,3107
 supervisely/nn/benchmark/visualization/vis_metrics/what_is.py,sha256=MDnYR-o7Mj-YE1Jwu9EcLUEPcu6rLknRx7LvV4nnUBo,842
 supervisely/nn/inference/__init__.py,sha256=mtEci4Puu-fRXDnGn8RP47o97rv3VTE0hjbYO34Zwqg,1622
-supervisely/nn/inference/cache.py,sha256=vjFYIkoV-txzAl_C_WKvS5odccBU8GHFY8iTxxnSqLU,25619
+supervisely/nn/inference/cache.py,sha256=WylgHgPQRIoA_RDks8FyKgHqeZZ_YFoyddxkVvOX2YQ,25713
 supervisely/nn/inference/inference.py,sha256=pwTh6_EQ-sJNXTBD08eUMdOH8VoNF2uJUTr_P1-BuN0,114983
 supervisely/nn/inference/session.py,sha256=jmkkxbe2kH-lEgUU6Afh62jP68dxfhF5v6OGDfLU62E,35757
 supervisely/nn/inference/video_inference.py,sha256=8Bshjr6rDyLay5Za8IB8Dr6FURMO2R_v7aELasO8pR4,5746
@@ -957,9 +957,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.213.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.213.dist-info/METADATA,sha256=PXttYVP1qxfusv5jsnH9G_sDtKQ4V0e9LJ3mItlP2VY,33086
-supervisely-6.73.213.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-supervisely-6.73.213.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.213.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.213.dist-info/RECORD,,
+supervisely-6.73.214.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.214.dist-info/METADATA,sha256=eiPzbAzdjKq2Ni6e1iFqKqPdKouyzo9fONMZqs_Rx2A,33090
+supervisely-6.73.214.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+supervisely-6.73.214.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.214.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.214.dist-info/RECORD,,