supervisely 6.73.400__tar.gz → 6.73.402__tar.gz

{supervisely-6.73.400/supervisely.egg-info → supervisely-6.73.402}/PKG-INFO

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

{supervisely-6.73.400 → supervisely-6.73.402}/supervisely/convert/image/sly/sly_image_helper.py

@@ -33,7 +33,7 @@ def get_meta_from_annotation(ann_json: dict, meta: ProjectMeta) -> ProjectMeta:
         ann_json = ann_json.get("annotation", {})
 
     if not all(key in ann_json for key in SLY_IMAGE_ANN_KEYS):
-        logger.warn(
+        logger.warning(
             f"Some keys are missing in the annotation file. "
             "Check the annotation format documentation at: "
             "https://docs.supervisely.com/customization-and-integration/00_ann_format_navi/05_supervisely_format_images"
@@ -44,7 +44,7 @@ def get_meta_from_annotation(ann_json: dict, meta: ProjectMeta) -> ProjectMeta:
     for object in ann_objects:
         obj_tags = object.get(LabelJsonFields.TAGS, None)
         if obj_tags is None:
-            logger.warn(
+            logger.warning(
                 f"Key '{LabelJsonFields.TAGS}' for object tags is missing in the annotation file. Tags will not be added to the meta."
             )
             obj_tags = []
@@ -52,7 +52,7 @@ def get_meta_from_annotation(ann_json: dict, meta: ProjectMeta) -> ProjectMeta:
         meta = create_classes_from_annotation(object, meta)
     img_tags = ann_json.get(AnnotationJsonFields.IMG_TAGS, None)
     if img_tags is None:
-        logger.warn(
+        logger.warning(
             f"Key '{AnnotationJsonFields.IMG_TAGS}' for image tags is missing in the annotation file. Tags will not be added to the meta."
         )
         img_tags = []
@@ -63,14 +63,14 @@ def get_meta_from_annotation(ann_json: dict, meta: ProjectMeta) -> ProjectMeta:
 def create_tags_from_annotation(tags: List[dict], meta: ProjectMeta) -> ProjectMeta:
     for tag in tags:
         if not all(key in tag for key in SLY_TAG_KEYS):
-            logger.warn(
+            logger.warning(
                 f"Tag in annotation file is not in Supervisely format. "
                 "Read more about the Supervisely JSON format of tags in the documentation at: "
                 "https://docs.supervisely.com/customization-and-integration/00_ann_format_navi/03_supervisely_format_tags"
             )
             continue
         tag_name = tag[TagJsonFields.TAG_NAME]
-        tag_value = tag[TagJsonFields.VALUE]
+        tag_value = tag.get(TagJsonFields.VALUE)
         if tag_value is None:
             tag_meta = TagMeta(tag_name, TagValueType.NONE)
         elif isinstance(tag_value, int) or isinstance(tag_value, float):
@@ -87,7 +87,7 @@ def create_tags_from_annotation(tags: List[dict], meta: ProjectMeta) -> ProjectM
 
 def create_classes_from_annotation(object: dict, meta: ProjectMeta) -> ProjectMeta:
     if not all(key in object for key in SLY_OBJECT_KEYS):
-        logger.warn(
+        logger.warning(
             f"Object in annotation file is not in Supervisely format: {object}. "
             "Read more about the Supervisely JSON format of objects in the documentation at: "
             "https://docs.supervisely.com/customization-and-integration/00_ann_format_navi/04_supervisely_format_objects"
@@ -100,7 +100,7 @@ def create_classes_from_annotation(object: dict, meta: ProjectMeta) -> ProjectMe
     try:
         geometry_type = GET_GEOMETRY_FROM_STR(geometry_type_str)
     except KeyError:
-        logger.warn(f"Unknown geometry type {geometry_type_str} for class {class_name}")
+        logger.warning(f"Unknown geometry type {geometry_type_str} for class {class_name}")
         return meta
 
     obj_class = None
@@ -117,7 +117,7 @@ def create_classes_from_annotation(object: dict, meta: ProjectMeta) -> ProjectMe
     existing_class = meta.get_obj_class(class_name)
 
     if obj_class is None:
-        logger.warn(
+        logger.warning(
             f"Failed to create object class for {class_name} with geometry type {geometry_type_str}"
         )
         return meta

{supervisely-6.73.400 → supervisely-6.73.402}/supervisely/convert/video/sly/sly_video_helper.py

@@ -14,17 +14,34 @@ from supervisely import (
     TagValueType,
     logger,
 )
-from supervisely.geometry.graph import KeypointsTemplate
-from supervisely.io.json import load_json_file
 from supervisely.annotation.label import LabelJsonFields
 from supervisely.annotation.tag import TagJsonFields
-from supervisely.video_annotation.constants import FIGURES, INDEX, KEY, IMG_SIZE, OBJECT_KEY, OBJECTS, FRAMES_COUNT, TAGS, FRAMES
+from supervisely.geometry.graph import KeypointsTemplate
+from supervisely.io.json import load_json_file
+from supervisely.video_annotation.constants import (
+    FIGURES,
+    FRAMES,
+    FRAMES_COUNT,
+    IMG_SIZE,
+    INDEX,
+    KEY,
+    OBJECT_KEY,
+    OBJECTS,
+    TAGS,
+)
 
 SLY_ANN_KEYS = [IMG_SIZE, FRAMES_COUNT, FRAMES, OBJECTS, TAGS]
 SLY_VIDEO_OBJECT_KEYS = [LabelJsonFields.OBJ_CLASS_NAME, LabelJsonFields.TAGS, KEY]
-SLY_TAG_KEYS = [TagJsonFields.TAG_NAME, TagJsonFields.VALUE]
+SLY_TAG_KEYS = [
+    TagJsonFields.TAG_NAME,
+    # TagJsonFields.VALUE
+]
 SLY_FRAME_KEYS = [FIGURES, INDEX]
-SLY_FIGURE_KEYS = [KEY, OBJECT_KEY, "geometryType"]  #, LabelJsonFields.GEOMETRY_TYPE] TODO: add geometry type
+SLY_FIGURE_KEYS = [
+    KEY,
+    OBJECT_KEY,
+    "geometryType",
+]  # , LabelJsonFields.GEOMETRY_TYPE] TODO: add geometry type
 
 
 def get_meta_from_annotation(ann_path: str, meta: ProjectMeta) -> ProjectMeta:
@@ -32,7 +49,7 @@ def get_meta_from_annotation(ann_path: str, meta: ProjectMeta) -> ProjectMeta:
     if "annotation" in ann_json:
         ann_json = ann_json["annotation"]
     if not all(key in ann_json for key in SLY_ANN_KEYS):
-        logger.warn(
+        logger.warning(
             f"VideoAnnotation file {ann_path} is not in Supervisely format. "
             "Check the annotation format documentation at: "
             "https://docs.supervisely.com/customization-and-integration/00_ann_format_navi/06_supervisely_format_videos"
@@ -42,7 +59,7 @@ def get_meta_from_annotation(ann_path: str, meta: ProjectMeta) -> ProjectMeta:
     object_key_to_name = {}
     for object in ann_json[OBJECTS]:
         if not all(key in object for key in SLY_VIDEO_OBJECT_KEYS):
-            logger.warn(
+            logger.warning(
                 f"Object in annotation file is not in Supervisely format: {object}. "
                 "Read more about the Supervisely JSON format of objects in the documentation at: "
                 "https://docs.supervisely.com/customization-and-integration/00_ann_format_navi/06_supervisely_format_videos"
@@ -52,7 +69,7 @@ def get_meta_from_annotation(ann_path: str, meta: ProjectMeta) -> ProjectMeta:
         object_key_to_name[object[KEY]] = object[LabelJsonFields.OBJ_CLASS_NAME]
     for frame in ann_json[FRAMES]:
         if not all(key in frame for key in SLY_FRAME_KEYS):
-            logger.warn(
+            logger.warning(
                 f"Frame in annotation file is not in Supervisely format: {frame}."
                 "Read more about the Supervisely JSON format of frames in the documentation at: "
                 "https://docs.supervisely.com/customization-and-integration/00_ann_format_navi/06_supervisely_format_videos"
@@ -86,7 +103,7 @@ def create_classes_from_annotation(
 ) -> ProjectMeta:
     for fig in frame[FIGURES]:
         if not all(key in fig for key in SLY_FIGURE_KEYS):
-            logger.warn(
+            logger.warning(
                 f"Figure in annotation file is not in Supervisely format: {fig}. "
                 "Read more about the Supervisely JSON format of figures in the documentation at: "
                 "https://docs.supervisely.com/customization-and-integration/00_ann_format_navi/06_supervisely_format_videos"
@@ -119,11 +136,13 @@ def create_classes_from_annotation(
                 if "loc" not in node or len(node["loc"]) != 2:
                     continue
                 template.add_point(label=uuid, row=node["loc"][0], col=node["loc"][1])
-            obj_class = ObjClass(name=class_name, geometry_type=GraphNodes, geometry_config=template)
+            obj_class = ObjClass(
+                name=class_name, geometry_type=GraphNodes, geometry_config=template
+            )
 
         existing_class = meta.get_obj_class(class_name)
         if obj_class is None:
-            logger.warn(f"Object class {class_name} is not in Supervisely format.")
+            logger.warning(f"Object class {class_name} is not in Supervisely format.")
             continue
         if existing_class is None:
             meta = meta.add_obj_class(obj_class)
@@ -134,6 +153,7 @@ def create_classes_from_annotation(
                 meta = meta.add_obj_class(obj_class)
     return meta
 
+
 def rename_in_json(ann_json, renamed_classes=None, renamed_tags=None):
     if renamed_classes:
         for obj in ann_json[OBJECTS]:

{supervisely-6.73.400 → supervisely-6.73.402}/supervisely/nn/inference/cache.py

@@ -18,7 +18,7 @@ from fastapi import BackgroundTasks, FastAPI, Form, Request, UploadFile
 import supervisely as sly
 import supervisely.io.env as env
 from supervisely._utils import batched
-from supervisely.io.fs import silent_remove
+from supervisely.io.fs import list_files, silent_remove
 from supervisely.video.video import VideoFrameReader
 
 
@@ -101,6 +101,10 @@ class PersistentImageTTLCache(TTLCache):
             silent_remove(filepath)
         except TypeError:
             pass
+        except:
+            sly.logger.debug(f"File {filepath} was not deleted from cache", exc_info=True)
+        else:
+            sly.logger.debug(f"File {filepath} was deleted from cache")
 
     def __update_timer(self, key):
         try:
@@ -135,6 +139,7 @@ class PersistentImageTTLCache(TTLCache):
                 except TypeError:
                     pass
             sly.logger.debug(f"Deleted keys: {deleted}")
+            sly.logger.trace(f"Existing files: {list_files(str(self._base_dir))}")
 
     def clear(self, rm_base_folder=True) -> None:
         while self.currsize > 0:
@@ -542,6 +547,7 @@ class InferenceImageCache:
                     f"Video #{video_id} downloaded to cache in {download_time:.2f} sec",
                     extra={"video_id": video_id, "download_time": download_time},
                 )
+                silent_remove(temp_video_path)
             except Exception as e:
                 self._load_queue.delete(video_id)
                 raise e
@@ -619,14 +625,9 @@ class InferenceImageCache:
                 self.add_frame_to_cache(frame, video_id, frame_index)
         elif task_type is InferenceImageCache._LoadType.Video:
             video_id = image_ids
-            temp_video_path = Path("/tmp/smart_cache").joinpath(
-                f"_{sly.rand_str(6)}_" + files[0].file.name
-            )
-            with open(temp_video_path, "wb") as f:
-                shutil.copyfileobj(files[0].file, f)
             self._wait_if_in_queue(video_id, sly.logger)
             self._load_queue.set(video_id, video_id)
-            self.add_video_to_cache(video_id, str(temp_video_path))
+            self.add_video_to_cache(video_id, files[0].file)
 
     def run_cache_task_manually(
         self,

{supervisely-6.73.400 → supervisely-6.73.402/supervisely.egg-info}/PKG-INFO

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