fix: qa fixes

Author: UdaySagar-Git

pyatlan/generator/templates/methods/asset/alpha__d_q_rule.jinja2

@@ -1,5 +1,5 @@
 
- @classmethod
+    @classmethod
     @init_guid
     def custom_sql_creator(
         cls,

pyatlan/model/dq_rule_conditions.py

@@ -93,7 +93,7 @@ def add_condition(
         value: Optional[Union[str, int, List[str]]] = None,
         min_value: Optional[int] = None,
         max_value: Optional[int] = None,
-    ) -> "DQRuleConditionsBuilder":
+    ) -> DQRuleConditionsBuilder:
         """
         Add a condition to the builder.
 

tests/unit/model/alpha__d_q_rule_test.py

@@ -3,6 +3,7 @@
 
 import pytest
 
+from pyatlan.errors import ErrorCode, InvalidRequestError
 from pyatlan.model.assets import Column, Table, alpha_DQRule
 from pyatlan.model.dq_rule_conditions import DQRuleConditionsBuilder
 from pyatlan.model.enums import (
@@ -454,8 +455,6 @@ def test_column_level_rule_creator_with_rule_conditions(mock_client):
 
 
 def test_validate_template_features_rule_conditions_not_supported(mock_client):
-    from pyatlan.errors import InvalidRequestError
-
     config = Mock()
     config.alpha_dq_rule_template_config_rule_conditions = None
     config.alpha_dq_rule_template_advanced_settings = json.dumps({})
@@ -494,8 +493,6 @@ def test_validate_template_features_rule_conditions_not_supported(mock_client):
 
 
 def test_validate_template_features_row_scope_filtering_not_supported(mock_client):
-    from pyatlan.errors import InvalidRequestError
-
     config = Mock()
     config.alpha_dq_rule_template_config_rule_conditions = json.dumps(
         {"enum": ["STRING_LENGTH_BETWEEN"]}
@@ -539,3 +536,76 @@ def test_updater_with_invalid_parameter_raises_value_error(
             client=mock_client,
             qualified_name=qualified_name,
         )
+
+
+def test_validate_template_features_invalid_rule_conditions(mock_client):
+    config = Mock()
+    config.alpha_dq_rule_template_config_rule_conditions = json.dumps(
+        {"enum": ["STRING_LENGTH_BETWEEN"]}
+    )
+    config.alpha_dq_rule_template_advanced_settings = json.dumps({})
+
+    template_config = {
+        "name": "Test Template",
+        "qualified_name": "test/template/123",
+        "config": config,
+    }
+
+    mock_client.dq_template_config_cache.get_template_config.return_value = (
+        template_config
+    )
+
+    unsupported_condition = json.dumps(
+        {"conditions": [{"type": "UNSUPPORTED_CONDITION", "value": "test"}]}
+    )
+
+    with pytest.raises(
+        InvalidRequestError,
+        match="Invalid rule conditions: condition type 'UNSUPPORTED_CONDITION' not supported, allowed: \\['STRING_LENGTH_BETWEEN'\\]",
+    ):
+        alpha_DQRule.Attributes._validate_template_features(
+            rule_type="Test Rule",
+            rule_conditions=unsupported_condition,
+            row_scope_filtering_enabled=False,
+            template_config=template_config,
+            threshold_compare_operator=alpha_DQRuleThresholdCompareOperator.EQUAL,
+        )
+
+
+def test_validate_template_features_row_scope_filter_column_missing(mock_client):
+    config = Mock()
+    config.alpha_dq_rule_template_config_rule_conditions = json.dumps(
+        {"enum": ["STRING_LENGTH_BETWEEN"]}
+    )
+    config.alpha_dq_rule_template_advanced_settings = json.dumps(
+        {"alpha_dqRuleRowScopeFilteringEnabled": True}
+    )
+
+    template_config = {
+        "name": "Test Template",
+        "qualified_name": "test/template/123",
+        "config": config,
+    }
+
+    mock_client.dq_template_config_cache.get_template_config.return_value = (
+        template_config
+    )
+
+    table_asset = Table.ref_by_qualified_name(
+        qualified_name=ALPHA_DQ_TABLE_QUALIFIED_NAME
+    )
+
+    with pytest.raises(
+        InvalidRequestError,
+        match=ErrorCode.DQ_ROW_SCOPE_FILTER_COLUMN_MISSING.error_message.format(
+            ALPHA_DQ_TABLE_QUALIFIED_NAME
+        ),
+    ):
+        alpha_DQRule.Attributes._validate_template_features(
+            rule_type="Test Rule",
+            rule_conditions=None,
+            row_scope_filtering_enabled=True,
+            template_config=template_config,
+            threshold_compare_operator=alpha_DQRuleThresholdCompareOperator.EQUAL,
+            asset=table_asset,
+        )

tests/unit/test_client.py

@@ -71,6 +71,8 @@
     TEST_USER_CLIENT_METHODS,
 )
 from tests.unit.model.constants import (
+    ALPHA_DQ_COLUMN_QUALIFIED_NAME,
+    ALPHA_DQ_TABLE_QUALIFIED_NAME,
     CONNECTION_NAME,
     CONNECTOR_TYPE,
     DATA_DOMAIN_NAME,
@@ -2770,12 +2772,6 @@ def test_add_dq_rule_schedule(mock_api_caller):
 
 
 def test_set_dq_row_scope_filter_column(mock_api_caller):
-    from pyatlan.model.response import AssetMutationResponse
-    from tests.unit.model.constants import (
-        ALPHA_DQ_COLUMN_QUALIFIED_NAME,
-        ALPHA_DQ_TABLE_QUALIFIED_NAME,
-    )
-
     asset_client = AssetClient(mock_api_caller)
     mock_response = Mock(spec=AssetMutationResponse)