fix: mypy complains about types

Makefile

@@ -1,5 +1,5 @@
 PYTHON := $(shell which python)
-POETRY := $(PYTHON) -m poetry
+POETRY := poetry
 
 all : test
 

plotdigitizer/grid.py

@@ -2,8 +2,10 @@
 __email__ = "[email protected]"
 
 from pathlib import Path
+import typing as T
 import cv2 as cv
 import numpy as np
+import numpy.typing as npt
 
 import tempfile
 
@@ -31,18 +33,21 @@ def heal(orig):
 
 
 def remove_grid(
-    orig, num_iter=3, background_color: int = 255, grid_size: int = 2
+    orig: npt.ArrayLike,
+    num_iter: int = 3,
+    background_color: T.Sequence[int] = (255, 255, 255),
+    grid_size: int = 2,
 ) -> np.ndarray:
-    img = orig.copy()
+    img = np.array(orig, copy=True)
     thres = cv.threshold(img, 0, 255, cv.THRESH_BINARY_INV + cv.THRESH_OTSU)[1]
     # Remove horizontal lines
     horizontal_kernel = cv.getStructuringElement(cv.MORPH_RECT, (40, 1))
     remove_horizontal = cv.morphologyEx(
         thres, cv.MORPH_OPEN, horizontal_kernel, iterations=num_iter
     )
     cnts = cv.findContours(remove_horizontal, cv.RETR_EXTERNAL, cv.CHAIN_APPROX_SIMPLE)
-    cnts = cnts[0] if len(cnts) == 2 else cnts[1]
-    for c in cnts:
+    contours = cnts[0] if len(cnts) == 2 else cnts[1]
+    for c in contours:
         cv.drawContours(img, [c], -1, background_color, grid_size)
 
     # Remove vertical lines
@@ -51,8 +56,8 @@ def remove_grid(
         thres, cv.MORPH_OPEN, vertical_kernel, iterations=num_iter
     )
     cnts = cv.findContours(remove_vertical, cv.RETR_EXTERNAL, cv.CHAIN_APPROX_SIMPLE)
-    cnts = cnts[0] if len(cnts) == 2 else cnts[1]
-    for c in cnts:
+    contours = cnts[0] if len(cnts) == 2 else cnts[1]
+    for c in contours:
         cv.drawContours(img, [c], -1, background_color, grid_size)
     return img
 

plotdigitizer/plotdigitizer.py

@@ -33,7 +33,7 @@
 locations_: T.List[geometry.Point] = []
 points_: T.List[geometry.Point] = []
 
-img_: np.ndarray = np.zeros((1, 1))
+img_: npt.NDArray[np.float64] = np.zeros((1, 1))
 
 
 def cache() -> Path:
@@ -52,7 +52,7 @@ def save_img_in_cache(
     if filename is None:
         filename = Path(f"{data_to_hash(img)}.png")
     outpath = cache() / filename
-    cv.imwrite(str(outpath), img)
+    cv.imwrite(str(outpath), np.array(img))
     logging.debug(f" Saved to {outpath}")
 
 
@@ -66,7 +66,9 @@ def plot_traj(traj, outfile: Path):
 
     for p in locations_:
         csize = img_.shape[0] // 40
-        cv.circle(img_, (p.x, img_.shape[0] - p.y), csize, 128, -1)
+        cv.circle(
+            img_, (int(p.x), int(img_.shape[0] - p.y)), int(csize), (128, 128, 128), -1
+        )
 
     plt.imshow(img_, interpolation="none", cmap="gray")
     plt.axis(False)