supervisely 6.73.218__py3-none-any.whl → 6.73.219__py3-none-any.whl

supervisely/api/api.py

@@ -287,6 +287,8 @@ class Api:
         api_server_address: str = None,
         check_instance_version: Union[bool, str] = False,
     ):
+        self.logger = external_logger or logger
+
         if server_address is None and token is None:
             server_address = os.environ.get(SERVER_ADDRESS, None)
             token = os.environ.get(API_TOKEN, None)
@@ -295,10 +297,7 @@ class Api:
             raise ValueError(
                 "SERVER_ADDRESS env variable is undefined, https://developer.supervisely.com/getting-started/basics-of-authentication"
             )
-        if token is None:
-            raise ValueError(
-                "API_TOKEN env variable is undefined, https://developer.supervisely.com/getting-started/basics-of-authentication"
-            )
+
         self.server_address = Api.normalize_server_address(server_address)
 
         self._api_server_address = None
@@ -313,11 +312,10 @@ class Api:
         if retry_sleep_sec is None:
             retry_sleep_sec = int(os.getenv(SUPERVISELY_PUBLIC_API_RETRY_SLEEP_SEC, "1"))
 
-        if len(token) != 128:
-            raise ValueError("Invalid token {!r}: length != 128".format(token))
-
         self.token = token
-        self.headers = {"x-api-key": token}
+        self.headers = {}
+        if token is not None:
+            self.headers["x-api-key"] = token
         self.task_id = os.getenv(SUPERVISELY_TASK_ID)
         if self.task_id is not None and ignore_task_id is False:
             self.headers["x-task-id"] = self.task_id
@@ -359,8 +357,6 @@ class Api:
         self.retry_count = retry_count
         self.retry_sleep_sec = retry_sleep_sec
 
-        self.logger = external_logger or logger
-
         self._require_https_redirect_check = not self.server_address.startswith("https://")
 
         if check_instance_version:
@@ -652,6 +648,14 @@ class Api:
                     Api._raise_for_status(response)
                 return response
             except requests.RequestException as exc:
+                if (
+                    isinstance(exc, requests.exceptions.HTTPError)
+                    and response.status_code == 400
+                    and self.token is None
+                ):
+                    self.logger.warning(
+                        "API_TOKEN env variable is undefined. See more: https://developer.supervisely.com/getting-started/basics-of-authentication"
+                    )
                 if raise_error:
                     raise exc
                 else:
@@ -715,6 +719,14 @@ class Api:
                     Api._raise_for_status(response)
                 return response
             except requests.RequestException as exc:
+                if (
+                    isinstance(exc, requests.exceptions.HTTPError)
+                    and response.status_code == 400
+                    and self.token is None
+                ):
+                    self.logger.warning(
+                        "API_TOKEN env variable is undefined. See more: https://developer.supervisely.com/getting-started/basics-of-authentication"
+                    )
                 process_requests_exception(
                     self.logger,
                     exc,
@@ -807,10 +819,11 @@ class Api:
 
     def _check_https_redirect(self):
         if self._require_https_redirect_check is True:
-            response = requests.get(self.server_address, allow_redirects=False)
-            if (300 <= response.status_code < 400) or (
-                response.headers.get("Location", "").startswith("https://")
-            ):
+            try:
+                response = requests.get(
+                    self.server_address.replace("http://", "https://"), allow_redirects=False
+                )
+                response.raise_for_status()
                 self.server_address = self.server_address.replace("http://", "https://")
                 msg = (
                     "You're using HTTP server address while the server requires HTTPS. "
@@ -818,8 +831,8 @@ class Api:
                     f"Consider updating your server address to {self.server_address}"
                 )
                 self.logger.warn(msg)
-
-            self._require_https_redirect_check = False
+            finally:
+                self._require_https_redirect_check = False
 
     @classmethod
     def from_credentials(

{supervisely-6.73.218.dist-info → supervisely-6.73.219.dist-info}/METADATA

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

{supervisely-6.73.218.dist-info → supervisely-6.73.219.dist-info}/RECORD

@@ -22,7 +22,7 @@ supervisely/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/api/advanced_api.py,sha256=Nd5cCnHFWc3PSUrCtENxTGtDjS37_lCHXsgXvUI3Ti8,2054
 supervisely/api/agent_api.py,sha256=ShWAIlXcWXcyI9fqVuP5GZVCigCMJmjnvdGUfLspD6Y,8890
 supervisely/api/annotation_api.py,sha256=Eps-Jf10_SQFy7DjghUnyiM6DcVJBsamHDViRAXv2fg,51403
-supervisely/api/api.py,sha256=u2T0yOQ-tUnP3iIzFu8zEQb4t_EDrXQSKnaXHCvFDyg,36514
+supervisely/api/api.py,sha256=iq5wS7j95dfktZwubT2J9rBBMl-GHy75PkOQtZcwl24,37099
 supervisely/api/app_api.py,sha256=zX3Iy16RuGwtcLZfMs3YfUFc93S9AVGb3W_eINeMjOs,66729
 supervisely/api/dataset_api.py,sha256=7iwAyz3pmzFG2i072gLdXjczfBGbyj-V_rRl7Tx-V30,37944
 supervisely/api/file_api.py,sha256=y8FkE-vx1382cbhNo_rTZs7SobrkxmYQAe79CpvStO4,54279
@@ -997,9 +997,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.218.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.218.dist-info/METADATA,sha256=EnGwT_zAqgvOytZQYfG8Cc6sTL3MniXkWeNgG-TXZP4,33090
-supervisely-6.73.218.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.218.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.218.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.218.dist-info/RECORD,,
+supervisely-6.73.219.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.219.dist-info/METADATA,sha256=-yzVg7FtlrUZjhE7a0hRmL6ZofE6G3rLY6pB1KVoJ5Q,33090
+supervisely-6.73.219.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.219.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.219.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.219.dist-info/RECORD,,