supervisely 6.73.307__py3-none-any.whl → 6.73.308__py3-none-any.whl

supervisely/app/fastapi/subapp.py

@@ -54,6 +54,22 @@ from supervisely.sly_logger import logger
 if TYPE_CHECKING:
     from supervisely.app.widgets import Widget
 
+import logging
+
+uvicorn_logger = logging.getLogger("uvicorn.access")
+
+
+class ReadyzFilter(logging.Filter):
+    def filter(self, record):
+        if "/readyz" in record.getMessage() or "/livez" in record.getMessage():
+            record.levelno = logging.DEBUG  # Change log level to DEBUG
+            record.levelname = "DEBUG"
+        return True
+
+
+# Apply the filter
+uvicorn_logger.addFilter(ReadyzFilter())
+
 
 class Event:
     class Brush:

supervisely/nn/benchmark/instance_segmentation/evaluation_params.yaml

@@ -5,3 +5,6 @@ iou_threshold: 0.5
 # Confidence threshold.
 # Set 'auto' to calculate the optimal confidence threshold.
 confidence_threshold: auto
+
+# Maximum number of detections per image.
+max_detections: 100

supervisely/nn/benchmark/object_detection/evaluation_params.yaml

@@ -5,3 +5,6 @@ iou_threshold: 0.5
 # Confidence threshold.
 # Set 'auto' to calculate the optimal confidence threshold.
 confidence_threshold: auto
+
+# Maximum number of detections per image.
+max_detections: 100

supervisely/nn/benchmark/utils/detection/calculate_metrics.py

@@ -3,9 +3,15 @@ from typing import Callable, List, Literal, Optional
 
 import numpy as np
 
+from supervisely.nn.benchmark.utils.detection.coco_eval import (
+    COCO,
+    SlyCOCOeval,
+    pycocotools_installed,
+)
+
 
 def set_cocoeval_params(
-    cocoeval,
+    cocoeval: SlyCOCOeval,
     parameters: dict,
 ):
     """
@@ -28,8 +34,8 @@ def set_cocoeval_params(
 
 
 def calculate_metrics(
-    cocoGt,
-    cocoDt,
+    cocoGt: COCO,
+    cocoDt: COCO,
     iouType: Literal["bbox", "segm"],
     progress_cb: Optional[Callable] = None,
     evaluation_params: Optional[dict] = None,
@@ -48,12 +54,14 @@ def calculate_metrics(
     :return: Results of the evaluation
     :rtype: dict
     """
-    from pycocotools.coco import COCO  # pylint: disable=import-error
-    from pycocotools.cocoeval import COCOeval  # pylint: disable=import-error
+    if not pycocotools_installed:
+        raise ImportError("pycocotools is not installed")
 
-    cocoGt: COCO = cocoGt
+    evaluation_params = evaluation_params or {}
+    max_dets = evaluation_params.get("max_detections", 100)
 
-    cocoEval = COCOeval(cocoGt, cocoDt, iouType=iouType)
+    cocoEval = SlyCOCOeval(cocoGt, cocoDt, iouType=iouType)
+    cocoEval.params.maxDets[-1] = max_dets
     cocoEval.evaluate()
     progress_cb(1) if progress_cb is not None else None
     cocoEval.accumulate()
