supervisely 6.73.489__tar.gz → 6.73.499__tar.gz

{supervisely-6.73.489/supervisely.egg-info → supervisely-6.73.499}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supervisely
-Version: 6.73.489
+Version: 6.73.499
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely
@@ -146,6 +146,8 @@ Requires-Dist: imagecorruptions<2.0.0,>=1.1.2; extra == "aug"
 Requires-Dist: numpy<2.0.0,>=1.19; extra == "aug"
 Provides-Extra: agent
 Requires-Dist: protobuf<=3.20.3,>=3.19.5; extra == "agent"
+Provides-Extra: versioning
+Requires-Dist: pyarrow<=22.0.0,>=17.0.0; extra == "versioning"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{supervisely-6.73.489 → supervisely-6.73.499}/setup.py

@@ -313,5 +313,8 @@ setup(
         "agent": [
             "protobuf>=3.19.5, <=3.20.3",
         ],
+        "versioning": [
+            "pyarrow>=17.0.0, <=22.0.0",
+        ],
     },
 )

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/api/app_api.py

@@ -1750,6 +1750,7 @@ class AppApi(TaskApi):
         module_id: Optional[int] = None,
         redirect_requests: Dict[str, int] = {},
         kubernetes_settings: Optional[Union[KubernetesSettings, Dict[str, Any]]] = None,
+        multi_user_session: bool = False,
     ) -> SessionInfo:
         """Start a new application session (task).
 
@@ -1783,13 +1784,20 @@ class AppApi(TaskApi):
         :type redirect_requests: dict
         :param kubernetes_settings: Kubernetes settings for the task. If not specified, default settings will be used.
         :type kubernetes_settings: Optional[Union[KubernetesSettings, Dict[str, Any]]]
+        :param multi_user_session: If True, the application session will be created as multi-user.
+                                   In this case, multiple users will be able to connect to the same application session.
+                                   All users will have separate application states.
+                                   Available only for applications that support multi-user sessions.
+        :type multi_user_session: bool, default is False
         :return: SessionInfo object with information about the started task.
         :rtype: SessionInfo
         :raises ValueError: If both app_id and module_id are not provided.
         :raises ValueError: If both app_id and module_id are provided.
         """
         users_ids = None
-        if users_id is not None:
+        if isinstance(users_id, list) and all(isinstance(u, int) for u in users_id):
+            users_ids = users_id
+        elif isinstance(users_id, int):
             users_ids = [users_id]
 
         new_params = {}
@@ -1818,6 +1826,7 @@ class AppApi(TaskApi):
             module_id=module_id,
             redirect_requests=redirect_requests,
             kubernetes_settings=kubernetes_settings,
+            multi_user_session=multi_user_session,
         )
         if type(result) is not list:
             result = [result]

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/api/module_api.py

@@ -716,6 +716,8 @@ class ApiField:
     M_GUIDE_ID = (["meta", "guide"], "guide_id")
     """"""
     GUIDE_ID = "guideId"
+    """"""
+    SINGLE_SESSION_MODE = "singleSessionMode"
 
 
 def _get_single_item(items):

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/api/project_api.py

@@ -692,6 +692,7 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
         type: ProjectType = ProjectType.IMAGES,
         description: Optional[str] = "",
         change_name_if_conflict: Optional[bool] = False,
