From b107bed67c114b8acf7d9347acdcff693afe737f Mon Sep 17 00:00:00 2001 From: Sanjana Garg Date: Mon, 22 Apr 2024 18:24:33 -0700 Subject: [PATCH 1/2] added easy mypy fixes --- src/cleanvision/dataset/hf_dataset.py | 2 +- src/cleanvision/dataset/torch_dataset.py | 4 +++- src/cleanvision/issue_managers/image_property.py | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/cleanvision/dataset/hf_dataset.py b/src/cleanvision/dataset/hf_dataset.py index c02ab964..1ae6fc10 100644 --- a/src/cleanvision/dataset/hf_dataset.py +++ b/src/cleanvision/dataset/hf_dataset.py @@ -29,7 +29,7 @@ def __len__(self) -> int: def __getitem__(self, item: Union[int, str]) -> Optional[Image.Image]: try: - image = self._data[item][self._image_key] + image: Image.Image = self._data[item][self._image_key] return image except Exception as e: print(f"Could not load image at index: {item}\n", e) diff --git a/src/cleanvision/dataset/torch_dataset.py b/src/cleanvision/dataset/torch_dataset.py index 8e8b7973..02625fad 100644 --- a/src/cleanvision/dataset/torch_dataset.py +++ b/src/cleanvision/dataset/torch_dataset.py @@ -6,6 +6,7 @@ from cleanvision.dataset.base_dataset import Dataset + if TYPE_CHECKING: # pragma: no cover from torchvision.datasets.vision import VisionDataset @@ -26,7 +27,8 @@ def __len__(self) -> int: return len(self._data) def __getitem__(self, item: Union[int, str]) -> Image.Image: - return self._data[item][self._image_idx] + image: Image.Image = self._data[item][self._image_idx] + return image def get_name(self, index: Union[int, str]) -> str: return f"idx: {index}" diff --git a/src/cleanvision/issue_managers/image_property.py b/src/cleanvision/issue_managers/image_property.py index 1d2e5b2f..1ff670e3 100644 --- a/src/cleanvision/issue_managers/image_property.py +++ b/src/cleanvision/issue_managers/image_property.py @@ -62,7 +62,7 @@ def mark_issue( def calc_avg_brightness(image: Image) -> float: - stat = ImageStat.Stat(image) + stat = ImageStat.Stat(image) # type:ignore try: red, green, blue = stat.mean except ValueError: @@ -197,7 +197,7 @@ def get_scores( def calc_entropy(image: Image) -> float: - entropy = image.entropy() + entropy = image.entropy() # type:ignore assert isinstance( entropy, float ) # PIL does not have type ann stub so need to assert function return @@ -235,7 +235,7 @@ def get_scores( def calc_blurriness(gray_image: Image) -> float: edges = get_edges(gray_image) - blurriness = ImageStat.Stat(edges).var[0] + blurriness = ImageStat.Stat(edges).var[0] # type:ignore return np.sqrt(blurriness) # type:ignore @@ -289,7 +289,7 @@ def get_scores( def get_edges(gray_image: Image) -> Image: - edges = gray_image.filter(ImageFilter.FIND_EDGES) + edges: Image = gray_image.filter(ImageFilter.FIND_EDGES) # type:ignore return edges From ff444bc75b51a2ee16c870e3da8460e7f4e1a2f1 Mon Sep 17 00:00:00 2001 From: Sanjana Garg Date: Tue, 23 Apr 2024 15:55:51 -0700 Subject: [PATCH 2/2] Running CI on macos-12 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ae6bb2e..41fe053c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: matrix: os: - ubuntu-latest - - macos-latest + - macos-12 - windows-latest python: - "3.7"