[fix] Move validate.py to pyatlan/ to resolve circular import and fix v9 test failures

Aryamanz29 · Aryamanz29 · commit b3c6546c4a81 · 2026-03-05T19:06:20.000+05:30
- Moved pyatlan/client/common/validate.py → pyatlan/validate.py to break
  circular import chain: search.py → client.common.__init__ → asset → model.assets → atlan_fields
- Updated all 41 import paths from pyatlan.client.common.validate to pyatlan.validate
- Added Mock spec-class support to _is_model_instance for v9 Batch tests
- Changed v9 test_client.py to catch ValueError instead of ValidationError
- All tests pass: 5798 legacy + 1540 v9
diff --git a/pyatlan/client/admin.py b/pyatlan/client/admin.py
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2025 Atlan Pte. Ltd.
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import AdminGetAdminEvents, AdminGetKeycloakEvents, ApiCaller
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/aio/admin.py b/pyatlan/client/aio/admin.py
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2025 Atlan Pte. Ltd.
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AdminGetAdminEvents,
diff --git a/pyatlan/client/aio/asset.py b/pyatlan/client/aio/asset.py
@@ -19,7 +19,7 @@
 
 from pydantic.v1 import StrictStr, constr
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 from tenacity import (
     retry,
     retry_if_exception_type,
diff --git a/pyatlan/client/aio/audit.py b/pyatlan/client/aio/audit.py
@@ -4,7 +4,7 @@
 
 import logging
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import AsyncApiCaller, AuditSearch
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/aio/batch.py b/pyatlan/client/aio/batch.py
@@ -4,7 +4,7 @@
 
 from typing import TYPE_CHECKING, Dict, List, Optional, cast
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.asset import (
     AssetCreationHandling,
diff --git a/pyatlan/client/aio/contract.py b/pyatlan/client/aio/contract.py
@@ -4,7 +4,7 @@
 
 from typing import Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import AsyncApiCaller, ContractInit
 from pyatlan.client.constants import CONTRACT_INIT_API
diff --git a/pyatlan/client/aio/credential.py b/pyatlan/client/aio/credential.py
@@ -4,7 +4,7 @@
 
 from typing import TYPE_CHECKING, Any, Dict, Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/aio/file.py b/pyatlan/client/aio/file.py
@@ -2,7 +2,7 @@
 # Copyright 2025 Atlan Pte. Ltd.
 from __future__ import annotations
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/aio/group.py b/pyatlan/client/aio/group.py
@@ -6,7 +6,7 @@
 
 from pydantic.v1 import parse_obj_as
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/aio/oauth_client.py b/pyatlan/client/aio/oauth_client.py
@@ -5,7 +5,7 @@
 
 from typing import List, Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/aio/open_lineage.py b/pyatlan/client/aio/open_lineage.py
@@ -3,7 +3,7 @@
 
 from typing import Any, Dict, List, Optional, Union
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/aio/query.py b/pyatlan/client/aio/query.py
@@ -3,7 +3,7 @@
 
 from __future__ import annotations
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import AsyncApiCaller, QueryStream
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/aio/role.py b/pyatlan/client/aio/role.py
@@ -5,7 +5,7 @@
 
 from typing import Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import AsyncApiCaller, RoleGet, RoleGetAll
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/aio/search_log.py b/pyatlan/client/aio/search_log.py
@@ -5,7 +5,7 @@
 
 from typing import Union, cast
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import AsyncApiCaller, SearchLogSearch
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/aio/sso.py b/pyatlan/client/aio/sso.py
@@ -5,7 +5,7 @@
 
 from typing import TYPE_CHECKING, List
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/aio/task.py b/pyatlan/client/aio/task.py
@@ -3,7 +3,7 @@
 
 from __future__ import annotations
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import AsyncApiCaller, TaskSearch
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/aio/token.py b/pyatlan/client/aio/token.py
@@ -5,7 +5,7 @@
 
 from typing import Optional, Set
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/aio/typedef.py b/pyatlan/client/aio/typedef.py
@@ -5,7 +5,7 @@
 
 from typing import List, Union
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/aio/user.py b/pyatlan/client/aio/user.py
@@ -6,7 +6,7 @@
 import json
 from typing import TYPE_CHECKING, List, Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.aio.atlan import client_connection
 from pyatlan.client.common import (
diff --git a/pyatlan/client/aio/workflow.py b/pyatlan/client/aio/workflow.py
@@ -6,7 +6,7 @@
 from logging import Logger
 from typing import List, Optional, Union, overload
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     AsyncApiCaller,
diff --git a/pyatlan/client/asset.py b/pyatlan/client/asset.py
@@ -32,7 +32,7 @@
     parse_obj_as,
 )
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 from tenacity import (
     RetryError,
     retry,
diff --git a/pyatlan/client/atlan.py b/pyatlan/client/atlan.py
@@ -28,7 +28,7 @@
     constr,
 )
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.cache.atlan_tag_cache import AtlanTagCache
 from pyatlan.cache.connection_cache import ConnectionCache
diff --git a/pyatlan/client/audit.py b/pyatlan/client/audit.py
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2025 Atlan Pte. Ltd.
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import ApiCaller, AuditSearch
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/contract.py b/pyatlan/client/contract.py
@@ -2,7 +2,7 @@
 # Copyright 2025 Atlan Pte. Ltd.
 from typing import Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import ApiCaller, ContractInit
 from pyatlan.client.constants import CONTRACT_INIT_API
diff --git a/pyatlan/client/credential.py b/pyatlan/client/credential.py
@@ -2,7 +2,7 @@
 # Copyright 2025 Atlan Pte. Ltd.
 from typing import Any, Dict, Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/client/file.py b/pyatlan/client/file.py
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2025 Atlan Pte. Ltd.
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import ApiCaller, FileDownload, FilePresignedUrl, FileUpload
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/group.py b/pyatlan/client/group.py
@@ -2,7 +2,7 @@
 # Copyright 2025 Atlan Pte. Ltd.
 from typing import List, Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/client/oauth_client.py b/pyatlan/client/oauth_client.py
@@ -4,7 +4,7 @@
 
 from typing import List, Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/client/open_lineage.py b/pyatlan/client/open_lineage.py
@@ -1,6 +1,6 @@
 from typing import Any, Dict, List, Optional, Union
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/client/query.py b/pyatlan/client/query.py
@@ -1,4 +1,4 @@
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import ApiCaller, QueryStream
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/role.py b/pyatlan/client/role.py
@@ -2,7 +2,7 @@
 # Copyright 2022 Atlan Pte. Ltd.
 from typing import Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import ApiCaller, RoleGet, RoleGetAll
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/search_log.py b/pyatlan/client/search_log.py
@@ -1,6 +1,6 @@
 from typing import Union
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import ApiCaller, SearchLogSearch
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/sso.py b/pyatlan/client/sso.py
@@ -1,6 +1,6 @@
 from typing import List
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/client/task.py b/pyatlan/client/task.py
@@ -1,4 +1,4 @@
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import ApiCaller, TaskSearch
 from pyatlan.errors import ErrorCode
diff --git a/pyatlan/client/token.py b/pyatlan/client/token.py
@@ -4,7 +4,7 @@
 
 from typing import Optional, Set
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/client/typedef.py b/pyatlan/client/typedef.py
@@ -4,7 +4,7 @@
 
 from typing import List, Union
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/client/user.py b/pyatlan/client/user.py
@@ -5,7 +5,7 @@
 import json
 from typing import List, Optional
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/client/workflow.py b/pyatlan/client/workflow.py
@@ -4,7 +4,7 @@
 from time import sleep
 from typing import List, Optional, Union, overload
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 from pyatlan.client.common import (
     ApiCaller,
diff --git a/pyatlan/model/lineage.py b/pyatlan/model/lineage.py
@@ -9,7 +9,7 @@
 
 from pydantic.v1 import Field, StrictBool, StrictInt, StrictStr
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 
 if TYPE_CHECKING:
     from dataclasses import dataclass
diff --git a/pyatlan/model/search.py b/pyatlan/model/search.py
@@ -21,7 +21,7 @@
     validator,
 )
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 from pydantic.v1.config import Extra
 from pydantic.v1.dataclasses import dataclass
 
diff --git a/pyatlan/pkg/ui.py b/pyatlan/pkg/ui.py
@@ -5,7 +5,7 @@
 
 from pydantic.v1 import Extra, StrictStr
 
-from pyatlan.client.common.validate import validate_arguments
+from pyatlan.validate import validate_arguments
 from pydantic.v1.json import pydantic_encoder
 
 from pyatlan.pkg.widgets import (
diff --git a/pyatlan/validate.py b/pyatlan/validate.py
@@ -72,6 +72,18 @@ class with the same name as *expected_type*.
         if expected_type.__name__ in pydantic_mro_names:
             return True
 
+    # For unittest.mock.Mock objects with a spec, check the spec class MRO
+    spec_class = getattr(value, "_spec_class", None)
+    if spec_class is not None:
+        try:
+            if issubclass(spec_class, expected_type):
+                return True
+        except TypeError:
+            pass
+        spec_mro_names = {cls.__name__ for cls in spec_class.__mro__}
+        if expected_type.__name__ in spec_mro_names:
+            return True
+
     return False
 
 
diff --git a/tests_v9/unit/test_client.py b/tests_v9/unit/test_client.py
