From 8ea4cf7663d8eecd8fc6351c45f4f0653e22a61e Mon Sep 17 00:00:00 2001 From: Alex Parsons Date: Mon, 7 Aug 2023 15:25:41 +0000 Subject: [PATCH] Add typing exemptions --- src/data_common/charting/download.py | 4 ++-- src/data_common/charting/sw_theme.py | 2 +- src/data_common/charting/theme.py | 2 +- src/data_common/pandas/df_extensions/space.py | 8 +------- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/data_common/charting/download.py b/src/data_common/charting/download.py index 76e6852..df56f50 100644 --- a/src/data_common/charting/download.py +++ b/src/data_common/charting/download.py @@ -39,12 +39,12 @@ def json_to_chart(json_spec: str) -> alt.Chart: del di_copy["datasets"] del di_copy["width"] c = Chart.from_dict(di_copy) - chart += c + chart += c # type: ignore else: del di["width"] del di["config"]["view"] chart = Chart.from_dict(di) - return chart + return chart # type: ignore def get_chart_from_url(url: str, n: int = 0) -> alt.Chart: diff --git a/src/data_common/charting/sw_theme.py b/src/data_common/charting/sw_theme.py index bc6d292..6ca81ae 100644 --- a/src/data_common/charting/sw_theme.py +++ b/src/data_common/charting/sw_theme.py @@ -118,7 +118,7 @@ def color_scale( use_palette = palette[: len(domain)] if reverse: use_palette = use_palette[::-1] - return alt.Scale(domain=domain, range=use_palette) + return alt.Scale(domain=domain, range=use_palette) # type: ignore font = "Lato" diff --git a/src/data_common/charting/theme.py b/src/data_common/charting/theme.py index 3b2935a..2e1316a 100644 --- a/src/data_common/charting/theme.py +++ b/src/data_common/charting/theme.py @@ -131,7 +131,7 @@ def color_scale( use_palette = palette[: len(domain)] if reverse: use_palette = use_palette[::-1] - return alt.Scale(domain=domain, range=use_palette) + return alt.Scale(domain=domain, range=use_palette) # type: ignore font = "Source Sans Pro" diff --git a/src/data_common/pandas/df_extensions/space.py b/src/data_common/pandas/df_extensions/space.py index 6df9673..d7042dd 100644 --- a/src/data_common/pandas/df_extensions/space.py +++ b/src/data_common/pandas/df_extensions/space.py @@ -125,14 +125,12 @@ def t(x): self.label_df = label_df def set_k(self, k: int) -> "Cluster": - new = copy.deepcopy(self) new.k = k return new def get_label_name(self, n, include_short=True) -> str: - short_label = n name = self.label_names.get(self.k, {}).get(n, short_label) if include_short: @@ -205,7 +203,6 @@ def map_from_anchor(self, anchor: pd.DataFrame | Path) -> dict[int, int]: return mapping.to_dict() def get_label_options(self) -> list: - return [self.get_label_name(x) for x in range(1, self.k + 1)] def get_cluster_label_ids(self) -> pd.Series: @@ -215,7 +212,6 @@ def get_cluster_label_ids(self) -> pd.Series: return labels def get_cluster_labels(self, include_short=True) -> ArrayLike: - labels = self.get_cluster_label_ids() def f(x): @@ -227,7 +223,6 @@ def f(x): label_array = get_cluster_labels def get_cluster_descs(self) -> ArrayLike: - labels = self.get_cluster_label_ids() labels = labels.apply(lambda x: self.get_label_desc(n=x)) return np.array(labels) @@ -331,7 +326,7 @@ def _get_clusters(self, k: int): """ fetch k means results for this cluster """ - km = KMeans(n_clusters=k, random_state=self.default_seed, n_init=10) + km = KMeans(n_clusters=k, random_state=self.default_seed, n_init=10) # type: ignore return km.fit(self.df) def get_clusters(self, k: int): @@ -622,7 +617,6 @@ def join_distance(df_label_dict: Dict[str, pd.DataFrame]) -> pd.DataFrame: """ def prepare(df, label): - return ( df.set_index(list(df.columns[:2])) .rename(columns={"distance": label})