+        readme: Optional[str] = None,
     ) -> ProjectInfo:
         """
         Create Project with given name in the given Workspace ID.
@@ -706,6 +707,8 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
         :type description: str
         :param change_name_if_conflict: Checks if given name already exists and adds suffix to the end of the name.
         :type change_name_if_conflict: bool, optional
+        :param readme: Project readme.
+        :type readme: str, optional
         :return: Information about Project. See :class:`info_sequence<info_sequence>`
         :rtype: :class:`ProjectInfo`
         :Usage example:
@@ -746,15 +749,15 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
             name=name,
             change_name_if_conflict=change_name_if_conflict,
         )
-        response = self._api.post(
-            "projects.add",
-            {
-                ApiField.WORKSPACE_ID: workspace_id,
-                ApiField.NAME: effective_name,
-                ApiField.DESCRIPTION: description,
-                ApiField.TYPE: str(type),
-            },
-        )
+        payload = {
+            ApiField.NAME: effective_name,
+            ApiField.WORKSPACE_ID: workspace_id,
+            ApiField.DESCRIPTION: description,
+            ApiField.TYPE: str(type),
+        }
+        if readme is not None:
+            payload[ApiField.README] = readme
+        response = self._api.post("projects.add", payload)
         return self._convert_json_info(response.json())
 
     def _get_update_method(self):

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/api/storage_api.py

@@ -228,7 +228,9 @@ class StorageApi(FileApi):
         path_infos = self.list(team_id, parent_dir, recursive=False, return_type="dict")
         for info in path_infos:
             if info["type"] == path_type:
-                if info["path"].rstrip("/") == remote_path.rstrip("/"):
+                if path_type == "file" and info["path"] == remote_path:
+                    return True
+                elif path_type == "folder" and info["path"].rstrip("/") == remote_path.rstrip("/"):
                     return True
         return False
 

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/api/task_api.py

@@ -390,6 +390,7 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
         redirect_requests: Optional[Dict[str, int]] = {},
         limit_by_workspace: bool = False,
         kubernetes_settings: Optional[Union[KubernetesSettings, Dict[str, Any]]] = None,
+        multi_user_session: bool = False,
     ) -> Dict[str, Any]:
         """Starts the application task on the agent.
 
@@ -428,6 +429,11 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
         :type limit_by_workspace: bool, optional
         :param kubernetes_settings: Kubernetes settings for the application.
         :type kubernetes_settings: Union[KubernetesSettings, Dict[str, Any]], optional
+        :param multi_user_session: If True, the application session will be created as multi-user.
+                                   In this case, multiple users will be able to connect to the same application session.
+                                   All users will have separate application states.
+                                   Available only for applications that support multi-user sessions.
+        :type multi_user_session: bool, default is False
         :return: Task information in JSON format.
         :rtype: Dict[str, Any]
 
@@ -497,6 +503,11 @@ class TaskApi(ModuleApiBase, ModuleWithStatus):
             data[ApiField.APP_ID] = app_id
         if module_id is not None:
             data[ApiField.MODULE_ID] = module_id
+        if multi_user_session:
+            # * Enables single multi-user session mode for all users in the users_ids list.
+            # * Otherwise, if users_ids contains multiple IDs, separate single-user sessions will be created for each.
+            # * If users_ids is empty, a session is created only for the current user.
+            data[ApiField.SINGLE_SESSION_MODE] = multi_user_session
         resp = self._api.post(method="tasks.run.app", data=data)
         task = resp.json()[0]
         if "id" not in task:

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/app/content.py

@@ -18,6 +18,7 @@ from fastapi import Request
 
 from supervisely._utils import is_production
 from supervisely.api.api import Api
+import supervisely.app.fastapi.multi_user as multi_user
 from supervisely.app.fastapi import run_sync
 from supervisely.app.fastapi.websocket import WebsocketManager
 from supervisely.app.singleton import Singleton
@@ -112,8 +113,15 @@ class _PatchableJson(dict):
 
     async def synchronize_changes(self, user_id: Optional[Union[int, str]] = None):
         patch = self._get_patch()
-        await self._apply_patch(patch)
-        await self._ws.broadcast(self.get_changes(patch), user_id=user_id)
+        if user_id is not None:
+            async with multi_user.async_session_context(user_id):
+                await self._apply_patch(patch)
+                await self._ws.broadcast(
+                    self.get_changes(patch), user_id=user_id
+                )
+        else:
+            await self._apply_patch(patch)
+            await self._ws.broadcast(self.get_changes(patch), user_id=user_id)
 
     async def send_changes_async(self):
         user_id = None

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/app/development/development.py

