From c829140b07346539134ae1468fff0d93f7607d44 Mon Sep 17 00:00:00 2001 From: Xiangzhuang Shen Date: Sun, 12 Jan 2025 10:56:13 +0800 Subject: [PATCH 1/6] ci(mypy): remove attrs type ignore --- crowdkit/aggregation/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdkit/aggregation/utils.py b/crowdkit/aggregation/utils.py index 358c16a..7c706c0 100644 --- a/crowdkit/aggregation/utils.py +++ b/crowdkit/aggregation/utils.py @@ -191,7 +191,7 @@ def converter(series: "pd.Series[Any]") -> "pd.Series[Any]": series.name = name return series - return attr.ib(init=False, converter=converter, on_setattr=attr.setters.convert) # type: ignore[no-any-return] + return attr.ib(init=False, converter=converter, on_setattr=attr.setters.convert) def add_skills_to_data( From 7d09dc07d7af5f1629610052d6b5bf8e5a67c587 Mon Sep 17 00:00:00 2001 From: Xiangzhuang Shen Date: Mon, 13 Jan 2025 11:11:17 +0800 Subject: [PATCH 2/6] fix: more mypy errors --- crowdkit/aggregation/classification/mace.py | 3 ++- crowdkit/aggregation/image_segmentation/segmentation_rasa.py | 2 +- crowdkit/metrics/data/_classification.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/crowdkit/aggregation/classification/mace.py b/crowdkit/aggregation/classification/mace.py index 0d6c1cb..bf96c35 100644 --- a/crowdkit/aggregation/classification/mace.py +++ b/crowdkit/aggregation/classification/mace.py @@ -8,6 +8,7 @@ import scipy.stats as sps from numpy.typing import NDArray from scipy.special import digamma +from torch import dtype from tqdm.auto import tqdm, trange from ..base import BaseClassificationAggregator @@ -313,7 +314,7 @@ def _initialize(self, n_workers: int, n_labels: int) -> None: self.theta_priors_[:, 0] = self.alpha self.theta_priors_[:, 1] = self.beta - self.strategy_priors_ = np.ones((n_workers, n_labels)) * 10.0 + self.strategy_priors_ = np.multiply(10.0, np.ones((n_workers, n_labels)), dtype=np.float64) def _e_step( self, diff --git a/crowdkit/aggregation/image_segmentation/segmentation_rasa.py b/crowdkit/aggregation/image_segmentation/segmentation_rasa.py index 5ea4b0a..97640a2 100644 --- a/crowdkit/aggregation/image_segmentation/segmentation_rasa.py +++ b/crowdkit/aggregation/image_segmentation/segmentation_rasa.py @@ -105,7 +105,7 @@ def _aggregate_one(self, segmentations: "pd.Series[Any]") -> npt.NDArray[Any]: for _ in range(self.n_iter): weighted = self._segmentation_weighted(segmentations_np, weights) mv = weighted >= 0.5 - weights = self._calculate_weights(segmentations_np, mv) + weights = self._calculate_weights(segmentations_np, mv) # type: ignore[assignment] if last_aggregated is not None: delta = weighted - last_aggregated diff --git a/crowdkit/metrics/data/_classification.py b/crowdkit/metrics/data/_classification.py index 4afece2..457a4fc 100644 --- a/crowdkit/metrics/data/_classification.py +++ b/crowdkit/metrics/data/_classification.py @@ -266,7 +266,7 @@ def alpha_krippendorff( 0.4444444444444444 """ _check_answers(answers) - data: List[Tuple[Any, Hashable, Hashable]] = answers[ + data = answers[ ["worker", "task", "label"] ].values.tolist() return float(AnnotationTask(data, distance).alpha()) From 1bd75a08351abb7bc7b66a3336c9f250ede67b84 Mon Sep 17 00:00:00 2001 From: Xiangzhuang Shen Date: Mon, 13 Jan 2025 11:12:51 +0800 Subject: [PATCH 3/6] remove unused import --- crowdkit/aggregation/classification/mace.py | 1 - 1 file changed, 1 deletion(-) diff --git a/crowdkit/aggregation/classification/mace.py b/crowdkit/aggregation/classification/mace.py index bf96c35..679ef7a 100644 --- a/crowdkit/aggregation/classification/mace.py +++ b/crowdkit/aggregation/classification/mace.py @@ -8,7 +8,6 @@ import scipy.stats as sps from numpy.typing import NDArray from scipy.special import digamma -from torch import dtype from tqdm.auto import tqdm, trange from ..base import BaseClassificationAggregator From 9a91c7fd6f8b4f29cdeb099fcceadfe9c2c2fd56 Mon Sep 17 00:00:00 2001 From: Xiangzhuang Shen Date: Mon, 13 Jan 2025 11:15:15 +0800 Subject: [PATCH 4/6] remove unused import and ignore --- crowdkit/aggregation/image_segmentation/segmentation_rasa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdkit/aggregation/image_segmentation/segmentation_rasa.py b/crowdkit/aggregation/image_segmentation/segmentation_rasa.py index 97640a2..5ea4b0a 100644 --- a/crowdkit/aggregation/image_segmentation/segmentation_rasa.py +++ b/crowdkit/aggregation/image_segmentation/segmentation_rasa.py @@ -105,7 +105,7 @@ def _aggregate_one(self, segmentations: "pd.Series[Any]") -> npt.NDArray[Any]: for _ in range(self.n_iter): weighted = self._segmentation_weighted(segmentations_np, weights) mv = weighted >= 0.5 - weights = self._calculate_weights(segmentations_np, mv) # type: ignore[assignment] + weights = self._calculate_weights(segmentations_np, mv) if last_aggregated is not None: delta = weighted - last_aggregated From 4fe2ddb1b170205ea96a3a13e31a7c43c3a4e87d Mon Sep 17 00:00:00 2001 From: Xiangzhuang Shen Date: Mon, 13 Jan 2025 11:21:52 +0800 Subject: [PATCH 5/6] fix: format error --- crowdkit/aggregation/classification/mace.py | 4 +++- crowdkit/metrics/data/_classification.py | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crowdkit/aggregation/classification/mace.py b/crowdkit/aggregation/classification/mace.py index 679ef7a..193518d 100644 --- a/crowdkit/aggregation/classification/mace.py +++ b/crowdkit/aggregation/classification/mace.py @@ -313,7 +313,9 @@ def _initialize(self, n_workers: int, n_labels: int) -> None: self.theta_priors_[:, 0] = self.alpha self.theta_priors_[:, 1] = self.beta - self.strategy_priors_ = np.multiply(10.0, np.ones((n_workers, n_labels)), dtype=np.float64) + self.strategy_priors_ = np.multiply( + 10.0, np.ones((n_workers, n_labels)), dtype=np.float64 + ) def _e_step( self, diff --git a/crowdkit/metrics/data/_classification.py b/crowdkit/metrics/data/_classification.py index 457a4fc..b66d15d 100644 --- a/crowdkit/metrics/data/_classification.py +++ b/crowdkit/metrics/data/_classification.py @@ -4,7 +4,7 @@ "alpha_krippendorff", ] -from typing import Any, Callable, Hashable, List, Optional, Tuple, Union, cast +from typing import Any, Callable, Hashable, List, Optional, Union, cast import numpy as np import pandas as pd @@ -266,7 +266,5 @@ def alpha_krippendorff( 0.4444444444444444 """ _check_answers(answers) - data = answers[ - ["worker", "task", "label"] - ].values.tolist() + data = answers[["worker", "task", "label"]].values.tolist() return float(AnnotationTask(data, distance).alpha()) From d270fa116f3a9e7d68901b411e08b3ed023528c9 Mon Sep 17 00:00:00 2001 From: Xiangzhuang Shen Date: Mon, 13 Jan 2025 11:36:14 +0800 Subject: [PATCH 6/6] fix: unused error --- crowdkit/aggregation/image_segmentation/segmentation_rasa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdkit/aggregation/image_segmentation/segmentation_rasa.py b/crowdkit/aggregation/image_segmentation/segmentation_rasa.py index 5ea4b0a..8ee83b1 100644 --- a/crowdkit/aggregation/image_segmentation/segmentation_rasa.py +++ b/crowdkit/aggregation/image_segmentation/segmentation_rasa.py @@ -105,7 +105,7 @@ def _aggregate_one(self, segmentations: "pd.Series[Any]") -> npt.NDArray[Any]: for _ in range(self.n_iter): weighted = self._segmentation_weighted(segmentations_np, weights) mv = weighted >= 0.5 - weights = self._calculate_weights(segmentations_np, mv) + weights = self._calculate_weights(segmentations_np, mv) # type: ignore[assignment,unused-ignore] if last_aggregated is not None: delta = weighted - last_aggregated