supervisely 6.73.217__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/api/image_api.py

@@ -2629,7 +2629,7 @@ class ImageApi(RemoveableBulkModuleApi):
         """
         return resize_image_url(url, ext, method, width, height, quality)
 
-    def update_meta(self, id: int, meta: Dict) -> Dict:
+    def update_meta(self, id: int, meta: Dict) -> Dict[str, Any]:
         """
         It is possible to add custom JSON data to every image for storing some additional information.
         Updates Image metadata by ID. Metadata is visible in Labeling Tool.
@@ -2669,10 +2669,93 @@ class ImageApi(RemoveableBulkModuleApi):
             #     "Focal Length": "16 mm"
             # }
         """
-        if type(meta) is not dict:
-            raise TypeError("Meta must be dict, not {}".format(type(meta)))
-        response = self._api.post("images.editInfo", {ApiField.ID: id, ApiField.META: meta})
-        return response.json()
+        return self.edit(id=id, meta=meta, return_json=True)
+
+    def edit(
+        self,
+        id: int,
+        name: Optional[str] = None,
+        description: Optional[str] = None,
+        meta: Optional[Dict] = None,
+        return_json: bool = False,
+    ) -> Union[ImageInfo, Dict[str, Any]]:
+        """Updates the information about the image by given ID with provided parameters.
+        At least one parameter must be set, otherwise ValueError will be raised.
+
+        :param id: Image ID in Supervisely.
+        :type id: int
+        :param name: New Image name.
+        :type name: str, optional
+        :param description: New Image description.
+        :type description: str, optional
+        :param meta: New Image metadata.
+        :type meta: dict, optional
+        :return_json: If True, return response in JSON format, otherwise convert it ImageInfo object.
+            This parameter is only added for backward compatibility for update_meta method.
+            It's not recommended to use it in new code.
+        :type return_json: bool, optional
+        :raises: :class:`ValueError` if at least one parameter is not set
+        :raises: :class:`ValueError if meta parameter was set and it is not a dictionary
+        :return: Information about updated image as ImageInfo object or as dict if return_json is True
+        :rtype: :class:`ImageInfo` or :class:`dict`
+
+        :Usage example:
+
+        .. code-block:: python
+
+            import supervisely as sly
+
+            api = sly.Api.from_env()
+
+            image_id = 123456
+            new_image_name = "IMG_3333_new.jpg"
+
+            api.image.edit(id=image_id, name=new_image_name)
+        """
+        if name is None and description is None and meta is None:
+            raise ValueError("At least one parameter must be set")
+
+        if meta is not None and not isinstance(meta, dict):
+            raise ValueError("meta parameter must be a dictionary")
+
+        data = {
+            ApiField.ID: id,
+            ApiField.NAME: name,
+            ApiField.DESCRIPTION: description,
+            ApiField.META: meta,
+        }
+        data = {k: v for k, v in data.items() if v is not None}
+
+        response = self._api.post("images.editInfo", data)
+        if return_json:
+            return response.json()
+        return self._convert_json_info(response.json(), skip_missing=True)
+
+    def rename(self, id: int, name: str) -> ImageInfo:
+        """
+        Renames Image with given ID.
+
+        :param id: Image ID in Supervisely.
+        :type id: int
+        :param name: New Image name.
+        :type name: str
+        :return: Information about updated Image.
+        :rtype: :class:`ImageInfo`
+        :Usage example:
+
+         .. code-block:: python
+
+            import supervisely as sly
+
+            os.environ['SERVER_ADDRESS'] = 'https://app.supervisely.com'
+            os.environ['API_TOKEN'] = 'Your Supervisely API Token'
+            api = sly.Api.from_env()
+
+            image_id = 376729
+            new_image_name = 'new_image_name.jpg'
+            img_info = api.image.rename(image_id, new_image_name)
+        """
+        return self.edit(id=id, name=name)
 
     def add_tag(self, image_id: int, tag_id: int, value: Optional[Union[str, int]] = None) -> None:
         """

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

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

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

@@ -22,13 +22,13 @@ 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
 supervisely/api/github_api.py,sha256=NIexNjEer9H5rf5sw2LEZd7C1WR-tK4t6IZzsgeAAwQ,623
 supervisely/api/image_annotation_tool_api.py,sha256=YcUo78jRDBJYvIjrd-Y6FJAasLta54nnxhyaGyanovA,5237
-supervisely/api/image_api.py,sha256=TALfxJoBf6xYJs_UKuX7nNt6WNADsAHso2r8cffSm3o,135794
+supervisely/api/image_api.py,sha256=wnzoCbD5vV8f8joBQsNCbRjoG0jhyAXHe1ZM8YhbCsc,138727
 supervisely/api/import_storage_api.py,sha256=BDCgmR0Hv6OoiRHLCVPKt3iDxSVlQp1WrnKhAK_Zl84,460
 supervisely/api/issues_api.py,sha256=BqDJXmNoTzwc3xe6_-mA7FDFC5QQ-ahGbXk_HmpkSeQ,17925
 supervisely/api/labeling_job_api.py,sha256=odnzZjp29yM16Gq-FYkv-OA4WFMNJCLFo4qSikW2A7c,56280
@@ -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.217.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.217.dist-info/METADATA,sha256=J-MzogOhMEtif7Ihw4DFhpeMKhRlY18L34Djs1DCE80,33090
-supervisely-6.73.217.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-supervisely-6.73.217.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.217.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.217.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,,

{supervisely-6.73.217.dist-info → supervisely-6.73.219.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any