@@ -156,7 +156,10 @@ def supervisely_vpn_network(
 
 
 def create_debug_task(
-    team_id: int = None, port: int = 8000, update_status: bool = True
+    team_id: int = None,
+    port: int = 8000,
+    update_status: bool = True,
+    project_id: Optional[int] = None,
 ) -> Dict[str, Any]:
     """Gets or creates a debug task for the current user.
 
@@ -167,6 +170,8 @@ def create_debug_task(
     :type port: int
     :param update_status: If True, the task status will be updated to STARTED.
     :type update_status: bool
+    :param project_id: Project ID to filter existing debug tasks. Creates a new task if no match is found. Default is None.
+    :type project_id: Optional[int]
     :return: The task details.
     :rtype: Dict[str, Any]
     """
@@ -189,6 +194,10 @@ def create_debug_task(
         if (session.details["meta"].get("redirectRequests") == redirect_requests) and (
             session.details["status"] in [str(api.app.Status.QUEUED), str(api.app.Status.STARTED)]
         ):
+            if project_id is not None:
+                state = session.details["meta"].get("params", {}).get("state", {})
+                if state.get("slyProjectId") != project_id:
+                    continue  # project_id not set in state, skip this session
             task = session.details
             if "id" not in task:
                 task["id"] = task["taskId"]
@@ -196,6 +205,7 @@ def create_debug_task(
             break
     workspaces = api.workspace.get_list(team_id)
     if task is None:
+        params = {"state": {"slyProjectId": project_id}} if project_id is not None else None
         task = api.task.start(
             agent_id=None,
             module_id=module_id,
@@ -203,6 +213,7 @@ def create_debug_task(
             task_name=session_name,
             redirect_requests=redirect_requests,
             proxy_keep_url=False,  # to ignore /net/<token>/endpoint
+            params=params,
         )
         if type(task) is list:
             task = task[0]
@@ -222,6 +233,7 @@ def enable_advanced_debug(
     vpn_action: Literal["up", "down"] = "up",
     vpn_raise_on_error: bool = True,
     only_for_development: bool = True,
+    project_id: Optional[int] = None,
 ) -> Optional[int]:
     """Enables advanced debugging for the app.
     At first, it establishes a WireGuard VPN connection to the Supervisely network.
@@ -244,6 +256,8 @@ def enable_advanced_debug(
     :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
+    :param project_id: Project ID to filter existing debug tasks. Creates a new task if no match is found. Default is None.
+    :type project_id: Optional[int]
     :return: The task ID of the debug task or None if the debugging was not started.
     :rtype: Optional[int]
 
@@ -285,7 +299,9 @@ def enable_advanced_debug(
     )
 
     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 = create_debug_task(
+        team_id=team_id, port=port, update_status=update_status, project_id=project_id
+    )
     task_id = task.get("id", None)
 
     logger.debug(

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/app/fastapi/multi_user.py

@@ -1,5 +1,5 @@
 import hashlib
-from contextlib import contextmanager
+from contextlib import contextmanager, asynccontextmanager
 from typing import Optional, Union
 
 from fastapi import Request
@@ -60,20 +60,37 @@ async def extract_user_id_from_request(request: Request) -> Optional[Union[int,
     return user_id
 
 
+def _session_context_impl(user_id: Optional[Union[int, str]]):
+    """Internal implementation for session context."""
+    if not sly_env.is_multiuser_mode_enabled() or user_id is None:
+        return None
+    return sly_env.set_user_for_multiuser_app(user_id)
+
 @contextmanager
 def session_context(user_id: Optional[Union[int, str]]):
     """
     Context manager to set and reset user context for multiuser applications.
     Call this at the beginning of a request handling to ensure the correct user context is set in environment variables (`supervisely_multiuser_app_user_id` ContextVar).
     """
-    if not sly_env.is_multiuser_mode_enabled() or user_id is None:
+    token = _session_context_impl(user_id)
+    try:
         yield
-        return
-    token = sly_env.set_user_for_multiuser_app(user_id)
+    finally:
+        if token is not None:
+            sly_env.reset_user_for_multiuser_app(token)
+
+@asynccontextmanager
+async def async_session_context(user_id: Optional[Union[int, str]]):
+    """
+    Asynchronous context manager to set and reset user context for multiuser applications.
+    Call this at the beginning of an async request handling to ensure the correct user context is set in environment variables (`supervisely_multiuser_app_user_id` ContextVar).
+    """
+    token = _session_context_impl(user_id)
     try:
         yield
     finally:
-        sly_env.reset_user_for_multiuser_app(token)
+        if token is not None:
+            sly_env.reset_user_for_multiuser_app(token)
 
 
 def remember_cookie(request: Request, user_id: Optional[Union[int, str]]):

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/app/widgets/heatmap/heatmap.py

@@ -10,7 +10,7 @@ from supervisely.annotation.annotation import Annotation
 from supervisely.app.content import DataJson, StateJson
 from supervisely.app.widgets import Widget
 from supervisely.app.widgets_context import JinjaWidgets
-from supervisely.imaging.image import np_image_to_data_url_backup_rgb, read
+from supervisely.imaging.image import np_image_to_data_url, read
 
 
 def mask_to_heatmap(
@@ -35,11 +35,9 @@ def mask_to_heatmap(
     heatmap_bgra = cv2.cvtColor(heatmap_bgr, cv2.COLOR_BGR2BGRA)
 
     if transparent_low:
-        alpha = np.where(mask_norm == 0, 0, 255).astype(np.uint8)
+        alpha = np.where(mask_norm == mask_norm.min(), 0, 255).astype(np.uint8)
         heatmap_bgra[..., 3] = alpha
-    heatmap_rgba = heatmap_bgra[..., [2, 1, 0, 3]]
-
-    return heatmap_rgba
+    return heatmap_bgra
 
 
 def colormap_to_hex_list(colormap=cv2.COLORMAP_JET, n=5):
@@ -207,7 +205,9 @@ class Heatmap(Widget):
         """
         try:
             if isinstance(background_image, np.ndarray):
-                self._background_url = np_image_to_data_url_backup_rgb(background_image)
+                # rgb or rgba to bgr or bgra
+                background_image = background_image[..., ::-1]
+                self._background_url = np_image_to_data_url(background_image)
             elif isinstance(background_image, str):
                 parsed = urlparse(background_image)
                 bg_image_path = Path(background_image)
@@ -217,7 +217,8 @@ class Heatmap(Widget):
                     self._background_url = background_image
                 elif bg_image_path.exists() and bg_image_path.is_file():
                     np_image = read(bg_image_path, remove_alpha_channel=False)
-                    self._background_url = np_image_to_data_url_backup_rgb(np_image)
+                    np_image = np_image[..., ::-1]  # rgb or rgba to bgr or bgra
+                    self._background_url = np_image_to_data_url(np_image)
                 else:
                     raise ValueError(f"Unable to find image at {background_image}")
             else:
@@ -266,7 +267,7 @@ class Heatmap(Widget):
                 vmax=self._vmax,
                 transparent_low=self._transparent_low,
             )
-            self._heatmap_url = np_image_to_data_url_backup_rgb(heatmap)
+            self._heatmap_url = np_image_to_data_url(heatmap)
             self._min_value = to_json_safe(mask.min())
             self._max_value = to_json_safe(mask.max())
 

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/app/widgets/heatmap/script.js

@@ -111,21 +111,29 @@ Vue.component('heatmap-image', {
     },
     imageWrapperStyle() {
       const styles = { ...this.widthStyle };
-      
-      // Use max-height instead of height to allow responsive scaling
-      if (this.height) {
+
+      const hasWidth = this.width !== undefined && this.width !== null;
+      const hasHeight = this.height !== undefined && this.height !== null;
+
+      // CASE 1: both width & height → FIXED BOX
+      if (hasWidth && hasHeight) {
+        styles.width = typeof this.width === 'number' ? `${this.width}px` : this.width;
+        styles.height = typeof this.height === 'number' ? `${this.height}px` : this.height;
+        return styles;
+      }
+
+      // CASE 2 & 3: aspect-ratio driven
+      if (hasHeight) {
         styles.maxHeight = typeof this.height === 'number' ? `${this.height}px` : this.height;
       }
-      
-      // Use naturalWidth/Height from loaded image, or fallback to maskWidth/Height
+
       const effectiveWidth = this.naturalWidth || this.maskWidth;
       const effectiveHeight = this.naturalHeight || this.maskHeight;
-      
-      // Always use aspect-ratio if we have dimensions
+
       if (effectiveWidth && effectiveHeight) {
         styles.aspectRatio = `${effectiveWidth} / ${effectiveHeight}`;
       }
-      
+
       return styles;
     },
     indicatorStyle() {

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/app/widgets/heatmap/style.css

@@ -14,9 +14,9 @@
 
 .image-wrapper img {
   width: 100%;
-  height: auto;
+  height: 100%;
   display: block;
-  object-fit: contain;
+  object-fit: fill;
   object-position: center;
   -webkit-user-drag: none;
   user-select: none;

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/convert/image/image_converter.py

@@ -136,10 +136,12 @@ class ImageConverter(BaseConverter):
             item_names = []
             item_paths = []
             item_metas = []
+            valid_batch_items = []
             for item in batch:
                 item.path = self.validate_image(item.path)
                 if item.path is None:
                     continue  # image has failed validation
+                valid_batch_items.append(item)
                 name = f"{get_file_name(item.path)}{get_file_ext(item.path).lower()}"
 
                 item.name = generate_free_name(
@@ -180,7 +182,7 @@ class ImageConverter(BaseConverter):
 
                 anns = []
                 if not (self.upload_as_links and not self.supports_links):
-                    for info, item in zip(img_infos, batch):
+                    for info, item in zip(img_infos, valid_batch_items):
                         if self._force_shape_for_links:
                             item.set_shape((info.height, info.width))
                         anns.append(self.to_supervisely(item, meta, renamed_classes, renamed_tags))

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/convert/image/multispectral/multispectral_converter.py

@@ -132,4 +132,10 @@ class MultiSpectralImageConverter(ImageConverter):
             logger.warning(f"Failed to read image {file_path}.")
             return
 
+        # Handle single-channel images (grayscale)
+        if len(image.shape) == 2:
+            logger.debug(f"Image {file_path} has single channel.")
+            return [image]
+        
+        # Handle multi-channel images
         return [image[:, :, i] for i in range(image.shape[2])]

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/convert/pointcloud/kitti_3d/kitti_3d_converter.py

@@ -1,5 +1,6 @@
 import os
 from pathlib import Path
+from typing import Optional
 
 from supervisely import PointcloudAnnotation, ProjectMeta, is_development, logger
 from supervisely.api.api import Api, ApiField
@@ -28,12 +29,32 @@ class KITTI3DConverter(PointcloudConverter):
     def key_file_ext(self) -> str:
         return ".bin"
 
+    @property
+    def ann_ext(self) -> str:
+        return ".txt"
+
     def validate_format(self) -> bool:
+        def _calib_file_filter_fn(file_path):
+            return get_file_ext(file_path).lower() == self.ann_ext
+
         def _file_filter_fn(file_path):
             return get_file_ext(file_path).lower() == self.key_file_ext
 
         def _dir_filter_fn(path):
-            return all([(Path(path) / name).exists() for name in kitti_3d_helper.FOLDER_NAMES])
+            return all(
+                [_resolve_dir(path, name) is not None for name in kitti_3d_helper.FOLDER_NAMES]
+            )
+
+        def _resolve_dir(base_dir: str, expected_name: str) -> Optional[str]:
+            prefix = expected_name.split("_")[0]
+            exact_path = os.path.join(base_dir, expected_name)
+            if os.path.isdir(exact_path):
+                return exact_path
+            for entry in sorted(os.listdir(base_dir)):
+                candidate = os.path.join(base_dir, entry)
+                if entry.lower().startswith(prefix) and os.path.isdir(candidate):
+                    return candidate
+            return None
 
         input_paths = [d for d in dirs_filter(self._input_data, _dir_filter_fn)]
         if len(input_paths) == 0:
@@ -41,15 +62,22 @@ class KITTI3DConverter(PointcloudConverter):
 
         input_path = input_paths[0]
         velodyne_dir = os.path.join(input_path, "velodyne")
-        image_2_dir = os.path.join(input_path, "image_2")
-        label_2_dir = os.path.join(input_path, "label_2")
+        image_2_dir = _resolve_dir(input_path, "image_2")
+        label_2_dir = _resolve_dir(input_path, "label_2")
         calib_dir = os.path.join(input_path, "calib")
 
         self._items = []
+
         velodyne_files = list_files(velodyne_dir, filter_fn=_file_filter_fn)
         if len(velodyne_files) == 0:
             return False
 
+        calib_files = list_files(calib_dir, filter_fn=_calib_file_filter_fn)
+        if len(calib_files) == 0:
+            raise RuntimeError(
+                f"Calibration directory '{calib_dir}' does not contain any .txt files, which are required for KITTI 3D format."
+            )
+
         kitti_labels = []
         for velodyne_path in velodyne_files:
             file_name = get_file_name(velodyne_path)
@@ -67,6 +95,8 @@ class KITTI3DConverter(PointcloudConverter):
                 continue
 
             label = kitti_3d_helper.read_kitti_label(label_path, calib_path)
+            if label is None:
+                continue
             kitti_labels.append(label)
             self._items.append(self.Item(velodyne_path, label, (image_path, calib_path)))
 

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/convert/pointcloud/kitti_3d/kitti_3d_helper.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from supervisely import ObjClass, ObjClassCollection, ProjectMeta
+from supervisely import ObjClass, ObjClassCollection, ProjectMeta, logger
 from supervisely.geometry.cuboid_3d import Cuboid3d
 from supervisely.geometry.point_3d import Vector3d
 from supervisely.pointcloud_annotation.pointcloud_figure import PointcloudFigure
@@ -10,11 +10,18 @@ FOLDER_NAMES = ["velodyne", "image_2", "label_2", "calib"]
 
 
 def read_kitti_label(label_path, calib_path):
-    import open3d as o3d  # pylint: disable=import-error
+    """
+    Read KITTI label file with calibration.
+    """
 
-    calib = o3d.ml.datasets.KITTI.read_calib(calib_path)
-    label = o3d.ml.datasets.KITTI.read_label(label_path, calib)
-    return label
+    import open3d as o3d  # pylint: disable=import-error
+    try:
+        calib = o3d.ml.datasets.KITTI.read_calib(calib_path)
+        label = o3d.ml.datasets.KITTI.read_label(label_path, calib)
+        return label
+    except Exception as e:
+        logger.warning(f"Failed to read KITTI label or calibration: {e}")
+        return None
 
 
 def convert_labels_to_meta(labels):

{supervisely-6.73.489 → supervisely-6.73.499}/supervisely/geometry/oriented_bbox.py

@@ -98,6 +98,8 @@ class OrientedBBox(Rectangle):
             created_at=created_at,
         )
         self._angle = angle
+        if self._angle is None:
+            self._angle = 0
 
     @property
     def angle(self) -> Union[int, float]:
@@ -501,8 +503,12 @@ class OrientedBBox(Rectangle):
         """Crop the OrientedBBox by another OrientedBBox using the Sutherland-Hodgman algorithm."""
         subject_corners = self._calculate_rotated_corners(self)
         if isinstance(clip, Rectangle):
+            if all([clip.contains_point_location(corner) for corner in subject_corners]):
+                return [self]
             clip_corners = clip.corners
         else:
+            if clip.contains_obb(self):
+                return [self]
             clip_corners = self._calculate_rotated_corners(clip)
 
         def inside(p: PointLocation, edge_start: PointLocation, edge_end: PointLocation) -> bool: