minor typo

Author: ahosler

ads/opctl/operator/lowcode/anomaly/__main__.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
 # Copyright (c) 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
@@ -15,7 +14,7 @@
 from ads.opctl.operator.common.const import ENV_OPERATOR_ARGS
 from ads.opctl.operator.common.utils import _parse_input_args
 
-from .model.anomaly_dataset import AnomalyDatasets, AnomalyData
+from .model.anomaly_dataset import AnomalyDatasets
 from .operator_config import AnomalyOperatorConfig
 
 
@@ -34,7 +33,7 @@ def operate(operator_config: AnomalyOperatorConfig) -> None:
                 f"Failed to forecast with error {e.args}. Trying again with model `autots`."
             )
             operator_config.spec.model = "autots"
-            operator_config.spec.model_kwargs = dict()
+            operator_config.spec.model_kwargs = {}
             datasets = AnomalyDatasets(operator_config.spec)
             try:
                 AnomalyOperatorModelFactory.get_model(
@@ -44,12 +43,12 @@ def operate(operator_config: AnomalyOperatorConfig) -> None:
                 logger.debug(
                     f"Failed to backup forecast with error {ee.args}. Raising original error."
                 )
-            raise ee
+                raise ee
         else:
             raise e
 
 
-def verify(spec: Dict, **kwargs: Dict) -> bool:
+def verify(spec: Dict) -> bool:
     """Verifies the anomaly detection operator config."""
     operator = AnomalyOperatorConfig.from_dict(spec)
     msg_header = (
@@ -83,7 +82,7 @@ def main(raw_args: List[str]):
             yaml_string = yaml.safe_dump(json.loads(operator_spec_str))
         except json.JSONDecodeError:
             yaml_string = yaml.safe_dump(yaml.safe_load(operator_spec_str))
-        except:
+        except Exception:
             yaml_string = operator_spec_str
 
     operator_config = AnomalyOperatorConfig.from_yaml(

ads/opctl/operator/lowcode/anomaly/model/factory.py

@@ -1,20 +1,20 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
-# Copyright (c) 2023 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
-from ..const import SupportedModels, NonTimeADSupportedModels
+from ads.opctl.operator.lowcode.anomaly.utils import select_auto_model
+
+from ..const import NonTimeADSupportedModels, SupportedModels
 from ..operator_config import AnomalyOperatorConfig
+from .anomaly_dataset import AnomalyDatasets
 from .automlx import AutoMLXOperatorModel
 from .autots import AutoTSOperatorModel
-from .oneclasssvm import OneClassSVMOperatorModel
-from .isolationforest import IsolationForestOperatorModel
-from ads.opctl.operator.lowcode.anomaly.utils import select_auto_model
 
 # from .tods import TODSOperatorModel
 from .base_model import AnomalyOperatorBaseModel
-from .anomaly_dataset import AnomalyDatasets
+from .isolationforest import IsolationForestOperatorModel
+from .oneclasssvm import OneClassSVMOperatorModel
 
 
 class UnSupportedModelError(Exception):
@@ -83,7 +83,7 @@ def get_model(
         """
         model_type = operator_config.spec.model
         if model_type == "auto":
-            model_type = select_auto_model(datasets, operator_config)
+            model_type = select_auto_model(operator_config)
 
         model_map = (
             cls._MAP if operator_config.spec.datetime_column else cls._NonTime_MAP

ads/opctl/operator/lowcode/anomaly/utils.py

@@ -1,31 +1,32 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*--
 
 # Copyright (c) 2023, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import os
+
 import pandas as pd
-import fsspec
-from .operator_config import AnomalyOperatorSpec
-from .const import SupportedMetrics, SupportedModels
+
 from ads.opctl import logger
 
+from .const import SupportedMetrics, SupportedModels
+from .operator_config import AnomalyOperatorSpec
+
 
 def _build_metrics_df(y_true, y_pred, column_name):
     from sklearn.metrics import (
-        recall_score,
-        precision_score,
         accuracy_score,
-        f1_score,
-        confusion_matrix,
-        roc_auc_score,
-        precision_recall_curve,
         auc,
+        confusion_matrix,
+        f1_score,
         matthews_corrcoef,
+        precision_recall_curve,
+        precision_score,
+        recall_score,
+        roc_auc_score,
     )
 
-    metrics = dict()
+    metrics = {}
     metrics[SupportedMetrics.RECALL] = recall_score(y_true, y_pred)
     metrics[SupportedMetrics.PRECISION] = precision_score(y_true, y_pred)
     metrics[SupportedMetrics.ACCURACY] = accuracy_score(y_true, y_pred)
@@ -78,5 +79,7 @@ def default_signer(**kwargs):
     return default_signer(**kwargs)
 
 
-def select_auto_model(datasets, operator_config):
-    return SupportedModels.AutoTS
+def select_auto_model(operator_config):
+    if operator_config.spec.datetime_column is not None:
+        return SupportedModels.AutoTS
+    return SupportedModels.IsolationForest

docs/source/user_guide/operators/anomaly_detection_operator/quickstart.rst

@@ -41,7 +41,7 @@ Within the ``anomaly`` folder created above there will be a ``anomaly.yaml`` fil
             name: ds
         input_data:
             url: https://raw.githubusercontent.com/facebook/prophet/main/examples/example_yosemite_temps.csv
-        model: automlx
+        model: autots
         target_column: y
 
 There are many more options in this :doc:`YAML file <./yaml_schema>`.