From 7382d99fc58b5ef448c9a1c0351582ea944ad50c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:52:54 -0400 Subject: [PATCH 1/2] Bump actions/setup-node from 4.0.2 to 4.0.3 (#657) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.2 to 4.0.3. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4.0.2...v4.0.3) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Amrit Krishnan --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b843589cc..3f1e80ece 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -39,7 +39,7 @@ jobs: fi - name: Set up Node.js - uses: actions/setup-node@v4.0.2 + uses: actions/setup-node@v4.0.3 with: node-version: 18 cache: yarn From f391ebf7d6ea0c301b7a1d20ef6354f02498ae91 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 17 Jul 2024 09:06:45 -0400 Subject: [PATCH 2/2] Fix/ignore new ruff errors --- cyclops/data/clean.py | 2 +- cyclops/data/slicer.py | 2 +- cyclops/evaluate/metrics/average_precision.py | 8 ++++++-- cyclops/evaluate/metrics/functional/average_precision.py | 4 ++-- cyclops/report/model_card/base.py | 4 ++-- .../cyclops/evaluate/metrics/experimental/test_metric.py | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cyclops/data/clean.py b/cyclops/data/clean.py index eb0a6df32..edde9a719 100644 --- a/cyclops/data/clean.py +++ b/cyclops/data/clean.py @@ -131,7 +131,7 @@ def normalize_events( data = data.infer_objects() data[event_name_col] = normalize_names(data[event_name_col]) - if event_value_col and data[event_value_col].dtypes == object: + if event_value_col and data[event_value_col].dtypes == object: # noqa: E721 data[event_value_col] = normalize_values(data[event_value_col]) log_df_counts(data, event_name_col, "Normalized values...", columns=True) diff --git a/cyclops/data/slicer.py b/cyclops/data/slicer.py index cc4487405..ad06a0728 100644 --- a/cyclops/data/slicer.py +++ b/cyclops/data/slicer.py @@ -923,7 +923,7 @@ def is_datetime( return False if isinstance(value, (list, np.ndarray)): return all((is_datetime(v) for v in value)) - if isinstance(value, (datetime.datetime, np.datetime64)): + if isinstance(value, (datetime.datetime, np.datetime64)): # noqa: SIM103 return True return False diff --git a/cyclops/evaluate/metrics/average_precision.py b/cyclops/evaluate/metrics/average_precision.py index 025a69e88..5a6024480 100644 --- a/cyclops/evaluate/metrics/average_precision.py +++ b/cyclops/evaluate/metrics/average_precision.py @@ -131,9 +131,13 @@ def __new__( # type: ignore # mypy expects a subclass of AveragePrecision pos_label=pos_label, ) if task == "multiclass": - NotImplementedError("Multiclass average precision is not implemented.") + raise NotImplementedError( + "Multiclass average precision is not implemented." + ) if task == "multilabel": - NotImplementedError("Multilabel average precision is not implemented.") + raise NotImplementedError( + "Multilabel average precision is not implemented." + ) raise ValueError( "Expected argument `task` to be either 'binary', 'multiclass' or " diff --git a/cyclops/evaluate/metrics/functional/average_precision.py b/cyclops/evaluate/metrics/functional/average_precision.py index d6cd9f01f..40ecd52b3 100644 --- a/cyclops/evaluate/metrics/functional/average_precision.py +++ b/cyclops/evaluate/metrics/functional/average_precision.py @@ -159,9 +159,9 @@ def average_precision( if task == "binary": return binary_average_precision(target, preds, thresholds, pos_label) if task == "multiclass": - NotImplementedError("Multiclass average precision is not implemented.") + raise NotImplementedError("Multiclass average precision is not implemented.") if task == "multilabel": - NotImplementedError("Multilabel average precision is not implemented.") + raise NotImplementedError("Multilabel average precision is not implemented.") raise ValueError( "Expected argument `task` to be either 'binary', 'multiclass' or " diff --git a/cyclops/report/model_card/base.py b/cyclops/report/model_card/base.py index 235f37fba..d0f6dc0db 100644 --- a/cyclops/report/model_card/base.py +++ b/cyclops/report/model_card/base.py @@ -118,7 +118,7 @@ def update_field(self, name: str, value: Any) -> None: raise ValueError(f"Field {name} does not exist.") field = self.__fields__[name] - if field.default_factory == list or isinstance(getattr(self, name), list): + if field.default_factory == list or isinstance(getattr(self, name), list): # noqa: E721 # NOTE: pydantic does not trigger validation when appending to a list, # but if `validate_assignment` is set to `True`, then validation will # be triggered when the list is assigned to the field. @@ -173,6 +173,6 @@ def add_field(self, name: str, value: Any) -> None: model_config=BaseModelCardField.Config, default_factory=default_factory, field_info=FieldInfo(unique_items=True) - if default_factory == list + if default_factory == list # noqa: E721 else None, ) diff --git a/tests/cyclops/evaluate/metrics/experimental/test_metric.py b/tests/cyclops/evaluate/metrics/experimental/test_metric.py index ff94db0d2..ceea71694 100644 --- a/tests/cyclops/evaluate/metrics/experimental/test_metric.py +++ b/tests/cyclops/evaluate/metrics/experimental/test_metric.py @@ -53,7 +53,7 @@ def test_add_state_factory(): # default_factory is 'list' metric.add_state_default_factory("b", list) # type: ignore assert ( - metric._default_factories.get("b") == list + metric._default_factories.get("b") == list # noqa: E721 ), "Default factory should be 'list'." # dist_reduce_fn is "sum"