Merge pull request #645 from atlanhq/APP-6975

APP-6975 : Change the applicable_asset_types validator to use import approach

Author: Aryamanz29

pyatlan/errors.py

@@ -484,8 +484,8 @@ class ErrorCode(Enum):
     INVALID_PARAMETER_VALUE = (
         400,
         "ATLAN-PYTHON-400-051",
-        "{0} is an invalid value for {1} should be in {2}.",
-        "Check that value you are using is valid.",
+        "Invalid value(s) {0} provided for '{1}'. Expected one or more of the supported {2}.",
+        "Verify that each value corresponds to a valid SDK asset type.",
         InvalidRequestError,
     )
     ASSET_CAN_NOT_BE_ARCHIVED = (

pyatlan/model/typedef.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+import importlib
 import json
 import time
-from typing import Any, Callable, ClassVar, Dict, List, Optional, Set, cast
+from typing import Any, Callable, ClassVar, Dict, List, Optional, Set, Union, cast
 
 from pydantic.v1 import Field, PrivateAttr
 
@@ -651,7 +652,7 @@ def applicable_entity_types(self, entity_types: EntityTypes):
         self.options.applicable_entity_types = json.dumps(list(entity_types))
 
     @property
-    def applicable_asset_types(self) -> AssetTypes:
+    def applicable_asset_types(self) -> Union[Set[str], AssetTypes]:
         """
         Asset type names to which to restrict the attribute.
         Only assets of one of these types will have this attribute available.
@@ -662,16 +663,26 @@ def applicable_asset_types(self) -> AssetTypes:
         return set()
 
     @applicable_asset_types.setter
-    def applicable_asset_types(self, asset_types: AssetTypes):
+    def applicable_asset_types(self, asset_types: Union[Set[str], AssetTypes]):
         if self.options is None:
             raise ErrorCode.MISSING_OPTIONS.exception_with_parameters()
+
         if not isinstance(asset_types, set):
             raise ErrorCode.INVALID_PARAMETER_TYPE.exception_with_parameters(
                 "applicable_asset_types", AssetTypes
             )
-        if not asset_types.issubset(_complete_type_list):
+
+        # Validate asset type names against SDK asset classes
+        invalid_types = {
+            asset_type
+            for asset_type in asset_types
+            if not getattr(
+                importlib.import_module("pyatlan.model.assets"), asset_type, None
+            )
+        }
+        if invalid_types:
             raise ErrorCode.INVALID_PARAMETER_VALUE.exception_with_parameters(
-                asset_types, "applicable_asset_types", _complete_type_list
+                invalid_types, "applicable_asset_types", "SDK asset types"
             )
         self.options.applicable_asset_types = json.dumps(list(asset_types))
 
@@ -826,7 +837,7 @@ def create(
         multi_valued: bool = False,
         options_name: Optional[str] = None,
         applicable_connections: Optional[Set[str]] = None,
-        applicable_asset_types: Optional[AssetTypes] = None,
+        applicable_asset_types: Optional[Union[Set[str], AssetTypes]] = None,
         applicable_glossaries: Optional[Set[str]] = None,
         applicable_glossary_types: Optional[GlossaryTypes] = None,
         applicable_other_asset_types: Optional[OtherAssetTypes] = None,

tests/unit/constants.py

@@ -699,7 +699,7 @@
     (
         APPLICABLE_ASSET_TYPES,
         {"Bogus"},
-        "ATLAN-PYTHON-400-051 {'Bogus'} is an invalid value for applicable_asset_types should be in ",
+        "ATLAN-PYTHON-400-051 Invalid value(s) {'Bogus'} provided for 'applicable_asset_types'.",
     ),
     (
         APPLICABLE_GLOSSARY_TYPES,
@@ -709,7 +709,7 @@
     (
         APPLICABLE_GLOSSARY_TYPES,
         {"Bogus"},
-        "ATLAN-PYTHON-400-051 {'Bogus'} is an invalid value for applicable_glossary_types should be in ",
+        "ATLAN-PYTHON-400-051 Invalid value(s) {'Bogus'} provided for 'applicable_glossary_types'.",
     ),
     (
         APPLICABLE_DOMAIN_TYPES,
@@ -719,7 +719,7 @@
     (
         APPLICABLE_DOMAIN_TYPES,
         {"Bogus"},
-        "ATLAN-PYTHON-400-051 {'Bogus'} is an invalid value for applicable_domain_types should be in ",
+        "ATLAN-PYTHON-400-051 Invalid value(s) {'Bogus'} provided for 'applicable_domain_types'.",
     ),
     (
         APPLICABLE_OTHER_ASSET_TYPES,
@@ -729,7 +729,7 @@
     (
         APPLICABLE_OTHER_ASSET_TYPES,
         {"Bogus"},
-        "ATLAN-PYTHON-400-051 {'Bogus'} is an invalid value for applicable_other_asset_types should be in ",
+        "ATLAN-PYTHON-400-051 Invalid value(s) {'Bogus'} provided for 'applicable_other_asset_types'.",
     ),
     (
         APPLICABLE_ENTITY_TYPES,