chore: Cleanup

python/lib/sift_py/ingestion/config/telemetry.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from loguru import logger
 from pathlib import Path
 from typing import Any, Dict, List, Optional, cast
 
+from loguru import logger
 from typing_extensions import Self
 
 from sift_py.ingestion.channel import (
@@ -84,13 +84,6 @@ def validate_rules(rules: List[RuleConfig]):
                 )
             seen_rule_names.add(rule.name)
 
-    #            if rule.asset_names:
-    #                logger.warning(
-    #                    f"Rule '{rule.name}' has an 'asset_names' field, which is not allowed when defining rules in a telemetry config."
-    #                    "Please remove the 'asset_names' field from the rule, or create the rule outside of telemetry config."
-    #                    "Proceeding, but the asset_names field will be ignored."
-    #                )
-
     @staticmethod
     def validate_flows(flows: List[FlowConfig]):
         """

python/lib/sift_py/ingestion/config/telemetry_test.py

@@ -1,9 +1,9 @@
-from loguru import logger
 from pathlib import Path
 from typing import Any, Dict, cast
 
 import pytest
 import yaml
+from loguru import logger
 from pytest_mock import MockerFixture, MockFixture
 
 import sift_py.ingestion.config.telemetry
@@ -26,6 +26,7 @@
 
 _mock_path = _mock_path_imp(sift_py.ingestion.config.telemetry)
 
+
 @pytest.fixture
 def caplog(caplog):
     """Needed to capture loguru logs per: https://github.com/Delgan/loguru/pull/572"""
@@ -323,7 +324,10 @@ def test_telemetry_config_validations_not_allowed_fields(mocker: MockerFixture,
     mock_read_and_validate.return_value = yaml_config
 
     TelemetryConfig.try_from_yaml(Path())
-    assert "Please remove the 'asset_names' or 'tag_names' field from the rule, or create the rule outside of telemetry config." in caplog.text
+    assert (
+        "Please remove the 'asset_names' or 'tag_names' field from the rule, or create the rule outside of telemetry config."
+        in caplog.text
+    )
 
 
 TEST_YAML_CONFIG_STR = """

python/lib/sift_py/ingestion/config/yaml/test_load.py

@@ -231,7 +231,6 @@ def test__validate_rule():
         }
     )
 
-
     with pytest.raises(YamlConfigError, match="Expected 'name' to be <str> but it is <int>"):
         load._validate_rule(
             {
@@ -349,41 +348,40 @@ def test__validate_rule():
         )
 
     with pytest.raises(YamlConfigError, match="Expected 'asset_names' to be"):
-       load._validate_rule(
-           {
-               "name": "overheat_rule",
-               "description": "some_description",
-               "expression": "$1 > 10 && $2 > 10",
-               "type": "review",
-               "assignee": "[email protected]",
-               "tags": ["foo", "bar"],
-               "channel_references": [
-                   {"$1": {"name": "voltage", "data_type": "double"}},
-                   {"$2": {"name": "vehicle_state", "data_type": "double"}},
-               ],
-               "rule_client_key": "overheat_rule_key",
-               "asset_names": 123,
-           }
-       )
+        load._validate_rule(
+            {
+                "name": "overheat_rule",
+                "description": "some_description",
+                "expression": "$1 > 10 && $2 > 10",
+                "type": "review",
+                "assignee": "[email protected]",
+                "tags": ["foo", "bar"],
+                "channel_references": [
+                    {"$1": {"name": "voltage", "data_type": "double"}},
+                    {"$2": {"name": "vehicle_state", "data_type": "double"}},
+                ],
+                "rule_client_key": "overheat_rule_key",
+                "asset_names": 123,
+            }
+        )
 
     with pytest.raises(YamlConfigError, match="Expected 'tag_names' to be"):
-       load._validate_rule(
-           {
-               "name": "overheat_rule",
-               "description": "some_description",
-               "expression": "$1 > 10 && $2 > 10",
-               "type": "review",
-               "assignee": "[email protected]",
-               "tags": ["foo", "bar"],
-               "channel_references": [
-                   {"$1": {"name": "voltage", "data_type": "double"}},
-                   {"$2": {"name": "vehicle_state", "data_type": "double"}},
-               ],
-               "rule_client_key": "overheat_rule_key",
-               "tag_names": 123,
-           }
-       )
-
+        load._validate_rule(
+            {
+                "name": "overheat_rule",
+                "description": "some_description",
+                "expression": "$1 > 10 && $2 > 10",
+                "type": "review",
+                "assignee": "[email protected]",
+                "tags": ["foo", "bar"],
+                "channel_references": [
+                    {"$1": {"name": "voltage", "data_type": "double"}},
+                    {"$2": {"name": "vehicle_state", "data_type": "double"}},
+                ],
+                "rule_client_key": "overheat_rule_key",
+                "tag_names": 123,
+            }
+        )
 
     with pytest.raises(YamlConfigError, match="should not have any other properties set"):
         load._validate_rule(

python/lib/sift_py/ingestion/rule/config_test.py

@@ -136,7 +136,6 @@ def test_rule_namespace():
                 "rule_client_key": "another_valid_rule_client_key",
                 "asset_names": ["asset2"],
                 "tag_names": ["tag2"],
-
             },
         ]
     }