From 7789a2b16bfb717641cb8de0d2729aa10e08075a Mon Sep 17 00:00:00 2001 From: Ernest Hill Date: Wed, 15 Feb 2023 14:18:23 +0300 Subject: [PATCH] Update copyright notices --- LICENSE | 206 +++++++++++++++++++++ NOTICE | 3 + README.md | 32 ++-- pyatlan/__init__.py | 2 + pyatlan/cache/__init__.py | 3 + pyatlan/cache/classification_cache.py | 2 + pyatlan/cache/custom_metadata_cache.py | 2 + pyatlan/cache/role_cache.py | 2 + pyatlan/client/__init__.py | 3 + pyatlan/client/atlan.py | 22 +-- pyatlan/client/constants.py | 3 + pyatlan/error.py | 2 + pyatlan/exceptions.py | 23 +-- pyatlan/generator/__init__.py | 2 + pyatlan/generator/generate_from_typdefs.py | 3 + pyatlan/generator/templates/__init__.py | 2 + pyatlan/generator/templates/entity.jinja2 | 58 +++--- pyatlan/generator/templates/structs.jinja2 | 2 + pyatlan/model/__init__.py | 3 + pyatlan/model/assets.py | 58 +++--- pyatlan/model/core.py | 2 + pyatlan/model/enums.py | 3 + pyatlan/model/internal.py | 2 + pyatlan/model/role.py | 2 + pyatlan/model/search.py | 3 + pyatlan/model/structs.py | 3 + pyatlan/model/typedef.py | 1 + pyatlan/utils.py | 22 +-- tests/__init__.py | 2 + tests/integration/__init__.py | 2 + tests/integration/classification_test.py | 2 + tests/integration/custom_metadata_test.py | 2 + tests/integration/role_test.py | 2 + tests/integration/test_entity_model.py | 2 + tests/integration/test_index_search.py | 2 + tests/unit/__init__.py | 2 + tests/unit/test_classification_name.py | 2 + tests/unit/test_model.py | 2 + tests/unit/test_search_model.py | 2 + tests/unit/test_typedef_model.py | 2 + tests/unit/test_utils.py | 2 + 41 files changed, 365 insertions(+), 132 deletions(-) diff --git a/LICENSE b/LICENSE index fca280824..00cb4b1a1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,209 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +---- +License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/), +Copyright Contributors to the ODPi Egeria project. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/NOTICE b/NOTICE index f0763ba50..310155f7a 100644 --- a/NOTICE +++ b/NOTICE @@ -2,6 +2,9 @@ Pyatlan Copyright [2022] Atlan Pte. Ltd. Copyright [2015-2021] The Apache Software Foundation +Copyright [2013-2021] Elasticsearch + This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +The Licensed to Elasticsearch B.V. diff --git a/README.md b/README.md index c6542bfff..ac523bc27 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,26 @@ -# Atlan Python Client + + +# Atlan Python SDK -Python library for Atlan. +This repository houses the code for a Python SDK to interact with [Atlan](https://atlan.com). -## Installation +## [Documentation](https://developer.atlan.com/sdks/python/) -Use the package manager [pip](https://pip.pypa.io/en/stable/) to install Python client for Atlan +[https://developer.atlan.com/sdks/python/](https://developer.atlan.com/sdks/python/) -```bash -> pip install pyatlan -``` +## Attribution -Verify if atlan client is installed: -```bash -> pip list +Portions of the SDK are based on original work from https://github.com/apache/atlas. Those classes that derive from this original work have an extra heading comment as follows: -Package Version ------------- --------- -pyatlan 0.0.1 +```python +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) ``` -## Usage +Portions of the SDK are based on original work from https://github.com/elastic/elasticsearch-dsl-py. Those classes that derive from this original work have an extra heading comment as follows: + +```python +# Based on original code from https://github.com/elastic/elasticsearch-dsl-py.git (under Apache-2.0 license) +``` +---- +License: [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/), +Copyright 2022 Atlan Pte. Ltd. diff --git a/pyatlan/__init__.py b/pyatlan/__init__.py index e69de29bb..6be70a41e 100644 --- a/pyatlan/__init__.py +++ b/pyatlan/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. diff --git a/pyatlan/cache/__init__.py b/pyatlan/cache/__init__.py index e69de29bb..2f46aa7ec 100644 --- a/pyatlan/cache/__init__.py +++ b/pyatlan/cache/__init__.py @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) diff --git a/pyatlan/cache/classification_cache.py b/pyatlan/cache/classification_cache.py index f9a1baa5a..20898ea30 100644 --- a/pyatlan/cache/classification_cache.py +++ b/pyatlan/cache/classification_cache.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from typing import Optional from pyatlan.model.enums import AtlanTypeCategory diff --git a/pyatlan/cache/custom_metadata_cache.py b/pyatlan/cache/custom_metadata_cache.py index 9aea5b88c..45b2ae745 100644 --- a/pyatlan/cache/custom_metadata_cache.py +++ b/pyatlan/cache/custom_metadata_cache.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from typing import Optional from pyatlan.client.atlan import AtlanClient diff --git a/pyatlan/cache/role_cache.py b/pyatlan/cache/role_cache.py index 96b2b6693..16bfbcd5c 100644 --- a/pyatlan/cache/role_cache.py +++ b/pyatlan/cache/role_cache.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from typing import Optional from pyatlan.client.atlan import AtlanClient diff --git a/pyatlan/client/__init__.py b/pyatlan/client/__init__.py index e69de29bb..2f46aa7ec 100644 --- a/pyatlan/client/__init__.py +++ b/pyatlan/client/__init__.py @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) diff --git a/pyatlan/client/atlan.py b/pyatlan/client/atlan.py index 99b09363e..457056cb7 100644 --- a/pyatlan/client/atlan.py +++ b/pyatlan/client/atlan.py @@ -1,22 +1,6 @@ -#!/usr/bin/env/python -# Copyright 2022 Atlan Pte, Ltd -# Copyright [2015-2021] The Apache Software Foundation -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) import copy import json import logging diff --git a/pyatlan/client/constants.py b/pyatlan/client/constants.py index 61440ad9e..610f0821c 100644 --- a/pyatlan/client/constants.py +++ b/pyatlan/client/constants.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) from pyatlan.utils import ( ADMIN_URI, API, diff --git a/pyatlan/error.py b/pyatlan/error.py index dd922f67c..f78e643df 100644 --- a/pyatlan/error.py +++ b/pyatlan/error.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from __future__ import absolute_import, division, print_function from typing import Optional diff --git a/pyatlan/exceptions.py b/pyatlan/exceptions.py index f7f3fa28a..1428e0313 100644 --- a/pyatlan/exceptions.py +++ b/pyatlan/exceptions.py @@ -1,23 +1,6 @@ -#!/usr/bin/env/python -# Copyright 2022 Atlan Pte, Ltd -# Copyright [2015-2021] The Apache Software Foundation -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) from typing import Optional diff --git a/pyatlan/generator/__init__.py b/pyatlan/generator/__init__.py index e69de29bb..6be70a41e 100644 --- a/pyatlan/generator/__init__.py +++ b/pyatlan/generator/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. diff --git a/pyatlan/generator/generate_from_typdefs.py b/pyatlan/generator/generate_from_typdefs.py index 1819357d5..c7b5a3b93 100644 --- a/pyatlan/generator/generate_from_typdefs.py +++ b/pyatlan/generator/generate_from_typdefs.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) import datetime import json import os diff --git a/pyatlan/generator/templates/__init__.py b/pyatlan/generator/templates/__init__.py index e69de29bb..6be70a41e 100644 --- a/pyatlan/generator/templates/__init__.py +++ b/pyatlan/generator/templates/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. diff --git a/pyatlan/generator/templates/entity.jinja2 b/pyatlan/generator/templates/entity.jinja2 index 38381480e..61d039dcf 100644 --- a/pyatlan/generator/templates/entity.jinja2 +++ b/pyatlan/generator/templates/entity.jinja2 @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) from __future__ import annotations from typing import Optional, Dict, Any, List, Literal, TypeVar, Type from pydantic import Field, StrictStr, root_validator @@ -221,22 +224,18 @@ class {{ entity_def.name }}({{super_classes[0]}} {%- if "Asset" in super_classes {%- endif %} {%- if entity_def.name == "Connection" %} def validate_required(self): - if self.name: - if self.admin_roles or self.admin_groups or self.admin_users: - if self.qualified_name: - if self.category: - if not self.connector_name: - raise ValueError("connector_name is required") - else: - raise ValueError("category is required") - else: - raise ValueError("qualified_name is required") - else: - raise ValueError( - "One of admin_user, admin_groups or admin_roles is required" - ) - else: + if not self.name: raise ValueError("name is required") + if not self.admin_roles and not self.admin_groups and not self.admin_users: + raise ValueError( + "One of admin_user, admin_groups or admin_roles is required" + ) + if not self.qualified_name: + raise ValueError("qualified_name is required") + if not self.category: + raise ValueError("category is required") + if not self.connector_name: + raise ValueError("connector_name is required") @classmethod # @validate_arguments() @@ -277,8 +276,8 @@ class {{ entity_def.name }}({{super_classes[0]}} {%- if "Asset" in super_classes raise ValueError("Invalid connection_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid connection_qualified_name") + except ValueError as e: + raise ValueError("Invalid connection_qualified_name") from e return Database.Attributes( name=name, connection_qualified_name=connection_qualified_name, @@ -297,8 +296,8 @@ class {{ entity_def.name }}({{super_classes[0]}} {%- if "Asset" in super_classes raise ValueError("Invalid database_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid database_qualified_name") + except ValueError as e: + raise ValueError("Invalid database_qualified_name") from e return Schema.Attributes( name=name, database_name=fields[3], @@ -319,8 +318,8 @@ class {{ entity_def.name }}({{super_classes[0]}} {%- if "Asset" in super_classes raise ValueError("Invalid schema_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid schema_qualified_name") + except ValueError as e: + raise ValueError("Invalid schema_qualified_name") from e return {{ entity_def.name }}.Attributes( name=name, database_name=fields[3], @@ -410,8 +409,8 @@ class {{ entity_def.name }}({{super_classes[0]}} {%- if "Asset" in super_classes raise ValueError("Invalid connection_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid connection_qualified_name") + except ValueError as e: + raise ValueError("Invalid connection_qualified_name") from e attributes = Database.Attributes( name=name, connection_qualified_name=connection_qualified_name, @@ -481,12 +480,13 @@ class {{ entity_def.name }}({{super_classes[0]}} {%- if "Asset" in super_classes {% endif %} {% if entity_def.name == "Asset" %} def has_announcement(self) -> bool: - if self.attributes and ( - self.attributes.announcement_title or self.attributes.announcement_type - ): - return True - else: - return False + return bool( + self.attributes + and ( + self.attributes.announcement_title + or self.attributes.announcement_type + ) + ) def set_announcement(self, announcement: Announcement) -> None: self.attributes.announcement_type = announcement.announcement_type.value diff --git a/pyatlan/generator/templates/structs.jinja2 b/pyatlan/generator/templates/structs.jinja2 index c29ef35d0..0acf52e13 100644 --- a/pyatlan/generator/templates/structs.jinja2 +++ b/pyatlan/generator/templates/structs.jinja2 @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from datetime import datetime from typing import Optional diff --git a/pyatlan/model/__init__.py b/pyatlan/model/__init__.py index e69de29bb..2f46aa7ec 100644 --- a/pyatlan/model/__init__.py +++ b/pyatlan/model/__init__.py @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) diff --git a/pyatlan/model/assets.py b/pyatlan/model/assets.py index da5b03d2a..48c9d3a20 100644 --- a/pyatlan/model/assets.py +++ b/pyatlan/model/assets.py @@ -510,12 +510,12 @@ def remove_announcement(self): ) def has_announcement(self) -> bool: - if self.attributes and ( - self.attributes.announcement_title or self.attributes.announcement_type - ): - return True - else: - return False + return bool( + self.attributes + and ( + self.attributes.announcement_title or self.attributes.announcement_type + ) + ) def set_announcement(self, announcement: Announcement) -> None: self.attributes.announcement_type = announcement.announcement_type.value @@ -818,22 +818,18 @@ class Attributes(Asset.Attributes): ) # relationship def validate_required(self): - if self.name: - if self.admin_roles or self.admin_groups or self.admin_users: - if self.qualified_name: - if self.category: - if not self.connector_name: - raise ValueError("connector_name is required") - else: - raise ValueError("category is required") - else: - raise ValueError("qualified_name is required") - else: - raise ValueError( - "One of admin_user, admin_groups or admin_roles is required" - ) - else: + if not self.name: raise ValueError("name is required") + if not self.admin_roles and not self.admin_groups and not self.admin_users: + raise ValueError( + "One of admin_user, admin_groups or admin_roles is required" + ) + if not self.qualified_name: + raise ValueError("qualified_name is required") + if not self.category: + raise ValueError("category is required") + if not self.connector_name: + raise ValueError("connector_name is required") @classmethod # @validate_arguments() @@ -2893,8 +2889,8 @@ def create(cls, name: str, schema_qualified_name: str) -> Table.Attributes: raise ValueError("Invalid schema_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid schema_qualified_name") + except ValueError as e: + raise ValueError("Invalid schema_qualified_name") from e return Table.Attributes( name=name, database_name=fields[3], @@ -3228,8 +3224,8 @@ def create(cls, name: str, database_qualified_name: str) -> Schema.Attributes: raise ValueError("Invalid database_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid database_qualified_name") + except ValueError as e: + raise ValueError("Invalid database_qualified_name") from e return Schema.Attributes( name=name, database_name=fields[3], @@ -3308,8 +3304,8 @@ def create( raise ValueError("Invalid connection_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid connection_qualified_name") + except ValueError as e: + raise ValueError("Invalid connection_qualified_name") from e return Database.Attributes( name=name, connection_qualified_name=connection_qualified_name, @@ -3336,8 +3332,8 @@ def create(cls, name: str, connection_qualified_name: str) -> Database: raise ValueError("Invalid connection_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid connection_qualified_name") + except ValueError as e: + raise ValueError("Invalid connection_qualified_name") from e attributes = Database.Attributes( name=name, connection_qualified_name=connection_qualified_name, @@ -3568,8 +3564,8 @@ def create(cls, name: str, schema_qualified_name: str) -> View.Attributes: raise ValueError("Invalid schema_qualified_name") try: connector_type = AtlanConnectorType(fields[1]) # type:ignore - except ValueError: - raise ValueError("Invalid schema_qualified_name") + except ValueError as e: + raise ValueError("Invalid schema_qualified_name") from e return View.Attributes( name=name, database_name=fields[3], diff --git a/pyatlan/model/core.py b/pyatlan/model/core.py index ecd95a220..ccae0c295 100644 --- a/pyatlan/model/core.py +++ b/pyatlan/model/core.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from typing import TYPE_CHECKING from pydantic import BaseModel, Extra, Field diff --git a/pyatlan/model/enums.py b/pyatlan/model/enums.py index acc168064..802b8056c 100644 --- a/pyatlan/model/enums.py +++ b/pyatlan/model/enums.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) from datetime import datetime from enum import Enum diff --git a/pyatlan/model/internal.py b/pyatlan/model/internal.py index 1d8958a00..44958fb2f 100644 --- a/pyatlan/model/internal.py +++ b/pyatlan/model/internal.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from pyatlan.model.core import AtlanObject diff --git a/pyatlan/model/role.py b/pyatlan/model/role.py index e0d6ce4d6..3f0bb63db 100644 --- a/pyatlan/model/role.py +++ b/pyatlan/model/role.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from __future__ import annotations from typing import List, Optional diff --git a/pyatlan/model/search.py b/pyatlan/model/search.py index 59788b02e..19c1cbdba 100644 --- a/pyatlan/model/search.py +++ b/pyatlan/model/search.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/elastic/elasticsearch-dsl-py.git (under Apache-2.0 license) from abc import ABC, abstractmethod from datetime import datetime from enum import Enum diff --git a/pyatlan/model/structs.py b/pyatlan/model/structs.py index 6756f8295..855e71444 100644 --- a/pyatlan/model/structs.py +++ b/pyatlan/model/structs.py @@ -1,3 +1,6 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) from datetime import datetime from typing import Optional diff --git a/pyatlan/model/typedef.py b/pyatlan/model/typedef.py index cd9f61cc9..cc3bf306c 100644 --- a/pyatlan/model/typedef.py +++ b/pyatlan/model/typedef.py @@ -229,6 +229,7 @@ class Options(AtlanObject): index_type_es_fields: Optional[Dict[str, dict[str, str]]] = Field( None, description="", alias="indexTypeESFields" ) + is_default_value_null: Optional[bool] = Field(None, description="TBC") class StructDef(TypeDef): diff --git a/pyatlan/utils.py b/pyatlan/utils.py index 3e17efb53..5fc63206c 100644 --- a/pyatlan/utils.py +++ b/pyatlan/utils.py @@ -1,22 +1,6 @@ -#!/usr/bin/env/python -# Copyright 2022 Atlan Pte, Ltd -# Copyright [2015-2021] The Apache Software Foundation -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. +# Based on original code from https://github.com/apache/atlas (under Apache-2.0 license) import enum import logging import time diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb..6be70a41e 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index e69de29bb..6be70a41e 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. diff --git a/tests/integration/classification_test.py b/tests/integration/classification_test.py index 54a3ac1d3..9cbc6289d 100644 --- a/tests/integration/classification_test.py +++ b/tests/integration/classification_test.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. import pytest from pyatlan.cache.classification_cache import ClassificationCache diff --git a/tests/integration/custom_metadata_test.py b/tests/integration/custom_metadata_test.py index 7d56804f4..5d53a427c 100644 --- a/tests/integration/custom_metadata_test.py +++ b/tests/integration/custom_metadata_test.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. import pytest from pyatlan.cache.custom_metadata_cache import CustomMetadataCache diff --git a/tests/integration/role_test.py b/tests/integration/role_test.py index ea94a6809..b6c88ca16 100644 --- a/tests/integration/role_test.py +++ b/tests/integration/role_test.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from pyatlan.cache.role_cache import RoleCache diff --git a/tests/integration/test_entity_model.py b/tests/integration/test_entity_model.py index 197e9cb76..45918a386 100644 --- a/tests/integration/test_entity_model.py +++ b/tests/integration/test_entity_model.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. import os import random import string diff --git a/tests/integration/test_index_search.py b/tests/integration/test_index_search.py index 3e258de92..089b87c4b 100644 --- a/tests/integration/test_index_search.py +++ b/tests/integration/test_index_search.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from dataclasses import dataclass, field from typing import Generator diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index e69de29bb..6be70a41e 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. diff --git a/tests/unit/test_classification_name.py b/tests/unit/test_classification_name.py index 6e38ee53f..195902a7d 100644 --- a/tests/unit/test_classification_name.py +++ b/tests/unit/test_classification_name.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. import pytest import pyatlan.cache.classification_cache diff --git a/tests/unit/test_model.py b/tests/unit/test_model.py index ffa21c882..d2b93e3e0 100644 --- a/tests/unit/test_model.py +++ b/tests/unit/test_model.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. import json from pathlib import Path from unittest.mock import create_autospec diff --git a/tests/unit/test_search_model.py b/tests/unit/test_search_model.py index 721cfa9bf..c8fa5b63c 100644 --- a/tests/unit/test_search_model.py +++ b/tests/unit/test_search_model.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from datetime import datetime from typing import Literal, Union diff --git a/tests/unit/test_typedef_model.py b/tests/unit/test_typedef_model.py index bbf48f0ce..9ffb88d8f 100644 --- a/tests/unit/test_typedef_model.py +++ b/tests/unit/test_typedef_model.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. import json from pathlib import Path diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 735dc72c5..3b08aa35b 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright 2022 Atlan Pte. Ltd. from pyatlan.utils import list_attributes_to_params