@@ -61,8 +69,9 @@ def calculate_metrics(
     cocoEval.summarize()
 
     # For classification metrics
-    cocoEval_cls = COCOeval(cocoGt, cocoDt, iouType=iouType)
+    cocoEval_cls = SlyCOCOeval(cocoGt, cocoDt, iouType=iouType)
     cocoEval_cls.params.useCats = 0
+    cocoEval_cls.params.maxDets[-1] = max_dets
     cocoEval_cls.evaluate()
     progress_cb(1) if progress_cb is not None else None
     cocoEval_cls.accumulate()
@@ -70,7 +79,6 @@ def calculate_metrics(
     cocoEval_cls.summarize()
 
     iouThrs = cocoEval.params.iouThrs
-    evaluation_params = evaluation_params or {}
     iou_threshold = evaluation_params.get("iou_threshold", 0.5)
     iou_threshold_per_class = evaluation_params.get("iou_threshold_per_class")
     if iou_threshold_per_class is not None:
@@ -86,7 +94,7 @@ def calculate_metrics(
     if iou_threshold_per_class is not None or iou_threshold != 0.5:
         average_across_iou_thresholds = False
         evaluation_params["average_across_iou_thresholds"] = average_across_iou_thresholds
-    
+
     eval_img_dict = get_eval_img_dict(cocoEval)
     eval_img_dict_cls = get_eval_img_dict(cocoEval_cls)
     matches = get_matches(
@@ -116,7 +124,10 @@ def calculate_metrics(
     return eval_data
 
 
-def get_counts(eval_img_dict: dict, cocoEval_cls):
+def get_counts(eval_img_dict: dict, cocoEval_cls: SlyCOCOeval):
+    if not pycocotools_installed:
+        raise ImportError("pycocotools is not installed")
+
     cat_ids = cocoEval_cls.cocoGt.getCatIds()
     iouThrs = cocoEval_cls.params.iouThrs
     catId2idx = {cat_id: i for i, cat_id in enumerate(cat_ids)}
@@ -143,12 +154,12 @@ def get_counts(eval_img_dict: dict, cocoEval_cls):
     return true_positives.astype(int), false_positives.astype(int), false_negatives.astype(int)
 
 
-def get_counts_and_scores(cocoEval, cat_id: int, t: int):
-    """
-    tps, fps, scores, n_positives
+def get_counts_and_scores(cocoEval: SlyCOCOeval, cat_id: int, t: int):
+    """Returns tps, fps, scores, n_positives"""
+
+    if not pycocotools_installed:
+        raise ImportError("pycocotools is not installed")
 
-    type cocoEval: COCOeval
-    """
     aRng = cocoEval.params.areaRng[0]
     eval_imgs = [ev for ev in cocoEval.evalImgs if ev is not None and ev["aRng"] == aRng]
 
@@ -192,10 +203,10 @@ def get_counts_and_scores(cocoEval, cat_id: int, t: int):
     return tps, fps, scores, n_positives
 
 
-def get_eval_img_dict(cocoEval):
-    """
-    type cocoEval: COCOeval
-    """
+def get_eval_img_dict(cocoEval: SlyCOCOeval):
+    if not pycocotools_installed:
+        raise ImportError("pycocotools is not installed")
+
     aRng = cocoEval.params.areaRng[0]
     eval_img_dict = defaultdict(list)  # img_id : dt/gt
     for i, eval_img in enumerate(cocoEval.evalImgs):
@@ -211,7 +222,10 @@ def get_eval_img_dict(cocoEval):
     return eval_img_dict
 
 
-def _get_missclassified_match(eval_img_cls, dt_id, gtIds_orig, dtIds_orig, iou_t):
+def _get_missclassified_match(eval_img_cls: SlyCOCOeval, dt_id, gtIds_orig, dtIds_orig, iou_t):
+    if not pycocotools_installed:
+        raise ImportError("pycocotools is not installed")
+
     # Correction on miss-classification
     gt_idx = np.nonzero(eval_img_cls["gtMatches"][iou_t] == dt_id)[0]
     if len(gt_idx) == 1:
@@ -231,12 +245,12 @@ def _get_missclassified_match(eval_img_cls, dt_id, gtIds_orig, dtIds_orig, iou_t
 def get_matches(
     eval_img_dict: dict,
     eval_img_dict_cls: dict,
-    cocoEval_cls,
+    cocoEval_cls: SlyCOCOeval,
     iou_idx_per_class: dict = None,
 ):
-    """
-    type cocoEval_cls: COCOeval
-    """
+    if not pycocotools_installed:
+        raise ImportError("pycocotools is not installed")
+
     cat_ids = cocoEval_cls.cocoGt.getCatIds()
     matches = []
     for img_id, eval_imgs in eval_img_dict.items():
@@ -326,11 +340,10 @@ def get_matches(
     return matches
 
 
-def get_rare_classes(cocoGt, topk_ann_fraction=0.1, topk_classes_fraction=0.2):
-    """
-    :param cocoGt: Ground truth dataset in COCO format
-    :type cocoGt: COCO
-    """
+def get_rare_classes(cocoGt: COCO, topk_ann_fraction=0.1, topk_classes_fraction=0.2):
+    if not pycocotools_installed:
+        raise ImportError("pycocotools is not installed")
+
     anns_cat_ids = [ann["category_id"] for ann in cocoGt.anns.values()]
     cat_ids, cat_counts = np.unique(anns_cat_ids, return_counts=True)
     inds_sorted = np.argsort(cat_counts)

supervisely/nn/benchmark/utils/detection/coco_eval.py

@@ -0,0 +1,93 @@
+import numpy as np
+
+pycocotools_installed = False
+try:
+    from pycocotools.coco import COCO  # pylint: disable=import-error
+    from pycocotools.cocoeval import COCOeval  # pylint: disable=import-error
+
+    pycocotools_installed = True
+except ImportError:
+    COCO = object
+    COCOeval = object
+
+
+class SlyCOCOeval(COCOeval):
+    def summarize(self):
+        """
+        Compute and display summary metrics for evaluation results.
+        Note this functin can *only* be applied on the default parameter setting
+        """
+
+        def _summarize(ap=1, iouThr=None, areaRng="all", maxDets=100):
+            p = self.params
+            iStr = " {:<18} {} @[ IoU={:<9} | area={:>6s} | maxDets={:>3d} ] = {:0.3f}"
+            titleStr = "Average Precision" if ap == 1 else "Average Recall"
+            typeStr = "(AP)" if ap == 1 else "(AR)"
+            iouStr = (
+                "{:0.2f}:{:0.2f}".format(p.iouThrs[0], p.iouThrs[-1])
+                if iouThr is None
+                else "{:0.2f}".format(iouThr)
+            )
+
+            aind = [i for i, aRng in enumerate(p.areaRngLbl) if aRng == areaRng]
+            mind = [i for i, mDet in enumerate(p.maxDets) if mDet == maxDets]
+            if ap == 1:
+                # dimension of precision: [TxRxKxAxM]
+                s = self.eval["precision"]
+                # IoU
+                if iouThr is not None:
+                    t = np.where(iouThr == p.iouThrs)[0]
+                    s = s[t]
+                s = s[:, :, :, aind, mind]
+            else:
+                # dimension of recall: [TxKxAxM]
+                s = self.eval["recall"]
+                if iouThr is not None:
+                    t = np.where(iouThr == p.iouThrs)[0]
+                    s = s[t]
+                s = s[:, :, aind, mind]
+            if len(s[s > -1]) == 0:
+                mean_s = -1
+            else:
+                mean_s = np.mean(s[s > -1])
+            print(iStr.format(titleStr, typeStr, iouStr, areaRng, maxDets, mean_s))
+            return mean_s
+
+        def _summarizeDets():
+            stats = np.zeros((12,))
+            stats[0] = _summarize(1, maxDets=self.params.maxDets[2])
+            stats[1] = _summarize(1, iouThr=0.5, maxDets=self.params.maxDets[2])
+            stats[2] = _summarize(1, iouThr=0.75, maxDets=self.params.maxDets[2])
+            stats[3] = _summarize(1, areaRng="small", maxDets=self.params.maxDets[2])
+            stats[4] = _summarize(1, areaRng="medium", maxDets=self.params.maxDets[2])
+            stats[5] = _summarize(1, areaRng="large", maxDets=self.params.maxDets[2])
+            stats[6] = _summarize(0, maxDets=self.params.maxDets[0])
+            stats[7] = _summarize(0, maxDets=self.params.maxDets[1])
+            stats[8] = _summarize(0, maxDets=self.params.maxDets[2])
+            stats[9] = _summarize(0, areaRng="small", maxDets=self.params.maxDets[2])
+            stats[10] = _summarize(0, areaRng="medium", maxDets=self.params.maxDets[2])
+            stats[11] = _summarize(0, areaRng="large", maxDets=self.params.maxDets[2])
+            return stats
+
+        def _summarizeKps():
+            stats = np.zeros((10,))
+            stats[0] = _summarize(1, maxDets=20)
+            stats[1] = _summarize(1, maxDets=20, iouThr=0.5)
+            stats[2] = _summarize(1, maxDets=20, iouThr=0.75)
+            stats[3] = _summarize(1, maxDets=20, areaRng="medium")
+            stats[4] = _summarize(1, maxDets=20, areaRng="large")
+            stats[5] = _summarize(0, maxDets=20)
+            stats[6] = _summarize(0, maxDets=20, iouThr=0.5)
+            stats[7] = _summarize(0, maxDets=20, iouThr=0.75)
+            stats[8] = _summarize(0, maxDets=20, areaRng="medium")
+            stats[9] = _summarize(0, maxDets=20, areaRng="large")
+            return stats
+
+        if not self.eval:
+            raise Exception("Please run accumulate() first")
+        iouType = self.params.iouType
+        if iouType == "segm" or iouType == "bbox":
+            summarize = _summarizeDets
+        elif iouType == "keypoints":
+            summarize = _summarizeKps
+        self.stats = summarize()  # pylint: disable=possibly-used-before-assignment

{supervisely-6.73.307.dist-info → supervisely-6.73.308.dist-info}/METADATA

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

{supervisely-6.73.307.dist-info → supervisely-6.73.308.dist-info}/RECORD

@@ -93,7 +93,7 @@ supervisely/app/fastapi/index.html,sha256=6K8akK7_k9Au-BpZ7cM2qocuiegLdXz8UFPnWg
 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=MlB2dcHEtF0RPk-hxk67Gb1wBeGHsgCEIqAaBHzLEoY,43653
+supervisely/app/fastapi/subapp.py,sha256=AE_AJQ5ZfNKbV38To2uhSnSR7C_XoI99lAc0nDXOtbU,44064
 supervisely/app/fastapi/templating.py,sha256=JOAW8U-14GD47E286mzFi3mZSPbm_csJGqtXWLRM4rc,2929
 supervisely/app/fastapi/utils.py,sha256=GZuTWLcVRGVx8TL3jVEYUOZIT2FawbwIe2kAOBLw9ho,398
 supervisely/app/fastapi/websocket.py,sha256=TlRSPOAhRItTv1HGvdukK1ZvhRjMUxRa-lJlsRR9rJw,1308
@@ -781,14 +781,14 @@ supervisely/nn/benchmark/comparison/semantic_segmentation/vis_metrics/renormaliz
 supervisely/nn/benchmark/comparison/semantic_segmentation/vis_metrics/speedtest.py,sha256=sQDkzfpVNaSYBHVcHYqydRSWN0i-yV9uhtEAggg295A,10879
 supervisely/nn/benchmark/instance_segmentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/benchmark/instance_segmentation/benchmark.py,sha256=lTDzgKGpfeF5o_a2nS56wiAsUQPH1eubk37b9CaB2KI,1171
-supervisely/nn/benchmark/instance_segmentation/evaluation_params.yaml,sha256=NoaecTcEp-LhsDQcHNQZi1gzNXcahgycKy_C4aDcSSw,304
+supervisely/nn/benchmark/instance_segmentation/evaluation_params.yaml,sha256=fEYA-ExmxDiSzRl7YfBMpF6LZui0tcDgZyC-YUvmmqg,367
 supervisely/nn/benchmark/instance_segmentation/evaluator.py,sha256=mpCi8S6YNwlVvgcERQSHBOhC9PrSfQkQ55pPTcK6V9c,2811
 supervisely/nn/benchmark/instance_segmentation/text_templates.py,sha256=usKqm_FaO-WXiopxzrdjpIrOqHdqFQ89lmYoayzt6KM,25597
 supervisely/nn/benchmark/instance_segmentation/visualizer.py,sha256=8NscOKy7JK4AG-Czu3SM0qJQXLDfKD9URdG1d4nz89E,564
 supervisely/nn/benchmark/object_detection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/benchmark/object_detection/base_vis_metric.py,sha256=44Em214YPxZgn2hEzFvqBcnjsyiElD9TSuLamwUnx20,1611
 supervisely/nn/benchmark/object_detection/benchmark.py,sha256=Wb4xlFXilIMVfsifNNQY25uE52NeEDLzQpnq8QPYq9U,1086
-supervisely/nn/benchmark/object_detection/evaluation_params.yaml,sha256=NoaecTcEp-LhsDQcHNQZi1gzNXcahgycKy_C4aDcSSw,304
+supervisely/nn/benchmark/object_detection/evaluation_params.yaml,sha256=fEYA-ExmxDiSzRl7YfBMpF6LZui0tcDgZyC-YUvmmqg,367
 supervisely/nn/benchmark/object_detection/evaluator.py,sha256=s-hPBm5BmoCgwoozVyDacum4kVLNtYK6I6NCt_L_LSA,7278
 supervisely/nn/benchmark/object_detection/metric_provider.py,sha256=59UnOX7VuYvVQFeUJy5v6EFIpqSDNgx5wMp9qyVixgM,23686
 supervisely/nn/benchmark/object_detection/text_templates.py,sha256=4BgTIX1Co4WK9_VSUa1qWCmh5OJzo3_opVU6LOjKSjc,25842
@@ -837,7 +837,8 @@ supervisely/nn/benchmark/semantic_segmentation/vis_metrics/speedtest.py,sha256=0
 supervisely/nn/benchmark/semantic_segmentation/vis_metrics/vis_texts.py,sha256=rRdYZxmhQX4T3RsXJVGp34NMZPz8jUHtVvBN5BpPJ5I,603
 supervisely/nn/benchmark/utils/__init__.py,sha256=r0Ay4OMqfIL-9wwJykKji_Uks2Dm9vUhyA7hT8eLxII,657
 supervisely/nn/benchmark/utils/detection/__init__.py,sha256=6CsMxQqUp1GOc-2Wmnw2lamtvklHo2tcCYTxgT5NsZo,88
-supervisely/nn/benchmark/utils/detection/calculate_metrics.py,sha256=gC6by_2HT9ACuxbtW93eKeioW9sCMMDM3aPi99w1xx8,11963
+supervisely/nn/benchmark/utils/detection/calculate_metrics.py,sha256=plgBNJXRZ2MEY_Es8kVnrzpsZAyZqtvsOFT3uZocBhU,12593
+supervisely/nn/benchmark/utils/detection/coco_eval.py,sha256=9Pz0_zUzg8qCOWyE24wzhRoDLO5z9qPuWoqc8Pj29do,4135
 supervisely/nn/benchmark/utils/detection/metrics.py,sha256=oyictdJ7rRDUkaVvHoxntywW5zZweS8pIJ1bN6JgXtE,2420
 supervisely/nn/benchmark/utils/detection/sly2coco.py,sha256=0O2LSCU5zIX34mD4hZIv8O3-j6LwnB0DqhiVPAiosO8,6883
 supervisely/nn/benchmark/utils/detection/utlis.py,sha256=dKhsOGmQKH20-IlD90DWfZzi171j65N71hNdHRCX5Hs,954
@@ -1074,9 +1075,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.307.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.307.dist-info/METADATA,sha256=cAJxuLzG815JpY_UwjFG3soVNxtAiUo89L7wcISLSDY,33573
-supervisely-6.73.307.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.307.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.307.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.307.dist-info/RECORD,,
+supervisely-6.73.308.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.308.dist-info/METADATA,sha256=ahArJ7ylpv1q99AgrwIkcjoNL8-Dy-E6vWP5v4NCgow,33573
+supervisely-6.73.308.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.308.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.308.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.308.dist-info/RECORD,,