supervisely 6.73.220__py3-none-any.whl → 6.73.221__py3-none-any.whl

supervisely/api/file_api.py

@@ -5,14 +5,15 @@ from __future__ import annotations
 
 import mimetypes
 import os
-import re
 import shutil
 import tarfile
 import tempfile
 import urllib
 from pathlib import Path
+from time import time
 from typing import Callable, Dict, List, NamedTuple, Optional, Union
 
+from dotenv import load_dotenv
 import requests
 from requests_toolbelt import MultipartEncoder, MultipartEncoderMonitor
 from tqdm import tqdm
@@ -20,9 +21,8 @@ from typing_extensions import Literal
 
 import supervisely.io.env as env
 import supervisely.io.fs as sly_fs
-from supervisely._utils import batched, is_development, rand_str
+from supervisely._utils import batched, rand_str
 from supervisely.api.module_api import ApiField, ModuleApiBase
-from supervisely.imaging.image import get_hash, write_bytes
 from supervisely.io.fs import (
     ensure_base_path,
     get_file_ext,
@@ -36,7 +36,7 @@ from supervisely.io.fs import (
 from supervisely.io.fs_cache import FileCache
 from supervisely.io.json import load_json_file
 from supervisely.sly_logger import logger
-from supervisely.task.progress import Progress, handle_original_tqdm, tqdm_sly
+from supervisely.task.progress import Progress
 
 
 class FileInfo(NamedTuple):
@@ -958,9 +958,7 @@ class FileApi(ModuleApiBase):
             )
             return
 
-        resp = self._api.post(
-            "file-storage.remove", {ApiField.TEAM_ID: team_id, ApiField.PATH: path}
-        )
+        self._api.post("file-storage.remove", {ApiField.TEAM_ID: team_id, ApiField.PATH: path})
 
     def remove_file(self, team_id: int, path: str) -> None:
         """
@@ -1401,6 +1399,55 @@ class FileApi(ModuleApiBase):
             self.upload_bulk(team_id, local_paths_batch, remote_files_batch, progress_size_cb)
         return res_remote_dir
 
+    def load_dotenv_from_teamfiles(
+        self, remote_path: str = None, team_id: int = None, override: int = False
+    ) -> None:
+        """Loads .env file from Team Files into environment variables.
+        If remote_path or team_id is not specified, it will be taken from environment variables.
+
+        :param remote_path: Path to .env file in Team Files.
+        :type remote_path: str, optional
+        :param team_id: Team ID in Supervisely.
+        :type team_id: int, optional
+        :param override: If True, existing environment variables will be overridden.
+        :type override: bool, optional
+
+        :Usage example:
+
+            .. code-block:: python
+
+            import supervisely as sly
+
+            api = sly.Api.from_env()
+
+            api.file.load_dotenv_from_teamfiles()
+            # All variables from .env file are loaded into environment variables.
+        """
+        # If remote_path or team_id is not specified, it will be taken from environment variables.
+        remote_path = remote_path or env.file(raise_not_found=False)
+        team_id = team_id or env.team_id(raise_not_found=False)
+
+        if not remote_path or not team_id or not remote_path.endswith(".env"):
+            return
+
+        try:
+            file_name = sly_fs.get_file_name(remote_path)
+
+            # Use timestamp to avoid conflicts with existing files.
+            timestamp = int(time())
+            local_save_path = os.path.join(os.getcwd(), f"{file_name}_{timestamp}.env")
+
+            # Download .env file from Team Files.
+            self.download(team_id=team_id, remote_path=remote_path, local_save_path=local_save_path)
+
+            # Load .env file into environment variables and then remove it.
+            load_dotenv(local_save_path, override=override)
+            sly_fs.silent_remove(local_save_path)
+
+            logger.debug(f"Loaded .env file from team files: {remote_path}")
+        except Exception as e:
+            logger.debug(f"Failed to load .env file from team files: {remote_path}. Error: {e}")
+
     def get_json_file_content(self, team_id: int, remote_path: str, download: bool = False) -> dict:
         """
         Get JSON file content.

supervisely/app/development/__init__.py

@@ -1,4 +1,5 @@
 from supervisely.app.development.development import (
     supervisely_vpn_network,
     create_debug_task,
+    enable_advanced_debug,
 )

supervisely/app/development/development.py

@@ -6,6 +6,8 @@ from typing import Any, Dict, Optional
 
 import requests
 
+import supervisely.io.env as sly_env
+from supervisely._utils import is_development
 from supervisely.api.api import Api
 from supervisely.io.fs import mkdir
 from supervisely.sly_logger import logger
@@ -154,11 +156,12 @@ def supervisely_vpn_network(
 
 
 def create_debug_task(
-    team_id: int, port: int = 8000, update_status: bool = True
+    team_id: int = None, port: int = 8000, update_status: bool = True
 ) -> Dict[str, Any]:
     """Gets or creates a debug task for the current user.
 
-    :param team_id: The ID of the team to create the task in.
+    :param team_id: The ID of the team to create the task in, if not provided, the function
+        will try to obtain it from environment variables. Default is None.
     :type team_id: int
     :param port: The port to redirect the requests to. Default is 8000.
     :type port: int
@@ -167,6 +170,14 @@ def create_debug_task(
     :return: The task details.
     :rtype: Dict[str, Any]
     """
+    team_id = team_id or sly_env.team_id()
+    if not team_id:
+        raise ValueError(
+            "Team ID is not provided and cannot be obtained from environment variables."
+            "The debug task cannot be created. Please provide the team ID as an argument "
+            "or set the TEAM_ID environment variable."
+        )
+
     api = Api()
     me = api.user.get_my_info()
     session_name = me.login + "-development"
@@ -200,4 +211,87 @@ def create_debug_task(
     if update_status:
         logger.info(f"Task status will be updated to STARTED for task with ID: {task['id']}")
         api.task.update_status(task["id"], api.task.Status.STARTED)
+
     return task
+
+
+def enable_advanced_debug(
+    team_id: int = None,
+    port: int = 8000,
+    update_status: bool = True,
+    vpn_action: Literal["up", "down"] = "up",
+    vpn_raise_on_error: bool = True,
+    only_for_development: bool = True,
+) -> Optional[int]:
+    """Enables advanced debugging for the app.
+    At first, it establishes a WireGuard VPN connection to the Supervisely network.
+    And then creates a debug task to redirect requests to the local machine.
+
+    Please, ensure that the Team ID was provided, or set as TEAM_ID environment variable.
+    All other parameters can be omitted if using the default instance settings.
+
+    :param team_id: The ID of the team to create the task in, if not provided, the function
+        will try to obtain it from environment variables. Default is None.
+    :type team_id: int
+    :param port: The port to redirect the requests to. Default is 8000.
+    :type port: int
+    :param update_status: If True, the task status will be updated to STARTED.
+    :type update_status: bool
+    :param vpn_action: The action to perform with the VPN connection, either "up" or "down". Default is "up".
+    :type vpn_action: Literal["up", "down"]
+    :param vpn_raise_on_error: If True, an exception will be raised if an error occurs while connecting to VPN.
+    :type vpn_raise_on_error: bool
+    :param only_for_development: If True, the debugging will be started only if the app is running in development mode.
+        It's not recommended to set this parameter to False in production environments.
+    :type only_for_development: bool
+    :return: The task ID of the debug task or None if the debugging was not started.
+    :rtype: Optional[int]
+
+    :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()
+
+            # Ensure that the TEAM_ID environment variable is set.
+            # Or provide the team ID as an argument to the function.
+            os.environ['TEAM_ID'] = 123456
+
+            # The task ID can be used to make requests to the app.
+            task_id = sly.app.development.enable_advanced_debug()
+
+            # An example of how to send a request to the app using the task ID.
+            data = {"project_id": 789, "force": True}
+            api.task.send_request(task_id, "endpoint-name-here", data, skip_response=True)
+    """
+
+    if only_for_development and not is_development():
+        logger.debug(
+            "Advanced debugging was not started because the app is not running in development mode. "
+            "If you need to force the debugging, set the only_for_development argument to False. "
+            "Use this parameter with caution, and do not set to False in production environments."
+        )
+        return None
+
+    logger.debug(
+        "Starting advanced debugging, will create a wireguard VPN connection and create "
+        "or use an existing debug task to redirect requests to the local machine. "
+        "Learn more about this feature in Supervisely Developer Portal: "
+        "https://developer.supervisely.com/app-development/advanced/advanced-debugging"
+    )
+
+    supervisely_vpn_network(action=vpn_action, raise_on_error=vpn_raise_on_error)
+    task = create_debug_task(team_id=team_id, port=port, update_status=update_status)
+    task_id = task.get("id", None)
+
+    logger.debug(
+        f"Advanced debugging has been started. "
+        f"VPN connection has been established and debug task has been create. Task ID: {task_id}. "
+        "The metod will return the task ID, you can use it to make requests to the app."
+    )
+
+    return task_id

supervisely/app/fastapi/subapp.py

@@ -1,4 +1,5 @@
 import os
+import inspect
 import signal
 import sys
 from contextlib import suppress
@@ -1012,11 +1013,15 @@ class Application(metaclass=Singleton):
             self._graceful_stop_event.set()
         return suppress(self.StopException)
 
-    def event(self, event: Event) -> Callable:
+    def event(self, event: Event, use_state: bool = False) -> Callable:
         """Decorator to register posts to specific endpoints.
+        Supports both async and sync functions.
 
         :param event: event to register (e.g. `Event.Brush.LeftMouseReleased`)
         :type event: Event
+        :param use_state: if set to True, data will be extracted from request.state.state,
+            otherwise from request.state.context, defaults to False
+        :type use_state: bool, optional
         :return: decorator
         :rtype: Callable
 
@@ -1037,9 +1042,19 @@ class Application(metaclass=Singleton):
         def inner(func: Callable) -> Callable:
             server = self.get_server()
 
-            @server.post(event.endpoint)
-            def wrapper(request: Request):
-                return func(request.state.api, event.from_json(request.state.context))
+            if inspect.iscoroutinefunction(func):
+
+                @server.post(event.endpoint)
+                async def wrapper(request: Request):
+                    data = request.state.state if use_state else request.state.context
+                    return await func(request.state.api, event.from_json(data))
+
+            else:
+
+                @server.post(event.endpoint)
+                def wrapper(request: Request):
+                    data = request.state.state if use_state else request.state.context
+                    return func(request.state.api, event.from_json(data))
 
             return wrapper
 

supervisely/convert/base_converter.py

@@ -286,15 +286,23 @@ class BaseConverter:
             return found_formats[0]
 
     def _collect_items_if_format_not_detected(self):
+        from supervisely.convert.pointcloud_episodes.pointcloud_episodes_converter import (
+            PointcloudEpisodeConverter,
+        )
+
         only_modality_items = True
         unsupported_exts = set()
         items = []
+        is_episode = isinstance(self, PointcloudEpisodeConverter)
         for root, _, files in os.walk(self._input_data):
             for file in files:
                 full_path = os.path.join(root, file)
                 ext = get_file_ext(full_path)
                 if ext.lower() in self.allowed_exts:  # pylint: disable=no-member
-                    items.append(self.Item(full_path))  # pylint: disable=no-member
+                    if is_episode:
+                        items.append(self.Item(full_path, len(items)))  # pylint: disable=no-member
+                    else:
+                        items.append(self.Item(full_path))  # pylint: disable=no-member
                     continue
                 only_modality_items = False
                 if ext.lower() in self.unsupported_exts:

supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_converter.py

@@ -71,11 +71,17 @@ class SLYPointcloudEpisodesConverter(PointcloudEpisodeConverter):
                     continue
 
                 ext = get_file_ext(full_path)
+                recognized_ext = imghdr.what(full_path)
                 if file in JUNK_FILES:
                     continue
                 elif ext in self.ann_ext:
                     rimg_json_dict[file] = full_path
-                elif imghdr.what(full_path):
+                elif recognized_ext:
+                    if ext.lower() == ".pcd":
+                        logger.warning(
+                            f"File '{file}' has been recognized as '.{recognized_ext}' format. Skipping."
+                        )
+                        continue
                     rimg_dict[file] = full_path
                     if ext not in used_img_ext:
                         used_img_ext.append(ext)

{supervisely-6.73.220.dist-info → supervisely-6.73.221.dist-info}/METADATA

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

{supervisely-6.73.220.dist-info → supervisely-6.73.221.dist-info}/RECORD

@@ -25,7 +25,7 @@ supervisely/api/annotation_api.py,sha256=Eps-Jf10_SQFy7DjghUnyiM6DcVJBsamHDViRAX
 supervisely/api/api.py,sha256=YQ939NaIMDrZSb5ael1W8foKZOIIrB0TC2iTBCvTvWA,37198
 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/file_api.py,sha256=PfZe01eUpUHMIT_SCS7fac6WvUqNqPnEQ0XJmJ8TJlE,56223
 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=wnzoCbD5vV8f8joBQsNCbRjoG0jhyAXHe1ZM8YhbCsc,138727
@@ -83,8 +83,8 @@ supervisely/app/import_template.py,sha256=H2jaVekt9GZvz6FdzfrT8sJTS3VJY8JeXTCJiR
 supervisely/app/jinja2.py,sha256=H3TCoLDCdTfO7Fq3ZDtcBNqfyZBlNr7p8qcKrE88HE8,341
 supervisely/app/singleton.py,sha256=g8FI4vqt76tXF09tsb05N_N4ouTI0LJGZekrgVkulg0,406
 supervisely/app/widgets_context.py,sha256=JkAd4o87eqhkGJbai-Yq6YHULiPsbp1VwGOSBRxTOgY,313
-supervisely/app/development/__init__.py,sha256=Yx368OqG_YUksH9jayAbMKZwjxMaQi3IBfcx2wODtjY,108
-supervisely/app/development/development.py,sha256=p7ikzMTa5Q2uhvH0bZGiJAsRHsOjBmd203js6YNmaNQ,8223
+supervisely/app/development/__init__.py,sha256=f2SpWBcCFPbSEBsJijH25eCAK8NcY2An5NU9vPgCBVo,135
+supervisely/app/development/development.py,sha256=Ij3tn7HmkHr2RRoYxlpK9xkTGnpFjZwy2kArn6ZxVnA,12505
 supervisely/app/development/sly-net.sh,sha256=-EVburj4NtS7Dw4OiwXXolYu9SXvui83F-c2T8jWm-Y,1105
 supervisely/app/fastapi/__init__.py,sha256=kNhkaGuBKn9-GNnPOmikIHqhjL-j66xmZaBbjCmXfAo,460
 supervisely/app/fastapi/custom_static_files.py,sha256=5todaVIvUG9sAt6vu1IujJn8N7zTmFhVUfeCVbuXbvc,3391
@@ -93,7 +93,7 @@ supervisely/app/fastapi/index.html,sha256=4kF8PWYvssCX2iH0jOOq0dCcKxQfndpJbTzUF4
 supervisely/app/fastapi/no_html_main.html,sha256=NhQP7noyORBx72lFh1CQKgBRupkWjiq6Gaw-9Hkvg7c,37
 supervisely/app/fastapi/offline.py,sha256=CwMMkJ1frD6wiZS-SEoNDtQ1UJcJe1Ob6ohE3r4CQL8,7414
 supervisely/app/fastapi/request.py,sha256=NU7rKmxJ1pfkDZ7_yHckRcRAueJRQIqCor11UO2OHr8,766
-supervisely/app/fastapi/subapp.py,sha256=uZNRG-mX8tPdN-adVAWgv4wKr-4D3uqqMJWKikCSQtU,42706
+supervisely/app/fastapi/subapp.py,sha256=kvycQ2NSsitbdWxaSzGPjzNzvplONqi9UbNnfeAWryw,43411
 supervisely/app/fastapi/templating.py,sha256=3JO4WmQKfPMmb8xhSuV5knWCen3gTgfdqWpIx4RSJlg,2330
 supervisely/app/fastapi/utils.py,sha256=GZuTWLcVRGVx8TL3jVEYUOZIT2FawbwIe2kAOBLw9ho,398
 supervisely/app/fastapi/websocket.py,sha256=TlRSPOAhRItTv1HGvdukK1ZvhRjMUxRa-lJlsRR9rJw,1308
@@ -554,7 +554,7 @@ supervisely/collection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 supervisely/collection/key_indexed_collection.py,sha256=x2UVlkprspWhhae9oLUzjTWBoIouiWY9UQSS_MozfH0,37643
 supervisely/collection/str_enum.py,sha256=Zp29yFGvnxC6oJRYNNlXhO2lTSdsriU1wiGHj6ahEJE,1250
 supervisely/convert/__init__.py,sha256=gRTV93OYJPI3FNfy78HO2SfR59qQ3FFKFSy_jw1adJ8,2571
-supervisely/convert/base_converter.py,sha256=F5oCwQZ_w7XlIIQnW-y-2scvA9sC8vCJL2XMP3DtPZg,14343
+supervisely/convert/base_converter.py,sha256=6HAiKPuwHS-aP7id4JCb650k9fjYrMJc_xILcO1BUwI,14717
 supervisely/convert/converter.py,sha256=0F93xZmyprua63C6KxIeh0AbaFab81LiWqlkOVrkaYU,8672
 supervisely/convert/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/image_converter.py,sha256=6GC8-erDTIJnjkcDvaxs8VAItBNsJrMHaZtOcOsphew,9537
@@ -620,7 +620,7 @@ supervisely/convert/pointcloud_episodes/pointcloud_episodes_converter.py,sha256=
 supervisely/convert/pointcloud_episodes/bag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/pointcloud_episodes/bag/bag_converter.py,sha256=jzWKXoFUWu11d5WlPfT1hphCubYpq_lhQZmhh07xZdQ,1659
 supervisely/convert/pointcloud_episodes/sly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_converter.py,sha256=JD733jWyLXSljRNRAij5OTriaPrnPB6aIdQgQcUc_pg,5889
+supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_converter.py,sha256=7ONcZMOUJCNpmc0tmMX6FnNG0lu8Nj9K2SSTQHaSXFM,6188
 supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_helper.py,sha256=h4WvNH6cEHtjxxhCnU7Hs2vkyJMye0qwabqXNYVTywE,3570
 supervisely/convert/video/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/video/video_converter.py,sha256=ZMvZfrzglh5GsSp7fbtQwNsijDqPRrVmPxwAlGVAqOk,10648
@@ -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.220.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.220.dist-info/METADATA,sha256=FBTFB3GBrRDD6WPzIBQXWG1jgBIaxwFoIjaYJuFJUSk,33090
-supervisely-6.73.220.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.220.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.220.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.220.dist-info/RECORD,,
+supervisely-6.73.221.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.221.dist-info/METADATA,sha256=2F4Io8Yd8IAMGT1n7eNXEzMTvqAyH53k420bqxMBh2Q,33090
+supervisely-6.73.221.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.221.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.221.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.221.dist-info/RECORD,,