From 057824bafeeb152e8a46aff287a3e5c68b012842 Mon Sep 17 00:00:00 2001 From: Dillon Laird Date: Tue, 14 May 2024 20:02:04 -0700 Subject: [PATCH] fix types --- vision_agent/tools/__init__.py | 2 +- vision_agent/tools/tools_v2.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vision_agent/tools/__init__.py b/vision_agent/tools/__init__.py index 75b9830e..08a96d81 100644 --- a/vision_agent/tools/__init__.py +++ b/vision_agent/tools/__init__.py @@ -3,8 +3,8 @@ CLIP, OCR, TOOLS, - BboxStats, BboxIoU, + BboxStats, BoxDistance, Crop, DINOv, diff --git a/vision_agent/tools/tools_v2.py b/vision_agent/tools/tools_v2.py index d830f486..4d225860 100644 --- a/vision_agent/tools/tools_v2.py +++ b/vision_agent/tools/tools_v2.py @@ -4,7 +4,7 @@ import tempfile from importlib import resources from pathlib import Path -from typing import Any, Callable, Dict, List, Tuple, Union +from typing import Any, Callable, Dict, List, Tuple, Union, cast import numpy as np import pandas as pd @@ -255,7 +255,7 @@ def closest_mask_distance(mask1: np.ndarray, mask2: np.ndarray) -> float: mask1_points = np.transpose(np.nonzero(mask1)) mask2_points = np.transpose(np.nonzero(mask2)) dist_matrix = distance.cdist(mask1_points, mask2_points, "euclidean") - return np.min(dist_matrix) + return cast(float, np.min(dist_matrix)) def closest_box_distance(box1: List[float], box2: List[float]) -> float: @@ -276,10 +276,10 @@ def closest_box_distance(box1: List[float], box2: List[float]) -> float: x11, y11, x12, y12 = box1 x21, y21, x22, y22 = box2 - + horizontal_distance = np.max([0, x21 - x12, x11 - x22]) vertical_distance = np.max([0, y21 - y12, y11 - y22]) - return np.sqrt(horizontal_distance ** 2 + vertical_distance ** 2) + return cast(float, np.sqrt(horizontal_distance**2 + vertical_distance**2)) # Utility and visualization functions